magellan-cli 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb40bd948d572f7f0a642dc9b3baff058c112eb4
-  data.tar.gz: 50c8e29d10da813eddf77cf192ab9bb7e3782bf3
+  metadata.gz: 727be865a8fa69b098afe51d712bad1a31a45724
+  data.tar.gz: 506f81d124f8eb15b767f11f69feaf19d1684257
 SHA512:
-  metadata.gz: e9d3a89a666fe6454a1c1bd1f1ccb65b7a6daa9f334ab253d86f65cae27a5aff4e35586e9a78abed6b7d457c794a5abe06cc5b51552143f02f9047fd0a22f7c2
-  data.tar.gz: d3db854dcefaa6d1a7b6bbc62b5566a355a473496331166e5ad1c49ae85ed0689672d07c707e40e1d1819cd117af02df8968c760e8a686f954901f62bca5e08e
+  metadata.gz: dbecdde19ac927dcc2259a967a944e697aca441a12ec3f518d25a9a31d133663ed90e8a94daf719407f059d7933a1baa07248e8e0fe961640a8feb71eae47ab4
+  data.tar.gz: 935c8e96e86ec2cf3caf5742b40495bf941ebc3761c2464b72e93517d2709dc2a3fa4675bf27b8e02ef0d31bd34a1dce9e6362f9337c657d55400f7dbe72257c

data/Gemfile.lock

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

data/lib/magellan/cli/command.rb

@@ -32,37 +32,23 @@ module Magellan
 
           shell.say
           shell.say "RESOURCES:"
-          shell.say "  " << RESOURCES.keys.join(", ")
+          shell.say "  " << Resources::MAPPING.keys.join(", ")
           shell.say "  type `#{File.basename($0)} help RESOURCE` for more detail"
           shell.say
         end
       end
 
-      RESOURCES =\
-      {
-        "Organization"  => "organization",
-        "Team"          => "team",
-        "Project"       => "project",
-        "Stage"         => "stage",
-        "ClientVersion" => "client_version",
-        #"TransactionRouter" => "tr",
-        "Worker"        => "worker",
-        "Image"         => "image",
-        "Container"     => "container",
-        "Cloudsql"      => "cloudsql",
-      }
-
-      RESOURCES.each do |classname, name|
-        desc "#{name} SUBCOMMAND ...ARGS", "manage #{name.pluralize}"
+      Resources::MAPPING.each do |classname, name|
+        desc "#{name} SUBCOMMAND ...ARGS", "Manage #{name.pluralize}"
         subcommand name, ::Magellan::Cli::Resources.const_get(classname)
       end
 
-      COMMAND_ORDER = %w[login] + RESOURCES.values
+      COMMAND_ORDER = %w[login] + Resources::MAPPING.values
 
-      #desc "direct SUBCOMMAND ...ARGS", "send request directly"
+      #desc "direct SUBCOMMAND ...ARGS", "Send request directly"
       #subcommand "direct", ::Magellan::Cli::Direct
 
-      desc "login", "login to the Magellan server"
+      desc "login", "Login to the Magellan server"
       method_option :email,    aliases: "-e", desc: "email address for login"
       method_option :password, aliases: "-p", desc: "password for login"
       def login

data/lib/magellan/cli/direct.rb

@@ -5,23 +5,23 @@ module Magellan
   module Cli
     class Direct < ::Magellan::Cli::Http
 
-      desc "get PATH", "send GET request with PATH"
+      desc "get PATH", "Send GET request with PATH"
       def get(path)
         r = get_json(path)
         $stdout.puts(JSON.pretty_generate(r))
       end
 
-      desc "post PATH [PARAMS]", "send POST request with PATH and PARAMS"
+      desc "post PATH [PARAMS]", "Send POST request with PATH and PARAMS"
       def post(path, params = nil)
         post_json(path)
       end
 
-      desc "put PATH [PARAMS]", "send PUT request with PATH and PARAMS"
+      desc "put PATH [PARAMS]", "Send PUT request with PATH and PARAMS"
       def put(path, params = nil)
         put_json(path)
       end
 
