magellan-cli 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48fddb6b7104d258581e1abf2a1ca583359ea419
-  data.tar.gz: bd234a5b1aee93ee7a4d7ea48091c9c3e290134e
+  metadata.gz: 4b5b5f0a5bc12049990a5c842393ce408aff9a34
+  data.tar.gz: f4ce5c56d45a6b7fb2b17cc2620e512312a6d0ed
 SHA512:
-  metadata.gz: e5df9b5e615d38bf2cd8620eb983b46d78fa9e77502b71b6d6dc79397dd4a47a5cfdd9963e440b3eaee37aaf6ad4779002df8eb96320112d4438623f5565e516
-  data.tar.gz: 53ae945253f86ffd27e8258945f1b7ac8bb6c832fc6b0db89df97bc95d7dd0dfe21d175828321f3c63f8853fb95f67daf8e22eeaf735e6079a546fee2803036e
+  metadata.gz: 3f98e6f3f10adb66443ea4ebeaadd4ed16e45b4f875ad1dc23364bd3ed2ae6936c696cca338411ce1cc00f1ede15d7658e63d81dae79a625ac4e4484f251e90d
+  data.tar.gz: ac3fc0570bb6e17f6c5d5efe7ae0ae09a060ba302c7b92f74b8ba8f7a769072490ec633cf0a94af332aa05c171e6589df982326645896c7ce65577b3d105c774

data/Gemfile.lock

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

data/lib/magellan/cli/command.rb

@@ -81,7 +81,9 @@ module Magellan
           puts ""
         end
 
-        Magellan::Cli::Http.new.login!(email, password)
+        result = Magellan::Cli::Http.new.login!(email, password)
+        select_single_resources
+        result
       end
 
       desc "info", I18n.t(:info, scope: [:command, :cmd])
@@ -100,6 +102,23 @@ module Magellan
         log_info YAML.dump(d)
       end
 
+      no_commands do
+
+        def select_single_resources
+          %w[Organization Project ClientVersion Stage Worker Image].each do |class_name|
+            klass = Magellan::Cli::Resources.const_get(class_name)
+            cmd = klass.new
+            res = cmd.send(:query_list)
+            if res.length == 1
+              value = res.first[klass.caption_attr]
+              cmd.select(value)
+            else
+              break
+            end
+          end
+        end
+
+      end
     end
   end
 end

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

@@ -83,7 +83,10 @@ en:
       cmd:
         select: "Select the %{resource_name} by VERSION"
         create: "Create a new %{resource_name} with VERSION"
+        update: "Update the ATTRIBUTES(filename or JSON) of the selected %{resource_name}"
         delete: "Delete the %{resource_name} specified by VERSION"
+      cmd_create:
+        domain: "Domain name for HTTP access without OAuth"
     stage:
       cmd:
         create: "Create a new %{resource_name} with Name and Type"

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

@@ -81,7 +81,10 @@ ja:
       cmd:
         select: "VERSIONを指定して%{resource_name}を選択します"
         create: "VERSIONを指定して%{resource_name}を登録します"
+        update: "選択した%{resource_name}の属性を指定したATTRIBUTESで更新します。ATTRIBUTESにはYAMLのファイル名かJSON文字列を指定可能です"
         delete: "VERSIONを指定して%{resource_name}を削除します"
+      cmd_create:
+        domain: "OAuth認証を行わずHTTPアクセスする際のアクセス先となるドメイン名"
     stage:
       cmd:
         create: "NAMEとTYPEを指定して%{resource_name}を登録します"

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

@@ -173,16 +173,20 @@ module Magellan
 
           def deselect
             update_selections! do |s|
-              s.delete(self.class.parameter_name)
+              self.class.deselect(s)
             end
-            deselect_dependants
           end
 
-          def deselect_dependants
-            update_selections! do |s|
-              classes = Resources.dependants_on(self.class)
+          class << self
+            def deselect(selections)
+              selections.delete(parameter_name)
+              deselect_dependants(selections)
+            end
+
+            def deselect_dependants(selections)
+              classes = Resources.dependants_on(self)
               classes.each do |klass|
-                s.delete(klass.parameter_name)
+                klass.deselect(selections)
               end
             end
           end

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

@@ -19,13 +19,12 @@ module Magellan
         def create(version)
           project = load_selection!(Project)
           stage = load_selection!(Stage)
-          params = {
-            parameter_name => {
-              "project_id" => project["id"],
-              "stage_title_id" => stage["id"],
-              "version" => version,
-            }
+          attrs = {
+            "project_id" => project["id"],
+            "stage_title_id" => stage["id"],
+            "version" => version,
           }
+          params = { parameter_name => attrs }
           post_json("/admin/#{resource_key}/new.json", params)
           # TODO implement select method
           # select(version)
@@ -38,7 +37,6 @@ module Magellan
           super("/admin/#{resource_key}/#{r['id']}/delete")
           log_success("OK")
         end
-
       end
 
     end

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

@@ -54,13 +54,10 @@ module Magellan
           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)
-        def deselect
-          update_selections! do |s|
-            s.delete(parameter_name)
-            s.delete(VERSION_PARAMETER_NAME)
-          end
-          deselect_dependants
+        def self.deselect(selections)
+          selections.delete(parameter_name)
+          selections.delete(VERSION_PARAMETER_NAME)
+          deselect_dependants(selections)
         end
 
         desc "planning", I18n.t(:planning, scope: [:resources, :stage, :cmd])

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.5.8"
+    VERSION = "0.5.9"
   end
 end

data/spec/magellan/cli/command_spec.rb

@@ -9,6 +9,7 @@ describe Magellan::Cli::Command do
     describe :intaractive do
       before do
         $stdout = StringIO.new
+        allow(command).to receive(:select_single_resources)
         allow(Magellan::Cli::Http).to receive_message_chain(:new, :login!).and_return("OK")
       end
       it "nothing options" do
@@ -20,13 +21,15 @@ describe Magellan::Cli::Command do
 
       it "only email" do
         allow($stdin).to receive(:noecho).and_return(string).twice
-        expect(command.invoke(:login, [], {email: string})).to eq "OK"
+        command.options = Thor::CoreExt::HashWithIndifferentAccess.new email: string
+        expect(command.login).to eq "OK"
         expect($stdout.string).to eq "password: \n"
       end
 
       it "only password" do
         allow($stdin).to receive(:gets).and_return(string).once
-        expect(command.invoke(:login, [], {password: string})).to eq "OK"
+        command.options = Thor::CoreExt::HashWithIndifferentAccess.new password: string
+        expect(command.login).to eq "OK"
         expect($stdout.string).to eq "email: "
       end
     end

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

@@ -32,6 +32,7 @@ describe Magellan::Cli::Resources::ClientVersion do
         cmd.create("1.1.0")
       end
     end
+
     describe :error do
       context "stage not selected" do
         before do

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

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe "deselect" do
+  let(:work_yaml){ File.expand_path("../../../../tmp/magellan-cli.yml", __FILE__) }
+  let(:src_yaml){ File.expand_path("../magellan-cli_test.yml", __FILE__) }
+  around do |example|
+    FileUtils.cp(src_yaml, work_yaml)
+    ENV["MAGELLAN_CLI_CONFIG_FILE"], backup = work_yaml, ENV["MAGELLAN_CLI_CONFIG_FILE"]
+    begin
+      example.run
+    ensure
+      ENV["MAGELLAN_CLI_CONFIG_FILE"] = backup
+    end
+  end
+
+  stage_children = [
+    Magellan::Cli::Resources::Team,
+    Magellan::Cli::Resources::Worker,
+    Magellan::Cli::Resources::Image,
+  ].freeze
+
+  stage_deletions = [
+    Magellan::Cli::Resources::Stage.parameter_name,
+    Magellan::Cli::Resources::Stage::VERSION_PARAMETER_NAME,
+  ] + stage_children.map(&:parameter_name)
+
+  project_deletions = stage_deletions + [
+    Magellan::Cli::Resources::Project,
+    Magellan::Cli::Resources::ClientVersion
+  ].map(&:parameter_name)
+
+  organization_deletions = project_deletions + [
+    Magellan::Cli::Resources::Organization,
+  ].map(&:parameter_name)
+
+  {
+    Magellan::Cli::Resources::Stage => stage_deletions,
+    Magellan::Cli::Resources::Project => project_deletions,
+    Magellan::Cli::Resources::Organization => organization_deletions,
+  }.each do |klass, deletions|
+    describe klass do
+      it do
+        selections = YAML.load_file(src_yaml)
+        subject.deselect
+        deletions.each do |key|
+          selections.delete(key)
+        end
+        expect(YAML.load_file(work_yaml)).to eq selections
+      end
+    end
+  end
+
+  (
+    stage_children +
+    [Magellan::Cli::Resources::ClientVersion]
+  ).each do |klass|
+    describe klass do
+      it do
+        selections = YAML.load_file(src_yaml)
+        subject.deselect
+        selections.delete(subject.parameter_name)
+        expect(YAML.load_file(work_yaml)).to eq selections
+      end
+    end
+  end
+
+end

data/spec/magellan/cli/resources/magellan-cli_test.yml

@@ -0,0 +1,25 @@
+---
+last_update_searched_at: '2015-02-05 11:29:45 +0900'
+login:
+  email: test1@groovenauts.jp
+  token: SyPdUbwSdEZQ-gNbf6L7
+magellan_auth_organization:
+  id: 3
+  name: test2
+project:
+  id: 3
+  name: Project1
+client_version:
+  id: 4
+  version: Stage2
+stage_title:
+  id: 3
+  name: Stage1
+stage_version:
+  id: 8
+functions_worker:
+  id: 3
+  name: worker1
+container_image:
+  id: 9
+  name: groovenauts/magellan-rails-example-0.4.4

data/spec/tmp/.gitignore

@@ -0,0 +1 @@
+magellan-cli.yml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -255,12 +255,15 @@ files:
 - spec/magellan/cli/messaging/http_spec.rb
 - spec/magellan/cli/messaging/mqtt_spec.rb
 - spec/magellan/cli/resources/client_version_spec.rb
+- spec/magellan/cli/resources/deselect_spec.rb
+- spec/magellan/cli/resources/magellan-cli_test.yml
 - spec/magellan/cli/resources/organization_spec.rb
 - spec/magellan/cli/resources/project_spec.rb
 - spec/magellan/cli/resources/team_spec.rb
 - spec/magellan/cli/script_spec.rb
 - spec/magellan/cli_spec.rb
 - spec/spec_helper.rb
+- spec/tmp/.gitignore
 homepage: ''
 licenses:
 - MIT
@@ -298,9 +301,12 @@ test_files:
 - spec/magellan/cli/messaging/http_spec.rb
 - spec/magellan/cli/messaging/mqtt_spec.rb
 - spec/magellan/cli/resources/client_version_spec.rb
+- spec/magellan/cli/resources/deselect_spec.rb
+- spec/magellan/cli/resources/magellan-cli_test.yml
 - spec/magellan/cli/resources/organization_spec.rb
 - spec/magellan/cli/resources/project_spec.rb
 - spec/magellan/cli/resources/team_spec.rb
 - spec/magellan/cli/script_spec.rb
 - spec/magellan/cli_spec.rb
 - spec/spec_helper.rb
+- spec/tmp/.gitignore