magellan-cli 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cba09c2e05c47bef0f93009f6f11e19003f1506
-  data.tar.gz: 2d5d4c20884ac93e1b6d110b17b1d927b5cf49a7
+  metadata.gz: 8d6704f43cf56d986b9ff84182bc449ff4cab94b
+  data.tar.gz: 7288afebe3ad3db21870424d976e52d9467a4bfc
 SHA512:
-  metadata.gz: 938a8d116ac1452cac229553283ec3e4f6b00f097b7beccaf36baaa77052361251a2d1287e2fb095ea16c9e813e85dddb0992bd7f6024deb8b71b8a021aff3fb
-  data.tar.gz: 8198e8b595765180b9d02204056ae7afde7e1ef12029bc4f15508f201ccec45cf8da80e41d01fb5862b576e7c82a47bba1a4146afd8875bb39bbd01ede9673c6
+  metadata.gz: 1c84ff3dce8dd50cd767f14ba1cb8bcb503acd0fe81cebbec878a1e0e7fbc51ab5cddb0007915a9248478694bec73997bca4d3337094797ea55329e9f292ca8d
+  data.tar.gz: 954f8c14b5bbf532fab82cc1f02aa1ef89396eaa88d89b25b89c07a759f82d6adbcbfbea667f61fe70d8f182faf51e37d9dd166a5a621075e2d15a9e5f8025a4

data/Gemfile.lock

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

data/lib/magellan/cli/base.rb

@@ -96,9 +96,9 @@ module Magellan
         # @param [String] rel_path http.base_url からの相対パス
         # @param [Hash] params クエリ文字列
         # @return [Object] レスポンスのBODYをJSONとしてパースした結果オブジェクト
-        def get_json(rel_path, params = {})
+        def get_json(rel_path, params = {}, &block)
           http_access do |api|
-            api.get_json(rel_path, params)
+            api.get_json(rel_path, params, &block)
           end
         end
 
@@ -106,9 +106,9 @@ module Magellan
         # @param [String] rel_path http.base_url からの相対パス
         # @param [Hash] params POSTで渡されるパラメータ
         # @return nil
-        def post(rel_path, params)
+        def post(rel_path, params, &block)
           http_access do |api|
-            api.post(rel_path, params)
+            api.post(rel_path, params, &block)
           end
         end
 
@@ -116,9 +116,9 @@ module Magellan
         # @param [String] rel_path http.base_url からの相対パス
         # @param [Hash] params POSTで渡されるパラメータ
         # @return nil
-        def post_json(rel_path, params)
+        def post_json(rel_path, params, &block)
           http_access do |api|
-            api.post_json(rel_path, params)
+            api.post_json(rel_path, params, &block)
           end
         end
 
@@ -126,9 +126,9 @@ module Magellan
         # @param [String] rel_path http.base_url からの相対パス
         # @param [Hash] params PUTで渡されるパラメータ
         # @return nil
-        def put(rel_path, params)
+        def put(rel_path, params, &block)
           http_access do |api|
-            api.put(rel_path, params)
+            api.put(rel_path, params, &block)
           end
         end
 
@@ -136,18 +136,18 @@ module Magellan
         # @param [String] rel_path http.base_url からの相対パス
         # @param [Hash] params PUTで渡されるパラメータ
         # @return nil
-        def put_json(rel_path, params)
+        def put_json(rel_path, params, &block)
           http_access do |api|
-            api.put_json(rel_path, params)
+            api.put_json(rel_path, params, &block)
           end
         end
 
         # ログインしてDELETEします
         # @param [String] rel_path http.base_url からの相対パス
         # @return nil
-        def delete(rel_path)
+        def delete(rel_path, &block)
           http_access do |api|
-            api.delete(rel_path)
+            api.delete(rel_path, &block)
           end
         end
 

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

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

@@ -2,6 +2,7 @@
 require 'spec_helper'
 
 describe Magellan::Cli::Resources::Project do
+  before{ FileUtils.cp(File.expand_path("../../../../.magellan-cli.original", __FILE__), ENV["MAGELLAN_CLI_CONFIG_FILE"]) }
 
   let(:base_url){ "https://localhost:3000" }
   before{ allow(Magellan::Cli::Http).to receive(:base_url).and_return(base_url) }
@@ -18,7 +19,8 @@ describe Magellan::Cli::Resources::Project do
 
   describe :list do
     it do
-      expect(httpclient).to receive(:get).with(%{#{base_url}/admin/project.json}).and_return(res)
+      url = "#{base_url}/admin/project.json?%s=%s&%s=%s" % [CGI.escape("f[organization][6][o]"), "is", CGI.escape("f[organization][6][v]"), 1]
+      expect(httpclient).to receive(:get).with(url).and_return(res)
       expect($stdout).to receive(:puts)
       cmd.list
     end
@@ -31,7 +33,8 @@ describe Magellan::Cli::Resources::Project do
       buf = StringIO.new
       $stdout, backup = buf, $stdout
       begin
-        expect(httpclient).to receive(:get).with(%{#{base_url}/admin/project.json}).and_return(list_res)
+        url = "#{base_url}/admin/project.json?%s=%s&%s=%s" % [CGI.escape("f[organization][7][o]"), "is", CGI.escape("f[organization][7][v]"), 1]
+        expect(httpclient).to receive(:get).with(url).and_return(list_res)
         expect(httpclient).to receive(:get).with(%{#{base_url}/admin/magellan~auth~organization.json?compact=true}).and_return(org_res)
         cmd.list
         buf.rewind

metadata

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