magellan-cli 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a862c5cf1dedeb965c1b9b903d17a1fe41012b3
-  data.tar.gz: f7d879a8989894ac2d11fa04991ffa968052d672
+  metadata.gz: 9cc1cfe804181bf307d673744563f0c87ca43b26
+  data.tar.gz: ada7eb304a551d0d515020758e0f0cc2ab40507e
 SHA512:
-  metadata.gz: b2800d3ce556d12eb77ec5849229e51a9e08044ce93a8a187f70d8160871a8c48bc270831f782ae21124b6ab5a95e6e54a75cb5d67872b64c53e62b83798d4fd
-  data.tar.gz: 3e7b3d6f48da5e07015d7c72e44e3cfb14ce8512a2109d4ab11d143672c3a03c95cdc76ce4a7c0126324eaac3464d6022a9de49a03fe2c2b3d68067137b811b7
+  metadata.gz: 6bc4d0418e9795a74313d677ab79d3ed68eecc744d5eac394aed7ccd064f1aedb588fcc000ad8bf8eb7a56dadb63bfc0e8cefd671f17d312b9365bc906679ed0
+  data.tar.gz: 07bbce30a3b61dd1d4f96f6362228b686a3a497b7810c01ac256eeafcfde9cd0f144aa81f1279ca7643d4e6df3456b2990706af7deb61db973ef565a2dd709ac

data/Gemfile.lock

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

data/lib/magellan/cli/file_access.rb

@@ -6,7 +6,7 @@ module Magellan
   module Cli
     module FileAccess
 
-      class NotSelected < StandardError
+      class NotSelected < Magellan::Cli::Error
       end
 
       DEFAULT_SELECTION_FILENAME = File.expand_path("~/.config/magellan/magellan-cli")

data/lib/magellan/cli/http.rb

@@ -49,9 +49,8 @@ module Magellan
             if obj and obj.is_a?(Hash) and obj["message"]
               fatal(obj["message"])
             else
-              msg = "HTTP Error: status=#{res.status}"
-              msg << "\n#{res.body}" if verbose?
-              log_error(msg)
+              msg = "HTTP Error: status=#{res.status}\n#{res.body}"
+              log_verbose(msg)
             end
           end
         end

data/lib/magellan/cli/locales/en.yml

@@ -69,7 +69,7 @@ en:
       default_query:
         not_selected: "No %{label} selected"
       get_first_result:
-        not_found: "%{name} not found by using %{query}"
+        not_found: "%{resource_name} not found for %{name}"
     common:
       cmd:
         create: "Create a new %{resource_name} with NAME"

data/lib/magellan/cli/locales/ja.yml

@@ -67,7 +67,7 @@ ja:
       default_query:
         not_selected: "%{label}が選択されていません"
       get_first_result:
-        not_found: "%{name}は見つかりませんでした。クエリ %{query}"
+        not_found: "%{name}という%{resource_name}は見つかりませんでした"
     common:
       cmd:
         create: "NAMEを指定して%{resource_name}を登録します"

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

@@ -14,7 +14,7 @@ module Magellan
   module Cli
     module Resources
 
-      class NotFound < StandardError
+      class NotFound < Magellan::Cli::Error
       end
 
       class Base < ::Magellan::Cli::Http
@@ -53,19 +53,19 @@ module Magellan
             end
           end
 
-          def get_first_result!(name, path, query)
+          def get_first_result!(resource_name, name, path, query)
             results = get_json(path, query)
-            raise NotFound, I18n.t(:not_found, scope: [:resources, :base, :get_first_result], name: name, query: query.inspect) if results.blank? || results.first.blank?
+            raise NotFound, I18n.t(:not_found, scope: [:resources, :base, :get_first_result], resource_name: resource_name, name: name) if results.blank? || results.first.blank?
             results.first
           end
 
-          def update_first_result(name, path, query, fields = nil)
+          def update_first_result(resource_name, name, path, query, fields = nil)
             fields ||= ["id", self.class.caption_attr].compact
-            r = get_first_result!(name, path, query)
+            r = get_first_result!(resource_name, name, path, query)
             obj = fields.each_with_object({}) do |f, d|
               d[f] = r[f]
             end
-            update_selections!(name => obj)
+            update_selections!(resource_name => obj)
             return r
           end
 
@@ -168,7 +168,7 @@ module Magellan
 
           def select(name)
             q = build_query(self.class.caption_attr => name).update(default_query)
-            update_first_result(self.class.parameter_name, "/admin/#{self.class.resource_key}.json", q)
+            update_first_result(self.class.parameter_name, name, "/admin/#{self.class.resource_key}.json", q)
           end
 
           def deselect

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

