magellan-cli 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d1f40fdfc7506bd3896f983666f347ee1dbb53
-  data.tar.gz: 7bdf741e09e11d6daf57dd229faf3e12bd731956
+  metadata.gz: f84015af091e8e39e5a63466e4518e74ad3d9b65
+  data.tar.gz: ceae355f009d372955e052d0035a6ebbccc90a6b
 SHA512:
-  metadata.gz: cc40cac7fead1cc17822544c2a138f68837d760868b69e326d9cf90140e834d3556630354bd4658f99bf3ffd168841941c5aa4c0b8c3e1e92d5c999f6db61e9e
-  data.tar.gz: e90258063827ea1c377d56f85a8d574e3f60a6016ec9aa7f9b054e4c061ef4443dc4b0ba5d763e6ee92e27cc5fa1cf4791071f22e8d8de61b9b593406c6be0d7
+  metadata.gz: 3fef2a90a5b822b287ef8a8341b27ccd833602ca15105a656e747e09eafa83b2a21dddb5f3f316488e164cf6e404bc6f8030aac26cf2ab29af28a0cf502813ea
+  data.tar.gz: 094d538e70201384bd2af1c20c4f5895431631e001484c11d82de88936dc28c2380c9c6db9cbfd1e055db191042f579ef9c938a1ddcc4ef4b792925bd49cd650

data/Gemfile.lock

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

data/lib/magellan/cli/command.rb

@@ -6,7 +6,6 @@ require 'active_support/core_ext/string/inflections'
 module Magellan
   module Cli
     class Command < Base
-      include Magellan::Cli::FileAccess
 
       {
         "organization"  => "Organization",
@@ -34,8 +33,8 @@ module Magellan
         print "password: "
         password = STDIN.noecho(&:gets).chomp
         puts ""
-        update_selections("login" => {"email" => email, "password" => password})
-        Magellan::Cli::Http.new.login
+
+        Magellan::Cli::Http.new.login!(email, password)
       end
     end
   end

data/lib/magellan/cli/http.rb

@@ -7,9 +7,18 @@ module Magellan
 
       no_commands do
 
-        def login
+        def login!(email, password)
+          cli = Cli::Login.new
+          logined = cli.api_login!(email, password)
+          if logined
+            success("OK")
+          else
+            error("Login Failure.")
+          end
+        end
+
+        def access_api
           cli = Cli::Login.new
-          cli.login!
           return block_given? ? yield(cli) : success("OK")
         end
 
@@ -33,9 +42,10 @@ module Magellan
         # @param [String] rel_path cli.base_url からの相対パス
         # @param [Hash] params クエリ文字列
         # @return [Object] レスポンスのBODYをJSONとしてパースした結果オブジェクト
-        def get_json(rel_path, params = nil)
-          login do |cli|
-            url = "#{cli.base_url}#{rel_path}"
+        def get_json(rel_path, params = {})
+          access_api do |api|
+            url = "#{api.base_url}#{rel_path}"
+            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("&")
             end
@@ -43,7 +53,7 @@ module Magellan
             # "Unknown key: max-age = 0" というメッセージを表示させないために$stderrを一時的に上書き
             $stderr, bak = StringIO.new, $stderr
             begin
-              res = cli.httpclient.get(url)
+              res = api.httpclient.get(url)
               check_response(res)
             ensure
               $stderr = bak
@@ -56,9 +66,9 @@ module Magellan
         # @param [Hash] params POSTで渡されるパラメータ
         # @return nil
         def post(rel_path, params)
-          login do |cli|
-            params = {authenticity_token: cli.auth_token}.update(params || {})
-            process_res(cli, :post, rel_path, params)
+          access_api do |api|
+            params = api.login_auth.update(params || {})
+            process_res(api, :post, rel_path, params)
           end
         end
 
@@ -67,9 +77,9 @@ module Magellan
         # @param [Hash] params POSTで渡されるパラメータ
         # @return nil
         def post_json(rel_path, params)
-          login do |cli|
-            params = {authenticity_token: cli.auth_token}.update(params || {})
-            process_res(cli, :post, rel_path, params.to_json, JSON_HEADER)
+          access_api do |api|
+            params = api.login_auth.update(params || {})
+            process_res(api, :post, rel_path, params.to_json, JSON_HEADER)
           end
         end
 
@@ -78,9 +88,9 @@ module Magellan
         # @param [Hash] params PUTで渡されるパラメータ
         # @return nil
         def put(rel_path, params)
-          login do |cli|
-            params = {authenticity_token: cli.auth_token}.update(params || {})
-            process_res(cli, :put, rel_path, params)
+          access_api do |api|
+            params = cli.login_auth.update(params || {})
+            process_res(api, :put, rel_path, params)
           end
         end
 
@@ -89,9 +99,9 @@ module Magellan
         # @param [Hash] params PUTで渡されるパラメータ
         # @return nil
         def put_json(rel_path, params)
-          login do |cli|
-            params = {authenticity_token: cli.auth_token}.update(params || {})
-            process_res(cli, :put, rel_path, params.to_json, JSON_HEADER)
+          access_api do |api|
+            params = api.login_auth.update(params || {})
+            process_res(api, :put, rel_path, params.to_json, JSON_HEADER)
           end
         end
 
@@ -99,16 +109,16 @@ module Magellan
         # @param [String] rel_path cli.base_url からの相対パス
         # @return nil
         def delete(rel_path)
-          login do |cli|
-            params = {authenticity_token: cli.auth_token}
-            process_res(cli, :delete, rel_path, params)
+          access_api do |api|
+            params = api.login_auth
+            process_res(api, :delete, rel_path, params)
           end
         end
 
-        def process_res(cli, http_method, rel_path, *args)
-          url = "#{cli.base_url}#{rel_path}"
+        def process_res(api, http_method, rel_path, *args)
+          url = "#{api.base_url}#{rel_path}"
           verbose("%s %s\n%s" % [http_method, url, args])
-          res = cli.httpclient.send(http_method, url, *args)
+          res = api.httpclient.send(http_method, url, *args)
           check_response(res)
         end
 

data/lib/magellan/cli/login.rb

@@ -23,6 +23,7 @@ module Magellan
       attr_reader :base_url
 
       attr_reader :auth_token
+      attr_reader :login_auth
 
       # Magellan::Cli::Loginのコンストラクタです。
       #
@@ -45,6 +46,7 @@ module Magellan
 
         @httpclient = HTTPClient.new
         @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
+        @login_auth = load_selection("login")
       end
 
       def login_form_url
@@ -54,46 +56,30 @@ module Magellan
         @login_url ||= base_url + "/api/sign_in.json"
       end
 
-      # magellan-apiサーバに接続してログインの検証と処理を行います。
+      # magellan-apiサーバに接続してログインの検証とアクセストークンの保存を行います。
       #
-      # @param [Hash] extra オプション
-      # @return [Integer] サーバが返したレスポンスのステータスを返します
-      # @return [String] サーバが返したレスポンスのbodyを返します
-      def login_and_status
+      # @return [boolean] login成功/失敗
+      def api_login!(email, password)
         @auth_token ||= get_auth_token
         params = {
-          "user" => load_selection("login"),
+          "user" => {
+            "email" => email,
+            "password" => password
+           },
           "authenticity_token" => @auth_token
         }.to_json
         res2 = Ssl.retry_on_ssl_error("login"){ @httpclient.post(login_url, params, JSON_HEADER) }
-        return res2.status, res2.body
-      end
 
-      # GSSサーバに接続してログインの検証と処理を行います。
-      #
-      # @param [Hash] extra オプション
-      # @option extra [Integer] :device_type デバイス種別
-      # @option extra [Integer] :device_id デバイス識別子
-      # @return [Boolean] ログインに成功した場合はtrue、失敗した場合はfalse
-      def login
-        status, _ = login_and_status
-        case status
-        when 200...300 then true
-        else false
+        case res2.status
+        when 200...300 then logined = true
+        else logined = false
         end
-      end
 
-      # GSSサーバに接続してログインの検証と処理を行います。
-      #
-      # @param [Hash] extra オプション
-      # @see #login
-      # @return ログインに成功した場合は自身のオブジェクト返します。失敗した場合はLibgss::Network::Errorがraiseされます。
-      def login!
-        status, body = login_and_status
-        case status
-        when 200...300 then return self
-        else raise LoginError, "status: #{status} #{body}"
+        if logined
+          body = JSON.parse res2.body
+          update_selections("login" => {"email" => email, "token" => body["token"] })
         end
+        logined
       end
 
       def get_auth_token

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

@@ -42,6 +42,7 @@ module Magellan
               q[f] = r["id"]
             end
             return build_query(q)
+
           end
 
           DEFAULT_SELECTION_FIELDS = %w[id name].freeze
@@ -64,7 +65,7 @@ module Magellan
               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")
+              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

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

@@ -49,6 +49,14 @@ module Magellan
           put_json("/admin/#{resource_name}/#{w["id"]}/edit.js", params)
         end
 
+        desc "prepare_images", "prepare worker images"
+        def prepare_images
+          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"])
+        end
+
       end
 
     end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/spec/magellan/cli/login_spec.rb

@@ -36,7 +36,7 @@ describe Magellan::Cli::Login do
         allow(res).to receive(:status).and_return(200)
         allow(res).to receive(:body).and_return({"success" => true}.to_json)
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
-        expect(cli.login!).to eq cli # 自身を返す
+        expect(cli.api_login!(email, password)).to eq true
       end
 
       it :login_failure do
@@ -45,7 +45,7 @@ describe Magellan::Cli::Login do
         allow(res).to receive(:status).and_return(401) # Unauthorized
         allow(res).to receive(:body).and_return({"success" => false, "message" => "Error with your login or password"}.to_json)
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
-        expect{cli.login!}.to raise_error(Magellan::Cli::LoginError, 'status: 401 {"success":false,"message":"Error with your login or password"}')
+        expect(cli.api_login!(email, password)).to eq false
       end
     end
 
@@ -72,7 +72,7 @@ describe Magellan::Cli::Login do
         allow(res).to receive(:status).and_return(200)
         allow(res).to receive(:body).and_return({"success" => true}.to_json)
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
-        expect(cli.login!).to eq cli # 自身を返す
+        expect(cli.api_login!(email, password)).to eq true
       end
     end
   end

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

@@ -6,22 +6,20 @@ describe Magellan::Cli::Resources::Project do
   let(:base_url){ "https://localhost:3000" }
   let(:httpclient){ double(:httpclient) }
   let(:cli) do
-    cli = double(:login, base_url: base_url)
+    cli = double(:access_api, base_url: base_url, auth_token: {}, login_auth: {})
     allow(cli).to receive(:httpclient).and_return(httpclient)
     cli
   end
-  let(:res){ double(:res) }
+  let(:res){ double(:res, status: 200, body: {}.to_json) }
 
   let(:cmd){ Magellan::Cli::Resources::Project.new }
 
   before do
-    allow(cmd).to receive(:login).and_yield(cli)
+    allow(cmd).to receive(:access_api).and_yield(cli)
   end
 
   describe :list do
     it do
-      allow(res).to receive(:body).and_return("[]")
-      allow(res).to receive(:status).and_return(200)
       expect(httpclient).to receive(:get).with("#{base_url}/admin/project.json").and_return(res)
       expect($stdout).to receive(:puts)
       cmd.list

metadata

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