-      desc "delete PATH", "send DELETE request with PATH"
+      desc "delete PATH", "Send DELETE request with PATH"
       def delete(path)
         delete(path)
       end

data/lib/magellan/cli/file_access.rb

@@ -7,8 +7,16 @@ module Magellan
       class NotSelected < StandardError
       end
 
+      SELECTION_FILENAME = ".magellan-cli"
+
+      module_function
+
+      def remove_selection_file
+        File.exist?(SELECTION_FILENAME) && File.delete(SELECTION_FILENAME)
+      end
+
       def load_selections
-        File.readable?(".magellan-cli") ? YAML.load_file(".magellan-cli") : {}
+        File.readable?(SELECTION_FILENAME) ? YAML.load_file(SELECTION_FILENAME) : {}
       end
 
       def load_selection(name)

data/lib/magellan/cli/http.rb

@@ -7,8 +7,11 @@ module Magellan
 
       no_commands do
 
+        def cli
+          @cli ||= Cli::Login.new
+        end
+
         def login!(email, password)
-          cli = Cli::Login.new
           logined = cli.api_login!(email, password)
           if logined
             success("OK")
@@ -18,7 +21,6 @@ module Magellan
         end
 
         def access_api
-          cli = Cli::Login.new
           if block_given?
             auth = cli.login_auth
             if auth.nil? || auth.empty?
@@ -55,6 +57,7 @@ module Magellan
         def get_json(rel_path, params = {})
           access_api do |api|
             url = "#{api.base_url}#{rel_path}"
+            params.update(yield) if block_given?
             params = api.login_auth.merge(params)
             if params && !params.empty?
               url << '?' << params.map{|k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")

data/lib/magellan/cli/reference_generator.rb

@@ -16,7 +16,7 @@ module Magellan
         @shell = Thor::Shell::Basic.new
         change_global_var_temporarily(["$PROGRAM_NAME", "magellan-cli"]) do
           process(Magellan::Cli::Command, "index.md")
-          Magellan::Cli::Command::RESOURCES.each do |class_name, res_name|
+          Magellan::Cli::Resources::MAPPING.each do |class_name, res_name|
             klass = Magellan::Cli::Resources.const_get(class_name)
             process(klass, "#{res_name}.md", res_name)
           end
@@ -52,7 +52,7 @@ module Magellan
           f.puts "## Commands"
           f.puts
           klass.sorted_commands.each do |cmd|
-            rel_path = Magellan::Cli::Command::RESOURCES.values.include?(cmd.name) ? "./#{cmd.name}.html" : "##{cmd.name}"
+            rel_path = Magellan::Cli::Resources::MAPPING.values.include?(cmd.name) ? "./#{cmd.name}.html" : "##{cmd.name}"
             f.puts "- [%s](%s)" % [Thor.send(:banner, cmd, false, false), rel_path]
           end
           f.puts
@@ -69,7 +69,7 @@ module Magellan
 
           f.puts "## Details"
           klass.sorted_commands.each do |cmd|
-            next if Magellan::Cli::Command::RESOURCES.values.include?(cmd.name)
+            next if Magellan::Cli::Resources::MAPPING.values.include?(cmd.name)
             f.puts "### <a name=\"#{cmd.name}\"></a>#{cmd.name}"
             f.puts
             f.puts "```text"

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

@@ -22,6 +22,13 @@ module Magellan
 
         no_commands do
 
+          def load_selection!(name, &block)
+            return access_api{ load_selection(name, &block) }
+          end
+          def update_selections!(hash = nil, &block)
+            return access_api{ update_selections(hash, &block) }
+          end
+
           def build_query(hash)
             @@no ||= 0
             r = {}
@@ -34,15 +41,16 @@ module Magellan
           end
 
           def default_query
-            sel = load_selections
-            q = {}
-            (self.class.resource_dependency || {}).each do |f, res|
-              r = sel[res]
-              raise NotSelected, "No #{f} selected" unless r
-              q[f] = r["id"]
+            access_api do |cli|
+              sel = load_selections
+              q = {}
+              (self.class.resource_dependency || {}).each do |f, res|
+                r = sel[res]
+                raise NotSelected, "No #{f} selected" unless r
+                q[f] = r["id"]
+              end
+              build_query(q)
             end
-            return build_query(q)
-
           end
 
           DEFAULT_SELECTION_FIELDS = %w[id name].freeze
@@ -54,7 +62,7 @@ module Magellan
             obj = fields.each_with_object({}) do |f, d|
               d[f] = r[f]
             end
-            update_selections(name => obj)
+            update_selections!(name => obj)
             return r
           end
 
@@ -81,7 +89,7 @@ module Magellan
 
 
           def query_list
-            get_json("/admin/#{self.class.resource_key}.json", default_query)
+            get_json("/admin/#{self.class.resource_key}.json"){ default_query }
           end
           private :query_list
 
@@ -155,14 +163,14 @@ module Magellan
           end
 
           def deselect
-            update_selections do |s|
+            update_selections! do |s|
               s.delete(self.class.parameter_name)
             end
           end
 
           def self.inherited(klass)
             base_name = klass.name.split(/::/).last
-            res_name = Magellan::Cli::Command::RESOURCES[base_name] or raise "resource not found for #{base_name}"
+            res_name = Magellan::Cli::Resources::MAPPING[base_name] or raise "resource not found for #{base_name}"
 
             klass.instance_eval(<<-EOM, __FILE__, __LINE__ + 1)
               def resource_name

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

@@ -16,7 +16,7 @@ module Magellan
 
         desc "create VERSION", "Create a new #{resource_name}"
         def create(version)
-          stage = load_selection("stage")
+          stage = load_selection!("stage")
           params = {
             parameter_name => {
               "stage_title_id" => stage["id"],

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

@@ -12,7 +12,7 @@ module Magellan
 
         desc "create NAME", "Create a new #{resource_name} database with NAME"
         def create(name)
-          o = load_selection("stage")
+          o = load_selection!("stage")
           params = {
             parameter_name => {
               "stage_title_id" => o["id"],

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

@@ -10,7 +10,7 @@ module Magellan
         self.resource_key = "magellan~auth~organization"
         # self.field_associations = {"creator_id" => {name: "creator", class: "User"} }
 
-        desc "create NAME", "create a new #{resource_name} with NAME"
+        desc "create NAME", "Create a new #{resource_name} with NAME"
         def create(name)
           params = {
             parameter_name => {

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

@@ -13,14 +13,14 @@ module Magellan
 
         desc "update ATTRIBUTES", "Update the ATTRIBUTES of the selected #{resource_name}"
         def update(attrs)
-          s = load_selection("project")
+          s = load_selection!("project")
           attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
           put_json("/admin/project/#{s['id']}/edit", {"project" => attrs})
         end
 
         desc "create NAME", "Create a new #{resource_name} with NAME"
         def create(name)
-          o = load_selection(Organization.parameter_name)
+          o = load_selection!(Organization.parameter_name)
           params = {
             parameter_name => {
               "organization_id" => o["id"],

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

@@ -19,7 +19,7 @@ module Magellan
           unless %w{ development staging production other }.include?(type)
             raise "Unknown Stage Type #{type}"
           end
-          proj = load_selection("project")
+          proj = load_selection!("project")
           params = {
             parameter_name => {
               "project_id" => proj["id"],
@@ -47,7 +47,7 @@ module Magellan
 
         desc "deselect", "Deselect the #{resource_name}"
         def deselect
-          update_selections do |s|
+          update_selections! do |s|
             s.delete("stage")
             s.delete("stage-version")
           end
@@ -65,7 +65,7 @@ module Magellan
 
         no_commands do
           def switch_version(phase)
-            s = load_selection("stage")
+            s = load_selection!("stage")
             q = build_query("title" => s["id"], "phase" => phase) # 1: workspace, 2: current, 3: used
             update_first_result("stage-version", "/admin/stage~version.json", q, %w[id])
           end
@@ -73,7 +73,7 @@ module Magellan
 
         desc "prepare", "Prepare the #{Container.resource_name.pluralize}"
         def prepare
-          s = load_selection("stage")
+          s = load_selection!("stage")
           id = s["id"]
           r = post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "prepare_containers"})
           Container.new.show_list(r["result"])
@@ -87,7 +87,7 @@ module Magellan
 
         no_commands do
           def call_repair
-            s = load_selection("stage")
+            s = load_selection!("stage")
             id = s["id"]
             post_json("/admin/stage~title/#{id}/simple_method_call.json", {method_name: "repair"})
           end
@@ -95,7 +95,7 @@ module Magellan
 
         desc "update ATTRIBUTES", "Update ATTRIBUTES of the #{resource_name}"
         def update(attrs)
-          s = load_selection("stage")
+          s = load_selection!("stage")
           attrs = JSON.parse(File.readable?(attrs) ? File.read(attrs) : attrs)
           put_json("/admin/stage~title/#{s['id']}/edit", {"stage_title" => attrs})
         end
@@ -106,14 +106,14 @@ module Magellan
         option :t, type: :numeric, default: 600, desc: "-t timeout(seconds)"
         def release_now
           spacer = "\r" << (" " * 20)
+          stage = load_selection!("stage")
           print "\rrelease starting"
-          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
             print spacer
-            print "\rnow #{res1['status']}"
+            print "\r#{res1['status']}"
           else
             print spacer
             puts "\e[31m#{res0.inspect}\e[0m"
@@ -158,7 +158,7 @@ module Magellan
 
         desc "logs", "Fetch the logs of the #{Worker.resource_name.pluralize}"
         def logs
-          s = load_selection("stage")
+          s = load_selection!("stage")
           id = s["id"]
           obj = get_json("/admin/stage~title/#{id}/logs.json")
           if obj["value"]
@@ -170,15 +170,15 @@ module Magellan
 
         desc "set_container_num NUM", "Set the number of #{Container.resource_name.pluralize} for the selected #{Image.resource_name}"
         def set_container_num(num)
-          s = load_selection("stage")
-          v = load_selection("stage-version")
-          i = load_selection("container_image")
+          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
 
         desc "reload", "Reload the last selections"
         def reload
-          s = load_selection("stage")
+          s = load_selection!("stage")
           select(s["name"])
           [Worker, Image, Container].each do |klass|
             s = (load_selections || {})[klass.parameter_name]

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

@@ -15,7 +15,7 @@ module Magellan
           unless %w{ reader admin }.include?(role)
             raise "ROLE should be 'reader' or 'admin'"
           end
-          o = load_selection(Organization.parameter_name)
+          o = load_selection!(Organization.parameter_name)
           params = {
             parameter_name => {
               "organization_id" => o["id"],
@@ -30,7 +30,7 @@ module Magellan
 =begin
         desc "invite EMAIL", "Invite a user to the #{Team.resource_name}"
         def invite(email)
-          o = load_selection(parameter_name)
+          o = load_selection!(parameter_name)
           params = {
             "email" => email
           }

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

@@ -11,7 +11,7 @@ module Magellan
 
         desc "create NAME", "Create a new #{resource_name} with NAME"
         def create(name)
-          s = load_selection("stage-version")
+          s = load_selection!("stage-version")
           params = {
             self.class.parameter_name => {
               "stage_version_id" => s["id"],

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

@@ -15,7 +15,7 @@ module Magellan
         desc "create NAME, IMAGE", "Create a new #{resource_name} with NAME and IMAGE"
         method_option :attributes_yaml, aliases: "-A", desc: "path to YAML file which defines attributes"
         def create(name, image_name)
-          s = load_selection("stage-version")
+          s = load_selection!("stage-version")
           attrs =
             if path = options[:attributes_yaml]
               YAML.load_file(path)
@@ -41,7 +41,7 @@ module Magellan
           else
             attrs = JSON.parse(attrs)
           end
-          w = load_selection(parameter_name)
+          w = load_selection!(parameter_name)
           self.class.hidden_fields.each do |f| attrs.delete(f) end
           self.class.field_associations.keys.each do |f| attrs.delete(f) end
           params = {
@@ -50,9 +50,9 @@ module Magellan
           put_json("/admin/#{resource_key}/#{w["id"]}/edit.js", params)
         end
 
-        desc "prepare_images", "prepare the #{Image.resource_name.pluralize} for the selected #{Worker.resource_name}"
+        desc "prepare_images", "Prepare the #{Image.resource_name.pluralize} for the selected #{Worker.resource_name}"
         def prepare_images
-          s = load_selection("functions_worker")
+          s = load_selection!("functions_worker")
           id = s["id"]
           r = post_json("/admin/functions~worker/#{id}/simple_method_call.json", {method_name: "prepare_images"})
           Image.new.show_list(r["result"])

data/lib/magellan/cli/resources.rb

@@ -23,6 +23,22 @@ module Magellan
       autoload :Container        , "magellan/cli/resources/container"
 
       autoload :Cloudsql, "magellan/cli/resources/cloudsql"
+
+
+      MAPPING =\
+      {
+        "Organization"  => "organization",
+        "Team"          => "team",
+        "Project"       => "project",
+        "Stage"         => "stage",
+        "ClientVersion" => "client_version",
+        #"TransactionRouter" => "tr",
+        "Worker"        => "worker",
+        "Image"         => "image",
+        "Container"     => "container",
+        "Cloudsql"      => "cloudsql",
+      }
+
     end
   end
 end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.2.18"
+    VERSION = "0.2.19"
   end
 end

data/spec/magellan/cli/login_spec.rb

@@ -77,4 +77,25 @@ describe Magellan::Cli::Login do
     end
   end
 
+  context :without_login do
+    before(:all){ Magellan::Cli::FileAccess.remove_selection_file }
+
+    Magellan::Cli::Resources::MAPPING.keys.each do |classname|
+      context classname do
+        klass = ::Magellan::Cli::Resources.const_get(classname)
+        let(:cmd){ klass.new }
+
+        klass.commands.each do |cmd_name, _|
+          next if cmd_name == "help"
+          m = klass.instance_method(cmd_name)
+          if m.arity == 0
+            it "raises Magellan::Cli::Error when #{cmd_name}" do
+              expect{ cmd.send(cmd_name) }.to raise_error(Magellan::Cli::Error, /not logined/i)
+            end
+          end
+        end
+      end
+    end
+  end
+
 end

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

@@ -5,9 +5,11 @@ describe Magellan::Cli::Resources::ClientVersion do
 
   let(:cmd){ Magellan::Cli::Resources::ClientVersion.new }
 
+  let(:cli){ double(:cli, login_auth: {"email" => "magellan@example.com", "toekn" => "dummy"}) }
+  before{ allow(cmd).to receive(:cli).and_return(cli) }
+
   describe :list do
     before do
-      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

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

@@ -5,6 +5,9 @@ describe Magellan::Cli::Resources::Organization do
 
   let(:cmd){ Magellan::Cli::Resources::Organization.new }
 
+  let(:cli){ double(:cli, login_auth: {"email" => "magellan@example.com", "toekn" => "dummy"}) }
+  before{ allow(cmd).to receive(:cli).and_return(cli) }
+
   describe :list do
     before do
       expect(cmd).to receive(:get_json).and_return([{id: 1, name: "org1", creator_id: 1}])

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

@@ -5,9 +5,11 @@ describe Magellan::Cli::Resources::Team do
 
   let(:cmd){ Magellan::Cli::Resources::Team.new }
 
+  let(:cli){ double(:cli, login_auth: {"email" => "magellan@example.com", "toekn" => "dummy"}) }
+  before{ allow(cmd).to receive(:cli).and_return(cli) }
+
   describe :list do
     before do
-      expect(cmd).to receive(:load_selections).and_return({"magellan_auth_organization" => {"id" => "1", "name" => "testorg1"}})
       expect(cmd).to receive(:get_json).and_return([{id: 1, organization_id: 1, name: "team1" }])
       expect($stdout).to receive(:puts)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - akm2000