opsworks-cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80d65b9937273607a19fc3ea4eecd4f1b15311a
-  data.tar.gz: a0200344f6e62a71341c51584e5893d6e8b68de5
+  metadata.gz: 18ef86da686c271e0ca39400b1fdfd653933f038
+  data.tar.gz: 49fdede59882e9141496a5421857b5e25c052c15
 SHA512:
-  metadata.gz: f8847f8697a405dd22a31a16751623a2b429788cdf0c9fd31ea51b2d6a1c4c9e885872fe7c6d0ddba84d4c3e3310e5cb11df3e42b72e1dffa21c055dfc42e911
-  data.tar.gz: f6b8a09606fda4acbfbc600562a60782a6afbfe29cc68fe0b787d144adff694aa2baa4d67dfed8cd0da4ed274896f1b4bf259532ac60e0e410493e846492a7d3
+  metadata.gz: ee72de4769bfa43179a859bbc512cfadc4ba5342103ea9de8cbd5f653a21d988b7810f589753e2cf1b6dcb9406df4e9f42585ec1dee35ad57b9d6274da2c3faa
+  data.tar.gz: a58f99d1895c9f4bf4f673c739387717c464ad1b45064766c77e5d53283f7eafbb285d9515e96cf8a0093ce264e3104eefc8cffb36583bfd8bd44f5331826493

data/lib/opsworks/app.rb

@@ -18,13 +18,7 @@ module OpsWorks
     def initialize_deployments
       return [] unless id
       response = self.class.client.describe_deployments(app_id: id)
-      response.data[:deployments].map do |hash|
-        Deployment.new(
-          id: hash[:deployment_id],
-          created_at: hash[:created_at],
-          status: hash[:status]
-        )
-      end
+      Deployment.from_collection_response(response)
     end
   end
 end

data/lib/opsworks/cli/helpers/options.rb

@@ -7,7 +7,7 @@ module OpsWorks
         def parse_stacks(options = {})
           stacks = OpsWorks::Stack.all
           if options[:stack]
-            stacks.select! { |stack| stack.name == options[:stack] }
+            stacks.select! { |stack| options[:stack].include?(stack.name)  }
           end
           stacks
         end

data/lib/opsworks/cli/subcommands/deploy.rb

@@ -7,15 +7,23 @@ module OpsWorks
         def self.included(thor)
           thor.class_eval do
             desc 'deploy [--stack STACK] APP', 'Deploy an OpsWorks app'
-            option :stack
+            option :stack, type: :array
             def deploy(name)
               fetch_keychain_credentials unless env_credentials?
               stacks = parse_stacks(options)
-              stacks.each do |stack|
+              deployments = stacks.map do |stack|
                 next unless (app = stack.find_app_by_name(name))
                 say "Deploying to #{stack.name}..."
                 stack.deploy_app(app)
               end
+              Deployment.wait(deployments)
+              unless deployments.all?(&:success?)
+                failures = []
+                deployments.each_with_index do |deployment, i|
+                  failures << stacks[i].name if deployment.failed?
+                end
+                fail "Deploy failed on #{failures.join(', ')}"
+              end
             end
           end
         end

data/lib/opsworks/cli/subcommands/exec.rb

@@ -7,14 +7,22 @@ module OpsWorks
         def self.included(thor)
           thor.class_eval do
             desc 'exec [--stack STACK] RECIPE', 'Execute a Chef recipe'
-            option :stack
+            option :stack, type: :array
             def exec(recipe)
               fetch_keychain_credentials unless env_credentials?
               stacks = parse_stacks(options)
-              stacks.each do |stack|
+              deployments = stacks.map do |stack|
                 say "Executing recipe on #{stack.name}..."
                 stack.execute_recipe(recipe)
               end
+              Deployment.wait(deployments)
+              unless deployments.all?(&:success?)
+                failures = []
+                deployments.each_with_index do |deployment, i|
+                  failures << stacks[i].name if deployment.failed?
+                end
+                fail "Command failed on #{failures.join(', ')}"
+              end
             end
           end
         end

data/lib/opsworks/cli/subcommands/status.rb

@@ -11,7 +11,7 @@ module OpsWorks
 
             desc 'status [--stack STACK] APP',
                  'Display the most recent deployment of an app'
-            option :stack
+            option :stack, type: :array
             def status(name)
               fetch_keychain_credentials unless env_credentials?
 

data/lib/opsworks/cli/subcommands/update.rb

@@ -12,14 +12,22 @@ module OpsWorks
             include Helpers::Options
 
             desc 'update [--stack STACK]', 'Update OpsWorks custom cookbooks'
-            option :stack
+            option :stack, type: :array
             def update
               fetch_keychain_credentials unless env_credentials?
               stacks = parse_stacks(options)
-              stacks.each do |stack|
+              deployments = stacks.map do |stack|
                 say "Updating #{stack.name}..."
                 stack.update_custom_cookbooks
               end
+              Deployment.wait(deployments)
+              unless deployments.all?(&:success?)
+                failures = []
+                deployments.each_with_index do |deployment, i|
+                  failures << stacks[i].name if deployment.failed?
+                end
+                fail "Update failed on #{failures.join(', ')}"
+              end
             end
           end
         end

data/lib/opsworks/cli/version.rb

@@ -1,5 +1,5 @@
 module OpsWorks
   module CLI
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/lib/opsworks/deployment.rb

@@ -4,10 +4,59 @@ module OpsWorks
   class Deployment < Resource
     attr_accessor :id, :status, :created_at
 
+    POLL_INTERVAL = 5
+
+    # rubocop:disable MethodLength
+    def self.wait(deployments)
+      while deployments.any?(&:running?)
+        sleep POLL_INTERVAL
+        response = client.describe_deployments(
+          deployment_ids: deployments.map(&:id)
+        )
+        updates = from_collection_response(response)
+        deployments.each do |deployment|
+          update = updates.find { |u| u.id == deployment.id }
+          deployment.status = update.status
+        end
+      end
+    end
+    # rubocop:enble MethodLength
+
+    def self.from_collection_response(response)
+      response.data[:deployments].map do |hash|
+        new(
+          id: hash[:deployment_id],
+          created_at: hash[:created_at],
+          status: hash[:status]
+        )
+      end
+    end
+
+    def self.from_response(response)
+      new(id: response[:deployment_id])
+    end
+
+    def wait
+      while deployment.running?
+        sleep POLL_INTERVAL
+        response = client.describe_deployments(deployment_ids: [id])
+        update = from_collection_response(response).first
+        deployment.status = update.status
+      end
+    end
+
+    def running?
+      status.nil? || status == 'running'
+    end
+
     def success?
       status == 'successful'
     end
 
+    def failed?
+      status == 'failed'
+    end
+
     def created_at
       Time.parse(@created_at)
     rescue

data/lib/opsworks/stack.rb

@@ -52,7 +52,10 @@ module OpsWorks
     end
 
     def create_deployment(options = {})
-      self.class.client.create_deployment(options.merge(stack_id: id))
+      response = self.class.client.create_deployment(
+        options.merge(stack_id: id)
+      )
+      Deployment.from_response(response)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor