magellan-cli 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66841e41672c874e98cec2d212f62a2c58ef7f35
-  data.tar.gz: 7791ac28ef42d6184070379ecd71a9518c555ec3
+  metadata.gz: 39a2518f311bac8449c9a2deb205ace8b022ab89
+  data.tar.gz: ddb7b05fa8d5e68601e5aa36d3646a29fbc2727f
 SHA512:
-  metadata.gz: 5cc5fd4b7abbd7aeed50e36368a98fc2135b7c0cbd722c435fbededdfbc718f35d8cc4aad960482f93543d0d91289e6e3ac0729b8bf164f6cfd27211ad8dca43
-  data.tar.gz: 52cce928eba021a3859028bc5e10ce3f6f7dad3cb2171129880ad85ed1558a0d6b6c9f755b1d389cdff3073ebb62ac81332923b943e41bcdda0fb2d5744cc055
+  metadata.gz: d8f7923f9c7810cd2a759b360ba34e0766c5a20cbced5ca1398f6f0a8ceff4d46dc3453e64d547da0ea78f2bca622c04112d75513f42e0f3d33ddc8748eb64e6
+  data.tar.gz: 931bac737533317d2278d247a085257e6c8a6c13b9a09732569932c7978ae6980b9827917b77d139dcfd31f04d472f3de3e5d347b8ebd0c119794ac51e6e93e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.7.5)
+    magellan-cli (0.7.6)
       activesupport (~> 4.1.4)
       groovenauts-thor
       httpclient (~> 2.5)

data/lib/magellan/cli/base.rb

@@ -151,6 +151,12 @@ module Magellan
           end
         end
 
+        def process_error_response(res)
+          obj = JSON.parse(res.body) rescue nil
+          if obj and obj.is_a?(Hash) and msg = obj["message"]
+            fatal(msg)
+          end
+        end
       end
 
 

data/lib/magellan/cli/http.rb

@@ -180,10 +180,7 @@ module Magellan
           end
           r
         else
-          obj = JSON.parse(res.body) rescue nil
-          if obj and obj.is_a?(Hash) and obj["message"]
-            cmd.fatal(obj["message"])
-          end
+          cmd.process_error_response(res)
         end
       end
 

data/lib/magellan/cli/resources/base.rb

@@ -194,6 +194,18 @@ module Magellan
             end
           end
 
+          def process_error_response(res)
+            obj = JSON.parse(res.body) rescue nil
+            if obj and obj.is_a?(Hash) and msg = obj["message"]
+              res_name = self.class.name.split(/::/).last.underscore
+              msg.gsub!(/#{Regexp.escape(self.class.model_class_name)}/, res_name)
+              if msg =~ /\A#{Regexp.escape(res_name)}/
+                msg = "The #{msg}"
+              end
+              fatal(msg)
+            end
+          end
+
           def self.inherited(klass)
             base_name = klass.name.split(/::/).last
             res_name = Magellan::Cli::Resources::MAPPING[base_name] or raise "resource not found for #{base_name}"
@@ -219,6 +231,9 @@ module Magellan
                 def parameter_name
                   self.class.parameter_name
                 end
+                def self.model_class_name
+                  resource_key.split(/~/).map(&:camelize).join('::')
+                end
               end
 
               desc "list", "#{I18n.t(:list, scope: [:resources, :common, :cmd], res_names: res_name.pluralize)}"

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.7.5"
+    VERSION = "0.7.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient