use deployment-id

kickstarter · Sep 4, 2024 · a13c36f · a13c36f
1 parent 06c7b5f
commit a13c36f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/lib/egads/command/release.rb b/lib/egads/command/release.rb
@@ -10,7 +10,7 @@ class Release < Group
 
     desc '[remote] Symlinks SHA to current and restarts services. If needed, stages SHA'
     class_option :force, type: :boolean, default: false, banner: 'Overwrite existing release'
-    class_option :deployment_id, type: :boolean, default: false, banner: 'Include deployment ID in release directory'
+    class_option :deployment-id, type: :boolean, default: false, banner: 'Include deployment ID in release directory'
     argument :sha, type: :string, required: true, desc: 'git SHA to stage'
 
     def setup_environment

diff --git a/lib/egads/command/stage.rb b/lib/egads/command/stage.rb
@@ -10,7 +10,7 @@ class Stage < Group
 
     desc '[remote] Readies SHA for release. If needed, generates URL for SHA and extracts'
     class_option :force, type: :boolean, default: false, banner: 'Overwrite existing files'
-    class_option :deployment_id, type: :boolean, default: false, banner: 'Include deployment ID in release directory'
+    class_option :deployment-id, type: :boolean, default: false, banner: 'Include deployment ID in release directory'
     argument :sha, type: :string, required: true, desc: 'git SHA to stage'
 
     def setup_environment
@@ -69,9 +69,9 @@ def mark_as_staged
 
     def dir
       base_dir = RemoteConfig.release_dir(sha)
-      deployment_id_value = deployment_id if options[:deployment_id]
+      deployment-id_value = deployment-id if options[:deployment-id]
 
-      deployment_id_value ? "#{base_dir}_#{deployment_id_value}" : base_dir
+      deployment-id_value ? "#{base_dir}_#{deployment-id_value}" : base_dir
     end
 
     def stage_flag_path

diff --git a/lib/egads/local_helpers.rb b/lib/egads/local_helpers.rb
@@ -19,7 +19,7 @@ def tarball
       @tarball ||= S3Tarball.new(sha, seed: options[:seed])
     end
 
-    def deployment_id
+    def deployment-id
       environment = ENV['EC2_ENVIRONMENT'] || ''
       application = ENV['EC2_SERVICE'] || ''
 

diff --git a/spec/egads_release_spec.rb b/spec/egads_release_spec.rb
@@ -12,7 +12,7 @@
   it 'should have the correct class options' do
     expected_options = {
       force: { type: :boolean, default: false, banner: 'Overwrite existing release' },
-      deployment_id: { type: :boolean, default: false, banner: 'Include deployment ID in release directory' }
+      deployment-id: { type: :boolean, default: false, banner: 'Include deployment ID in release directory' }
     }
 
     actual_options = subject.class_options.transform_values { |opt| { type: opt.type, default: opt.default, banner: opt.banner }}

diff --git a/spec/egads_stage_spec.rb b/spec/egads_stage_spec.rb
@@ -12,7 +12,7 @@
   it 'should have the correct class options' do
     expected_options = {
       force: { type: :boolean, default: false, banner: 'Overwrite existing files' },
-      deployment_id: { type: :boolean, default: false, banner: 'Include deployment ID in release directory'}
+      deployment-id: { type: :boolean, default: false, banner: 'Include deployment ID in release directory'}
     }
 
     actual_options = subject.class_options.transform_values { |opt| { type: opt.type, default: opt.default, banner: opt.banner }}