silver_spurs 2.0.0.rc4 → 2.0.0.rc5

data/lib/silver_spurs/client/chef_output.rb

@@ -15,14 +15,20 @@ module SilverSpurs
     private
 
     def convert_status(response)
-      failure = (response['exit_code'] == 1) || (response['exit_status'] == 1)
-      failure ? :failed : :success
+      code = response[0]
+      case code
+      when 'ok'
+        :success
+      when 'error'
+        :failed
+      end
     end
 
     def prettify_log(response)
-      stdout = response['stdout']
-      stderr = response['stderr']
-      exit_code = response['exit_code'] || response['exit_status']
+      run_info = response[1]
+      stdout = run_info['stdout']
+      stderr = run_info['stderr']
+      exit_code = run_info['exit_code'] || run_info['exit_status']
 
       template = ERB.new <<-END
 Exit Code: <%= exit_code %>

data/lib/silver_spurs/version.rb

@@ -1,3 +1,3 @@
 module SilverSpurs
-  VERSION = '2.0.0.rc4'
+  VERSION = '2.0.0.rc5'
 end

data/spec/lib/silver_spurs/client/chef_output_spec.rb

@@ -3,16 +3,16 @@ require 'silver_spurs/client/chef_output'
 describe SilverSpurs::ChefOutput do
   describe :convert_status do
     before :each do
-      @chef_run = SilverSpurs::ChefOutput.new({'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0})
+      @chef_run = SilverSpurs::ChefOutput.new(['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
     end
 
     def call_convert_status(response)
       @chef_run.send(:convert_status, response)
     end
 
-    context 'exit code and status = 0' do
+    context 'response is "ok"' do
       before :each do
-        @response = { 'exit_code' => 0, 'exit_status' => 0}
+        @response = ["ok", {}]
       end
 
       it "should return :success" do
@@ -20,14 +20,9 @@ describe SilverSpurs::ChefOutput do
       end
     end
 
-    context 'exit code or status = 1' do
+    context 'response is "error"' do
       it "should return :failed" do
-        @response = { 'exit_code' => 0, 'exit_status' => 1}
-        call_convert_status(@response).should eq :failed
-      end
-
-      it "should return :failed" do
-        @response = { 'exit_code' => 1, 'exit_status' => 0}
+        @response = ["error", {}]
         call_convert_status(@response).should eq :failed
       end
     end
@@ -36,7 +31,7 @@ describe SilverSpurs::ChefOutput do
 
   describe :prettify_log do
     before :each do
-      @chef_run = SilverSpurs::ChefOutput.new({'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0})
+      @chef_run = SilverSpurs::ChefOutput.new(['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
     end
 
     def call_prettify_log(response)
@@ -44,39 +39,39 @@ describe SilverSpurs::ChefOutput do
     end
 
     it 'should output stderr' do
-      response = {'stdout' => '', 'stderr' => 'stdERR, son', 'exit_code' => 0, 'exit_status' => 0}
+      response = ['ok', {'stdout' => '', 'stderr' => 'stdERR, son', 'exit_code' => 0, 'exit_status' => 0}]
       call_prettify_log(response).should match(/stdERR, son/)
     end
 
     it 'should output stdout' do
-      response = {'stdout' => 'stdOUT, son', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}
+      response = ['ok', {'stdout' => 'stdOUT, son', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}]
       call_prettify_log(response).should match(/stdOUT, son/)
     end
 
     context 'when exit_code and exit_status are present' do
       it 'should prefer exit_code' do
-        response = {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => 2}
+        response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => 2}]
         call_prettify_log(response).should match(/Exit Code: 1/)
       end
     end
 
     context 'when exit_code is not present' do
       it 'should use exit_status' do
-        response = {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => 2}
+        response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => 2}]
         call_prettify_log(response).should match(/Exit Code: 2/)
       end
     end
 
     context 'when exit_status is not present' do
       it 'should use exit_code' do
-        response = {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => nil}
+        response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => nil}]
         call_prettify_log(response).should match(/Exit Code: 1/)
       end
     end
 
     context 'when exit_code and exit_status are not present' do
       it 'should use nil' do
-        response = {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => nil}
+        response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => nil}]
         call_prettify_log(response).should match(/Exit Code: /)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silver_spurs
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra