opsworks-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ef86da686c271e0ca39400b1fdfd653933f038
-  data.tar.gz: 49fdede59882e9141496a5421857b5e25c052c15
+  metadata.gz: 24ea648dce531f41a4ff17b6d4cb9ab1991f708a
+  data.tar.gz: 4b897b4a05110a1de06a9196da2ac84d8a9fc62a
 SHA512:
-  metadata.gz: ee72de4769bfa43179a859bbc512cfadc4ba5342103ea9de8cbd5f653a21d988b7810f589753e2cf1b6dcb9406df4e9f42585ec1dee35ad57b9d6274da2c3faa
-  data.tar.gz: a58f99d1895c9f4bf4f673c739387717c464ad1b45064766c77e5d53283f7eafbb285d9515e96cf8a0093ce264e3104eefc8cffb36583bfd8bd44f5331826493
+  metadata.gz: 899b768a457184a2e69014c9de72e385fa35601a7c4229c6df828793624532d8002967a7c3a9a0386fe9aa1fc5bf6f6f0c3db011180b53da6613692a1c7faa75
+  data.tar.gz: fbbe850475cfa8625531a78ce76df586255f85fa41cebab7ee94cccda743da2ae074e0794dcdc57abe7b7e82838becbda8f72d2f9e64fc6bf3d564f72dd3e367

data/lib/opsworks/app.rb

@@ -1,10 +1,17 @@
-require_relative 'resource'
-require_relative 'deployment'
+require 'opsworks/resource'
+require 'opsworks/deployment'
 
 module OpsWorks
   class App < Resource
     attr_accessor :id, :name, :revision
 
+    def self.from_collection_response(response)
+      response.data[:apps].map do |hash|
+        revision = hash[:app_source][:revision] if hash[:app_source]
+        new(id: hash[:app_id], name: hash[:name], revision: revision)
+      end
+    end
+
     def deployments
       @deployments ||= initialize_deployments
     end

data/lib/opsworks/cli/agent.rb

@@ -9,10 +9,6 @@ require_relative 'subcommands/exec'
 require_relative 'subcommands/deploy'
 require_relative 'subcommands/status'
 
-require 'opsworks/stack'
-require 'opsworks/app'
-require 'opsworks/deployment'
-
 module OpsWorks
   module CLI
     class Agent < Thor

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

@@ -5,11 +5,13 @@ module OpsWorks
     module Helpers
       module Options
         def parse_stacks(options = {})
-          stacks = OpsWorks::Stack.all
           if options[:stack]
-            stacks.select! { |stack| options[:stack].include?(stack.name)  }
+            OpsWorks::Stack.all.select! do |stack|
+              options[:stack].include?(stack.name)
+            end
+          else
+            options[:active] ? OpsWorks::Stack.active : OpsWorks::Stack.all
           end
-          stacks
         end
       end
     end

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

@@ -1,3 +1,5 @@
+require 'opsworks/deployment'
+
 module OpsWorks
   module CLI
     module Subcommands
@@ -10,17 +12,18 @@ module OpsWorks
             option :stack, type: :array
             def deploy(name)
               fetch_keychain_credentials unless env_credentials?
-              stacks = parse_stacks(options)
+              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)
               end
-              Deployment.wait(deployments)
+              deployments.compact!
+              OpsWorks::Deployment.wait(deployments)
               unless deployments.all?(&:success?)
                 failures = []
                 deployments.each_with_index do |deployment, i|
-                  failures << stacks[i].name if deployment.failed?
+                  failures << stacks[i].name unless deployment.success?
                 end
                 fail "Deploy failed on #{failures.join(', ')}"
               end

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

@@ -1,3 +1,5 @@
+require 'opsworks/deployment'
+
 module OpsWorks
   module CLI
     module Subcommands
@@ -10,16 +12,16 @@ module OpsWorks
             option :stack, type: :array
             def exec(recipe)
               fetch_keychain_credentials unless env_credentials?
-              stacks = parse_stacks(options)
+              stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Executing recipe on #{stack.name}..."
                 stack.execute_recipe(recipe)
               end
-              Deployment.wait(deployments)
+              OpsWorks::Deployment.wait(deployments)
               unless deployments.all?(&:success?)
                 failures = []
                 deployments.each_with_index do |deployment, i|
