magellan-cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa7a868a64b02328acb0a38a2bfb053de87e49b
-  data.tar.gz: bcabb60c11b143ea38770f29c8067c99e52b56eb
+  metadata.gz: 5c657e803c1316bbcf6ab385531c2399076d4370
+  data.tar.gz: 46fa633ed4fec7b8bb9f55ab446192ff7dbe7a9d
 SHA512:
-  metadata.gz: 9f0d1be5fc876158a71a669a6bb216f0ff349c55d9e5617037087b3a21c3bc6addd26fb468081a82073be2cdf88189af2d1def64d0f8c075fab4930902a19bb2
-  data.tar.gz: eebc2f8eb73895bee74cb42746b983e4f13efbc75dde1fe3a132a354426390bdb11bd8dde8c93d4126823e2b5d1fce9a86017e4662c50945adf867cdd709e0c3
+  metadata.gz: c1e084d92a653dbbd5e0596752d60c19ae6e2450efb6ab54920ccbfcbea71813818c7a5774b5e0e0cb32bbe6e0530c6f2df715bcfe3fc074de51fba4727f2c6c
+  data.tar.gz: 2e9ecec939e2e7d57718aec804f9a55d6f1aaace363d38b29ee953535d018a84a1c10ba96cbdb3f9c483e65f019520a4eda6e5a648d9a69d0d9efd6b65027416

data/Gemfile.lock

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

data/lib/magellan/cli/http.rb

@@ -13,6 +13,22 @@ module Magellan
           return block_given? ? yield(cli) : success("OK")
         end
 
+        def check_response(res)
+          case res.status
+          when 200...300 then
+            r = JSON.parse(res.body)
+            verbose(JSON.pretty_generate(r))
+            r
+          else
+            obj = JSON.parse(res.body) rescue nil
+            if obj and obj.is_a?(Hash) and obj["message"]
+              error(obj["message"])
+            else
+              error("HTTP Error: status=#{res.status}: #{res.body}")
+            end
+          end
+        end
+
         # ログインしてGETします
         # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params クエリ文字列
@@ -28,7 +44,7 @@ module Magellan
             $stderr, bak = StringIO.new, $stderr
             begin
               res = cli.httpclient.get(url)
-              return JSON.parse(res.body)
+              check_response(res)
             ensure
               $stderr = bak
             end
@@ -93,18 +109,7 @@ module Magellan
           url = "#{cli.base_url}#{rel_path}"
           verbose("%s %s\n%s" % [http_method, url, args])
           res = cli.httpclient.send(http_method, url, *args)
-          case res.status
-          when 200...300 then
-            r = JSON.parse(res.body)
-            verbose(JSON.pretty_generate(r))
-            unless r["success"]
-              error(r["message"])
-            end
-            return r
-          else
-            info("\e[31m[#{res.status}]\e[0m\ #{res.body}")
-            return nil
-          end
+          check_response(res)
         end
 
       end

data/lib/magellan/cli/login.rb

@@ -100,6 +100,9 @@ module Magellan
         res = Ssl.retry_on_ssl_error("login_form"){ @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
+          raise Cli::Error.new("fail to login Magellan")
+        end
         node.attribute('value').value
       end
 

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

@@ -23,7 +23,7 @@ module Magellan
               "version" => version,
             }
           }
-          post_json("/admin/#{resource_name}/new.js", params)
+          post_json("/admin/#{resource_name}/new.json", params)
         end
       end
 

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

@@ -19,7 +19,7 @@ module Magellan
               "name" => name,
             }
           }
-          post_json("/admin/#{resource_name}/new.js", params)
+          post_json("/admin/#{resource_name}/new.json", params)
         end
 
         desc "delete ID", "delete CloudSQL Database"

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

@@ -16,7 +16,7 @@ module Magellan
               "name" => name,
             }
           }
-          post_json("/admin/#{self.resource_name}/new.js", params)
+          post_json("/admin/#{self.resource_name}/new.json", params)
         end
       end
 

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

@@ -27,7 +27,7 @@ module Magellan
               "name" => name,
             }
           }
-          post_json("/admin/#{resource_name}/new.js", params)
+          post_json("/admin/#{resource_name}/new.json", params)
         end
       end
 

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

@@ -27,7 +27,7 @@ module Magellan
               "stage_type" => type,
             }
           }
-          post_json("/admin/#{resource_name}/new.js", params)
+          post_json("/admin/#{resource_name}/new.json", params)
         end
 
         desc "select NAME", "select Stage named by NAME"

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

@@ -23,7 +23,7 @@ module Magellan
               "role" => role,
             }
           }
-          post_json("/admin/#{self.resource_name}/new.js", params)
+          post_json("/admin/#{self.resource_name}/new.json", params)
         end
 
 =begin

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

@@ -19,7 +19,7 @@ module Magellan
               # "instance_base_name" => name,
             }
           }
-          post_json("/admin/#{self.resource_name}/new.js", params)
+          post_json("/admin/#{self.resource_name}/new.json", params)
         end
 
       end

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

@@ -30,7 +30,7 @@ module Magellan
               # "instance_base_name" => name,
             }.update(attrs)
           }
-          post_json("/admin/#{self.resource_name}/new.js", params)
+          post_json("/admin/#{self.resource_name}/new.json", params)
         end
 
       end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

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

@@ -20,7 +20,7 @@ describe Magellan::Cli::Resources::ClientVersion do
     describe :success do
       before do
         expect(cmd).to receive(:load_selections).and_return({"project" => {"id" => 1, "name" => "ProjectA"}, "stage" => {"id" => 1, "name" => "StageA"} })
-        expect(cmd).to receive(:post_json).with("/admin/client_version/new.js", { "client_version" => { "stage_title_id" => 1, "version" => "1.1.0" } })
+        expect(cmd).to receive(:post_json).with("/admin/client_version/new.json", { "client_version" => { "stage_title_id" => 1, "version" => "1.1.0" } })
       end
       it do
         cmd.create("1.1.0")

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

@@ -17,7 +17,7 @@ describe Magellan::Cli::Resources::Organization do
 
   describe :create do
     before do
-      expect(cmd).to receive(:post_json).with("/admin/magellan~auth~organization/new.js", {"magellan_auth_organization" => { "name" => "new1" }})
+      expect(cmd).to receive(:post_json).with("/admin/magellan~auth~organization/new.json", {"magellan_auth_organization" => { "name" => "new1" }})
     end
     it do
       cmd.create("new1")

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

@@ -21,6 +21,7 @@ describe Magellan::Cli::Resources::Project do
   describe :list do
     it do
       allow(res).to receive(:body).and_return("[]")
+      allow(res).to receive(:status).and_return(200)
       expect(httpclient).to receive(:get).with("#{base_url}/admin/project.json").and_return(res)
       expect($stdout).to receive(:puts)
       cmd.list
@@ -30,6 +31,7 @@ describe Magellan::Cli::Resources::Project do
   describe :show do
     it do
       allow(res).to receive(:body).and_return("{}")
+      allow(res).to receive(:status).and_return(200)
       expect(httpclient).to receive(:get).with("#{base_url}/admin/project/1.json").and_return(res)
       expect($stdout).to receive(:puts)
       cmd.show(1)

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

@@ -20,7 +20,7 @@ describe Magellan::Cli::Resources::Team do
     describe :success do
       before do
         expect(cmd).to receive(:load_selection).with("magellan_auth_organization").and_return({"id" => 1, "name" => "org1"})
-        expect(cmd).to receive(:post_json).with("/admin/magellan~auth~team/new.js", { "magellan_auth_team" => { "organization_id" => 1, "name" => "team1", "role" => role } })
+        expect(cmd).to receive(:post_json).with("/admin/magellan~auth~team/new.json", { "magellan_auth_team" => { "organization_id" => 1, "name" => "team1", "role" => role } })
       end
       context "role=readers" do
         let(:role){ "readers" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient