magellan-cli 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d829f5340c9e4797b529be715f0ffd9bc62b44f
-  data.tar.gz: 8ebfa269282db8303e14a8c9f2ee39e00f28f225
+  metadata.gz: 81d4181816437b398636b67acff42a17e42c7612
+  data.tar.gz: 3cb4698e4a1d55bcdeb0559514e6e26c24b073e3
 SHA512:
-  metadata.gz: 5666f010b538f0c87573b7a40f0cbc7995d6a6671d21e3470e4c269ed1c04961a38d01d8b250fa6bdde5f6fb4e98b8a1ff6330ae863bf795fdbad65b288c6cb6
-  data.tar.gz: 7c19bbe98bab15456a866c1e72c25e5adad073771ac878903255bca39435370071f8c2412b8b98a24ce14387c74e9b5eaa90d3022c647354fcebbc6ddd4fa287
+  metadata.gz: 19759caaf922e87d3a05f047c5ab79fa51a007d64091ab499c763f15b10f08f9fa32b9db3e41b684b12579bbaa57a966a18e01c32f5a27cb47155a3e017a93a7
+  data.tar.gz: 293f9e67ef749634533897c7562aef3a2f3fb3a439ad0627d232ff588256a41ddd8408cc3a1f5f868a3f14d2a5d492a4f7347ecc516e95830baa17450a466d07

data/Gemfile.lock

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

data/lib/magellan/cli/base.rb

@@ -38,8 +38,11 @@ module Magellan
         def success(msg)
           $stderr.puts("\e[32m#{msg}\e[0m")
         end
-
         def error(msg)
+          $stderr.puts("\e[31m#{msg}\e[0m")
+        end
+
+        def fatal(msg)
           verbose(caller.join("\n  "))
           raise Cli::Error, msg
         end

data/lib/magellan/cli/command.rb

@@ -6,7 +6,6 @@ require 'active_support/core_ext/string/inflections'
 module Magellan
   module Cli
     class Command < Base
-
       {
         "organization"  => "Organization",
         "team"          => "Team",
@@ -36,6 +35,11 @@ module Magellan
 
         Magellan::Cli::Http.new.login!(email, password)
       end
+
+      desc "version", "show version"
+      def version
+        $stdout.puts Magellan::Cli::VERSION
+      end
     end
   end
 end

data/lib/magellan/cli/http.rb

@@ -31,7 +31,7 @@ module Magellan
           else
             obj = JSON.parse(res.body) rescue nil
             if obj and obj.is_a?(Hash) and obj["message"]
-              error(obj["message"])
+              fatal(obj["message"])
             else
               error("HTTP Error: status=#{res.status}: #{res.body}")
             end

data/lib/magellan/cli/login.rb

@@ -31,7 +31,7 @@ module Magellan
       # @param [Hash] options オプション
       # @option options [String]  :api_version APIのバージョン。デフォルトは "1.0.0"
       def initialize(base_url_or_host = nil, options = {})
-        base_url_or_host ||= (ENV["MAGELLAN_SITE"] || "http://localhost:3000/")
+        base_url_or_host ||= (ENV["MAGELLAN_SITE"] || "https://api-asia.magellanic-clouds.com")
         if base_url_or_host =~ URI.regexp
           @base_url = base_url_or_host.sub(/\/\Z/, '')
           uri = URI.parse(@base_url)

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

@@ -24,6 +24,7 @@ module Magellan
             }
           }
           post_json("/admin/#{resource_name}/new.json", params)
+          select(version)
         end
       end
 

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

@@ -20,6 +20,7 @@ module Magellan
             }
           }
           post_json("/admin/#{resource_name}/new.json", params)
+          select(name)
         end
 
         desc "delete ID", "delete CloudSQL Database"

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

@@ -17,6 +17,7 @@ module Magellan
             }
           }
           post_json("/admin/#{self.resource_name}/new.json", params)
+          select(name)
         end
       end
 

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

@@ -28,6 +28,7 @@ module Magellan
             }
           }
           post_json("/admin/#{resource_name}/new.json", params)
+          select(name)
         end
       end
 

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

@@ -28,6 +28,7 @@ module Magellan
             }
           }
           post_json("/admin/#{resource_name}/new.json", params)
+          select(name)
         end
 
         desc "select NAME", "select Stage named by NAME"
@@ -106,8 +107,8 @@ module Magellan
         def release_now
           spacer = "\r" << (" " * 20)
           print "\rrelease starting"
-          s = load_selection("stage")
-          id = s["id"]
+          stage = load_selection("stage")
+          id = stage["id"]
           res0 = post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "release_now"})
           res1 = res0["result"]
           if res1
@@ -140,6 +141,7 @@ module Magellan
                 when "completed"
                   print spacer
                   puts "\r#{st}"
+                  reload
                   return
                 when "aborted" then
                   print spacer
@@ -173,6 +175,19 @@ module Magellan
           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
+
+        desc "reload", "reload last selections"
+        def reload
+          s = load_selection("stage")
+          select(s["name"])
+          [Worker, Image, Container].each do |klass|
+            s = (load_selections || {})[klass.parameter_name]
+            next unless s
+            name = s["name"]
+            next unless name
+            klass.new.select(name)
+          end
+        end
       end
 
     end

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

@@ -24,6 +24,7 @@ module Magellan
             }
           }
           post_json("/admin/#{self.resource_name}/new.json", params)
+          select(name)
         end
 
 =begin

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

@@ -20,6 +20,7 @@ module Magellan
             }
           }
           post_json("/admin/#{self.resource_name}/new.json", params)
+          select(name)
         end
 
       end

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

@@ -31,6 +31,7 @@ module Magellan
             }.update(attrs)
           }
           post_json("/admin/#{self.resource_name}/new.json", params)
+          select(name)
         end
 
         desc "update ATTRIBUTE", "update selected worker with ATTRIBUTE(filename or JSON)"

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.2.11"
+    VERSION = "0.2.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient