magellan-cli 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 825dac1a4d4361a1c521db2201e45592cab0359b
-  data.tar.gz: 87893d4ac9dc1125bebc04160ce9c579a9928aef
+  metadata.gz: 9f81ab633b90549d1474807b9924f28eb0d87fed
+  data.tar.gz: 34fd0c8d234687f1b0b3cce29cd11b48a0431992
 SHA512:
-  metadata.gz: f080a73494a60a47dcbe21bf0c7a39380a4d5c0b2bf0b957a987fefc4fc88ce9f380bf3ab81a900931b5465900e4c2f5f7ef4978d14032a82610ad5647a72c1c
-  data.tar.gz: c6d8e64cea99a1ca67bdf15c16b7f471e473fa36541a2a02c9d3379011897f267211f899e67ba186ef5904473e002056c2347b2cccca0ac1a8393e2da00406cc
+  metadata.gz: 26e60decb0ff48f362516b2750719d48285bb721a163f23b88bb8f6164d1e3f6262c55e9178da54cbcff89e46f59a71a78f7fea73e3560d857802405932db76f
+  data.tar.gz: fc4bb095493fd8c09f8dbc8896a9f8fa62f4b60144864c3c63feb8b5b13412fe3ed795a0f8c1c5469dabeea97a0c70522875e915a17f6f0e78fbebc117ded255

data/Gemfile.lock

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

data/lib/magellan/cli/command.rb

@@ -22,11 +22,11 @@ module Magellan
             super(given_args, config)
           rescue Magellan::Cli::Error => e
             log_error(e.message)
-            exit(1)
+            block_given? ? yield(e) : exit(1)
           rescue => e
             log_error("[#{e.class}] #{e.message}")
             log_verbose("  " << e.backtrace.join("\n  "), ARGV.include?("-V") || ARGV.include?("--verbose"))
-            exit(1)
+            block_given? ? yield(e) : exit(1)
           end
         end
 

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

@@ -56,6 +56,11 @@ en:
       async: "-A async mode. release_now returns soon"
       interval: "-i polling interval(seconds)"
       timeout: "-t timeout(seconds)"
+  cloudsql:
+    cmd_create:
+      async: "-A async mode. release_now returns soon"
+      interval: "-i polling interval(seconds)"
+      timeout: "-t timeout(seconds)"
   team:
     cmd:
       create: "Create a new %{resource_name} with NAME and ROLE"

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

@@ -56,6 +56,11 @@ ja:
       async: "-A 非同期モード。リリースの終了を待たずにコマンドを終了します"
       interval: "-i 状態を取得する間隔を秒で指定します"
       timeout: "-t タイムアウトを秒で指定します"
+  cloudsql:
+    cmd_create:
+      async: "-A 非同期モード。リリースの終了を待たずにコマンドを終了します"
+      interval: "-i 状態を取得する間隔を秒で指定します"
+      timeout: "-t タイムアウトを秒で指定します"
   team:
     cmd:
       create: "NAMEとROLEを指定して%{resource_name}を登録します"

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

@@ -99,11 +99,12 @@ module Magellan
 
           def list
             res1 = query_list
+            Magellan::Cli.last_result = res1
             show_list(res1)
           end
 
           def show_list(res1)
-            return $stdout.puts("Total: 0") if res1.empty?
+            return $stdout.puts("Total: 0") if res1.nil? or res1.empty?
 
             t = Text::Table.new
             original_fields =
@@ -129,8 +130,10 @@ module Magellan
             $stdout.puts(t.to_s << "\nTotal: #{res1.length}")
           end
 
-          def show(id)
+          def show(id = nil)
+            id ||= load_selection!(self.class.parameter_name)["id"]
             r = get_json("/admin/#{self.class.resource_key}/#{id}.json")
+            Magellan::Cli.last_result = r
             t = Text::Table.new
             t.head = ["field", "value"]
 
@@ -215,8 +218,8 @@ module Magellan
                 super
               end
 
