shipitron 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 954b1e50e1911cd893e1770ab496735768bea9be
-  data.tar.gz: cf5446d33417962c1f70b664bc8e2ca8202cba57
+SHA256:
+  metadata.gz: 1b1404f46280ca67a501c2c249f955b266d028466357edb5332c8572ad487e0b
+  data.tar.gz: 93d96a64b5aec13d99c3927b593b5c564429ad34f5d7e9aaf162ef9499d52d2f
 SHA512:
-  metadata.gz: 57d272d47ed61fc5b4c2329fcc3d16b7ceb0033ee1bf9da18f1db58335ab19c51a4b8c08af43ad0f8321d558bd09c351e23e79fb458f0b623869afa3423c3f5e
-  data.tar.gz: a7fe7bcf8bd7410c4391d1413dc76f1f3379958508b5b3b80a40128c0a86249bf757b038ea89110aa355b1b1b1a21bd6f9e7a50612d128a78f9c0ecad5246851
+  metadata.gz: a5cfd2a66affc37f96d87d96e1311a06cb7deaea52f98a591962772afbe5ef25038cd5a62b718576be367c22d24e15a00261f61ee4fa98620e3790faece8588b
+  data.tar.gz: d5c4703312aeb1a64b61544c5a1f6ad5a533e60def6e8b29c09726fce89b974a6dfe939769ee5268f4501cd628c4271148cbe179ec60914767ac72073cf6e738

data/Dockerfile

@@ -1,11 +1,11 @@
-FROM ruby:2.4.1-alpine as cache
+FROM ruby:2.5.0-alpine3.7 as cache
 COPY cache/ /tmp/
 RUN   cd /usr/local/bundle && \
     ([ -f /tmp/bundler-data.tar.gz ] && \
     tar -zxf /tmp/bundler-data.tar.gz && \
     rm /tmp/bundler-data.tar.gz) || true
 
-FROM ruby:2.4.1-alpine
+FROM ruby:2.5.0-alpine3.7
 MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 
 RUN addgroup -S shipitron && \

data/Dockerfile.release

@@ -1,4 +1,4 @@
-FROM ruby:2.4.1-alpine
+FROM ruby:2.5.0-alpine3.7
 MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 
 RUN addgroup -S shipitron && \
@@ -40,7 +40,7 @@ RUN apk add --no-cache \
 
 WORKDIR /app
 
-ENV SHIPITRON_VERSION=0.3.5
+ENV SHIPITRON_VERSION=0.4.0
 
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \

data/README.md

@@ -15,11 +15,7 @@ applications:
       - ecs_task: dummy-app
         container_name: dummy-app
         command: echo postbuild
-    ecs_clusters:
-      - name: us-east-1-prod-blue
-        region: us-east-1
-      - name: us-east-1-prod-green
-        region: us-east-1
+    cluster_discovery: _ecs-prod._tcp.example.com
     shipitron_task: shipitron
     ecs_task_defs:
       - dummy-app
@@ -44,6 +40,11 @@ applications:
 - `docker run -it --rm -v $(pwd):/shipitron -v $APP_PATH:/app outstand/shipitron:dev deploy <app> --simulate` to get the arguments for `server_deploy` below
 - `docker run -it --rm --dns 10.10.10.2 -v $(pwd):/shipitron -v $APP_PATH:/app -v /bin/docker:/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v shipitron_fog:/fog -e FOG_LOCAL=true -e CONSUL_HOST=consul outstand/shipitron:dev server_deploy --name dummy-app --repository git@github.com:outstand/dummy-app --bucket outstand-shipitron --image-name outstand/dummy-app --region us-east-1 --cluster-name us-east-1-prod-blue --ecs-task-defs dummy-app --ecs-services dummy-app --build-script shipitron/build.sh --post-builds 'ecs_task:dummy-app,container_name:dummy-app,command:echo postbuild' --ecs-task-def-templates LS0tCmZhbWlseTogZHVtbXktYXBwCmNvbnRhaW5lcl9kZWZpbml0aW9uczoKICAtIG5hbWU6IGR1bW15LWFwcAogICAgaW1hZ2U6IG91dHN0YW5kL2R1bW15LWFwcDp7e3RhZ319CiAgICBtZW1vcnk6IDEyOAogICAgZXNzZW50aWFsOiB0cnVlCiAgICBwb3J0X21hcHBpbmdzOgogICAgICAtIGNvbnRhaW5lcl9wb3J0OiA4MAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gbmFtZTogU0VSVklDRV84MF9OQU1FCiAgICAgICAgdmFsdWU6IGR1bW15Cg== --ecs-service-templates LS0tCmNsdXN0ZXI6IHt7Y2x1c3Rlcn19CnNlcnZpY2VfbmFtZTogZHVtbXktYXBwCnRhc2tfZGVmaW5pdGlvbjogZHVtbXktYXBwe3tyZXZpc2lvbn19CmRlc2lyZWRfY291bnQ6IHt7Y291bnR9fQojcm9sZToge3tyb2xlfX0KZGVwbG95bWVudF9jb25maWd1cmF0aW9uOgogIG1heGltdW1fcGVyY2VudDogMjAwCiAgbWluaW11bV9oZWFsdGh5X3BlcmNlbnQ6IDUwCg== --debug` to run server side (dummy-app is an example)
 
+Running a dev version in production:
+- `docker push outstand/shipitron:dev`
+- Update config to use `shipitron_task: shipitron-dev`
+- `docker run -it --rm -v $(pwd):/shipitron -v $APP_PATH:/app outstand/shipitron:dev deploy <app> --debug`
+
 To release a new version:
 - Update the version number in `version.rb` and `Dockerfile.release` and commit the result.
 - `./build_dev.sh`

data/lib/shipitron/cli.rb

@@ -12,8 +12,6 @@ module Shipitron
     desc 'deploy <app>', 'Deploys the app'
     option :config_file, default: 'shipitron/config.yml'
     option :secrets_file, default: 'shipitron/secrets.yml'
-    option :ember, type: :boolean, default: false
-    option :ember_only, type: :boolean, default: false
     option :debug, type: :boolean, default: false
     option :simulate, type: :boolean, default: false
     def deploy(app)
@@ -42,8 +40,9 @@ module Shipitron
     option :repository_branch, default: 'master'
     option :bucket, required: true
     option :image_name, required: true
+    option :named_tag, default: 'latest'
     option :region, required: true
-    option :cluster_name, required: true
+    option :clusters, type: :array, required: true
     option :ecs_task_defs, type: :array, required: true
     option :ecs_task_def_templates, type: :array, default: []
     option :ecs_services, type: :array, default: []
@@ -64,8 +63,9 @@ module Shipitron
         repository_branch: options[:repository_branch],
         s3_cache_bucket: options[:bucket],
         image_name: options[:image_name],
+        named_tag: options[:named_tag],
         region: options[:region],
-        cluster_name: options[:cluster_name],
+        clusters: options[:clusters],
         ecs_task_defs: options[:ecs_task_defs],
         ecs_task_def_templates: options[:ecs_task_def_templates],
         ecs_services: options[:ecs_services],
@@ -90,7 +90,7 @@ module Shipitron
     desc 'bootstrap <app>', 'Bootstrap ECS task definitions and services'
     option :region, required: true
     option :cluster_name, required: true
-    option :service_count, type: :numeric, default: 3
+    option :service_count, type: :numeric, default: 0
     option :task_def_dir, default: 'shipitron/ecs_task_defs'
     option :service_dir, default: 'shipitron/ecs_services'
     option :secrets_file, default: 'shipitron/secrets.yml'

data/lib/shipitron/client/deploy_application.rb

@@ -1,6 +1,7 @@
 require 'shipitron'
 require 'shipitron/client/load_application_config'
 require 'shipitron/client/load_templates'
+require 'shipitron/client/fetch_clusters'
 require 'shipitron/client/ensure_deploy_not_running'
 require 'shipitron/client/run_ecs_tasks'
 
@@ -11,10 +12,12 @@ module Shipitron
       include Interactor::Organizer
 
       required :application
+      optional :simulate
 
       organize [
         LoadApplicationConfig,
         LoadTemplates,
+        FetchClusters,
         EnsureDeployNotRunning,
         RunEcsTasks
       ]

data/lib/shipitron/client/fetch_clusters.rb

@@ -0,0 +1,43 @@
+require 'shipitron'
+require 'resolv'
+
+module Shipitron
+  module Client
+    class FetchClusters
+      include Metaractor
+
+      required :cluster_discovery
+
+      def call
+        resources = dns_resources.sort! do |a,b|
+          (a.priority <=> b.priority).yield_self do |prio|
+            if prio == 0
+              b.weight <=> a.weight
+            else
+              prio
+            end
+          end
+        end
+
+        context.clusters = resources.map do |r|
+          Smash.new(
+            name: r.target[0].to_s,
+            region: r.target[1].to_s
+          )
+        end
+
+        Logger.debug "Clusters: #{context.clusters.inspect}"
+      end
+
+      private
+      def dns_resources
+        Resolv::DNS.open do |dns|
+          dns.getresources(
+            context.cluster_discovery,
+            Resolv::DNS::Resource::IN::SRV
+          )
+        end
+      end
+    end
+  end
+end

data/lib/shipitron/client/load_application_config.rb

@@ -13,6 +13,7 @@ module Shipitron
         context.repository_branch = config.repository_branch
         context.s3_cache_bucket = config.cache_bucket
         context.image_name = config.image_name
+        context.named_tag = config.named_tag
         context.build_script = config.build_script
         context.post_builds = begin
                                 if config.post_builds.nil?
@@ -21,7 +22,7 @@ module Shipitron
                                   config.post_builds.map {|pb| PostBuild.new(pb) }
                                 end
                               end
-        context.clusters = config.ecs_clusters
+        context.cluster_discovery = config.cluster_discovery
         context.shipitron_task = config.shipitron_task
         context.ecs_task_defs = config.ecs_task_defs
         context.ecs_services = config.ecs_services

data/lib/shipitron/client/load_templates.rb

@@ -23,7 +23,7 @@ module Shipitron
       end
 
       def load_templates(dir)
-        return [] if dir.nil?
+        return {} if dir.nil?
 
         search_path = Pathname.new(dir)
         unless search_path.directory?
@@ -32,11 +32,12 @@ module Shipitron
           )
         end
 
-        templates = []
+        templates = {}
         search_path.find do |path|
           next if path.directory?
+          next if path.extname != '.yml'
 
-          templates << path.read
+          templates[path.basename('.yml').to_s] = path.read
         end
 
         Logger.debug "Templates loaded: #{templates.inspect}"

data/lib/shipitron/client/run_ecs_tasks.rb

@@ -2,6 +2,8 @@ require 'shipitron'
 require 'shipitron/ecs_client'
 require 'shellwords'
 require 'base64'
+require 'tty-table'
+require 'pastel'
 
 module Shipitron
   module Client
@@ -15,6 +17,7 @@ module Shipitron
       required :repository_url
       required :s3_cache_bucket
       required :image_name
+      required :named_tag
       required :ecs_task_defs
       optional :ecs_task_def_templates
       optional :ecs_services
@@ -26,48 +29,63 @@ module Shipitron
 
       before do
         context.post_builds ||= []
-        context.ecs_task_def_templates ||= []
+        context.ecs_task_def_templates ||= {}
         context.ecs_services ||= []
-        context.ecs_service_templates ||= []
+        context.ecs_service_templates ||= {}
       end
 
       def call
         Logger.info "Skipping ECS run_task calls due to --simulate" if simulate?
 
-        clusters.each do |cluster|
-          begin
-            if simulate?
-              command_args(cluster)
-              next
+        Logger.info "Deploying to:"
+        pastel = Pastel.new
+        table = TTY::Table.new do |t|
+          clusters.each_with_index do |cluster, i|
+            if i == 0
+              t << [pastel.yellow('*'), cluster.name, cluster.region, '[' + pastel.green('shipitron') + ']']
+            else
+              t << ['', cluster.name, cluster.region, '']
             end
+          end
+        end
+        table.render.each_line do |line|
+          Logger.info line.chomp
+        end
 
-            response = ecs_client(region: cluster.region).run_task(
-              cluster: cluster.name,
-              task_definition: shipitron_task,
-              overrides: {
-                container_overrides: [
-                  {
-                    name: 'shipitron',
-                    command: command_args(cluster)
-                  }
-                ]
-              },
-              count: 1,
-              started_by: 'shipitron'
-            )
+        cluster = clusters.first
 
-            if !response.failures.empty?
-              response.failures.each do |failure|
-                fail_with_error! message: "ECS run_task failure: #{failure.arn}: #{failure.reason}"
-              end
-            end
+        begin
+          if simulate?
+            command_args(cluster)
+            return
+          end
 
-          rescue Aws::ECS::Errors::ServiceError => e
-            fail_with_errors!(messages: [
-              "Error: #{e.message}",
-              e.backtrace.join("\n")
-            ])
+          response = ecs_client(region: cluster.region).run_task(
+            cluster: cluster.name,
+            task_definition: shipitron_task,
+            overrides: {
+              container_overrides: [
+                {
+                  name: 'shipitron',
+                  command: command_args(cluster)
+                }
+              ]
+            },
+            count: 1,
+            started_by: 'shipitron'
+          )
+
+          if !response.failures.empty?
+            response.failures.each do |failure|
+              fail_with_error! message: "ECS run_task failure: #{failure.arn}: #{failure.reason}"
+            end
           end
+
+        rescue Aws::ECS::Errors::ServiceError => e
+          fail_with_errors!(messages: [
+            "Error: #{e.message}",
+            e.backtrace.join("\n")
+          ])
         end
       end
 
@@ -84,59 +102,66 @@ module Shipitron
         context.shipitron_task
       end
 
-      def escape(str)
-        Shellwords.escape(str)
-      end
-
-      def escaped(sym)
-        escape(context[sym])
-      end
-
       def command_args(cluster)
         [
           'server_deploy',
-          '--name', escaped(:application),
-          '--repository', escaped(:repository_url),
-          '--bucket', escaped(:s3_cache_bucket),
-          '--image-name', escaped(:image_name),
-          '--region', escape(cluster.region),
-          '--cluster-name', escape(cluster.name),
+          '--name', context.application,
+          '--repository', context.repository_url,
+          '--bucket', context.s3_cache_bucket,
+          '--image-name', context.image_name,
+          '--named-tag', context.named_tag,
+          '--region', cluster.region,
         ].tap do |ary|
+          ary << '--clusters'
+          ary.concat(context.clusters.map(&:name))
+
           ary << '--ecs-task-defs'
-          ary.concat(context.ecs_task_defs.each {|s| escape(s)})
+          ary.concat(context.ecs_task_defs)
 
           unless context.ecs_services.empty?
             ary << '--ecs-services'
-            ary.concat(context.ecs_services.each {|s| escape(s)})
+            ary.concat(context.ecs_services)
           end
 
           if context.build_script != nil
-            ary.concat ['--build-script', escaped(:build_script)]
+            ary.concat ['--build-script', context.build_script]
           end
 
           if !context.post_builds.empty?
             ary << '--post-builds'
-            ary.concat(context.post_builds.map(&:to_s).each {|s| escape(s)})
+            ary.concat(context.post_builds.map(&:to_s))
           end
 
           if !context.ecs_task_def_templates.empty?
             ary << '--ecs-task-def-templates'
-            ary.concat(context.ecs_task_def_templates.map {|t| Base64.urlsafe_encode64(t)})
+            ary.concat(
+              context.ecs_task_def_templates.map do |name, data|
+                if context.ecs_task_defs.include?(name)
+                  Base64.urlsafe_encode64(data)
+                end
+              end.compact
+            )
           end
 
           if !context.ecs_service_templates.empty?
             ary << '--ecs-service-templates'
-            ary.concat(context.ecs_service_templates.map {|t| Base64.urlsafe_encode64(t)})
+            ary.concat(
+              context.ecs_service_templates.map do |name, data|
+                if context.ecs_services.include?(name)
+                  Base64.urlsafe_encode64(data)
+                end
+              end.compact
+            )
           end
 
           unless context.repository_branch.nil?
-            ary.concat ['--repository-branch', escaped(:repository_branch)]
+            ary.concat ['--repository-branch', context.repository_branch]
           end
 
           if simulate?
-            Logger.info "server_deploy command: #{ary.join(' ')}"
+            Logger.info "server_deploy command: #{ary.shelljoin}"
           else
-            Logger.debug "server_deploy command: #{ary.join(' ')}"
+            Logger.debug "server_deploy command: #{ary.shelljoin}"
           end
         end
       end