@@ -32,7 +32,7 @@ module Magellan
         desc "delete VERSION", I18n.t(:delete, scope: [:resources, :client_version, :cmd], resource_name: resource_name)
         def delete(version)
           q = build_query("version" => version).update(default_query)
-          r = get_first_result!(self.class.resource_name, "/admin/#{resource_key}.json", q)
+          r = get_first_result!(self.class.resource_name, version, "/admin/#{resource_key}.json", q)
           super("/admin/#{resource_key}/#{r['id']}/delete")
           log_success("OK")
         end

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

@@ -13,7 +13,7 @@ module Magellan
             desc "delete NAME", I18n.t(:delete, scope: [:resources, :common, :cmd], resource_name: resource_name)
             def delete(name)
               q = build_query("name" => name).update(default_query)
-              r = get_first_result!(self.class.resource_name, "/admin/#{resource_key}.json", q)
+              r = get_first_result!(self.class.resource_name, name, "/admin/#{resource_key}.json", q)
               super("/admin/#{resource_key}/#{r['id']}/delete")
               log_success("OK")
             end

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

@@ -9,7 +9,7 @@ module Magellan
         include Deletable
 
         self.resource_key = "project"
-        self.resource_dependency = nil
+        self.resource_dependency = { "organization" =>  Organization.parameter_name }
         self.hidden_fields = %w[default_nebula_id created_at updated_at].map(&:freeze).freeze
         self.field_associations = {"organization_id" => {name: "organization", class: "Organization"} }
 

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

@@ -43,15 +43,15 @@ module Magellan
           end
 
           q = build_query("name" => name).update(default_query)
-          r = update_first_result(parameter_name, "/admin/stage~title.json", q)
+          r = update_first_result(parameter_name, name, "/admin/stage~title.json", q)
 
           # # current
           # q = build_query("title" => r["id"], "phase" => 2) # 2: current
-          # update_first_result(VERSION_PARAMETER_NAME, "/admin/stage~version.json", q, %w[id])
+          # update_first_result(VERSION_PARAMETER_NAME, "phase=2", "/admin/stage~version.json", q, %w[id])
 
           # # workspace
           q = build_query("title" => r["id"], "phase" => 1) # 1: workspace
-          update_first_result(VERSION_PARAMETER_NAME, "/admin/stage~version.json", q, %w[id])
+          update_first_result(VERSION_PARAMETER_NAME, "phase=1", "/admin/stage~version.json", q, %w[id])
         end
 
         desc "deselect", I18n.t(:deselect, scope: [:resources, :common, :cmd], res_name: resource_name)
@@ -77,7 +77,7 @@ module Magellan
           def switch_version(phase)
             s = load_selection!(self.class)
             q = build_query("title" => s["id"], "phase" => phase) # 1: workspace, 2: current, 3: used
-            update_first_result(VERSION_PARAMETER_NAME, "/admin/stage~version.json", q, %w[id])
+            update_first_result(VERSION_PARAMETER_NAME, "phase=#{phase}", "/admin/stage~version.json", q, %w[id])
           end
         end
 

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

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

@@ -20,7 +20,7 @@ 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)
+      expect(httpclient).to receive(:get).with(%r{\A#{base_url}/admin/project.json}).and_return(res)
       expect($stdout).to receive(:puts)
       cmd.list
     end
@@ -36,4 +36,32 @@ describe Magellan::Cli::Resources::Project do
     end
   end
 
+  describe :delete do
+    before do
+      @name = "dummyproject"
+    end
+    context "organization selected" do
+      before do
+        Magellan::Cli::FileAccess.update_selections(Magellan::Cli::FileAccess.load_selections.merge("magellan_auth_organization" => { id: 1, name: @name}))
+        allow(res).to receive(:body).and_return("")
+        allow(res).to receive(:status).and_return(401)
+        expect(httpclient).to receive(:get).and_return(res)
+      end
+      it "show not found error message" do
+        expect do
+          cmd.delete(@name)
+        end.to raise_error(Magellan::Cli::Resources::NotFound)
+      end
+    end
+    context "organization not selected" do
+      before do
+        Magellan::Cli::FileAccess.update_selections(Magellan::Cli::FileAccess.load_selections.merge("magellan_auth_organization" => nil))
+      end
+      it "show not selected error message" do
+        expect do
+          cmd.delete(@name)
+        end.to raise_error(Magellan::Cli::FileAccess::NotSelected)
+      end
+    end
+  end
 end

metadata

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