magellan-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c33e40274842ea373e0c3cbbcdbdc4afd66c8c6
-  data.tar.gz: 4960b996af7200302e22ded5a71d7c4fb28832f8
+  metadata.gz: afa7a868a64b02328acb0a38a2bfb053de87e49b
+  data.tar.gz: bcabb60c11b143ea38770f29c8067c99e52b56eb
 SHA512:
-  metadata.gz: caa4369a0ce38eee04acea442b4d543f10f660519598c4da4a45fc6bdccf5befded5d34c5462935060fde7ab8a94424f147dd6febd063b97cc89acf7cd550c75
-  data.tar.gz: fbff5926ef59ee089720da957de03989ca5f4415bddd27748c58e1b740c49a66e0d5d2ff3f3bdb529c0303344a66c735f1d70e7829749a9ac7c2aeffb710b186
+  metadata.gz: 9f0d1be5fc876158a71a669a6bb216f0ff349c55d9e5617037087b3a21c3bc6addd26fb468081a82073be2cdf88189af2d1def64d0f8c075fab4930902a19bb2
+  data.tar.gz: eebc2f8eb73895bee74cb42746b983e4f13efbc75dde1fe3a132a354426390bdb11bd8dde8c93d4126823e2b5d1fce9a86017e4662c50945adf867cdd709e0c3

data/Gemfile.lock

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

data/lib/magellan/cli/base.rb

@@ -40,6 +40,7 @@ module Magellan
         end
 
         def error(msg)
+          verbose(caller.join("\n  "))
           raise Cli::Error, msg
         end
       end

data/lib/magellan/cli/command.rb

@@ -16,10 +16,9 @@ module Magellan
         "client_version" => "ClientVersion",
         "tr"            => "TransactionRouter",
         "worker"        => "WorkerVersion",
-        "instance"      => "VmInstance",
         "image"         => "ContainerImage",
         "container"     => "ContainerInstance",
-        "assignment"    => "ContainerAssignment",
+        "cloudsql"      => "Cloudsql",
       }.each do |name, classname|
         desc "#{name} SUBCOMMAND ...ARGS", "manage #{name}"
         subcommand name, ::Magellan::Cli::Resources.const_get(classname)

data/lib/magellan/cli/http.rb

@@ -97,8 +97,13 @@ module Magellan
           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
         end
 

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

@@ -86,6 +86,10 @@ module Magellan
 
           def list
             res1 = query_list
+            show_list(res1)
+          end
+
+          def show_list(res1)
             return $stdout.puts("Total: 0") if res1.empty?
 
             t = Text::Table.new
@@ -151,7 +155,7 @@ module Magellan
 
           def deselect
             update_selections do |s|
-              s.delete(self.class.resource_name)
+              s.delete(self.class.parameter_name)
             end
           end
 

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

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require "magellan/cli/resources"
+
+module Magellan
+  module Cli
+    module Resources
+
+      class Cloudsql < Base
+        self.resource_name = "cloudsql~database"
+        self.resource_dependency = {"stage" => "stage"}
+        self.hidden_fields = %w[cloudsql_instance_id].map(&:freeze).freeze
+
+        desc "create NAME", "create new CloudSQL Database with NAME"
+        def create(name)
+          o = load_selection("stage")
+          params = {
+            parameter_name => {
+              "stage_title_id" => o["id"],
+              "name" => name,
+            }
+          }
+          post_json("/admin/#{resource_name}/new.js", params)
+        end
+
+        desc "delete ID", "delete CloudSQL Database"
+        def delete(id)
+          super("/admin/#{resource_name}/#{id}/delete.js")
+        end
+      end
+    end
+  end
+end

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

@@ -44,6 +44,14 @@ module Magellan
           update_first_result("stage-version", "/admin/stage~version.json", q, %w[id])
         end
 
+        desc "deselect", "deselect Stage"
+        def deselect
+          update_selections do |s|
+            s.delete("stage")
+            s.delete("stage-version")
+          end
+        end
+
         desc "planning", "switch to planning to build next released version"
         def planning
           switch_version(1)
@@ -66,7 +74,8 @@ module Magellan
         def prepare
           s = load_selection("stage")
           id = s["id"]
-          post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "prepare_containers"})
+          r = post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "prepare_containers"})
+          ContainerInstance.new.show_list(r["result"])
         end
 
         desc "update ATTRIBUTES", "update stage with ATTRIBUTES"
@@ -77,10 +86,51 @@ module Magellan
         end
 
         desc "release_now", "release changes now"
+        option :A, type: :boolean, default: false, desc: "-A async mode. release_now returns soon"
+        option :i, type: :numeric, default: 10, desc: "-i polling interval(seconds)"
+        option :t, type: :numeric, default: 600, desc: "-t timeout(seconds)"
         def release_now
+          spacer = "\r" << (" " * 20)
+          print "\rrelease starting"
           s = load_selection("stage")
           id = s["id"]