data/lib/shipitron/ecs_client.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-ecs'
 
 module Shipitron
   module EcsClient

data/lib/shipitron/server/deploy_application.rb

@@ -20,8 +20,9 @@ module Shipitron
       required :repository_url
       required :s3_cache_bucket
       required :docker_image
+      required :named_tag
       required :region
-      required :cluster_name
+      required :clusters
       required :ecs_task_defs
       optional :ecs_task_def_templates
       optional :ecs_services

data/lib/shipitron/server/docker/configure.rb

@@ -15,7 +15,11 @@ module Shipitron
         end
 
         def call
-          docker_auth = fetch_key!(key: "shipitron/#{application}/docker_auth")
+          docker_auth = begin
+                          key = fetch_key(key: "shipitron/#{application}/docker_auth")
+                          key = fetch_key!(key: 'shipitron/docker_auth') if key.nil?
+                          key
+                        end
           auth_file = Pathname.new('/home/shipitron/.docker/config.json')
           auth_file.parent.mkpath
           auth_file.open('wb') do |file|

data/lib/shipitron/server/docker/push_image.rb

@@ -7,11 +7,12 @@ module Shipitron
         include Metaractor
 
         required :docker_image
+        required :named_tag
 
         def call
-          Logger.info "Pushing docker image #{docker_image} and #{docker_image.name_with_tag(:latest)}"
+          Logger.info "Pushing docker image #{docker_image} and #{docker_image.name_with_tag(named_tag)}"
 
-          Logger.info `docker tag #{docker_image} #{docker_image.name_with_tag(:latest)}`
+          Logger.info `docker tag #{docker_image} #{docker_image.name_with_tag(named_tag)}`
           if $? != 0
             fail_with_error!(message: 'Docker tag failed.')
           end
@@ -21,9 +22,9 @@ module Shipitron
             fail_with_error!(message: 'Docker push failed.')
           end
 
-          Logger.info `docker push #{docker_image.name_with_tag(:latest)}`
+          Logger.info `docker push #{docker_image.name_with_tag(named_tag)}`
           if $? != 0
-            fail_with_error!(message: 'Docker push (latest) failed.')
+            fail_with_error!(message: "Docker push (#{named_tag}) failed.")
           end
         end
 
@@ -31,6 +32,10 @@ module Shipitron
         def docker_image
           context.docker_image
         end
+
+        def named_tag
+          context.named_tag
+        end
       end
     end
   end

data/lib/shipitron/server/git/configure.rb

@@ -17,12 +17,20 @@ module Shipitron
         end
 
         def call
-          host_key = fetch_key!(key: "shipitron/#{application}/git_host_key")
+          host_key = begin
+                       key = fetch_key(key: "shipitron/#{application}/git_host_key")
+                       key = fetch_key!(key: 'shipitron/git_host_key') if key.nil?
+                       key
+                     end
           Pathname.new('/home/shipitron/.ssh/known_hosts').open('a') do |file|
             file.puts(host_key.to_s)
           end
 
-          deploy_key = fetch_key!(key: "shipitron/#{application}/git_deploy_key")
+          deploy_key = begin
+                         key = fetch_key(key: "shipitron/#{application}/git_deploy_key")
+                         key = fetch_key!(key: 'shipitron/git_deploy_key') if key.nil?
+                         key
+                       end
           Pathname.new('/home/shipitron/.ssh/id_rsa').open('w') do |file|
             file.puts(deploy_key.to_s)
             file.chmod(0600)

data/lib/shipitron/server/git/update_cache.rb

@@ -25,7 +25,7 @@ module Shipitron
           else
             Logger.info 'Fetching new git commits'
             FileUtils.cd('/home/shipitron/git-cache') do
-              `git fetch #{Shellwords.escape repository_url} #{Shellwords.escape repository_branch}:#{Shellwords.escape repository_branch}`
+              `git fetch -f #{Shellwords.escape repository_url} #{Shellwords.escape repository_branch}:#{Shellwords.escape repository_branch}`
             end
           end
         end

data/lib/shipitron/server/run_post_build.rb

@@ -8,7 +8,7 @@ module Shipitron
       include EcsClient
 
       required :region
