magellan-cli 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3402fbc5e7cc849553603e4e8dbd35e9eb090031
-  data.tar.gz: 9cad7dd3f7e0b175b4e50655c7b65d9a4dbe5fc6
+  metadata.gz: 8144d5811aa9f01b91f6287eab3c849d4893dc9a
+  data.tar.gz: 8e5f176af5447629a9d0438e46b57cdbe0d90282
 SHA512:
-  metadata.gz: f876cd2026ca3f75c00c54266a73ad0b5dae1dd583146edd6e117dffb6a0304e1431254bcb62518c102231178e0e80366a51fb734dd9d4c04846903dea0ccca3
-  data.tar.gz: 14c6b7fe1145a865486f7be38ee09846c20423a9351e1bdbea82c434c4e256d6d8ff2934886c78fc7bd09649dc406231784bd6528eed9f0a3d138d1b4bfa11ff
+  metadata.gz: 7065244060033b8c5d3413b143ee34e1f1ff87a3f3c250f09d4e1057123f0f00efcd719485866305565ecd433b66ca3f4e4db949fc05212ccbac2d4dbdc85b28
+  data.tar.gz: 4e10f24bb6a016bccacea6ae4af4c8f754efb4b40fe5f600b1c48f586579443f86db614d40381f9300bbf3fd6e6238111df02376e577a8e96a5fb50e3f1ea0fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.2.15)
+    magellan-cli (0.2.16)
       activesupport (~> 4.1.4)
       httpclient (~> 2.5)
       nokogiri

data/Rakefile

@@ -5,3 +5,11 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
+module Bundler
+  class GemHelper
+    def version_tag
+      d = File.basename(File.dirname(__FILE__))
+      "#{d}/#{version}"
+    end
+  end
+end

data/bin/magellan-cli

@@ -8,6 +8,9 @@ rescue Magellan::Cli::Error => e
   $stderr.puts("\e[31m#{e.message}\e[0m")
   exit(1)
 rescue => e
-  $stderr.puts("\e[31m[#{e.class}] #{e.message}\e[0m\n  " << e.backtrace.join("\n  "))
+  verbose = ARGV.include?("-V") || ARGV.include?("--verbose")
+  msg = "\e[31m[#{e.class}] #{e.message}\e[0m"
+  msg << "\n  " << e.backtrace.join("\n  ") if verbose
+  $stderr.puts(msg)
   exit(1)
 end

data/lib/magellan/cli/http.rb

@@ -33,7 +33,9 @@ module Magellan
             if obj and obj.is_a?(Hash) and obj["message"]
               fatal(obj["message"])
             else
-              error("HTTP Error: status=#{res.status}: #{res.body}")
+              msg = "HTTP Error: status=#{res.status}"
+              msg << "\n#{res.body}" if verbose?
+              error(msg)
             end
           end
         end
@@ -49,15 +51,16 @@ module Magellan
             if params && !params.empty?
               url << '?' << params.map{|k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
             end
-            verbose("url: #{url}")
+            verbose("GET #{url}")
             # "Unknown key: max-age = 0" というメッセージを表示させないために$stderrを一時的に上書き
             $stderr, bak = StringIO.new, $stderr
+            res = nil
             begin
               res = api.httpclient.get(url)
-              check_response(res)
             ensure
               $stderr = bak
             end
+            check_response(res)
           end
         end
 
@@ -117,7 +120,7 @@ module Magellan
 
         def process_res(api, http_method, rel_path, *args)
           url = "#{api.base_url}#{rel_path}"
-          verbose("%s %s\n%s" % [http_method, url, args])
+          verbose("%s %s\n%s" % [http_method.to_s.upcase, url, args])
           res = api.httpclient.send(http_method, url, *args)
           check_response(res)
         end

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

@@ -163,7 +163,7 @@ module Magellan
           def self.inherited(klass)
             base_name = klass.name.split(/::/).last
             res_name = base_name.underscore
-            klass.module_eval <<-EOM
+            klass.module_eval(<<-EOM, __FILE__, __LINE__ + 1)
               no_commands do
                 cattr_accessor :resource_name
                 cattr_accessor :resource_dependency

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

@@ -7,7 +7,7 @@ module Magellan
 
       class Team < Base
         self.resource_name = "magellan~auth~team"
-        self.resource_dependency = { Organization.parameter_name =>  Organization.parameter_name }
+        self.resource_dependency = { "organization" =>  Organization.parameter_name }
         self.field_associations = {"organization_id" => {name: "organization", class: "Organization"} }
 
         desc "create NAME ROLE", "create Team with NAME ROLE"

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.2.15"
+    VERSION = "0.2.16"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - akm2000