magellan-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50c83378c4c2e7c8992abde1d7c6b6eb2b712c2
-  data.tar.gz: 3e193a9ab5f4f00afa3571ba160219574cb3d3bb
+  metadata.gz: 5c33e40274842ea373e0c3cbbcdbdc4afd66c8c6
+  data.tar.gz: 4960b996af7200302e22ded5a71d7c4fb28832f8
 SHA512:
-  metadata.gz: 140f87071bb2401945d826685ac7892a8da9c6ae8a1af162cea849e5e12e009d01b108d96dea472af50fe84bf556417c8cd6986fdec968733d2406690ca7eb17
-  data.tar.gz: 5cc732c2b875cc9d8425d6149824ff122cb3fff887009842b2c5940e29f51931fa69505303dddb3412ef6e2b28010086e4f1035e39ea5d86769b8bec870d2ce0
+  metadata.gz: caa4369a0ce38eee04acea442b4d543f10f660519598c4da4a45fc6bdccf5befded5d34c5462935060fde7ab8a94424f147dd6febd063b97cc89acf7cd550c75
+  data.tar.gz: fbff5926ef59ee089720da957de03989ca5f4415bddd27748c58e1b740c49a66e0d5d2ff3f3bdb529c0303344a66c735f1d70e7829749a9ac7c2aeffb710b186

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.2.0)
+    magellan-cli (0.2.1)
       activesupport (~> 4.1.4)
       httpclient
       nokogiri
+      text-table (~> 1.2.3)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.6)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -18,14 +19,14 @@ GEM
       tzinfo (~> 1.1)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    httpclient (2.4.0)
+    httpclient (2.5.3.3)
     i18n (0.6.11)
     json (1.8.1)
     method_source (0.8.2)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -44,6 +45,7 @@ GEM
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
     slop (3.5.0)
+    text-table (1.2.3)
     thor (0.19.1)
     thread_safe (0.3.4)
     tzinfo (1.2.2)

data/README.md

@@ -62,7 +62,7 @@ Modify Host Instance config, if you need.
 magellan-cli host_instance show 1
 ```
 
-#### 7. [cli terminal] start stage inculding HostInstances and ContainerInstances
+#### 7. [cli terminal] start stage inculding VmInstances and ContainerInstances
 
 ```
 magellan-cli stage start 1

data/lib/magellan/cli/command.rb

@@ -16,9 +16,10 @@ module Magellan
         "client_version" => "ClientVersion",
         "tr"            => "TransactionRouter",
         "worker"        => "WorkerVersion",
-        "instance"      => "HostInstance",
+        "instance"      => "VmInstance",
         "image"         => "ContainerImage",
         "container"     => "ContainerInstance",
+        "assignment"    => "ContainerAssignment",
       }.each do |name, classname|
         desc "#{name} SUBCOMMAND ...ARGS", "manage #{name}"
         subcommand name, ::Magellan::Cli::Resources.const_get(classname)
@@ -35,6 +36,7 @@ module Magellan
         password = STDIN.noecho(&:gets).chomp
         puts ""
         update_selections("login" => {"email" => email, "password" => password})
+        Magellan::Cli::Http.new.login
       end
     end
   end

data/lib/magellan/cli/http.rb

@@ -10,9 +10,7 @@ module Magellan
         def login
           cli = Cli::Login.new
           cli.login!
-          r = yield(cli)
-          success("OK")
-          return r
+          return block_given? ? yield(cli) : success("OK")
         end
 
         # ログインしてGETします
@@ -26,8 +24,14 @@ module Magellan
               url << '?' << params.map{|k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
             end
             verbose("url: #{url}")
-            res = cli.httpclient.get(url)
-            JSON.parse(res.body)
+            # "Unknown key: max-age = 0" というメッセージを表示させないために$stderrを一時的に上書き
+            $stderr, bak = StringIO.new, $stderr
+            begin
+              res = cli.httpclient.get(url)
+              return JSON.parse(res.body)
+            ensure
+              $stderr = bak
+            end
           end
         end
 
@@ -86,13 +90,15 @@ module Magellan
         end
 
         def process_res(cli, http_method, rel_path, *args)
-          res = cli.httpclient.send(http_method, "#{cli.base_url}#{rel_path}", *args)
+          url = "#{cli.base_url}#{rel_path}"
+          verbose("%s %s\n%s" % [http_method, url, args])
+          res = cli.httpclient.send(http_method, url, *args)
           case res.status
           when 200...300 then
             r = JSON.parse(res.body)
-            $stdout.puts(JSON.pretty_generate(r))
+            verbose(JSON.pretty_generate(r))
           else
-            $stdout.puts("\e[31m[#{res.status}]\e[0m\ #{res.body}")
+            info("\e[31m[#{res.status}]\e[0m\ #{res.body}")
           end
         end
 

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

@@ -8,6 +8,8 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/object/blank'
 
+require 'text-table'
+
 module Magellan
   module Cli
     module Resources
@@ -55,14 +57,91 @@ module Magellan
             return r
           end
 
+          def association_map(fields)
+            associations = {}
+            (self.class.field_associations || {}).each do |f, obj|
+              i = fields.index(f)
+              next unless i
+              fields[i] = obj[:name]
+              res = obj[:resource] || ((k = Resources.const_get(obj[:class])) ? k.resource_name : nil)
+              res2 = get_json("/admin/#{res}.json?compact=true")
+              associations[f] = res2.each_with_object({}){|r,d| d[ r["id"].to_i ] = r["label"] }
+            end
+            return associations
+          end
+
+          def association_get(associations, r, f)
+            v = r[f]
+            m = associations[f]
+            m ? m[v] || "(not found: #{v.inspect})" : v
+          end
+
+          DEFAULT_HIDDEN_FIELDS = %w[created_at updated_at].map(&:freeze).freeze
+
+
+          def query_list
+            get_json("/admin/#{self.class.resource_name}.json", default_query)
+          end
+          private :query_list
+
           def list
-            r = get_json("/admin/#{self.class.resource_name}.json", default_query)
-            $stdout.puts(JSON.pretty_generate(r) << "\nTotal: #{r.length}")
+            res1 = query_list
+            return $stdout.puts("Total: 0") if res1.empty?
+
+            t = Text::Table.new
+            original_fields =
+              res1.map(&:keys).flatten.uniq -
+              (self.class.hidden_fields || DEFAULT_HIDDEN_FIELDS) -
+              (self.class.multiline_fields || [])
+
+            fields = original_fields.dup
+            associations = association_map(fields)
+
+            t.head = fields
+            t.rows = []
+            res1.each do |r|
+              row = original_fields.map do |f|
+                association_get(associations, r, f)
+              end
+              t.rows << row
+            end
+            # $stdout.puts(JSON.pretty_generate(res1) << "\nTotal: #{res1.length}")
+            $stdout.puts(t.to_s << "\nTotal: #{res1.length}")
           end
 
           def show(id)
             r = get_json("/admin/#{self.class.resource_name}/#{id}.json")
-            $stdout.puts(JSON.pretty_generate(r))
+            t = Text::Table.new
+            t.head = ["field", "value"]
+
+            table_fields = r.keys - (self.class.multiline_fields || [])
+            associations = association_map(table_fields.dup)
+            table_fields.each do |f|
+              t.rows << [f, association_get(associations, r, f)]
+            end
+            $stdout.puts t.to_s
+
+            (self.class.multiline_fields || []).each do |f|
+              $stdout.puts "\n"
+              $stdout.puts " #{f} ".center(50, "=")
+              v = r[f]
+              next unless v
+
+              case f
+              when /_json\Z/ then
+                next if v.empty?
+                begin
+                  o = JSON.parse(v)
+                  $stdout.puts(JSON.pretty_generate(o))
+                rescue JSON::ParserError => e
+                  $stdout.puts "\e[33m[WARN] #{e.message}\e[0m"
+                  $stdout.puts v
+                end
+              # when /_yaml\Z/ then
+              else
+                $stdout.puts v
+              end
+            end
           end
 
           def select(name)
@@ -83,6 +162,9 @@ module Magellan
               no_commands do
                 cattr_accessor :resource_name
                 cattr_accessor :resource_dependency
+                cattr_accessor :field_associations
+                cattr_accessor :hidden_fields, :multiline_fields
+
                 def self.parameter_name
                   resource_name.gsub(/~/, "_")
                 end

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

@@ -7,7 +7,12 @@ module Magellan
 
       class ClientVersion < Base
         self.resource_name = "client_version"
-        self.resource_dependency = {"stage" => "stage"}
+        self.resource_dependency = {"project" => "project"}
+
+        self.hidden_fields = %w[project_id created_at updated_at].map(&:freeze).freeze
+        self.field_associations = {
+          "stage_title_id" => {name: "stage", class: "Stage"},
+        }
 
         desc "create VERSION", "create New Client Version"
         def create(version)

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

@@ -0,0 +1,43 @@
+# -*- 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/container_image.rb

@@ -8,6 +8,8 @@ module Magellan
       class ContainerImage < Base
         self.resource_name = "container~image"
         self.resource_dependency = {"stage" => "stage-version"}
+        self.hidden_fields = %w[function_id function_type created_at updated_at].map(&:freeze).freeze
+        self.field_associations = {"stage_version_id" => {name: "stage", resource: "stage~version"} }
       end
 
     end

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

@@ -8,6 +8,14 @@ module Magellan
       class ContainerInstance < Base
         self.resource_name = "container~instance"
         self.resource_dependency = {"stage" => "stage-version"}
+        self.hidden_fields = %w[created_at updated_at].map(&:freeze).freeze
+        self.multiline_fields = %w[docker_properties_json links_yaml publishings_yaml volumes_yaml env_yaml].map(&:freeze).freeze
+        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"},
+          # "container_assignment_id" => {name: "assignment", class: "ContainerAssignment"},
+        }
       end
 
     end

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

