magellan-cli 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bab0dd77260b7d366397bd02fb6f4766b4ba7f47
-  data.tar.gz: 152e8e61b2bcdac3c7dc7fe1fe27e8a1688a67f1
+  metadata.gz: 6cba09c2e05c47bef0f93009f6f11e19003f1506
+  data.tar.gz: 2d5d4c20884ac93e1b6d110b17b1d927b5cf49a7
 SHA512:
-  metadata.gz: 8b4c3d9947f0f1ddf908e590292578c6710f00cfff5090e9dcf9abcbf4a057d4fabd947a6c0480e77a4877be67fbf139cf54d74be9199542ecdcc86baa761af4
-  data.tar.gz: 0404b4013395496b738756d993c63f2e94c9deb72850d51128547b80d7afb9b419897bdd3eac96119209cee3fe80a0b6b2aabff6c42572e843174fd0d6a4cb31
+  metadata.gz: 938a8d116ac1452cac229553283ec3e4f6b00f097b7beccaf36baaa77052361251a2d1287e2fb095ea16c9e813e85dddb0992bd7f6024deb8b71b8a021aff3fb
+  data.tar.gz: 8198e8b595765180b9d02204056ae7afde7e1ef12029bc4f15508f201ccec45cf8da80e41d01fb5862b576e7c82a47bba1a4146afd8875bb39bbd01ede9673c6

data/Gemfile.lock

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

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

@@ -78,7 +78,7 @@ module Magellan
               res = obj[:resource] || ((k = Resources.const_get(obj[:class])) ? k.resource_key : nil)
               res2 = get_json("/admin/#{res}.json", {"compact" => true})
               attr_name = (k ? k.caption_attr : nil) || "caption"
-              associations[f] = res2.each_with_object({}){|r,d| d[ r["id"].to_i ] = r[attr_name] }
+              associations[f] = res2.each_with_object({}){|r,d| d[ r["id"].to_i ] = r[attr_name] || r["label"] }
             end
             return associations
           end

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

@@ -41,9 +41,18 @@ module Magellan
           else
             attrs = JSON.parse(attrs)
           end
+          stage_name = attrs.delete("stage")
+
           cv = load_selection!(self.class)
           self.class.hidden_fields.each do |f| attrs.delete(f) end
           self.class.field_associations.keys.each do |f| attrs.delete(f) end
+
+          unless stage_name.blank?
+            q = Stage.new.build_name_query(stage_name)
+            r = get_first_result!(Stage.parameter_name, stage_name, "/admin/stage~title.json", q)
+            attrs["stage_title_id"] = r["id"]
+          end
+
           params = {
             parameter_name => attrs
           }

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

@@ -36,13 +36,19 @@ module Magellan
           select(name)
         end
 
+        no_commands do
+          def build_name_query(name)
+            build_query("name" => name).update(default_query)
+          end
+        end
+
         desc "select NAME", I18n.t(:select, scope: [:resources, :common, :cmd], res_name: resource_name)
         def select(name)
           if selected = load_selections[parameter_name]
             deselect unless selected["name"] == name
           end
 
-          q = build_query("name" => name).update(default_query)
+          q = build_name_query(name)
           r = update_first_result(parameter_name, name, "/admin/stage~title.json", q)
 
           # # current

data/lib/magellan/cli/version.rb

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

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

@@ -62,7 +62,8 @@ describe Magellan::Cli::Resources::ClientVersion do
     let(:selections) do
       {
         Magellan::Cli::Resources::Project.parameter_name => {"id" => 1, "name" => "ProjectA"},
-        Magellan::Cli::Resources::ClientVersion.parameter_name => {"id" => 1, "version" => "Sandbox1"}
+        Magellan::Cli::Resources::ClientVersion.parameter_name => {"id" => 1, "version" => "Sandbox1"},
+        Magellan::Cli::Resources::Stage.parameter_name => {"id" => 1, "name" => "Stage1"},
       }
     end
     describe :success_to_update_domain do
@@ -74,6 +75,23 @@ describe Magellan::Cli::Resources::ClientVersion do
         cmd.update('{"domain": "bar.example.com"}')
       end
     end
+
+    describe :success_to_update_stage do
+      let(:st_id){ 2 }
+      let(:st_name){ "Stage2" }
+      before do
+        allow_any_instance_of(Magellan::Cli::Resources::Stage).to receive(:http_conn).and_return(http_conn)
+        allow_any_instance_of(Magellan::Cli::Resources::Stage).to receive(:load_selections).and_return(selections)
+        allow(cmd).to receive(:load_selections).and_return(selections)
+        expect(http_conn).to receive(:get_json).with("/admin/stage~title.json", {"f[name][1][o]"=>"is", "f[name][1][v]"=>st_name, "f[project][2][o]"=>"is", "f[project][2][v]"=>1}).
+                              and_return([{"id" => st_id, "name" => st_name}])
+        expect(cmd).to receive(:put_json).with("/admin/client_version/1/edit.json", { "client_version" => { "stage_title_id" => st_id } })
+      end
+      it do
+        cmd.update('{"stage": "Stage2"}')
+      end
+    end
+
   end
 
 end

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

@@ -34,7 +34,7 @@ describe Magellan::Cli::Resources::Organization do
     let(:org_name){ "org5" }
     let(:organization_list_response) { [ { "id" => org_id, "name" => org_name } ] }
     before do
-      allow(http_conn).to receive(:get_json).with("/admin/magellan~auth~organization.json", {"f[name][2][o]"=>"is", "f[name][2][v]"=> org_name}).and_return(organization_list_response)
+      allow(http_conn).to receive(:get_json).with("/admin/magellan~auth~organization.json", {"f[name][5][o]"=>"is", "f[name][5][v]"=> org_name}).and_return(organization_list_response)
       allow(http_conn).to receive(:delete).with("/admin/magellan~auth~organization/5/delete")
     end
     it do

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

@@ -32,7 +32,7 @@ describe Magellan::Cli::Resources::Project do
       $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)
+        expect(httpclient).to receive(:get).with(%{#{base_url}/admin/magellan~auth~organization.json?compact=true}).and_return(org_res)
         cmd.list
         buf.rewind
         output = buf.read

metadata

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