-              desc "show ID", "#{I18n.t(:show, scope: [:resources_common, :cmd], res_name: res_name)}"
-              def show(id)
+              desc "show [ID]", "#{I18n.t(:show, scope: [:resources_common, :cmd], res_name: res_name)}"
+              def show(id = nil)
                 super(id)
               end
 

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

@@ -13,6 +13,9 @@ module Magellan
         self.hidden_fields = %w[cloudsql_instance_id].map(&:freeze).freeze
 
         desc "create NAME", I18n.t(:create, scope: [:resources_common, :cmd], resource_name: "#{resource_name} database")
+        option :A, type: :boolean, default: false, desc: I18n.t(:async, scope: [:cloudsql, :cmd_create])
+        option :i, type: :numeric, default: 10, desc: I18n.t(:interval, scope: [:cloudsql, :cmd_create])
+        option :t, type: :numeric, default: 600, desc: I18n.t(:timeout, scope: [:cloudsql, :cmd_create])
         def create(name)
           o = load_selection!(Stage)
           params = {
@@ -21,9 +24,22 @@ module Magellan
               "name" => name,
             }
           }
-          post_json("/admin/#{resource_key}/new.json", params)
+          res0 = post_json("/admin/#{resource_key}/new.json", params)
           select(name)
+
+          return res0 if options["A"]
+
+          id = load_selection!(parameter_name)["id"]
+          interval = options["i"]
+          Timeout.timeout(options["t"]) do
+            loop do
+              sleep(interval)
+              res1 = get_json("/admin/#{resource_key}/#{id}.json")
+              return res1 if res1["available"]
+            end
+          end
         end
+
       end
     end
   end

data/lib/magellan/cli/script.rb

@@ -0,0 +1,17 @@
+require 'magellan/cli'
+
+require 'shellwords'
+
+def cli(args, options = {})
+  args = Shellwords.split(args) if args.is_a?(String)
+  args << "-V" if ARGV.include?("-V")
+  $PROGRAM_NAME, backup = "magellan-cli", $PROGRAM_NAME
+  puts "[CLI] `#{$PROGRAM_NAME} #{args.join(' ')}`"
+  begin
+    Magellan::Cli::Command.start(args) do |e|
+      exit(1) unless e.message =~ options[:allow]
+    end
+  ensure
+    $PROGRAM_NAME = backup
+  end
+end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.3.4"
+    VERSION = "0.4.0"
   end
 end

data/lib/magellan/cli.rb

@@ -22,5 +22,10 @@ module Magellan
     }.freeze
 
     autoload :ReferenceGenerator, "magellan/cli/reference_generator"
+
+    class << self
+      attr_accessor :last_result
+    end
+
   end
 end

data/spec/magellan/cli/script_spec.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'magellan/cli/script'
+
+describe Magellan::Cli do
+  describe "cli" do
+    it "pass args to Magellan::Cli::Command.start" do
+      expect(Magellan::Cli::Command).to receive(:start).with(%w[foo bar])
+      cli %w[foo bar]
+    end
+
+    it "parse args" do
+      expect(Magellan::Cli::Command).to receive(:start).with(%w[foo bar])
+      cli "foo bar"
+    end
+
+    it "parse args with space in quotation" do
+      expect(Magellan::Cli::Command).to receive(:start).with(["foo bar"])
+      cli '"foo bar"'
+    end
+
+    it "parse args with space escaped" do
+      expect(Magellan::Cli::Command).to receive(:start).with(["foo bar"])
+      cli 'foo\ bar'
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -180,6 +180,7 @@ files:
 - lib/magellan/cli/resources/transaction_router.rb
 - lib/magellan/cli/resources/worker.rb
 - lib/magellan/cli/sample_launch_options.json
+- lib/magellan/cli/script.rb
 - lib/magellan/cli/ssl.rb
 - lib/magellan/cli/version.rb
 - magellan-cli.gemspec
@@ -191,6 +192,7 @@ files:
 - 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
 homepage: ''
@@ -226,5 +228,6 @@ test_files:
 - 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