@@ -7,6 +7,7 @@ module Magellan
 
       class Organization < Base
         self.resource_name = "magellan~auth~organization"
+        # self.field_associations = {"creator_id" => {name: "creator", class: "User"} }
 
         desc "create NAME", "create Organization with NAME"
         def create(name)

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

@@ -8,6 +8,8 @@ module Magellan
       class Project < Base
         self.resource_name = "project"
         self.resource_dependency = nil
+        self.hidden_fields = %w[default_nebula_id created_at updated_at].map(&:freeze).freeze
+        self.field_associations = {"organization_id" => {name: "organization", class: "Organization"} }
 
         desc "update ATTRIBUTES", "update project with ATTRIBUTES"
         def update(attrs)

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

@@ -9,6 +9,8 @@ module Magellan
       class Stage < Base
         self.resource_name = "stage~title"
         self.resource_dependency = {"project" => "project"}
+        self.hidden_fields = %w[nebula_id created_at updated_at].map(&:freeze).freeze
+        self.field_associations = {"project_id" => {name: "project", class: "Project"} }
 
         desc "create NAME [-t development|staging|production|other]", "create Stage with Name and Type"
         option :t, type: :string, default: "development", desc: "-t development|staging|production. specify Stage Type"

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

@@ -8,6 +8,7 @@ module Magellan
       class Team < Base
         self.resource_name = "magellan~auth~team"
         self.resource_dependency = { "organization" =>  Organization.parameter_name }
+        self.field_associations = {"organization_id" => {name: "organization", class: "Organization"} }
 
         desc "create NAME ROLE", "create Team with NAME ROLE"
         def create(name, role)

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

@@ -0,0 +1,55 @@
+# -*- 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

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