-          post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "release_now"})
+          res0 = post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "release_now"})
+          res1 = res0["result"]
+          if res1
+            print spacer
+            print "\rnow #{res1['status']}"
+          else
+            print spacer
+            puts "\e[31m#{res0.inspect}\e[0m"
+            raise res0["message"]
+          end
+
+          return res1 if options["A"]
+          res2 = get_json("/admin/release~operation.json", build_query("release_job" => res1["id"]))
+          ope = res2.first
+          ope_id = ope["id"]
+          i = options["i"]
+          Timeout.timeout(options["t"]) do
+            loop do
+              sleep(i)
+              res3 = get_json("/admin/release~job/#{ope_id}.json", default_query)
+              st = res3["status"]
+              unless res1["status"] == st
+                case st
+                when "executing" then
+                  res4 = get_json("/admin/release~transaction.json", build_query("release_operation" => ope_id))
+                  total = res4.length
+                  complete = res4.select{ |r| r["status"] == "completed" }.length
+                  print spacer
+                  print "\rProgress: %2d /%2d" % [complete, total]
+                when "completed", "aborted" then
+                  print spacer
+                  puts "\r#{st}"
+                  return
+                end
+              end
+            end
+          end
         end
 
         desc "logs", "fetch worker logs"
@@ -94,6 +144,14 @@ module Magellan
             end
           end
         end
+
+        desc "set_container_num NUM", "set container numbers for selected stage and image"
+        def set_container_num(num)
+          s = load_selection("stage")
+          v = load_selection("stage-version")
+          i = load_selection("container_image")
+          post_json("/admin/stage~version/#{v["id"]}/set_container_num.json", { container_num: num, container_image_id: i["id"] })
+        end
       end
 
     end

data/lib/magellan/cli/resources.rb

@@ -25,6 +25,7 @@ module Magellan
       autoload :ContainerInstance, "magellan/cli/resources/container_instance"
       autoload :ContainerAssignment, "magellan/cli/resources/container_assignment"
 
+      autoload :Cloudsql, "magellan/cli/resources/cloudsql"
     end
   end
 end

data/lib/magellan/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -151,7 +151,7 @@ files:
 - lib/magellan/cli/resources.rb
 - lib/magellan/cli/resources/base.rb
 - lib/magellan/cli/resources/client_version.rb
-- lib/magellan/cli/resources/container_assignment.rb
+- lib/magellan/cli/resources/cloudsql.rb
 - lib/magellan/cli/resources/container_image.rb
 - lib/magellan/cli/resources/container_instance.rb
 - lib/magellan/cli/resources/organization.rb
@@ -159,7 +159,6 @@ files:
 - lib/magellan/cli/resources/stage.rb
 - lib/magellan/cli/resources/team.rb
 - lib/magellan/cli/resources/transaction_router.rb
-- lib/magellan/cli/resources/vm_instance.rb
 - lib/magellan/cli/resources/worker_version.rb
 - lib/magellan/cli/sample_launch_options.json
 - lib/magellan/cli/ssl.rb

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

@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-require "magellan/cli/resources"
-
-module Magellan
-  module Cli
-    module Resources
-
-      class ContainerAssignment < Base
-        self.resource_name = "container~assignment"
-        self.resource_dependency = {"stage" => "stage-version"}
-
-        self.field_associations = {
-          "stage_version_id" => {name: "stage", resource: "stage~version"},
-          "vm_instance_id" => {name: "instance", class: "VmInstance"},
-          "container_image_id" => {name: "image", class: "ContainerImage"},
-        }
-
-        desc "create AMOUNT", "create assignment"
-        def create(amount)
-          img = load_selection("container_image")
-          instance = load_selection("vm_instance")
-          stage_version = load_selection("stage-version")
-          params = {
-            "container_assignment" => {
-              "stage_version_id"   => stage_version["id"],
-              "vm_instance_id"     => instance["id"],
-              "container_image_id" => img["id"],
-              "amount" => amount.to_i,
-            }
-          }
-          post_json("/admin/#{self.resource_name}/new.js", params)
-        end
-
-        desc "delete ID", "delete assignment"
-        def delete(id)
-          super "/admin/#{self.resource_name}/#{id}/delete"
-        end
-
-      end
-
-    end
-  end
-end

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

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-require "magellan/cli/resources"
-
-module Magellan
-  module Cli
-    module Resources
-
-      class VmInstance < Base
-        self.resource_name = "vm~instance"
-        self.resource_dependency = {"stage" => "stage"}
-
-        self.multiline_fields = %w[additional_disks_yaml].map(&:freeze).freeze
-
-        no_commands do
-          def query_list
-            stage_id = load_selection("stage")["id"] rescue nil
-            if stage_id
-              get_json("/admin/stage~title/#{stage_id}/instance_list.json", {})
-            else
-              get_json("/admin/vm~instance.json")
-            end
-          end
-          private :query_list
-        end
-
-        def select(name)
-          q = build_query("name" => name)
-          update_first_result(self.class.parameter_name, "/admin/#{self.class.resource_name}.json", q)
-        end
-
-        desc "sample_launch_options", "dump sample launch_options for create"
-        def sample_launch_options
-          $stdout.puts File.read(File.expand_path("../sample_launch_options.json", __FILE__))
-        end
-
-        desc "create NAME [LAUNCH_OPTIONS]", "create Instance"
-        def create(name, launch_options = nil)
-          stage_id = load_selection("stage-version")
-          launch_options = JSON.parse(File.readable?(launch_options) ? File.read(launch_options) : launch_options)
-
-          params = {
-            "host_instance" => {
-              "stage_id" => stage_id,
-              "name" => name,
-              "launch_options_yaml" => YAML.dump(launch_options),
-            }
-          }
-          post_json("/admin/vm~instance/new.js", params)
-        end
-
-      end
-
-    end
-  end
-end