opsworks-cli 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00979b100ad560ac20e1198ebde33d3b81d3f46f
-  data.tar.gz: 3f66d10db7a20b4aff6db3b1d1b5ab214efba24e
+  metadata.gz: 1f9314cdf3a4f3ca9c386e2dc2f0e537cfa498f9
+  data.tar.gz: cfb55e0c88b9efb9188c0fece32de6edbf83494e
 SHA512:
-  metadata.gz: 79ada7860aa57e55e00edc85d5b52162a416ceed7b23d3c966ba4441a0ac140824aeb4c236d35172098567c40ff330dc5d109d2bce5f376326afdf55f52dff8b
-  data.tar.gz: 1bfc5d83a69d437590abfa1ff791ba719bc829a410e624fda20201c6855d93269864a8b0a711711c8f78dd115d37120c8e53563349015d54e6d98c796736d7ac
+  metadata.gz: c63763cc141a5bc68fc7a32632cf6b73da5ba4e316dfbc2b96c51b7b29aded201b45eb857b5cc79fc42bacbb31a9b630081ad93c8755577329297963d47f4ab9
+  data.tar.gz: 221fe534dcb3affcc3de82ec1038fe5524c48af2a9a5ea79f69a446e9ec6b418b893cf80538de625f3dc7d91cb29f71fd5f277d1656081e018eb398ba39746ab

data/.travis.yml

@@ -1,3 +1,6 @@
+sudo: false
+
 rvm:
-  - 2.0.0
-  - jruby
+  - 2.1.0
+  - 2.2.0
+  - 2.3.0

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+# Support older Rubies in specs
+gem 'activesupport', '~> 4.0'
+
 # Specify your gem's dependencies in opsworks-cli.gemspec
 gemspec

data/README.md

@@ -14,12 +14,14 @@ Install the gem:
 
 ## Configuration
 
-The gem expects to have access to your AWS access key ID and secret access key. You can configure this in either of two ways. First, you may set the following environment variables:
+The gem expects to have access to your AWS access key ID and secret access key. You may set the following environment variables:
 
     export AWS_ACCESS_KEY_ID=...
     export AWS_SECRET_ACCESS_KEY=...
 
-Second (the preferred option), you may use the [Omnivault](https://github.com/aptible/omnivault) gem to store and configure your credentials automatically, via your choice of password-protected vault (Apple Keychain or pws).
+To avoid manually setting these ENV variables each time, you may use the [Omnivault](https://github.com/aptible/omnivault) gem to store and configure your credentials once, then access them later by running e.g.
+
+    omnivault exec opsworks [...]
 
 ## Usage
 

data/lib/opsworks/app.rb

@@ -5,10 +5,11 @@ module OpsWorks
   class App < Resource
     attr_accessor :id, :name, :revision
 
-    def self.from_collection_response(response)
-      response.data[:apps].map do |hash|
+    def self.from_collection_response(client, response)
+      response.data[:apps].map do |app|
+        hash = app.to_h
         revision = hash[:app_source][:revision] if hash[:app_source]
-        new(id: hash[:app_id], name: hash[:name], revision: revision)
+        new(client, id: hash[:app_id], name: hash[:name], revision: revision)
       end
     end
 
@@ -20,12 +21,21 @@ module OpsWorks
       deployments.find(&:success?)
     end
 
+    def update_revision(revision)
+      client.update_app(
+        app_id: id,
+        app_source: { revision: revision }
+      )
+
+      self.revision = revision
+    end
+
     private
 
     def initialize_deployments
       return [] unless id
-      response = self.class.client.describe_deployments(app_id: id)
-      Deployment.from_collection_response(response)
+      response = client.describe_deployments(app_id: id)
+      Deployment.from_collection_response(client, response)
     end
   end
 end

data/lib/opsworks/cli/agent.rb

@@ -1,7 +1,5 @@
 require 'thor'
-require 'aws'
 
-require_relative 'helpers/credentials'
 require_relative 'helpers/options'
 require_relative 'helpers/typecasts'
 
@@ -10,13 +8,13 @@ require_relative 'subcommands/recipes'
 require_relative 'subcommands/apps'
 require_relative 'subcommands/iam'
 require_relative 'subcommands/config'
+require_relative 'subcommands/deployments'
 
 module OpsWorks
   module CLI
     class Agent < Thor
       include Thor::Actions
 
-      include Helpers::Credentials
       include Helpers::Options
       include Helpers::Typecasts
 
@@ -25,6 +23,7 @@ module OpsWorks
       include Subcommands::Apps
       include Subcommands::IAM
       include Subcommands::Config
+      include Subcommands::Deployments
 
       desc 'version', 'Print OpsWorks CLI version'
       def version

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

@@ -4,31 +4,37 @@ module OpsWorks
   module CLI
     module Subcommands
       module Apps
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
-        # rubocop:disable PerceivedComplexity
         def self.included(thor)
           thor.class_eval do
             desc 'apps:deploy APP [--stack STACK]', 'Deploy an OpsWorks app'
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
             option :migrate, type: :boolean, default: false
+            option :layer, type: :string
             define_method 'apps:deploy' do |name|
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 next unless (app = stack.find_app_by_name(name))
                 say "Deploying to #{stack.name}..."
-                stack.deploy_app(app, 'migrate' => [options[:migrate].to_s])
-              end
-              deployments.compact!
-              OpsWorks::Deployment.wait(deployments, options[:timeout])
-              unless deployments.all?(&:success?)
-                failures = []
-                deployments.each_with_index do |deployment, i|
-                  failures << stacks[i].name unless deployment.success?
-                end
-                fail "Deploy failed on #{failures.join(', ')}"
+                dpl = stack.deploy_app(
+                  app,
+                  layer: options[:layer],
+                  args: { 'migrate' => [options[:migrate].to_s] }
+                )
+                next unless dpl
+                [stack, dpl]
+              end.compact
+
+              OpsWorks::Deployment.wait(deployments.map(&:last),
+                                        options[:timeout])
+
+              failures = deployments.map do |stack, deployment|
+                next if deployment.success?
+                stack
+              end.compact
+
+              unless failures.empty?
+                raise "Deploy failed on #{failures.map(&:name).join(' ')}"
               end
             end
 
@@ -36,8 +42,6 @@ module OpsWorks
                  'Display the most recent deployment of an app'
             option :stack, type: :array
             define_method 'apps:status' do |name|
-              fetch_credentials unless env_credentials?
-
               table = parse_stacks(options).map do |stack|
                 next unless (app = stack.find_app_by_name(name))
                 if (deployment = app.last_deployment)
@@ -60,12 +64,11 @@ module OpsWorks
             option :shortname
             define_method 'apps:create' do |name|
               unless %w(other).include?(options[:type])
-                fail "Unsupported type: #{options[:type]}"
+                raise "Unsupported type: #{options[:type]}"
               end
 
-              fail 'Git URL not yet supported' if options[:git_url]
+              raise 'Git URL not yet supported' if options[:git_url]
 
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options)
 
               stacks.each do |stack|
@@ -75,6 +78,18 @@ module OpsWorks
               end
             end
 
+            desc 'apps:revision:update APP REVISION [--stack STACK]',
+                 'Set the revision for an app'
+            option :stack, type: :array
+            define_method 'apps:revision:update' do |app_name, revision|
+              stacks = parse_stacks(options.merge(active: true))
+              stacks.each do |stack|
+                next unless (app = stack.find_app_by_name(app_name))
+                say "Updating #{stack.name} (from: #{app.revision})..."
+                app.update_revision(revision)
+              end
+            end
+
             private
 
             def formatted_time(timestamp)
@@ -82,9 +97,6 @@ module OpsWorks
             end
           end
         end
-        # rubocop:enable PerceivedComplexity
-        # rubocop:enable CyclomaticComplexity
-        # rubocop:enable MethodLength
       end
     end
   end

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

@@ -1,12 +1,9 @@
-require 'aws'
 require 'opsworks/stack'
 
 module OpsWorks
   module CLI
     module Subcommands
       module Chef
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
             desc 'chef:configure [--stack STACK]', 'Configure Chef/Berkshelf'
@@ -20,7 +17,6 @@ module OpsWorks
             option :cookbook_username
             option :cookbook_password
             define_method 'chef:configure' do
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               stacks.each do |stack|
                 say "Configuring Chef #{options[:version]} on #{stack.name}..."
@@ -32,25 +28,28 @@ module OpsWorks
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
             define_method 'chef:sync' do
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Syncing #{stack.name}..."
-                stack.update_custom_cookbooks
-              end
-              OpsWorks::Deployment.wait(deployments, options[:timeout])
-              unless deployments.all?(&:success?)
-                failures = []
-                deployments.each_with_index do |deployment, i|
-                  failures << stacks[i].name unless deployment.success?
-                end
-                fail "Update failed on #{failures.join(', ')}"
+                dpl = stack.update_custom_cookbooks
+                next unless dpl
+                [stack, dpl]
+              end.compact
+
+              OpsWorks::Deployment.wait(deployments.map(&:last),
+                                        options[:timeout])
+
+              failures = deployments.map do |stack, deployment|
+                next if deployment.success?
+                stack
+              end.compact
+
+              unless failures.empty?
+                raise "Deploy failed on #{failures.map(&:name).join(', ')}"
               end
             end
           end
         end
-        # rubocop:enable CyclomaticComplexity
-        # rubocop:enable MethodLength
       end
     end
   end

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

@@ -1,21 +1,17 @@
-require 'aws'
 require 'opsworks/stack'
 
 module OpsWorks
   module CLI
     module Subcommands
       module Config
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
             desc 'config:get KEY [--stack STACK]', 'Get a single config value'
             option :stack, type: :array
             define_method 'config:get' do |key|
-              fetch_credentials unless env_credentials?
               table = parse_stacks(options).map do |stack|
                 value = stack.custom_json_at(key)
-                [stack.name, value || '(null)']
+                [stack.name, value.nil? ? '(null)' : value]
               end
               table.compact!
               table.sort! { |x, y| x.first <=> y.first }
@@ -25,7 +21,6 @@ module OpsWorks
             desc 'config:set KEY VALUE [--stack STACK]', 'Set a config value'
             option :stack, type: :array
             define_method 'config:set' do |key, value|
-              fetch_credentials unless env_credentials?
               parse_stacks(options).each do |stack|
                 say "Updating #{stack.name}..."
                 stack.set_custom_json_at(key, typecast_string_argument(value))
@@ -35,7 +30,6 @@ module OpsWorks
             desc 'config:unset KEY [--stack STACK]', 'Unset a config value'
             option :stack, type: :array
             define_method 'config:unset' do |key|
-              fetch_credentials unless env_credentials?
               parse_stacks(options).map do |stack|
                 say "Updating #{stack.name}..."
                 stack.set_custom_json_at(key, nil)
@@ -43,8 +37,6 @@ module OpsWorks
             end
           end
         end
-        # rubocop:enable CyclomaticComplexity
-        # rubocop:enable MethodLength
       end
     end
   end

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

@@ -0,0 +1,82 @@
+module OpsWorks
+  module CLI
+    module Subcommands
+      module Deployments
+        def self.included(thor)
+          thor.class_eval do
+            desc 'deployments:retry [--stack STACK]', 'Retry last deployment'
+            option :stack, type: :array
+            option :timeout, type: :numeric, default: 300
+            define_method 'deployments:retry' do
+              stacks = parse_stacks(options.merge(active: true))
+
+              last_deployment = stacks.map do |stack|
+                say "Loading last deployment for #{stack.name}"
+                [stack, stack.deployments.max_by(&:created_at)]
+              end
+
+              will_retry = last_deployment.map do |stack, deployment|
+                if deployment.status == 'successful'
+                  say "Skipping stack #{stack.name}: last deployment is " \
+                      "#{deployment.status}"
+                  next
+                end
+
+                say "Loading instance status for #{stack.name}"
+
+                res = deployment.client.describe_commands(
+                  deployment_id: deployment.id
+                )
+
+                retry_commands = res.commands.select do |command|
+                  command.status != 'successful'
+                end
+
+                instance_ids = retry_commands.map(&:instance_id).to_a
+
+                if instance_ids.empty?
+                  say "Skipping #{stack.name}: no instances failed"
+                  next
+                end
+
+                [stack, deployment, instance_ids]
+              end.compact
+
+              deployments = will_retry.map do |stack, dep, instance_ids|
+                say "Retrying #{dep.command[:name]} in #{stack.name} " \
+                    "on #{instance_ids.join ' '}"
+
+                opts = {
+                  command: dep.command,
+                  instance_ids: instance_ids
+                }
+                opts[:app_id] = dep.app_id if dep.app_id
+                opts[:custom_json] = dep.custom_json if dep.custom_json
+
+                new_deployment = stack.send(:create_deployment, opts)
+
+                [stack, new_deployment]
+              end
+
+              say "Waiting #{options[:timeout]}s for deployments to finish"
+
+              OpsWorks::Deployment.wait(deployments.map(&:last),
+                                        options[:timeout])
+
+              failures = deployments.map do |stack, deployment|
+                next if deployment.success?
+                stack
+              end.compact
+
+              unless failures.empty?
+                raise "Deploy failed on #{failures.map(&:name).join(' ')}"
+              end
+
+              say "All #{deployments.size} deployments suceeded"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,6 @@ module OpsWorks
   module CLI
     module Subcommands
       module IAM
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
             desc 'iam:allow USER [--stack STACK]',
@@ -14,7 +12,6 @@ module OpsWorks
             option :ssh, type: :boolean, default: true
             option :sudo, type: :boolean, default: true
             define_method 'iam:allow' do |user|
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               stacks.each do |stack|
                 permission = stack.find_permission_by_user(user)
@@ -27,7 +24,6 @@ module OpsWorks
             desc 'iam:lockdown [--stack STACK]', 'Remove all stack permissions'
             option :stack, type: :array
             define_method 'iam:lockdown' do
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               stacks.each do |stack|
                 say "Locking down #{stack.name}..."
@@ -38,8 +34,6 @@ module OpsWorks
             end
           end
         end
-        # rubocop:enable CyclomaticComplexity
-        # rubocop:enable MethodLength
       end
     end
   end

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

@@ -4,15 +4,12 @@ module OpsWorks
   module CLI
     module Subcommands
       module Recipes
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
             desc 'recipes:run RECIPE [--stack STACK]', 'Execute a Chef recipe'
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
             define_method 'recipes:run' do |recipe|
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Executing recipe on #{stack.name}..."
@@ -24,7 +21,7 @@ module OpsWorks
                 deployments.each_with_index do |deployment, i|
                   failures << stacks[i].name unless deployment.success?
                 end
-                fail "Command failed on #{failures.join(', ')}"
+                raise "Command failed on #{failures.join(', ')}"
               end
             end
 
@@ -32,7 +29,6 @@ module OpsWorks
                  'Add a recipe to a given layer and lifecycle event'
             option :stack, type: :array
             define_method 'recipes:add' do |layername, event, recipe|
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options)
               stacks.each do |stack|
                 layer = stack.layers.find { |l| l.shortname == layername }