@@ -8,6 +8,9 @@ module Magellan
       class WorkerVersion < Base
         self.resource_name = "functions~worker"
         self.resource_dependency = {"stage" => "stage-version"}
+        self.hidden_fields = %w[created_at updated_at].map(&:freeze).freeze
+        self.multiline_fields = %w[migration_command_1 migration_command_2 run_command environment_vars_yaml].map(&:freeze).freeze
+        self.field_associations = {"stage_version_id" => {name: "stage", resource: "stage~version"} }
 
         desc "create NAME, IMAGE", "create WorkerVersion with NAME, IMAGE"
         method_option :attributes_yaml, aliases: "-A", desc: "path to YAML file which defines attributes"

data/lib/magellan/cli/resources.rb

@@ -19,10 +19,11 @@ module Magellan
       autoload :TransactionRouter, "magellan/cli/resources/transaction_router"
       autoload :WorkerVersion     , "magellan/cli/resources/worker_version"
 
-      autoload :HostInstance     , "magellan/cli/resources/host_instance"
+      autoload :VmInstance       , "magellan/cli/resources/vm_instance"
 
       autoload :ContainerImage   , "magellan/cli/resources/container_image"
       autoload :ContainerInstance, "magellan/cli/resources/container_instance"
+      autoload :ContainerAssignment, "magellan/cli/resources/container_assignment"
 
     end
   end

data/lib/magellan/cli/version.rb

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

data/magellan-cli.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "nokogiri"
   spec.add_runtime_dependency "activesupport", "~> 4.1.4"
+  spec.add_runtime_dependency "text-table", "~> 1.2.3"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

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

@@ -7,7 +7,7 @@ describe Magellan::Cli::Resources::ClientVersion do
 
   describe :list do
     before do
-      expect(cmd).to receive(:load_selections).and_return({"stage" => {"id" => "1", "name" => "StageA"} })
+      expect(cmd).to receive(:load_selections).and_return({"project" => {"id" => 1, "name" => "ProjectA"}})
       expect(cmd).to receive(:get_json).and_return([{id: 1, project_id: 1, stage_title_id: 1, version: "1.0.0", url_mapping_yaml: nil, status: "1" }])
       expect($stdout).to receive(:puts)
     end
@@ -19,7 +19,7 @@ describe Magellan::Cli::Resources::ClientVersion do
   describe :create do
     describe :success do
       before do
-        expect(cmd).to receive(:load_selections).and_return({"stage" => {"id" => 1, "name" => "StageA"}})
+        expect(cmd).to receive(:load_selections).and_return({"project" => {"id" => 1, "name" => "ProjectA"}, "stage" => {"id" => 1, "name" => "StageA"} })
         expect(cmd).to receive(:post_json).with("/admin/client_version/new.js", { "client_version" => { "stage_title_id" => 1, "version" => "1.1.0" } })
       end
       it do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.4
+- !ruby/object:Gem::Dependency
+  name: text-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,14 +151,15 @@ 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/container_image.rb
 - lib/magellan/cli/resources/container_instance.rb
-- lib/magellan/cli/resources/host_instance.rb
 - lib/magellan/cli/resources/organization.rb
 - lib/magellan/cli/resources/project.rb
 - 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/host_instance.rb

@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-require "magellan/cli/resources"
-
-module Magellan
-  module Cli
-    module Resources
-
-      class HostInstance < Base
-        self.resource_name = "vm~instance"
-        self.resource_dependency = {"stage" => "stage"}
-
-        desc "list", "list instances"
-        def list
-          stage_id = load_selection("stage")["id"] rescue nil
-          r = ""
-          if stage_id
-            r = get_json("/admin/stage~title/#{stage_id}/instance_list.json", {})
-          else
-            r = get_json("/admin/vm~instance.json")
-          end
-          $stdout.puts(JSON.pretty_generate(r) << "\nTotal: #{r.length}")
-        end
-
-        desc "create NAME [LAUNCH_OPTIONS]", "create Host 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