shiprails 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ad943e3c31dce558f301d17f74d3fe9ee8fd66
-  data.tar.gz: 78cb95e986707c421b314be374cddd56c36d9d4e
+  metadata.gz: 3a24cbe59501f02ce1177daad4400093997b3acd
+  data.tar.gz: 23ff9d829b9205196b746ff89e10d7d0bb3bacac
 SHA512:
-  metadata.gz: 443405a53e8790d41e9df6c24bc08d8ff7d39b16b10804723af482271a7a4d7853c41924674d7056a8709ffe7e28cb74244a2fa8063355b85bb8582a3ab2c324
-  data.tar.gz: 7402c82fcb9ace723ef6fa623b7e9faf9087d008de371e1c58dc03e3e9c79bd28c2724c47c2fca1c18159c5673c8a49a3017a5d4bd2922a19503cf8737019085
+  metadata.gz: f5608078535b5c5af45622e052690b73fe25b6aab9fe518060e499b1d5a57f2c7c911704c672c9025b80b39763cf9eba0e851f9e7896f2802d0b08cc380dc9be
+  data.tar.gz: 137894c44aa41c42063f1e1d0dd7354021ad79eb6d4255fe9c7439f60f051361da6e644fe7603a935a4a6610d1c4b625c9ff9ea604fe0a4e5bf46550471d2ba4

data/lib/shiprails/ship/deploy.rb

@@ -108,6 +108,7 @@ module Shiprails
 
       def update_ecs_tasks
         perform_callbacks :before_update_ecs_tasks
+        task_arn = nil
         say "Updating ECS tasks..."
         configuration[:services].each do |service_name, service|
           image_name = "#{project_name}_#{service_name}"
@@ -146,12 +147,15 @@ module Shiprails
                 say "Updated #{service_name} container (#{image_name})."
               end
               task_definition_response = ecs.register_task_definition(task_definition)
+              if service_name == :app
+                task_arn = task_definition_response.task_definition.task_definition_arn
+              end
               say "Updated #{task_name}.", :green
             end
           end
         end
         say "ECS tasks updated.", :green
-        perform_callbacks :after_update_ecs_tasks
+        perform_callbacks :after_update_ecs_tasks, task_arn
       end
 
       def update_ecs_services
@@ -237,11 +241,13 @@ module Shiprails
         configuration[:config_s3_bucket]
       end
 
-      def perform_callbacks(stage_name)
+      def perform_callbacks(stage_name, task_arn=nil)
         @_callbacks ||= configuration[:callbacks] || {}
         if @_callbacks.key?(stage_name)
-          command = @_callbacks[stage_name]
-          wrapped_command = "ship exec -e #{environment} #{command}"
+          command = ["ship exec -e #{environment}"]
+          command << "--task-arn #{task_arn}" unless task_arn.nil?
+          command << @_callbacks[stage_name]
+          wrapped_command = command.join ' '
           say "#{stage_name.to_s}: #{wrapped_command}"
           result = run(wrapped_command)
           exit(1) unless result

data/lib/shiprails/ship/exec.rb

@@ -24,6 +24,8 @@ module Shiprails
       class_option "private-key",
         aliases: ["-pk"],
         desc: "Specify the AWS SSH private key path"
+      class_option "task-arn",
+        desc: "Specify the ECS task ARN"
 
       def run_command
         cluster_name = "#{project_name}_#{environment}"
@@ -92,7 +94,13 @@ module Shiprails
         task_definition_arn = task_descriptions.tasks.first.task_definition_arn
         task_definition_name = task_definition_arn.split('/').last
         container_instance_arn = task_descriptions.tasks.first.container_instance_arn
-        task_definition_description = ecs.describe_task_definition({task_definition: task_definition_name})
+
+        task_arn = options['task-arn']
+        if task_arn.nil?
+          task_definition_description = ecs.describe_task_definition({task_definition: task_definition_name})
+        else
+          task_definition_description = ecs.describe_task_definition({task_definition: task_arn})
+        end
 
         say "Setting up EC2 instance for SSH..."
         # with the instance ARN let's grab the intance id

data/lib/shiprails/version.rb

@@ -1,3 +1,3 @@
 module Shiprails
-  VERSION = "0.1.16"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiprails
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Zane Shannon