bixby-common 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18fbe02200bf8cecce22d6f30e11997917d262ab
-  data.tar.gz: 67c2cfdff3c661bfe232aeaaee87947ad9305669
+  metadata.gz: c42be708d73846920649d7e5d751739ec25457a5
+  data.tar.gz: 75b57b797385e2e5f9f5ecb00d3a95c0340f4286
 SHA512:
-  metadata.gz: 46d249eb473d1801fc704e9695e4a82f19abf11fc99b7086e0201185dbc2c8b2f3165d972e3a4ef15f1039ee5b83d4e5eecb8d7150956554aca3d164d4c7651c
-  data.tar.gz: ae4e61b4408a7f32887a7a87f0e8d920009aea26f3fbc526deb23e4e9b13791257316ce0ec91c0126eab2f9bc5d1e7fbc6d445219381f53280c2bf8842100c7b
+  metadata.gz: f994c619270d896ccb1a26084d4bda47755bdb1bf77453006137503873e68f9aeda766481f4241412855ac8411673e0605bf0b222ad2131f9e487f8923b24ccf
+  data.tar.gz: 74c12adcccc39bb244d26bd3fa41437e159df8c7a81810835f9cf6c56a22baa312c97161f642ab9a99d44b234e8b5be0f232d7a950535eb1d827db55a37a5504

data/VERSION

@@ -1 +1 @@
-0.4.11
+0.4.12

data/bixby-common.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-common 0.4.11 ruby lib
+# stub: bixby-common 0.4.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.4.11"
+  s.version = "0.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/bixby-common/command_response.rb

@@ -6,16 +6,23 @@ class CommandResponse
 
   attr_accessor :status, :stdout, :stderr
 
-  # Create a new CommandResponse from the given from_json_response
+  SUCCESS         = 0
+  UNKNOWN_FAILURE = 255
+
+  # Create a new CommandResponse from the given JsonResponse
   #
   # @param [JsonResponse] res
   #
   # @return [CommandResponse]
   def self.from_json_response(res)
     cr = CommandResponse.new(res.data)
-    if !(res.message.nil? || res.message.empty?) then
-      cr.status ||= 255
-      cr.stderr ||= res.message
+    if res.fail? then
+      if !(res.message.nil? || res.message.empty?) then
+        cr.status ||= UNKNOWN_FAILURE
+        cr.stderr ||= res.message
+      else
+        cr.status ||= UNKNOWN_FAILURE
+      end
     end
     return cr
   end
@@ -24,7 +31,7 @@ class CommandResponse
   #
   # @return [JsonResponse]
   def to_json_response
-    return JsonResponse.new((status == 0 ? "success" : "fail"), nil, self.to_hash)
+    return JsonResponse.new((success?() ? "success" : "fail"), nil, self.to_hash)
   end
 
   def initialize(params = nil)
@@ -39,7 +46,7 @@ class CommandResponse
   end
 
   def success?
-    @status.to_i == 0
+    @status && @status.to_i == SUCCESS
   end
 
   def fail?

data/test/command_response_test.rb

@@ -15,6 +15,11 @@ class TestCommandResponse < TestCase
     assert_kind_of CommandResponse, cr
     assert_equal 255, cr.status
     assert_equal "unknown", cr.stderr
+
+    assert_throws(CommandException) do
+      cr.raise!
+    end
+
     begin
       cr.raise!
     rescue CommandException => ex
@@ -29,6 +34,16 @@ class TestCommandResponse < TestCase
     assert_equal 0, cr.status
     assert_equal "foobar", cr.stdout
     assert_nil cr.stderr
+
+    # empty failure message
+    res = JsonResponse.new("fail")
+    assert res.fail?
+    refute res.success?
+    cr = CommandResponse.from_json_response(res)
+    refute cr.success?
+    assert cr.fail?
+    assert cr.error?
+    assert_equal 255, cr.status
   end
 
   def test_to_json_response

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Chetan Sarva