opsicle 0.4.2 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDhlY2I5Nzg3ZjU2OTMyOGZlMjgxMzM3ZjMzOGQ1YWE5MmNjNTZhNg==
+    ZGZlNmRhOWYwZGQwYWNmYmUwZDc1NDUwMDkyNjBlNzYyZDk3NjU3OA==
   data.tar.gz: !binary |-
-    ZjEyMTIwODVjOGQyM2E1ZTFlZjg3NzU5OGJkNTlmYThmMjA2NGNhMA==
+    NTA5Zjk5Y2E1OWU3OTc2YjQ0MDZmY2ZjODJhYmM0ZmYzMDE1NjY2Yw==
 SHA512:
   metadata.gz: !binary |-
-    OWRkNDRiMmUxMzdiMmE4MGUyY2JiNzc0ZDY3YzcyZjdlYmJmM2RlNGZmZDVi
-    MzQ4ZjdjMDFkMjQ4MTY4ODRkNWQ3YTE2NDMzMTQ2MDA2NTY5ZmIwZmQ1YTNj
-    ZWFjYTQxYmY3YTQ0ZjQ3MTA3NWUxYzcxM2Y5ZTQyZTk5OTIxYzQ=
+    OTNjYmVmYzg2NzIzMTE2ZTA2MmEwMGEwNGZjMGMwMmI4OTkxNzgyZWM0OWQy
+    YWZlNzRhYmJjYjFhZWM0NjU0NDgxODk1ZmViM2E1YzEzYWRkNWQxYzU5MTlk
+    ZTg0M2U4YTM3NWUzNzFhNWIwNmI3NmVjMjQzZWNjMjU2MzhjMzM=
   data.tar.gz: !binary |-
-    MjAzZjJkYzFlNjEwYjQzMjczM2I0MGY3OGQ1ZjgxZGExN2NiMmFlZGE2NmVj
-    MGM3OWVlMjZlNmJiOTIyNjVhYTUyOWZlOTBkYTU0YjAxZmE0OTYzYjk2OTk2
-    YTIxMTE1ZTQ4ZGY4MGI0MWRkOThiZTY2YzI2MjU0NTFlZDc0MTY=
+    YjAwMzVjZThkNDFiZTNhZGYxMTgwM2FiNDRjMjE0NTZhZGEyYmM0MjZmMDZi
+    YmNjOTc3NzQzNGZlNzU5ZDJkMjk3NjI3ZjUzOTNlNzdkOGU2ZDc5ZDUxMmNj
+    MzA2YmJlOTRkZDFjMTAyMmJhNGFiMTY3NzU0NGNjMDdkZTc5ZDc=

data/bin/opsicle

@@ -37,6 +37,7 @@ desc "Deploy your current app to the given environment stack"
 arg_name '<environment>'
 command :deploy do |c|
   c.switch [:b, :browser], :desc => "Open the OpsWorks deployments screen for this stack on deploy"
+  c.switch [:g, :migrate], :desc => "Deploy with migrations"
   c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
   c.action do |global_options, options, args|
     raise ArgumentError, 'You must specify an environment' unless args.first
@@ -129,4 +130,27 @@ command 'chef-update' do |c|
   end
 end
 
+desc "Execute arbitrary recipes on the Stack"
+arg_name '<environment>'
+arg_name '<recipe>'
+command 'execute-recipes' do |c|
+  c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
+  c.flag [:r, :recipes], :desc => 'The recipes to execute', :type => Array, :required => true
+  c.flag [:i, :instance_ids], :desc => 'The specific instances to execute recipes on', :type => Array
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+
+    Opsicle::ExecuteRecipes.new(*args).execute global_options.merge(options)
+  end
+end
+
+desc "List all instances in the given environment stack"
+arg_name '<environment>'
+command :instances do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::ListInstances.new(args.first).execute global_options.merge options
+  end
+end
+
 exit run(ARGV)

data/lib/opsicle/client.rb

@@ -13,8 +13,10 @@ module Opsicle
       @s3 = AWS::S3.new
     end
 
-    def run_command(command, options={})
-      opsworks.create_deployment(command_options(command, options))
+    def run_command(command, command_args={}, options={})
+      opts = command_options(command, command_args, options)
+      Output.say_verbose "OpsWorks call: create_deployment(#{opts})"
+      opsworks.create_deployment(opts)
     end
 
     def api_call(command, options={})
@@ -25,8 +27,8 @@ module Opsicle
       "https://console.aws.amazon.com/opsworks/home?#/stack/#{@config.opsworks_config[:stack_id]}"
     end
 
-    def command_options(command, options={})
-      config.opsworks_config.merge(options).merge({ command: { name: command } })
+    def command_options(command, command_args={}, options={})
+      config.opsworks_config.merge(options).merge({ command: { name: command, args: command_args } })
     end
     private :command_options
 

