opsicle 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1dcaf04bbc1b390d6d7c9f491b909e10883c3a
-  data.tar.gz: 547e55829683626e7598ef2324d59dc2f8218cd3
+  metadata.gz: b201eac6aa239dec9378f67aa1c34a03898eac11
+  data.tar.gz: be6e9ece12c51bd6d7c47b8bed9bac8fc8510ca2
 SHA512:
-  metadata.gz: 88e54592591ceffc65377b8e43c249a35119b7df2dfa6789839961d15900f355ecb6d355b2c8891c5e2a98a9a11b5824c2c7a86dcee8d3f70f8def9c222a9d48
-  data.tar.gz: 7bb7ef31c3860c90b20fd8eb7b1efca8f7e447e8ddc74c1e594c380cc95b21aba2b8d859c539764439b37224a334c62ca116a93b2fa54a85fc3b175756df5da9
+  metadata.gz: 6d1136716ed8666abb86979193ae285c5fd3d50534ca111a960d2f8ba1cb2334f96f46f5b23ee51c8c378dfdb2f9156a297f38347ed58006cda4e78a0e884ebe
+  data.tar.gz: 2ca94d4ba02f75230c06b1e1e15f549c106f6f26e6ddb60e613d23b13a42de10a4e063e8ee0eee42071c84d4e6a56d74a1d6d1cefbf869ae6b293f9d7521e755

data/bin/opsicle

@@ -31,6 +31,7 @@ end
 on_error do |exception|
   case exception
   when Opsicle::Monitor::QuitMonitor
+    Opsicle::Output.say exception.message, :success
     exit 0
   when Opsicle::Errors::DeployFailed
     Opsicle::Output.say exception.message, :error

data/lib/opsicle/commands/ssh.rb

@@ -28,8 +28,9 @@ module Opsicle
     end
 
     def instances
-      client.api_call(:describe_instances, { stack_id: client.config.opsworks_config[:stack_id] })
-        .data[:instances]
+      @instances ||= client.api_call(:describe_instances, { stack_id: client.config.opsworks_config[:stack_id] })
+                           .data[:instances]
+                           .select { |instance| instance[:status].to_s == 'online'}
     end
 
     def ssh_username

data/lib/opsicle/monitor/app.rb

@@ -62,13 +62,15 @@ module Opsicle
         end
       end
 
-      def stop(error=nil)
+      def stop(options={})
+        options = { error: nil, message: "" }.merge(options)
+
         @running = false
         wakey_wakey
         @screen.close
         @screen = nil # Ruby curses lib doesn't have closed?(), so we set to nil, just in case
 
-        raise (error || QuitMonitor)
+        options[:error] ? raise(options[:error]) : raise(QuitMonitor, options[:message])
       end
 
       def restart
@@ -167,7 +169,13 @@ module Opsicle
 
       def check_deploy_status
         unless deploy.running?
-          deploy.failed? ? stop(Opsicle::Errors::DeployFailed.new(deploy.command)) : stop
+          if deploy.failed?
+            stop(error: Opsicle::Errors::DeployFailed.new(deploy.command))
+          elsif deploy.successful?
+            stop(message: "Deploy completed successfully")
+          else
+            stop
+          end
         end
       end
 

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/opsicle/commands/ssh_spec.rb

@@ -81,8 +81,8 @@ module Opsicle
       it "makes a describe_instances API call" do
         expect(client).to receive(:api_call).with(:describe_instances, {stack_id: "1234"})
           .and_return(api_call)
-        expect(api_call).to receive(:data).and_return(instances: {:foo => :bar})
-        expect(subject.instances).to eq({:foo => :bar})
+        expect(api_call).to receive(:data).and_return(instances: [{:name => :foo, :status => "online"},{:name => :bar, :status => "stopped"}])
+        expect(subject.instances).to eq([{:name => :foo, :status=>"online"}])
       end
     end
 

data/spec/opsicle/monitor/app_spec.rb

@@ -70,15 +70,21 @@ describe Opsicle::Monitor::App do
     end
 
     context "when called normally" do
-      it "raises QuitMonitor and exits safely" do
-        expect { @app.stop }.to raise_error(Opsicle::Monitor::QuitMonitor)
+      it "raises QuitMonitor and exits safely without a message" do
+        expect { @app.stop }.to raise_error(Opsicle::Monitor::QuitMonitor, "")
+      end
+    end
+
+    context "when a message is passed in" do
+      it "raises QuitMonitor and exists with message" do
+        expect { @app.stop(message: "Hey!") }.to raise_error(Opsicle::Monitor::QuitMonitor, "Hey!")
       end
     end
 
     context "when a custom error is passed in" do
       it "raises the custom error" do
         MyAwesomeCustomError = Class.new(StandardError)
-        expect { @app.stop(MyAwesomeCustomError) }.to raise_error(MyAwesomeCustomError)
+        expect { @app.stop(error: MyAwesomeCustomError) }.to raise_error(MyAwesomeCustomError)
       end
     end
   end
@@ -125,7 +131,7 @@ describe Opsicle::Monitor::App do
         let(:deployment) { double("deployment", :[] => 'successful') }
 
         it "stops the monitor normally" do
-          expect(@app).to receive(:stop).with(no_args)
+          expect(@app).to receive(:stop).with(message: "Deploy completed successfully")
           @app.send :check_deploy_status
         end
       end
@@ -134,7 +140,7 @@ describe Opsicle::Monitor::App do
         let(:deployment) { double("deployment", :[] => 'failed') }
 
         it "stops the monitor with an DeployFailed error" do
-          expect(@app).to receive(:stop).with(Opsicle::Errors::DeployFailed)
+          expect(@app).to receive(:stop).with(error: Opsicle::Errors::DeployFailed)
           @app.send :check_deploy_status
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk
@@ -272,3 +272,4 @@ test_files:
 - spec/opsicle/monitor/subpanel_spec.rb
 - spec/opsicle/s3_bucket_spec.rb
 - spec/spec_helper.rb
+has_rdoc: