magellan-cli 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021a9cbdd704a2f8940fce12a2ac5edae28b29ef
-  data.tar.gz: 29ef3da35b7db1fa81b611baadf7aa3b530bb987
+  metadata.gz: 6c7d893925c8fc3fd547592488118addd0fada70
+  data.tar.gz: b3edf628a1b6574d0dcaba6f5f6fe5b4af7bf44a
 SHA512:
-  metadata.gz: 2711d186e8a3e95bade11bf6e5188edbbebafeebc3c3cdf546e594ccedb162a2086e85b57d7f12da9724cd160baf6d207f624d057d56ebc269dda05f057cb7cd
-  data.tar.gz: 154aa76787b259af995b26f126e072ecbb067566c8597a5103ac4c38a81f67a43144191d47b3366a1da8dc54635538de2e409daa276e67e1f487d3f72356e76b
+  metadata.gz: 5f35b29d379c475798dd215020796e8eb19ccee2ac429a9417470acc1b9fa97cb32083511c69ff8a23605ee17f35faf41c2b98468c6c12ad2b7bf73627ce9e33
+  data.tar.gz: f00de5c3575a1c580aafc50f2b59e6c58ae08e8e4777b330c5af683c1c5f0232895d71188c43320d63bd270f2dbaa70f462a1269a6617bdfac52cffa9910ace6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.8.2)
+    magellan-cli (0.8.3)
       activesupport (~> 4.1.4)
       groovenauts-thor
       httpclient (~> 2.5)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.10)
+    activesupport (4.1.12)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,15 +40,15 @@ GEM
     groovenauts-thor (0.19.1.1)
     httpclient (2.6.0.1)
     i18n (0.7.0)
-    json (1.8.2)
-    jwt (1.4.1)
+    json (1.8.3)
+    jwt (1.5.1)
     libmagellan (0.2.4)
       activesupport
       mqtt (~> 0.3.1)
       signet (~> 0.5.0)
     method_source (0.8.2)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.8.0)
     mqtt (0.3.1)
     multi_json (1.10.1)
     multipart-post (2.0.0)
@@ -108,3 +108,6 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec
   simplecov
+
+BUNDLED WITH
+   1.10.5

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

@@ -110,6 +110,7 @@ en:
         reload: "Reload the last selections"
       cmd_create:
         type: "-t development|staging|production. specify Stage Type"
+        size: "-s micro|standard. specify Stage Size"
       cmd_release_now:
         async: "-A async mode. release_now returns soon"
         interval: "-i polling interval(seconds)"

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

@@ -107,7 +107,8 @@ ja:
         set_container_num: "選択された%{image_name}の%{containers_name}の数を設定します"
         reload: "最後にselectされたものをロードし直します"
       cmd_create:
-        type: "-t development|staging|production いづれかのTYPEを指定してください"
+        type: "-t development|staging|production いずれかのTYPEを指定してください"
+        size: "-s micro|standard. いずれがのSIZEを指定してください"
       cmd_release_now:
         async: "-A 非同期モード。リリースの終了を待たずにコマンドを終了します"
         interval: "-i 状態を取得する間隔を秒で指定します"

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

@@ -19,17 +19,23 @@ module Magellan
 
         desc "create NAME [-t development|staging|production]", I18n.t(:create, scope: [:resources, :stage, :cmd], resource_name: resource_name)
         option :t, type: :string, default: "development", desc: I18n.t(:type, scope: [:resources, :stage, :cmd_create])
+        option :s, type: :string, default: "micro"      , desc: I18n.t(:size, scope: [:resources, :stage, :cmd_create])
         def create(name)
           type = options["t"]
           unless %w{ development staging production }.include?(type)
             raise "Unknown Stage Type #{type}"
           end
+          size = options["s"]
+          unless %w{ micro standard }.include?(size)
+            raise "Unknown Stage Size #{size}"
+          end
           proj = load_selection!(Project)
           params = {
             parameter_name => {
               "project_id" => proj["id"],
               "name" => name,
               "stage_type" => type,
+              "stage_size" => size,
             }
           }
           post_json("/admin/#{resource_key}/new.json", params)

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.8.2"
+    VERSION = "0.8.3"
   end
 end

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

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Magellan::Cli::Resources::Stage do
+
+  let(:cmd){ Magellan::Cli::Resources::Stage.new }
+
+  let(:http_conn){ double(:http_conn, :check_login_auth! => nil) }
+  before{ allow(cmd).to receive(:http_conn).and_return(http_conn) }
+
+  let(:proj1_json) do
+    {"id" => 1, "label" => "DefaultProject1"}
+  end
+  let(:stage1_json) do
+    {
+      "id" => 1, "project_id" => 1, "nebula_id" => 1, "name" => "DefaultStage1",
+      "stage_size" => "1",
+      "stage_type" => "1",
+      "status" => "1", "authentication" => true,
+      "created_at" => "2015-08-13T08:39:21.000Z", "updated_at" => "2015-08-13T08:39:21.000Z",
+      "max_worker_count" => 1, "max_container_count" => 5, "container_num" => 0,
+      "release_job_status" => nil,
+      "last_released_at" => nil, "can_update" => true, "can_delete" => true
+    }
+  end
+
+  describe :list do
+    before do
+      expect(cmd).to receive(:get_json).with("/admin/stage~title.json").and_return([stage1_json])
+      expect(cmd).to receive(:get_json).with("/admin/project.json", {"compact"=>true}).and_return([proj1_json])
+      expect($stdout).to receive(:puts)
+    end
+    it do
+      cmd.list
+    end
+  end
+
+  describe :create do
+    let(:stage_name){ "Stage2" }
+    let(:organization_list_response) { [ { "id" => 1, "label" => "Stage1" } ] }
+    before do
+      expect(cmd).to receive(:post_json).
+        with("/admin/stage~title/new.json", {"stage_title" => {"project_id"=>1,"name"=>stage_name, "stage_type"=>"development", "stage_size"=>"standard" }})
+      allow(cmd).to receive(:get_json).with(any_args).and_return(organization_list_response)
+      allow(cmd).to receive(:load_selection!).and_return(proj1_json)
+      allow(cmd).to receive(:select).with(stage_name)
+    end
+    it do
+      cmd.options = {"t" => "development", "s" => "standard"}
+      cmd.create(stage_name)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -267,6 +267,7 @@ files:
 - 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/stage_spec.rb
 - spec/magellan/cli/resources/team_spec.rb
 - spec/magellan/cli/resources/worker_spec.rb
 - spec/magellan/cli/script_spec.rb
@@ -316,6 +317,7 @@ test_files:
 - 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/stage_spec.rb
 - spec/magellan/cli/resources/team_spec.rb
 - spec/magellan/cli/resources/worker_spec.rb
 - spec/magellan/cli/script_spec.rb