data/lib/opsicle/commands.rb

@@ -2,6 +2,8 @@ require 'opsicle/client'
 
 require "opsicle/commands/deploy"
 require "opsicle/commands/chef_update"
+require "opsicle/commands/execute_recipes"
 require "opsicle/commands/list"
+require "opsicle/commands/list_instances"
 require "opsicle/commands/ssh"
 require "opsicle/commands/ssh_key"

data/lib/opsicle/commands/chef_update.rb

@@ -1,9 +1,11 @@
 require 'opsicle/s3_bucket'
 require 'zlib'
 require 'archive/tar/minitar'
+require "opsicle/deploy_helper"
 
 module Opsicle
   class ChefUpdate
+    include DeployHelper
     attr_reader :client
     attr_reader :tar_file
     attr_reader :stack
@@ -19,8 +21,8 @@ module Opsicle
       tar_cookbooks(options[:path])
       s3_upload(options[:"bucket-name"])
       cleanup_tar
-      update_custom_cookbooks
-      launch_stack_monitor(options)
+      response = update_custom_cookbooks
+      launch_stack_monitor(response, options)
     end
 
     private
@@ -44,11 +46,5 @@ module Opsicle
       Output.say "Starting OpsWorks Custom Cookboks Update..."
       client.run_command('update_custom_cookbooks')
     end
-
-    def launch_stack_monitor(options)
-      Output.say_verbose "Starting Stack Monitor..."
-      @monitor = Opsicle::Monitor::App.new(@environment, options)
-      @monitor.start
-    end
   end
 end

data/lib/opsicle/commands/deploy.rb

@@ -1,5 +1,8 @@
+require "opsicle/deploy_helper"
+
 module Opsicle
   class Deploy
+    include DeployHelper
     attr_reader :client
 
     def initialize(environment)
@@ -9,27 +12,14 @@ module Opsicle
 
     def execute(options={ monitor: true })
       Output.say "Starting OpsWorks deploy..."
-      response = client.run_command('deploy')
-
-      # Monitoring preferences
-      if options[:browser]
-        open_deploy(response[:deployment_id])
-      elsif options[:monitor] # Default option
-        Output.say_verbose "Starting Stack Monitor..."
-        @monitor = Opsicle::Monitor::App.new(@environment, options)
-        @monitor.start
-      end
 
-    end
+      #so this is how to format the command arguments:
+      #http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/OpsWorks/Client.html#create_deployment-instance_method
+      command_args = {}
+      command_args["migrate"] = [options[:migrate].to_s] if options[:migrate]
+      response = client.run_command('deploy', command_args)
 
-    def open_deploy(deployment_id)
-      if deployment_id
-        command = "open 'https://console.aws.amazon.com/opsworks/home?#/stack/#{client.config.opsworks_config[:stack_id]}/deployments'"
-        Output.say_verbose "Executing shell command: #{command}"
-        %x(#{command})
-      else
-        Output.say "Deploy failed. No deployment_id was received from OpsWorks", :error
-      end
+      launch_stack_monitor(response, options)
     end
   end
 end

data/lib/opsicle/commands/execute_recipes.rb

@@ -0,0 +1,28 @@
+require "opsicle/deploy_helper"
+
+module Opsicle
+  class ExecuteRecipes
+    include DeployHelper
+    attr_reader :client, :recipes
+
+    def initialize(environment)
+      @environment = environment
+      @client = Client.new(environment)
+    end
+
+    def execute(options={ monitor: true })
+      Output.say "Starting OpsWorks chef run..."
+
+      #so this is how to format the command arguments:
+      #http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/OpsWorks/Client.html#create_deployment-instance_method
+      command_args = {}
+      command_args["recipes"] = options[:recipes]
+
+      command_opts = {}
+      command_opts["instance_ids"] = options[:instance_ids] if options[:instance_ids]
+
+      response = client.run_command('execute_recipes', command_args, command_opts)
+      launch_stack_monitor(response, options)
+    end
+  end
+end

data/lib/opsicle/commands/list_instances.rb

@@ -0,0 +1,41 @@
+require 'terminal-table'
+
+module Opsicle
+  class ListInstances
+    attr_reader :client, :layers
+
+    def initialize(environment)
+      @client = Client.new(environment)
+    end
+
+    def execute(options={})
+      get_layers
+      print(get_instances)
+    end
+
+    def get_layers
+      @layers = client.api_call('describe_layers', stack_id: @client.config.opsworks_config[:stack_id])[:layers]
+    end
+
+    def get_instances
+      Opsicle::Instances.new(client).data
+    end
+
+    def print(instances)
+      puts Terminal::Table.new headings: ['Hostname', 'Layers', 'Status', 'Instance ID'], rows: instance_data(instances)
+    end
+
+    def instance_data(instances)
+      instances.map{|instance| [instance[:hostname], layer_names(instance), instance[:status], instance[:instance_id]] }
+    end
+
+    def layer_names(instance)
+      instance[:layer_ids].map{ |layer_id| layer_name(layer_id) }.join(" | ")
+    end
+
+    def layer_name(layer_id)
+      layers.detect{ |layer| layer[:layer_id] == layer_id }[:name]
+    end
+
+  end
+end

data/lib/opsicle/deploy_helper.rb

@@ -0,0 +1,24 @@
+module Opsicle
+  module DeployHelper
+    def launch_stack_monitor(response, options={})
+      # Monitoring preferences
+      if options[:browser]
+        open_deploy(response[:deployment_id])
+      elsif options[:monitor] # Default option
+        Output.say_verbose "Starting Stack Monitor..."
+        @monitor = Opsicle::Monitor::App.new(@environment, options)
+        @monitor.start
+      end
+    end
+
+    def open_deploy(deployment_id)
+      if deployment_id
+        command = "open 'https://console.aws.amazon.com/opsworks/home?#/stack/#{client.config.opsworks_config[:stack_id]}/deployments'"
+        Output.say_verbose "Executing shell command: #{command}"
+        %x(#{command})
+      else
+        Output.say "Deploy failed. No deployment_id was received from OpsWorks", :error
+      end
+    end
+  end
+end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/opsicle/client_spec.rb

@@ -19,7 +19,7 @@ module Opsicle
         expect(config).to receive(:configure_aws!)
         expect(aws_client).to receive(:create_deployment).with(
           hash_including(
-            command: { name: 'deploy' },
+            command: { name: 'deploy', args: {} },
             stack_id: 'stack',
             app_id: 'app'
           )

data/spec/opsicle/commands/chef_update_spec.rb

@@ -117,12 +117,12 @@ module Opsicle
     end
 
     context "#launch_stack_monitor" do
-      let(:options) { { derp: 'herp' } }
+      let(:options) { { derp: 'herp', monitor: true } }
       it "launches the opsicle stack monitor" do
 
         expect(Monitor::App).to receive(:new).with('derp', options)
 
-        subject.send :launch_stack_monitor, options
+        subject.send :launch_stack_monitor, nil, options
       end
     end
   end

data/spec/opsicle/commands/deploy_spec.rb

@@ -10,7 +10,7 @@ module Opsicle
       let(:monitor) { double(:start => nil) }
       before do
         allow(Client).to receive(:new).with('derp').and_return(client)
-        allow(client).to receive(:run_command).with('deploy').and_return({deployment_id: 'derp'})
+        allow(client).to receive(:run_command).with('deploy', {}).and_return({deployment_id: 'derp'})
 
         allow(Monitor::App).to receive(:new).and_return(monitor)
         allow(monitor).to receive(:start)
@@ -20,13 +20,25 @@ module Opsicle
       end
 
       it "creates a new deployment and opens stack monitor" do
-        expect(client).to receive(:run_command).with('deploy').and_return({deployment_id: 'derp'})
+        expect(client).to receive(:run_command).with('deploy', {}).and_return({deployment_id: 'derp'})
         expect(subject).to_not receive(:open_deploy)
         expect(Monitor::App).to receive(:new)
 
         subject.execute
       end
 
+      it "creates a new deployment with migrations" do
+        expect(client).to receive(:run_command).with('deploy', {"migrate"=>["true"]}).and_return({deployment_id: 'derp'})
+        expect(subject).to_not receive(:open_deploy)
+        subject.execute({ monitor: false, migrate: true })
+      end
+
+      it "creates a new deployment migrations explicitly disabled" do
+        expect(client).to receive(:run_command).with('deploy', {}).and_return({deployment_id: 'derp'})
+        expect(subject).to_not receive(:open_deploy)
+        subject.execute({ monitor: false, migrate: false })
+      end
+
       it "opens the OpsWorks deployments screen if browser option is given" do
         expect(subject).to receive(:open_deploy)
         expect(Monitor::App).to_not receive(:new)

data/spec/opsicle/commands/execute_recipes_spec.rb

@@ -0,0 +1,71 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe ExecuteRecipes do
+    subject { ExecuteRecipes.new('derp') }
+    let(:recipes) { ['herp'] }
+
+    context "#execute" do
+      let(:client) { double }
+      let(:monitor) { double(:start => nil) }
+      before do
+        allow(Client).to receive(:new).with('derp').and_return(client)
+        allow(client).to receive(:run_command).with('execute_recipes', {"recipes" => ['herp']}, {}).and_return({deployment_id: 'derp'})
+
+        allow(Monitor::App).to receive(:new).and_return(monitor)
+        allow(monitor).to receive(:start)
+
+        allow(Output).to receive(:say)
+        allow(Output).to receive(:say_verbose)
+      end
+
+      it "creates a new execute_recipes deployment and opens stack monitor" do
+        expect(client).to receive(:run_command).with('execute_recipes', {"recipes" => ['herp']}, {}).and_return({deployment_id: 'derp'})
+        expect(subject).to_not receive(:open_deploy)
+        expect(Monitor::App).to receive(:new)
+
+        subject.execute({ monitor: true, recipes: recipes })
+      end
+
+      context "multiple recipes" do
+        let(:recipes) { ['herp', 'flurp'] }
+        it "creates a new execute_recipes deployment with multiple recipes" do
+          expect(client).to receive(:run_command).with('execute_recipes', {"recipes" => ['herp', 'flurp']}, {}).and_return({deployment_id: 'derp'})
+          expect(subject).to_not receive(:open_deploy)
+          subject.execute({ monitor: false, recipes: recipes })
+        end
+      end
+
+      context "instance_ids provided" do
+        let(:instance_id) { "6df39ff7-711c-4a58-a64c-0b0e3195af73" }
+        it "creates a new execute_recipes deployment for the specific instance_ids" do
+          expect(client).to receive(:run_command).with('execute_recipes', {"recipes" => ['herp']}, {"instance_ids" => [instance_id]}).and_return({deployment_id: 'derp'})
+          subject.execute({ monitor: false, instance_ids: [instance_id], recipes: recipes })
+        end
+      end
+
+      it "opens the OpsWorks deployments screen if browser option is given" do
+        expect(subject).to receive(:open_deploy)
+        expect(Monitor::App).to_not receive(:new)
+
+        subject.execute({ browser: true, recipes: recipes })
+      end
+
+      it "doesn't open the stack monitor or open the browser window when no-monitor option is given" do
+        expect(subject).to_not receive(:open_deploy)
+        expect(Monitor::App).to_not receive(:new)
+
+        subject.execute({ monitor: false, recipes: recipes })
+      end
+    end
+
+    context "#client" do
+      it "generates a new aws client from the given configs" do
+        expect(Client).to receive(:new).with('derp')
+        subject.client
+      end
+    end
+
+  end
+end

data/spec/opsicle/commands/list_instances_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe ListInstances do
+    subject { ListInstances.new('derp') }
+
+    context "#execute" do
+      let(:client) { double }
+      let(:layers) { [ { layer_id: 1, name: "Layer 1" }, { layer_id: 2, name: "Layer 2" }] }
+      let(:instances) { [
+          { hostname: 'test', layer_ids: [1], status: 'online', instance_id: 'opsworks-instance-id'},
+          { hostname: 'test2', layer_ids: [2], status: 'online', instance_id: 'opsworks-instance-id2'},
+        ] }
+      before do
+        allow(Client).to receive(:new).with('derp').and_return(client)
+      end
+
+      it "shows a table with all of the instances for the stack from OpsWorks" do
+        expect(subject).to receive(:get_layers).and_return(layers)
+        expect(subject).to receive(:get_instances).and_return(instances)
+        expect(subject).to receive(:print).with(instances)
+        subject.execute
+      end
+    end
+
+    context "#client" do
+      it "generates a new aws client from the given configs" do
+        expect(Client).to receive(:new).with('derp')
+        subject.client
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -174,10 +174,13 @@ files:
 - lib/opsicle/commands.rb
 - lib/opsicle/commands/chef_update.rb
 - lib/opsicle/commands/deploy.rb
+- lib/opsicle/commands/execute_recipes.rb
 - lib/opsicle/commands/list.rb
+- lib/opsicle/commands/list_instances.rb
 - lib/opsicle/commands/ssh.rb
 - lib/opsicle/commands/ssh_key.rb
 - lib/opsicle/config.rb
+- lib/opsicle/deploy_helper.rb
 - lib/opsicle/deployment.rb
 - lib/opsicle/deployments.rb
 - lib/opsicle/instances.rb
@@ -202,6 +205,8 @@ files:
 - spec/opsicle/client_spec.rb
 - spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
+- spec/opsicle/commands/execute_recipes_spec.rb
+- spec/opsicle/commands/list_instances_spec.rb
 - spec/opsicle/commands/list_spec.rb
 - spec/opsicle/commands/ssh_key_spec.rb
 - spec/opsicle/commands/ssh_spec.rb
@@ -233,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk
@@ -241,6 +246,8 @@ test_files:
 - spec/opsicle/client_spec.rb
 - spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
+- spec/opsicle/commands/execute_recipes_spec.rb
+- spec/opsicle/commands/list_instances_spec.rb
 - spec/opsicle/commands/list_spec.rb
 - spec/opsicle/commands/ssh_key_spec.rb
 - spec/opsicle/commands/ssh_spec.rb