magellan-cli 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db0837835cc09a010e80b50ed05ef816eac9c2d
-  data.tar.gz: 5eaf1c7d35daeedab002dd47d6dc1f6298846550
+  metadata.gz: c2ba540ea2529d783f14d3628225f37692e04f3c
+  data.tar.gz: 26ca454236298f588565961a29c716cc11848222
 SHA512:
-  metadata.gz: 75ca604ec8f59c335e9eb4fe75e1ee9fff085dcb5212f7c86d47ea16a2efa7a51a2346b22d5738df7b15739a411218772658dffbb8ae6f18a755d0ed1094875e
-  data.tar.gz: d60150518e847386d483cd410d06bc8f02c340ffdbe43a34e51574f8023374e9b2d09c2881607be1242018cbddb6a80c5ebe36d14b0b9d32c56317a06db8367f
+  metadata.gz: 74efcf40e995664628987dc865a6ecc3be7d834100ae7be1ffcb98af2d37538e0ab035f9a06e867338792ffd3b63d4b27a95d8de665560dcf36b17b6a39675c9
+  data.tar.gz: bf52789d27406ab0ae831e59a96997c24ffac4a09dedc401f09443c9fad88904efa1c80aafc7c62caf1900943e5c753e6cea03eac19dd8a0b4c2cfe80bc0cc49

data/Gemfile.lock

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

data/lib/magellan/cli/http.rb

@@ -64,6 +64,13 @@ module Magellan
         end
       end
 
+      def debug_lf
+        r = yield if block_given?
+        @httpclient.debug_dev << "\n" if @httpclient.debug_dev
+        r
+      end
+
+
       def login_form_url
         @login_form_url ||= base_url + "/users/sign_in.html"
       end
@@ -90,7 +97,7 @@ module Magellan
           },
           "authenticity_token" => @auth_token
         }.to_json
-        res2 = Ssl.retry_on_ssl_error("login"){ @httpclient.post(login_url, params, JSON_HEADER) }
+        res2 = Ssl.retry_on_ssl_error("login"){ debug_lf{ @httpclient.post(login_url, params, JSON_HEADER) } }
 
         case res2.status
         when 200...300 then logined = true
@@ -109,7 +116,7 @@ module Magellan
       def api_login_by_token!(email, token)
         url = "#{base_url}/admin/magellan~auth~organization.json"
         params = {"email" => email, "token" => token}
-        res = httpclient.get(url, params)
+        res = debug_lf{ httpclient.get(url, params) }
 
         logined =
           case res.status
@@ -135,7 +142,7 @@ module Magellan
       end
 
       def get_auth_token
-        res = Ssl.retry_on_ssl_error("login_form"){ @httpclient.get(login_form_url) }
+        res = Ssl.retry_on_ssl_error("login_form"){ debug_lf{ @httpclient.get(login_form_url) } }
         doc = Nokogiri::HTML.parse(res.body, login_form_url, res.body_encoding.to_s)
         node = doc.xpath('//input[@name="authenticity_token"]').first
         unless node
@@ -175,7 +182,7 @@ module Magellan
         else
           obj = JSON.parse(res.body) rescue nil
           if obj and obj.is_a?(Hash) and obj["message"]
-            fatal(obj["message"])
+            cmd.fatal(obj["message"])
           end
         end
       end
@@ -195,7 +202,7 @@ module Magellan
         $stderr, bak = StringIO.new, $stderr
         res = nil
         begin
-          res = httpclient.get(url)
+          res = debug_lf{ httpclient.get(url) }
         ensure
           $stderr = bak
         end
@@ -248,7 +255,7 @@ module Magellan
 
       def process_res(http_method, rel_path, *args)
         url = "#{base_url}#{rel_path}"
-        res = httpclient.send(http_method, url, *args)
+        res = debug_lf{ httpclient.send(http_method, url, *args) }
         check_response(res)
       end
 

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

@@ -39,7 +39,7 @@ module Magellan
               client_version: client_version,
               mqtt_host: ENV["MAGELLAN_MQTT_SERVER_HOST"] || DEFAULT_MAGELLAN_MQTT_SERVER_HOST,
               mqtt_port: ENV["MAGELLAN_MQTT_SERVER_PORT"] || DEFAULT_MAGELLAN_MQTT_SERVER_PORT,
-              verbose: options[:verbose],
+              verbose: verbose?,
             }
             uri = ENV["MAGELLAN_HTTP_SERVER_URL"] || DEFAULT_MAGELLAN_HTTP_SERVER_URL
             log_verbose("HTTP URL    : #{uri.inspect}")

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

@@ -77,7 +77,8 @@ module Magellan
               fields[i] = obj[:name]
               res = obj[:resource] || ((k = Resources.const_get(obj[:class])) ? k.resource_key : nil)
               res2 = get_json("/admin/#{res}.json", {"compact" => true})
-              associations[f] = res2.each_with_object({}){|r,d| d[ r["id"].to_i ] = r["label"] }
+              attr_name = (k ? k.caption_attr : nil) || "caption"
+              associations[f] = res2.each_with_object({}){|r,d| d[ r["id"].to_i ] = r[attr_name] }
             end
             return associations
           end
@@ -114,7 +115,6 @@ module Magellan
             fields = original_fields.dup
             fields.unshift(" ")
             associations = association_map(fields)
-
             t.head = fields
             t.rows = []
             selected_id = (load_selections[ parameter_name ] || {})["id"]

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/spec/magellan/cli/resources/project_spec.rb

@@ -22,6 +22,26 @@ describe Magellan::Cli::Resources::Project do
       expect($stdout).to receive(:puts)
       cmd.list
     end
+
+    let(:org_res_body){ [{"id":8,"name":"test1","email":"","creator_id":4,"created_at":"2015-02-18T14:27:16.000Z","updated_at":"2015-02-18T14:27:16.000Z","max_project_count":1,"max_team_count":100}] }
+    let(:org_res){ double(:org_res, status: 200, body: org_res_body.to_json) }
+    let(:list_res_body){ [{"id":9,"organization_id":8,"default_nebula_id":2,"name":"Project1","icon_url":nil,"consumer_key":"test1.Project1","consumer_secret":"a5etckpurpy0od3keo25iw77mtllo2fb","created_at":"2015-02-18T14:27:21.000Z","updated_at":"2015-02-18T14:27:21.000Z","max_stage_count":2}] }
+    let(:list_res){ double(:res, status: 200, body: list_res_body.to_json) }
+    it do
+      buf = StringIO.new
+      $stdout, backup = buf, $stdout
+      begin
+        expect(httpclient).to receive(:get).with(%{#{base_url}/admin/project.json}).and_return(list_res)
+        expect(httpclient).to receive(:get).with(%{#{base_url}/admin/magellan~auth~organization.json}).and_return(org_res)
+        cmd.list
+        buf.rewind
+        output = buf.read
+        expect(output).to_not match /not found/
+        expect(output).to match /test1/
+      ensure
+        $stdout = backup
+      end
+    end
   end
 
   describe :show do

metadata

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