opsicle 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b201eac6aa239dec9378f67aa1c34a03898eac11
-  data.tar.gz: be6e9ece12c51bd6d7c47b8bed9bac8fc8510ca2
+  metadata.gz: 97dd611664d6cade219eb35829d9cc111636ab1b
+  data.tar.gz: 1ba96878b0d09b05dc2df05222507af9b4cfec48
 SHA512:
-  metadata.gz: 6d1136716ed8666abb86979193ae285c5fd3d50534ca111a960d2f8ba1cb2334f96f46f5b23ee51c8c378dfdb2f9156a297f38347ed58006cda4e78a0e884ebe
-  data.tar.gz: 2ca94d4ba02f75230c06b1e1e15f549c106f6f26e6ddb60e613d23b13a42de10a4e063e8ee0eee42071c84d4e6a56d74a1d6d1cefbf869ae6b293f9d7521e755
+  metadata.gz: beb8719a0691650d14a661a10b2b9cd5c79e63ae4d0f41d302a2ac30ed0b2585b09844914570bef34a1a73ca0515c2e091653da3344b8e78440f3d53c8ddf624
+  data.tar.gz: 3dfa883fabc57e83e0d04d56d6e41edbf52034c2c459c46a0ee97b09101ef7ea1c33f6179db86d927fad58a032977cf220752be93d413635d6ac0c55d6ad2751

data/bin/opsicle

@@ -48,6 +48,7 @@ command :deploy do |c|
   c.switch [:g, :migrate], :desc => "Deploy with migrations"
   c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
   c.switch [:t, :track],   :desc => "Tracks to deploy and exits when completed. Exits with non-zero if the deploy fails."
+  c.flag   [:j, :json],    :desc => 'Custom json to add to the deploy', :type => String
   c.action do |global_options, options, args|
     raise ArgumentError, 'You must specify an environment' unless args.first
     Opsicle::Deploy.new(args.first).execute global_options.merge(options)
@@ -84,6 +85,15 @@ command 'ssh-key' do |c|
   end
 end
 
+desc "Clear an environment's keys from your ssh known_hosts file"
+arg_name '<environment>'
+command 'ssh-clean-keys' do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::SSHCleanKeys.new(args.first).execute global_options.merge(options)
+  end
+end
+
 desc "Launch the Opsicle Stack Monitor for the given environment stack"
 arg_name '<environment>'
 command 'monitor' do |c|
@@ -147,13 +157,14 @@ 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.switch [:e, :eip], :desc => "Executes recipes on a single instance with an elastic IP", :default_value => false
-  c.switch [:t, :track],   :desc => "Tracks to deploy and exits when completed. Exits with non-zero if the deploy fails."
-  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.flag [:l, :layers], :desc => 'The specific layers to execute recipes on', :type => Array
-  c.flag [:a, :ip_addresses], :desc => 'The specific ip addresses of instance to execute recipes on', :type => Array
+  c.switch [:m, :monitor],      :desc => "Run the Stack Monitor on deploy", :default_value => true
+  c.switch [:e, :eip],          :desc => "Executes recipes on a single instance with an elastic IP", :default_value => false
+  c.switch [:t, :track],        :desc => "Tracks to deploy and exits when completed. Exits with non-zero if the deploy fails."
+  c.flag   [:j, :json],         :desc => 'Custom json to add to the deploy', :type => String
+  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.flag   [:l, :layers],       :desc => 'The specific layers to execute recipes on', :type => Array
+  c.flag   [:a, :ip_addresses], :desc => 'The specific ip addresses of instance to execute recipes on', :type => Array
   c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
 

data/lib/opsicle/commands/deploy.rb

@@ -17,7 +17,9 @@ module Opsicle
       #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)
+      command_opts = {}
+      command_opts["custom_json"] = options.delete(:json) if options[:json]
+      response = client.run_command('deploy', command_args, command_opts)
 
       launch_stack_monitor(response, options)
     end

data/lib/opsicle/commands/execute_recipes.rb

@@ -19,18 +19,19 @@ module Opsicle
       command_args["recipes"] = options[:recipes]
       command_opts = {}
       command_opts["instance_ids"] = determine_instance_ids(options)