-      required :cluster_name
+      required :clusters
       optional :post_builds
 
       def call
@@ -20,7 +20,7 @@ module Shipitron
           post_builds.each do |post_build|
             Logger.info "Running #{post_build.command}"
             response = ecs_client(region: region).run_task(
-              cluster: cluster_name,
+              cluster: clusters.first,
               task_definition: post_build.ecs_task,
               overrides: {
                 container_overrides: [
@@ -45,7 +45,7 @@ module Shipitron
             Logger.info 'Waiting for task to finish'
             loop do
               response = ecs_client(region: region).describe_tasks(
-                cluster: cluster_name,
+                cluster: clusters.first,
                 tasks: [task_arn]
               )
               next if response.tasks.empty?
@@ -72,8 +72,8 @@ module Shipitron
         context.region
       end
 
-      def cluster_name
-        context.cluster_name
+      def clusters
+        context.clusters
       end
     end
   end

data/lib/shipitron/server/transform_cli_args.rb

@@ -14,8 +14,9 @@ module Shipitron
       optional :repository_branch
       required :s3_cache_bucket
       required :image_name
+      required :named_tag
       required :region
-      required :cluster_name
+      required :clusters
       required :ecs_task_defs
       optional :ecs_task_def_templates
       optional :ecs_services
@@ -36,8 +37,9 @@ module Shipitron
           repository_url
           repository_branch
           s3_cache_bucket
+          named_tag
           region
-          cluster_name
+          clusters
           ecs_services
           build_script
         ].each_with_object(cli_args) { |k, args| args[k] = context[k] }

data/lib/shipitron/server/update_deploy_ref.rb

@@ -29,7 +29,12 @@ module Shipitron
       end
 
       def deploy_ref_key
-        fetch_key!(key: "shipitron/#{application}/deploy_ref_key")
+        key = fetch_key(key: "shipitron/#{application}/deploy_ref_key")
+        if key.nil?
+          key = "shipitron/#{application}/deploy_ref"
+          Logger.info "Defaulting deploy_ref_key to #{key}"
+        end
+        key
       end
     end
   end

data/lib/shipitron/server/update_ecs_services.rb

@@ -9,7 +9,7 @@ module Shipitron
       include EcsClient
 
       required :region
-      required :cluster_name
+      required :clusters
       optional :ecs_services
       required :ecs_task_defs
       optional :ecs_service_templates
@@ -28,56 +28,57 @@ module Shipitron
         Logger.info "Updating ECS services [#{ecs_services.join(', ')}] with task definitions [#{ecs_task_defs.map(&:to_s).join(', ')}]"
 
         begin
-          service_templates = ParseTemplates.call!(
-            templates: ecs_service_templates,
-            template_context: {
+          clusters.each do |cluster_name|
+            service_templates = ParseTemplates.call!(
+              templates: ecs_service_templates,
+              template_context: {
+                cluster: cluster_name,
+                revision: nil,
+                count: nil
+              }
+            ).parsed_templates
+
+            service_task_defs = {}
+
+            # Find all requested services
+            services_response = ecs_client(region: region).describe_services(
               cluster: cluster_name,
-              revision: nil,
-              count: nil
-            }
-          ).parsed_templates
-
-          service_task_defs = {}
-
-          # Find all requested services
-          services_response = ecs_client(region: region).describe_services(
-            cluster: cluster_name,
-            services: ecs_services
-          )
-
-          # For each service, find the task definition it references
-          services_response.services.each do |service|
-            response = ecs_client(region: region).describe_task_definition(
-              task_definition: service.task_definition
+              services: ecs_services
             )
 
-            # For the task definition, find the locally updated version in ecs_task_defs
-            ecs_task_def = ecs_task_defs.find {|task| task.name == response.task_definition.family }
-            service_task_defs[service.service_name] = ecs_task_def
-          end
+            # For each service, find the task definition it references
+            services_response.services.each do |service|
+              response = ecs_client(region: region).describe_task_definition(
+                task_definition: service.task_definition
+              )
 
-          service_task_defs.each do |ecs_service, ecs_task_def|
-            Logger.info "Updating #{ecs_service} with #{ecs_task_def}"
+              # For the task definition, find the locally updated version in ecs_task_defs
+              ecs_task_def = ecs_task_defs.find {|task| task.name == response.task_definition.family }
+              service_task_defs[service.service_name] = ecs_task_def
+            end
 
-            service_params = {
-              cluster: cluster_name,
-              service: ecs_service,
-              task_definition: ecs_task_def.name_with_revision
-            }
-
-            template = service_templates.find {|t| t.service_name == ecs_service }
-            if template != nil
-              if template.deployment_configuration != nil
-                Logger.debug "Merging deployment config: #{template.deployment_configuration}"
-                service_params.merge(
-                  deployment_configuration: template.deployment_configuration
-                )
+            service_task_defs.each do |ecs_service, ecs_task_def|
+              Logger.info "#{cluster_name}: Updating #{ecs_service} with #{ecs_task_def}"
+
+              service_params = {
+                cluster: cluster_name,
+                service: ecs_service,
+                task_definition: ecs_task_def.name_with_revision
+              }
+
+              template = service_templates.find {|t| t.service_name == ecs_service }
+              if template != nil
+                if template.deployment_configuration != nil
+                  Logger.debug "Merging deployment config: #{template.deployment_configuration}"
+                  service_params.merge(
+                    deployment_configuration: template.deployment_configuration
+                  )
+                end
               end
-            end
 
-            ecs_client(region: region).update_service(service_params)
+              ecs_client(region: region).update_service(service_params)
+            end
           end
-
         rescue Aws::ECS::Errors::ServiceError => e
           fail_with_errors!(messages: [
             "Error: #{e.message}",
@@ -91,8 +92,8 @@ module Shipitron
         context.region
       end
 
-      def cluster_name
-        context.cluster_name
+      def clusters
+        context.clusters
       end
 
       def ecs_services

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
 end

data/shipitron.gemspec

@@ -17,21 +17,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'thor', '~> 0.19'
-  spec.add_runtime_dependency 'aws-sdk', '~> 2.4'
-  spec.add_runtime_dependency 'hashie', '~> 3.4'
+  spec.add_runtime_dependency 'thor', '~> 0.20'
+  spec.add_runtime_dependency 'aws-sdk-ecs', '~> 1.8'
+  spec.add_runtime_dependency 'hashie', '~> 3.5'
   spec.add_runtime_dependency 'metaractor', '~> 0.5'
-  spec.add_runtime_dependency 'diplomat', '~> 0.18'
-  spec.add_runtime_dependency 'fog-aws', '~> 0.11'
-  spec.add_runtime_dependency 'mime-types', '~> 3.0'
-  spec.add_runtime_dependency 'minitar', '~> 0.5'
+  spec.add_runtime_dependency 'diplomat', '~> 2.0'
+  spec.add_runtime_dependency 'fog-aws', '~> 2.0'
+  spec.add_runtime_dependency 'mime-types', '~> 3.1'
+  spec.add_runtime_dependency 'minitar', '~> 0.6'
   spec.add_runtime_dependency 'mustache', '~> 1.0'
-  spec.add_runtime_dependency 'tty-command', '~> 0.6'
+  spec.add_runtime_dependency 'tty-command', '~> 0.7'
+  spec.add_runtime_dependency 'tty-table', '~> 0.9'
+  spec.add_runtime_dependency 'pastel', '~> 0.7'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry-byebug", "~> 3.4"
-  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "pry-byebug", "~> 3.5"
+  spec.add_development_dependency "rspec", "~> 3.7"
   spec.add_development_dependency "fivemat", "~> 1.3"
-  spec.add_development_dependency "fog-local", "~> 0.3"
+  spec.add_development_dependency "fog-local", "~> 0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: metaractor
   requirement: !ruby/object:Gem::Requirement
@@ -72,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -142,70 +142,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 description: 
 email:
 - ryan@outstand.com
@@ -259,6 +287,7 @@ files:
 - lib/shipitron/client/create_ecs_services.rb
 - lib/shipitron/client/deploy_application.rb
 - lib/shipitron/client/ensure_deploy_not_running.rb
+- lib/shipitron/client/fetch_clusters.rb
 - lib/shipitron/client/load_application_config.rb
 - lib/shipitron/client/load_templates.rb
 - lib/shipitron/client/register_ecs_task_definitions.rb
@@ -317,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.