-                  failures << stacks[i].name if deployment.failed?
+                  failures << stacks[i].name unless deployment.success?
                 end
                 fail "Command failed on #{failures.join(', ')}"
               end

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

@@ -25,8 +25,8 @@ module OpsWorks
                 [stack.name, name, "(#{app.revision})", deployed_at]
               end
               # Sort output in descending date order
-              table.sort! { |x, y| y.last <=> x.last }
               table.compact!
+              table.sort! { |x, y| y.last <=> x.last }
               print_table table
             end
 

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

@@ -1,4 +1,5 @@
 require 'aws'
+require 'opsworks/deployment'
 
 module OpsWorks
   module CLI
@@ -15,16 +16,16 @@ module OpsWorks
             option :stack, type: :array
             def update
               fetch_keychain_credentials unless env_credentials?
-              stacks = parse_stacks(options)
+              stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Updating #{stack.name}..."
                 stack.update_custom_cookbooks
               end
-              Deployment.wait(deployments)
+              OpsWorks::Deployment.wait(deployments)
               unless deployments.all?(&:success?)
                 failures = []
                 deployments.each_with_index do |deployment, i|
-                  failures << stacks[i].name if deployment.failed?
+                  failures << stacks[i].name unless deployment.success?
                 end
                 fail "Update failed on #{failures.join(', ')}"
               end

data/lib/opsworks/cli/version.rb

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

data/lib/opsworks/deployment.rb

@@ -1,20 +1,28 @@
-require_relative 'resource'
+require 'opsworks/resource'
 
 module OpsWorks
   class Deployment < Resource
     attr_accessor :id, :status, :created_at
 
+    TIMEOUT = 300
     POLL_INTERVAL = 5
+    API_LIMIT = 25
 
     # rubocop:disable MethodLength
-    def self.wait(deployments)
+    def self.wait(deployments, timeout = TIMEOUT)
+      start_time = Time.now
       while deployments.any?(&:running?)
+        return if Time.now - start_time > timeout
         sleep POLL_INTERVAL
-        response = client.describe_deployments(
-          deployment_ids: deployments.map(&:id)
-        )
-        updates = from_collection_response(response)
-        deployments.each do |deployment|
+        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)
+        end
+        running_deployments.each do |deployment|
           update = updates.find { |u| u.id == deployment.id }
           deployment.status = update.status
         end

data/lib/opsworks/instance.rb

@@ -0,0 +1,23 @@
+require 'opsworks/resource'
+
+module OpsWorks
+  class Instance < Resource
+    attr_accessor :id, :hostname, :ec2_instance_id, :instance_type, :status
+
+    def self.from_collection_response(response)
+      response.data[:instances].map do |hash|
+        new(
+          id: hash[:instance_id],
+          hostname: hash[:hostname],
+          ec2_instance_id: hash[:ec2_instance_id],
+          instance_type: hash[:instance_type],
+          status: hash[:status]
+        )
+      end
+    end
+
+    def online?
+      status == 'online'
+    end
+  end
+end

data/lib/opsworks/resource.rb

@@ -1,3 +1,5 @@
+require 'aws'
+
 module OpsWorks
   class Resource
     def initialize(options = {})

data/lib/opsworks/stack.rb

@@ -1,5 +1,6 @@
-require_relative 'resource'
-require_relative 'app'
+require 'opsworks/resource'
+require 'opsworks/app'
+require 'opsworks/instance'
 
 module OpsWorks
   class Stack < Resource
@@ -11,6 +12,10 @@ module OpsWorks
       end
     end
 
+    def self.active
+      all.select(&:active?)
+    end
+
     def self.find_by_name(name)
       all.find { |stack| stack.name == name }
     end
@@ -23,6 +28,10 @@ module OpsWorks
       apps.find { |app| app.name == name }
     end
 
+    def instances
+      @instances ||= initialize_instances
+    end
+
     def update_custom_cookbooks
       create_deployment(command: { name: 'update_custom_cookbooks' })
     end
@@ -41,14 +50,22 @@ module OpsWorks
       create_deployment(app_id: app.id, command: { name: 'deploy' })
     end
 
+    def active?
+      instances.any?(&:online?)
+    end
+
     private
 
     def initialize_apps
       return [] unless id
-      self.class.client.describe_apps(stack_id: id).data[:apps].map do |hash|
-        revision = hash[:app_source][:revision] if hash[:app_source]
-        App.new(id: hash[:app_id], name: hash[:name], revision: revision)
-      end
+      response = self.class.client.describe_apps(stack_id: id)
+      App.from_collection_response(response)
+    end
+
+    def initialize_instances
+      return [] unless id
+      response = self.class.client.describe_instances(stack_id: id)
+      Instance.from_collection_response(response)
     end
 
     def create_deployment(options = {})

data/opsworks-cli.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'aptible-tasks'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'fabrication'
   spec.add_development_dependency 'pry'
 end

data/spec/fabricators/opsworks/app_fabricator.rb

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

data/spec/fabricators/opsworks/deployment_fabricator.rb

@@ -0,0 +1,5 @@
+Fabricator(:deployment, from: OpsWorks::Deployment) do
+  id { SecureRandom.uuid }
+  status 'running'
+  created_at { Time.now }
+end

data/spec/fabricators/opsworks/stack_fabricator.rb

@@ -0,0 +1,4 @@
+Fabricator(:stack, from: OpsWorks::Stack) do
+  id { SecureRandom.uuid }
+  name { Fabricate.sequence(:name) { |i| "test-stack#{i}" } }
+end

data/spec/opsworks/cli/agent_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe OpsWorks::CLI::Agent do
-  before { subject.stub(:ask) }
-
   describe '#version' do
     it 'should print the version' do
       version = OpsWorks::CLI::VERSION

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

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe OpsWorks::CLI::Agent do
+  describe '#deploy' do
+    let(:app_name) { 'aptible' }
+    let(:app) { Fabricate(:app, name: app_name) }
+
+    let(:stacks) { 2.times.map { Fabricate(:stack) } }
+    let(:deployment) { Fabricate(:deployment, status: 'successful') }
+
+    before { allow(subject).to receive(:say) }
+    before { allow(OpsWorks::Deployment).to receive(:wait) }
+    before { allow(OpsWorks::Stack).to receive(:all) { stacks } }
+    before { allow(OpsWorks::Stack).to receive(:active) { stacks } }
+
+    before { stacks.each { |stack| allow(stack).to receive(:apps) { [app] } } }
+
+    it 'should update custom cookbooks on all stacks' do
+      expect(stacks[0]).to receive(:deploy_app).with(app) { deployment }
+      expect(stacks[1]).to receive(:deploy_app).with(app) { deployment }
+      subject.deploy(app_name)
+    end
+
+    it 'should not fail if some stacks are inactive' do
+      allow(OpsWorks::Stack).to receive(:active) { [stacks[0]] }
+      expect(stacks[0]).to receive(:deploy_app).with(app) { deployment }
+      expect(stacks[1]).not_to receive(:deploy_app)
+      subject.deploy(app_name)
+    end
+
+    it 'should optionally run on a subset of stacks' do
+      expect(stacks[0]).to receive(:deploy_app).with(app) { deployment }
+      expect(stacks[1]).not_to receive(:deploy_app)
+
+      allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+      subject.deploy(app_name)
+    end
+
+    it 'should not fail if a stack does not have the app' do
+      allow(stacks[0]).to receive(:apps) { [] }
+      expect(stacks[1]).to receive(:deploy_app).with(app) { deployment }
+      expect { subject.deploy(app_name) }.not_to raise_error
+    end
+
+    it 'should fail if any update fails' do
+      failure = Fabricate(:deployment, status: 'failed')
+      expect(stacks[0]).to receive(:deploy_app).with(app) { failure }
+
+      allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+      expect { subject.deploy(app_name) }.to raise_error
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe OpsWorks::CLI::Agent do
+  describe '#exec' do
+    let(:recipe) { 'hotpockets::install' }
+
+    let(:stacks) { 2.times.map { Fabricate(:stack) } }
+    let(:deployment) { Fabricate(:deployment, status: 'successful') }
+
+    before { allow(subject).to receive(:say) }
+    before { allow(OpsWorks::Deployment).to receive(:wait) }
+    before { allow(OpsWorks::Stack).to receive(:all) { stacks } }
+    before { allow(OpsWorks::Stack).to receive(:active) { stacks } }
+
+    it 'should update custom cookbooks on all stacks' do
+      expect(stacks[0]).to receive(:execute_recipe).with(recipe) { deployment }
+      expect(stacks[1]).to receive(:execute_recipe).with(recipe) { deployment }
+      subject.exec(recipe)
+    end
+
+    it 'should optionally run on a subset of stacks' do
+      expect(stacks[0]).to receive(:execute_recipe).with(recipe) { deployment }
+      expect(stacks[1]).not_to receive(:execute_recipe)
+
+      allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+      subject.exec(recipe)
+    end
+
+    it 'should fail if any update fails' do
+      failure = Fabricate(:deployment, status: 'failed')
+      expect(stacks[0]).to receive(:execute_recipe).with(recipe) { failure }
+
+      allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+      expect { subject.exec(recipe) }.to raise_error
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe OpsWorks::CLI::Agent do
+  describe '#update' do
+    let(:stacks) { 2.times.map { Fabricate(:stack) } }
+    let(:deployment) { Fabricate(:deployment, status: 'successful') }
+
+    before { allow(subject).to receive(:say) }
+    before { allow(OpsWorks::Deployment).to receive(:wait) }
+    before { allow(OpsWorks::Stack).to receive(:all) { stacks } }
+    before { allow(OpsWorks::Stack).to receive(:active) { stacks } }
+
+    it 'should update custom cookbooks on all stacks' do
+      expect(stacks[0]).to receive(:update_custom_cookbooks) { deployment }
+      expect(stacks[1]).to receive(:update_custom_cookbooks) { deployment }
+      subject.update
+    end
+
+    it 'should optionally run on a subset of stacks' do
+      expect(stacks[0]).to receive(:update_custom_cookbooks) { deployment }
+      expect(stacks[1]).not_to receive(:update_custom_cookbooks)
+
+      allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+      subject.update
+    end
+
+    it 'should fail if any update fails' do
+      failure = Fabricate(:deployment, status: 'failed')
+      expect(stacks[0]).to receive(:update_custom_cookbooks) { failure }
+
+      allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
+      expect { subject.update }.to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,23 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-# Load shared spec files
-Dir["#{File.dirname(__FILE__)}/shared/**/*.rb"].each do |file|
-  require file
-end
-
 # Require library up front
 require 'opsworks/cli'
+
+require 'fabrication'
+
+RSpec.configure do |config|
+  config.before do
+    allow(AWS::OpsWorks::Client).to receive(:new) { double.as_null_object }
+    allow(AWS).to receive(:config)
+
+    begin
+      require 'aws-keychain-util/credential_provider'
+      allow(AwsKeychainUtil::CredentialProvider).to receive(:new) do
+        double.as_null_object
+      end
+    rescue LoadError
+      nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: fabrication
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -149,10 +163,17 @@ files:
 - lib/opsworks/cli/subcommands/update.rb
 - lib/opsworks/cli/version.rb
 - lib/opsworks/deployment.rb
+- lib/opsworks/instance.rb
 - lib/opsworks/resource.rb
 - lib/opsworks/stack.rb
 - opsworks-cli.gemspec
+- spec/fabricators/opsworks/app_fabricator.rb
+- spec/fabricators/opsworks/deployment_fabricator.rb
+- spec/fabricators/opsworks/stack_fabricator.rb
 - spec/opsworks/cli/agent_spec.rb
+- spec/opsworks/cli/subcommands/deploy_spec.rb
+- spec/opsworks/cli/subcommands/exec_spec.rb
+- spec/opsworks/cli/subcommands/update_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/opsworks-cli
 licenses:
@@ -179,5 +200,11 @@ signing_key:
 specification_version: 4
 summary: Alternative CLI for Amazon OpsWorks
 test_files:
+- spec/fabricators/opsworks/app_fabricator.rb
+- spec/fabricators/opsworks/deployment_fabricator.rb
+- spec/fabricators/opsworks/stack_fabricator.rb
 - spec/opsworks/cli/agent_spec.rb
+- spec/opsworks/cli/subcommands/deploy_spec.rb
+- spec/opsworks/cli/subcommands/exec_spec.rb
+- spec/opsworks/cli/subcommands/update_spec.rb
 - spec/spec_helper.rb