@@ -48,7 +44,6 @@ module OpsWorks
                  'Remove a recipe from a given layer and lifecycle event'
             option :stack, type: :array
             define_method 'recipes:rm' do |layername, event, recipe|
-              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options)
               stacks.each do |stack|
                 layer = stack.layers.find { |l| l.shortname == layername }
@@ -61,8 +56,6 @@ module OpsWorks
             end
           end
         end
-        # rubocop:enable CyclomaticComplexity
-        # rubocop:enable MethodLength
       end
     end
   end

data/lib/opsworks/cli/version.rb

@@ -1,5 +1,5 @@
 module OpsWorks
   module CLI
-    VERSION = '0.4.5'
+    VERSION = '0.5.0'.freeze
   end
 end

data/lib/opsworks/deployment.rb

@@ -2,13 +2,12 @@ require 'opsworks/resource'
 
 module OpsWorks
   class Deployment < Resource
-    attr_accessor :id, :status, :created_at
+    attr_accessor :id, :command, :status, :created_at, :custom_json, :app_id
 
     TIMEOUT = 300
     POLL_INTERVAL = 5
     API_LIMIT = 25
 
-    # rubocop:disable MethodLength
     def self.wait(deployments, timeout = TIMEOUT)
       start_time = Time.now
       timeout ||= TIMEOUT
@@ -17,41 +16,40 @@ module OpsWorks
         sleep POLL_INTERVAL
         updates = []
         running_deployments = deployments.select(&:running?)
-        running_deployments.map(&:id).each_slice(API_LIMIT) do |slice|
-          response = client.describe_deployments(
-            deployment_ids: slice
-          )
-          updates += from_collection_response(response)
+        groups = running_deployments.group_by { |d| d.client.config.region }
+
+        groups.each do |region, region_deployments|
+          client = Aws::OpsWorks::Client.new(region: region)
+          region_deployments.map(&:id).each_slice(API_LIMIT) do |slice|
+            response = client.describe_deployments(deployment_ids: slice)
+            updates += from_collection_response(client, response)
+          end
         end
+
         running_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|
+    def self.from_collection_response(client, response)
+      response.data[:deployments].map do |deployment|
+        hash = deployment.to_h
         new(
+          client,
           id: hash[:deployment_id],
+          command: hash[:command],
           created_at: hash[:created_at],
-          status: hash[:status]
+          status: hash[:status],
+          custom_json: hash[:custom_json],
+          app_id: hash[:app_id]
         )
       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
+    def self.from_response(client, response)
+      new(client, id: response[:deployment_id])
     end
 
     def running?

data/lib/opsworks/instance.rb

@@ -4,9 +4,10 @@ module OpsWorks
   class Instance < Resource
     attr_accessor :id, :hostname, :ec2_instance_id, :instance_type, :status
 
-    def self.from_collection_response(response)
+    def self.from_collection_response(client, response)
       response.data[:instances].map do |hash|
         new(
+          client,
           id: hash[:instance_id],
           hostname: hash[:hostname],
           ec2_instance_id: hash[:ec2_instance_id],

data/lib/opsworks/layer.rb

@@ -5,14 +5,15 @@ module OpsWorks
   class Layer < Resource
     attr_accessor :id, :name, :shortname, :custom_recipes
 
-    # rubocop:disable MethodLength
-    def self.from_collection_response(response)
-      response.data[:layers].map do |hash|
+    def self.from_collection_response(client, response)
+      response.data[:layers].map do |layer|
+        hash = layer.to_h
         # Make custom_recipes accessible by string or symbol
         custom_recipes = Thor::CoreExt::HashWithIndifferentAccess.new(
           hash[:custom_recipes]
         )
         new(
+          client,
           id: hash[:layer_id],
           name: hash[:name],
           shortname: hash[:shortname],
@@ -20,14 +21,13 @@ module OpsWorks
         )
       end
     end
-    # rubocop:enable MethodLength
 
     def add_custom_recipe(event, recipe)
       return if custom_recipes[event].include?(recipe)
 
       custom_recipes[event] ||= []
       custom_recipes[event].push recipe
-      self.class.client.update_layer(
+      client.update_layer(
         layer_id: id,
         custom_recipes: custom_recipes
       )
@@ -37,7 +37,7 @@ module OpsWorks
       return unless custom_recipes[event].include?(recipe)
 
       custom_recipes[event].delete recipe
-      self.class.client.update_layer(
+      client.update_layer(
         layer_id: id,
         custom_recipes: custom_recipes
       )

data/lib/opsworks/permission.rb

@@ -4,9 +4,11 @@ module OpsWorks
   class Permission < Resource
     attr_accessor :id, :stack_id, :iam_user_arn, :ssh, :sudo
 
-    def self.from_collection_response(response)
-      response.data[:permissions].map do |hash|
+    def self.from_collection_response(client, response)
+      response.data[:permissions].map do |permission|
+        hash = permission.to_h
         new(
+          client,
           id: hash[:permission_id],
           stack_id: hash[:stack_id],
           iam_user_arn: hash[:iam_user_arn],
@@ -32,7 +34,7 @@ module OpsWorks
       options[:ssh] = ssh if options[:ssh].nil?
       options[:sudo] = sudo if options[:sudo].nil?
 
-      self.class.client.set_permission(
+      client.set_permission(
         stack_id: stack_id,
         iam_user_arn: iam_user_arn,
         allow_ssh: options[:ssh],

data/lib/opsworks/resource.rb

@@ -1,17 +1,15 @@
-require 'aws'
-
 module OpsWorks
   class Resource
-    def initialize(options = {})
+    attr_reader :client
+
+    def initialize(client, options = {})
+      @client = client
+
       options.each do |key, value|
         send("#{key}=", value) if respond_to?("#{key}=")
       end
     end
 
-    def self.client
-      @client ||= AWS::OpsWorks::Client.new
-    end
-
     def self.account
       ENV['ACCOUNT'] || @account || 'opsworks-cli'
     end

data/lib/opsworks/stack.rb

@@ -1,4 +1,5 @@
 require 'jsonpath'
+require 'aws-sdk'
 require 'active_support/core_ext/hash/slice'
 
 require 'opsworks/resource'
@@ -8,20 +9,38 @@ require 'opsworks/permission'
 require 'opsworks/layer'
 
 module OpsWorks
-  # rubocop:disable ClassLength
   class Stack < Resource
     attr_accessor :id, :name, :custom_json
 
-    AVAILABLE_CHEF_VERSIONS = %w(0.9 11.4 11.10)
+    AVAILABLE_CHEF_VERSIONS = %w(0.9 11.4 11.10).freeze
+    DEPLOY_NO_INSTANCES_ERROR = 'Please provide at least an instance ID of ' \
+                                'one running instance'.freeze
 
     def self.all
-      client.describe_stacks.data[:stacks].map do |hash|
-        new(
-          id: hash[:stack_id],
-          name: hash[:name],
-          custom_json: JSON.parse(hash.fetch(:custom_json, '{}'))
-        )
+      regions = Aws.partition('aws').regions.select do |region|
+        region.services.include?('OpsWorks')
+      end.map(&:name)
+
+      stack_queue = Queue.new
+
+      threads = regions.map do |region|
+        Thread.new do
+          client = Aws::OpsWorks::Client.new(region: region)
+          client.describe_stacks.stacks.each do |stack|
+            stack_queue << new(
+              client,
+              id: stack.stack_id,
+              name: stack.name,
+              custom_json: JSON.parse(stack.custom_json || '{}')
+            )
+          end
+        end
       end
+      threads.each(&:join)
+
+      stacks = []
+      stacks << stack_queue.pop until stack_queue.empty?
+      stacks
     end
 
     def self.active
@@ -60,6 +79,10 @@ module OpsWorks
       @layers ||= initialize_layers
     end
 
+    def deployments
+      @deployments ||= initialize_deployments
+    end
+
     def update_chef(options)
       params = {
         stack_id: id,
@@ -83,7 +106,7 @@ module OpsWorks
           password: options[:cookbook_password]
         }
       end
-      self.class.client.update_stack(params)
+      client.update_stack(params)
     end
 
     def update_custom_cookbooks
@@ -99,15 +122,24 @@ module OpsWorks
       )
     end
 
-    def deploy_app(app, args = {})
-      fail 'App not found' unless app && app.id
-      create_deployment(
+    def deploy_app(app, layer: nil, args: {})
+      raise 'App not found' unless app && app.id
+
+      deploy_args = {
         app_id: app.id,
         command: {
           name: 'deploy',
           args: args
         }
-      )
+      }
+
+      if layer
+        layer = layers.find { |l| l.shortname == layer }
+        raise "Layer #{layer} not found" unless layer
+        deploy_args[:layer_ids] = [layer.id]
+      end
+
+      create_deployment(**deploy_args)
     end
 
     def active?
@@ -121,31 +153,23 @@ module OpsWorks
     def set_custom_json_at(key, value)
       self.custom_json = replace_hash_at_path(custom_json, key, value)
 
-      self.class.client.update_stack(
+      client.update_stack(
         stack_id: id,
         custom_json: JSON.pretty_generate(custom_json)
       )
     end
 
     def create_app(name, options = {})
-      options = options.slice(:type, :shortname)
-      options.merge!(stack_id: id, name: name)
-      self.class.client.create_app(options)
+      options = options.slice(:type, :shortname).merge(stack_id: id, name: name)
+      client.create_app(options)
     end
 
     private
 
-    def initialize_apps
-      return [] unless id
-      response = self.class.client.describe_apps(stack_id: id)
-      App.from_collection_response(response)
-    end
-
     # rubocop:disable Eval
-    # rubocop:disable MethodLength
     def replace_hash_at_path(hash, key, value)
       path = JsonPath.new(key).path
-      if value
+      if !value.nil?
         # REVIEW: Is there a better way to parse the JSON Path and ensure
         # a value at the location?
         (0...(path.length - 1)).each do |i|
@@ -160,33 +184,46 @@ module OpsWorks
 
       hash
     end
-    # rubocop:enable MethodLength
     # rubocop:enable Eval
 
+    def initialize_apps
+      return [] unless id
+      response = client.describe_apps(stack_id: id)
+      App.from_collection_response(client, response)
+    end
+
     def initialize_permissions
       return [] unless id
-      response = self.class.client.describe_permissions(stack_id: id)
-      Permission.from_collection_response(response)
+      response = client.describe_permissions(stack_id: id)
+      Permission.from_collection_response(client, response)
     end
 
     def initialize_instances
       return [] unless id
-      response = self.class.client.describe_instances(stack_id: id)
-      Instance.from_collection_response(response)
+      response = client.describe_instances(stack_id: id)
+      Instance.from_collection_response(client, response)
     end
 
     def initialize_layers
       return [] unless id
-      response = self.class.client.describe_layers(stack_id: id)
-      Layer.from_collection_response(response)
+      response = client.describe_layers(stack_id: id)
+      Layer.from_collection_response(client, response)
+    end
+
+    def initialize_deployments
+      return [] unless id
+      response = client.describe_deployments(stack_id: id)
+      Deployment.from_collection_response(client, response)
     end
 
     def create_deployment(options = {})
-      response = self.class.client.create_deployment(
+      response = client.create_deployment(
         options.merge(stack_id: id)
       )
-      Deployment.from_response(response)
+    rescue Aws::OpsWorks::Errors::ValidationException => e
+      raise unless e.message == DEPLOY_NO_INSTANCES_ERROR
+    else
+      Deployment.from_response(client, response)
     end
   end
-  # rubocop:enable ClassLength
 end

data/opsworks-cli.gemspec

@@ -21,15 +21,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'thor'
-  spec.add_dependency 'aws-sdk-v1', '~> 1.64'
+  spec.add_dependency 'aws-sdk', '~> 2.9.6'
   spec.add_dependency 'jsonpath'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'omnivault'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'aptible-tasks'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'fabrication'
+  spec.add_development_dependency 'fabrication', '~> 2.16.0'
   spec.add_development_dependency 'pry'
 end

data/spec/fabricators/opsworks/app_fabricator.rb

@@ -1,4 +1,5 @@
 Fabricator(:app, from: OpsWorks::App) do
+  initialize_with { @_klass.new(opsworks_stub) }
   id { SecureRandom.uuid }
   name { Fabricate.sequence(:name) { |i| "app#{i}" } }
   revision 'master'

data/spec/fabricators/opsworks/deployment_fabricator.rb

@@ -1,4 +1,5 @@
 Fabricator(:deployment, from: OpsWorks::Deployment) do
+  initialize_with { @_klass.new(opsworks_stub) }
   id { SecureRandom.uuid }
   status 'running'
   created_at { Time.now }

data/spec/fabricators/opsworks/permission_fabricator.rb

@@ -1,4 +1,5 @@
 Fabricator(:permission, from: OpsWorks::Permission) do
+  initialize_with { @_klass.new(opsworks_stub) }
   id { SecureRandom.uuid }
   stack_id { SecureRandom.uuid }
   iam_user_arn { Fabricate.sequence(:iam) { |i| "iam::#{i}:user/bob" } }

data/spec/fabricators/opsworks/stack_fabricator.rb

@@ -1,4 +1,5 @@
 Fabricator(:stack, from: OpsWorks::Stack) do
+  initialize_with { @_klass.new(opsworks_stub) }
   id { SecureRandom.uuid }
   name { Fabricate.sequence(:name) { |i| "test-stack#{i}" } }
   custom_json { { 'env' => { 'FOO' => 'bar' } } }

data/spec/opsworks/cli/subcommands/apps_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe OpsWorks::CLI::Agent do
   context 'apps' do
     let(:app_name) { 'aptible' }
-    let(:stacks) { 2.times.map { Fabricate(:stack) } }
+    let(:stacks) { Array.new(2) { Fabricate(:stack) } }
 
     before { allow(subject).to receive(:say) }
     before { allow(OpsWorks::Deployment).to receive(:wait) }
@@ -46,9 +46,9 @@ describe OpsWorks::CLI::Agent do
 
       it 'should optionally run migrations' do
         expect(stacks[0]).to receive(:deploy_app)
-          .with(app, 'migrate' => ['true']) { success }
+          .with(app, args: { 'migrate' => ['true'] }, layer: nil) { success }
         expect(stacks[1]).to receive(:deploy_app)
-          .with(app, 'migrate' => ['true']) { success }
+          .with(app, args: { 'migrate' => ['true'] }, layer: nil) { success }
 
         allow(subject).to receive(:options) { { migrate: true } }
         subject.send('apps:deploy', app_name)
@@ -80,7 +80,7 @@ describe OpsWorks::CLI::Agent do
       end
 
       it 'should fail with a helpful error on unsupported type' do
-        options.merge!(type: 'foobar')
+        options[:type] = 'foobar'
         allow(subject).to receive(:options) { options }
         expect { subject.send('apps:create', app_name) }.to raise_error
       end
@@ -95,12 +95,50 @@ describe OpsWorks::CLI::Agent do
       end
 
       it 'should accept a different shortname' do
-        options.merge!(shortname: 'foobar')
+        options[:shortname] = 'foobar'
         allow(subject).to receive(:options) { options }
         expect(stacks[0]).to receive(:create_app).with(app_name, options)
         expect(stacks[1]).to receive(:create_app).with(app_name, options)
         subject.send('apps:create', app_name)
       end
     end
+
+    describe 'apps:revision:update' do
+      let(:revision) { '123' }
+
+      before do
+        stacks.each do |stack|
+          app = Fabricate(:app, name: app_name)
+          allow(stack).to receive(:apps) { [app] }
+        end
+      end
+
+      it 'should update the app revision on all stacks' do
+        expect(stacks[0].apps[0]).to receive(:update_revision).with(revision)
+        expect(stacks[1].apps[0]).to receive(:update_revision).with(revision)
+        subject.send('apps:revision:update', app_name, revision)
+      end
+
+      it 'should only run on active stacks' do
+        allow(OpsWorks::Stack).to receive(:active) { [stacks[0]] }
+        expect(stacks[0].apps[0]).to receive(:update_revision).with(revision)
+        expect(stacks[1].apps[0]).not_to receive(:update_revision)
+        subject.send('apps:revision:update', app_name, revision)
+      end
+
+      it 'should optionally run on a subset of stacks' do
+        expect(stacks[0].apps[0]).to receive(:update_revision).with(revision)
+        expect(stacks[1].apps[0]).not_to receive(:update_revision)
+
+        allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+        subject.send('apps:revision:update', app_name, revision)
+      end
+
+      it 'should not fail if a stack does not have the app' do
+        allow(stacks[0]).to receive(:apps) { [] }
+        expect(stacks[1].apps[0]).to receive(:update_revision).with(revision)
+        subject.send('apps:revision:update', app_name, revision)
+      end
+    end
   end
 end

data/spec/opsworks/cli/subcommands/chef_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OpsWorks::CLI::Agent do
   describe 'chef:sync' do
-    let(:stacks) { 2.times.map { Fabricate(:stack) } }
+    let(:stacks) { Array.new(2) { Fabricate(:stack) } }
     let(:deployment) { Fabricate(:deployment, status: 'successful') }
 
     before { allow(subject).to receive(:say) }

data/spec/opsworks/cli/subcommands/config_spec.rb

@@ -5,11 +5,9 @@ describe OpsWorks::CLI::Agent do
     let(:custom_json) { { 'env' => { 'FOO' => 'bar' } } }
     let(:json_path) { 'env.FOO' }
     let(:stack) { Fabricate(:stack, custom_json: custom_json) }
-    let(:client) { double.as_null_object }
 
     before { allow(subject).to receive(:say) }
-    before { allow(OpsWorks::Stack).to receive(:all) { [stack] } }
-    before { allow(OpsWorks::Stack).to receive(:client) { client } }
+    before { allow(subject).to receive(:parse_stacks).and_return([stack]) }
 
     describe 'config:get' do
       it 'should print the variable from the stack custom JSON' do
@@ -30,7 +28,7 @@ describe OpsWorks::CLI::Agent do
 
     describe 'config:set' do
       it 'should reset the variable, if it is already set' do
-        expect(client).to receive(:update_stack) do |hash|
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env']['FOO']).to eq 'baz'
         end
@@ -40,7 +38,7 @@ describe OpsWorks::CLI::Agent do
 
       it 'should work with deep nested hashes' do
         stack.custom_json = { 'app' => { 'var' => 'value' } }
-        expect(client).to receive(:update_stack) do |hash|
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['app']['env']['FOO']).to eq 'baz'
         end
@@ -50,7 +48,7 @@ describe OpsWorks::CLI::Agent do
 
       it 'should set the variable, if it is unset' do
         stack.custom_json = {}
-        expect(client).to receive(:update_stack) do |hash|
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env']['FOO']).to eq 'baz'
         end
@@ -59,8 +57,8 @@ describe OpsWorks::CLI::Agent do
       end
 
       it 'should leave other variables alone' do
-        stack.custom_json.merge!('other' => 'something')
-        expect(client).to receive(:update_stack) do |hash|
+        stack.custom_json['other'] = 'something'
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env']['FOO']).to eq 'baz'
           expect(json['other']).to eq 'something'
@@ -72,7 +70,7 @@ describe OpsWorks::CLI::Agent do
 
       it 'should typecast Boolean values' do
         stack.custom_json = {}
-        expect(client).to receive(:update_stack) do |hash|
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env']['FOO']).to eq true
         end
@@ -83,7 +81,7 @@ describe OpsWorks::CLI::Agent do
 
     describe 'config:unset' do
       it 'should unset the variable' do
-        expect(client).to receive(:update_stack) do |hash|
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env'].keys).not_to include('FOO')
         end
@@ -92,8 +90,8 @@ describe OpsWorks::CLI::Agent do
       end
 
       it 'should leave other variables alone' do
-        stack.custom_json['env'].merge!('OTHER' => 'something')
-        expect(client).to receive(:update_stack) do |hash|
+        stack.custom_json['env']['OTHER'] = 'something'
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env'].keys).not_to include('FOO')
         end
@@ -103,7 +101,7 @@ describe OpsWorks::CLI::Agent do
 
       it 'should work even with nil values' do
         stack.custom_json['env'] = { 'FOO' => nil }
-        expect(client).to receive(:update_stack) do |hash|
+        expect(stack.client).to receive(:update_stack) do |hash|
           json = JSON.parse(hash[:custom_json])
           expect(json['env'].keys).not_to include('FOO')
         end

data/spec/opsworks/cli/subcommands/iam_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OpsWorks::CLI::Agent do
   context 'iam' do
-    let(:permissions) { 2.times.map { Fabricate(:permission) } }
+    let(:permissions) { Array.new(2) { Fabricate(:permission) } }
     let(:user) { permissions[0].user }
 
     before { allow(subject).to receive(:say) }
@@ -11,7 +11,7 @@ describe OpsWorks::CLI::Agent do
 
     describe 'iam:allow' do
       let(:stacks) do
-        2.times.map do |i|
+        Array.new(2) do |i|
           Fabricate(:stack).tap do |stack|
             allow(stack).to receive(:find_permission_by_user) { permissions[i] }
           end

data/spec/opsworks/cli/subcommands/recipes_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe OpsWorks::CLI::Agent do
   context 'recipes' do
     let(:recipe) { 'hotpockets::install' }
-    let(:stacks) { 2.times.map { Fabricate(:stack) } }
+    let(:stacks) { Array.new(2) { Fabricate(:stack) } }
 
     before { allow(subject).to receive(:say) }
     before { allow(OpsWorks::Deployment).to receive(:wait) }

data/spec/spec_helper.rb

@@ -4,14 +4,12 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 # Require library up front
 require 'opsworks/cli'
 
+require 'securerandom'
 require 'fabrication'
-require 'omnivault'
 
-RSpec.configure do |config|
-  config.before do
-    allow(AWS::OpsWorks::Client).to receive(:new) { double.as_null_object }
-    allow(AWS).to receive(:config)
+def opsworks_stub
+  Aws::OpsWorks::Client.new(stub_responses: true)
+end
 
-    allow(Omnivault).to receive(:autodetect) { double.as_null_object }
-  end
+RSpec.configure do |_config|
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.64'
+        version: 2.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.64'
+        version: 2.9.6
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: omnivault
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +126,16 @@ dependencies:
   name: fabrication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -183,12 +169,12 @@ files:
 - lib/opsworks/app.rb
 - lib/opsworks/cli.rb
 - lib/opsworks/cli/agent.rb
-- lib/opsworks/cli/helpers/credentials.rb
 - lib/opsworks/cli/helpers/options.rb
 - lib/opsworks/cli/helpers/typecasts.rb
 - lib/opsworks/cli/subcommands/apps.rb
 - lib/opsworks/cli/subcommands/chef.rb
 - lib/opsworks/cli/subcommands/config.rb
+- lib/opsworks/cli/subcommands/deployments.rb
 - lib/opsworks/cli/subcommands/iam.rb
 - lib/opsworks/cli/subcommands/recipes.rb
 - lib/opsworks/cli/version.rb
@@ -230,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Alternative CLI for Amazon OpsWorks

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

@@ -1,18 +0,0 @@
-require 'omnivault'
-
-module OpsWorks
-  module CLI
-    module Helpers
-      module Credentials
-        def fetch_credentials
-          vault = Omnivault.autodetect
-          vault.configure_aws!
-        end
-
-        def env_credentials?
-          !!(ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY'])
-        end
-      end
-    end
-  end
-end