+      command_opts["custom_json"] = options.delete(:json) if options[:json]
       command_opts.reject! {|key,value| value.nil?}
 
       response = client.run_command('execute_recipes', command_args, command_opts)
       launch_stack_monitor(response, options)
     end
-      
+
     def determine_instance_ids(options)
       if options[:instance_ids]
         options[:instance_ids]
       elsif options[:layers]
         determine_from_layers(options[:layers])
-      elsif options[:ip_addresses]    
+      elsif options[:ip_addresses]
         determine_from_ips(options[:ip_addresses])
       elsif options[:eip]
         determine_from_eip
@@ -38,7 +39,7 @@ module Opsicle
     end
 
     def determine_from_ips(ips)
-      if instances = Opsicle::Instances.find_by_ip(client, ips)  
+      if instances = Opsicle::Instances.find_by_ip(client, ips)
         instances.map { |instance| instance[:instance_id] }
       else
         raise NoInstanceError, "Unable to find instances with given IP"

data/lib/opsicle/commands/ssh_clean_keys.rb

@@ -0,0 +1,29 @@
+module Opsicle
+  class SSHCleanKeys
+    attr_reader :client
+
+    def initialize(environment)
+      @client = Client.new(environment)
+    end
+
+    def execute(options={})
+      instances.each do |instance|
+        # Fun note: public_dns will be for the elastic ip (if elastic_ip?)
+        host_keys = [:elastic_ip, :public_ip, :public_dns]
+        hosts = host_keys.map { |key| instance[key] }
+        hosts = hosts.reject { |i| i.nil? }
+        hosts.uniq.each do |host|
+          # Is this properly escaped against expansion?
+          command = "ssh-keygen -R #{host}"
+          Output.say_verbose "Executing: #{command}"
+          system(command)
+        end
+      end
+    end
+
+    def instances
+      client.api_call(:describe_instances, { stack_id: client.config.opsworks_config[:stack_id] })
+        .data[:instances]
+    end
+  end
+end

data/lib/opsicle/commands.rb

@@ -7,3 +7,4 @@ require "opsicle/commands/list"
 require "opsicle/commands/list_instances"
 require "opsicle/commands/ssh"
 require "opsicle/commands/ssh_key"
+require "opsicle/commands/ssh_clean_keys"

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 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,7 +20,7 @@ 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).with('derp', :monitor => true)
 
@@ -28,7 +28,7 @@ module Opsicle
       end
 
       it "creates a new deployment that exits the stack monitor on completion" 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).with('derp', :monitor => true, :deployment_id => 'derp')
 
@@ -36,17 +36,25 @@ module Opsicle
       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(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(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 "pass custom json to the deploy if provided" do
+        expect(client).to receive(:run_command).with('deploy', {}, { 'custom_json' => '{ "expire_css": true }' }).and_return({deployment_id: 'derp'})
+        expect(subject).to_not receive(:open_deploy)
+        expect(Monitor::App).to_not receive(:new)
+
+        subject.execute({ json: '{ "expire_css": true }' })
+      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

@@ -53,6 +53,14 @@ module Opsicle
         end
       end
 
+      context "custom_json provided" do
+        let(:custom_json) { '{ "expire_css": true }' }
+        it "creates a new execute_recipes deployment and passes along the custom json" do
+          expect(client).to receive(:run_command).with('execute_recipes', {"recipes" => ['herp']}, {"custom_json" => custom_json}).and_return({deployment_id: 'derp'})
+          subject.execute({ monitor: false, json: custom_json, 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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -184,6 +184,7 @@ files:
 - lib/opsicle/commands/list.rb
 - lib/opsicle/commands/list_instances.rb
 - lib/opsicle/commands/ssh.rb
+- lib/opsicle/commands/ssh_clean_keys.rb
 - lib/opsicle/commands/ssh_key.rb
 - lib/opsicle/config.rb
 - lib/opsicle/deploy_helper.rb
@@ -248,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk
@@ -272,4 +273,3 @@ test_files:
 - spec/opsicle/monitor/subpanel_spec.rb
 - spec/opsicle/s3_bucket_spec.rb
 - spec/spec_helper.rb
-has_rdoc: