magellan-cli 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5b5f0a5bc12049990a5c842393ce408aff9a34
-  data.tar.gz: f4ce5c56d45a6b7fb2b17cc2620e512312a6d0ed
+  metadata.gz: 7db0837835cc09a010e80b50ed05ef816eac9c2d
+  data.tar.gz: 5eaf1c7d35daeedab002dd47d6dc1f6298846550
 SHA512:
-  metadata.gz: 3f98e6f3f10adb66443ea4ebeaadd4ed16e45b4f875ad1dc23364bd3ed2ae6936c696cca338411ce1cc00f1ede15d7658e63d81dae79a625ac4e4484f251e90d
-  data.tar.gz: ac3fc0570bb6e17f6c5d5efe7ae0ae09a060ba302c7b92f74b8ba8f7a769072490ec633cf0a94af332aa05c171e6589df982326645896c7ce65577b3d105c774
+  metadata.gz: 75ca604ec8f59c335e9eb4fe75e1ee9fff085dcb5212f7c86d47ea16a2efa7a51a2346b22d5738df7b15739a411218772658dffbb8ae6f18a755d0ed1094875e
+  data.tar.gz: d60150518e847386d483cd410d06bc8f02c340ffdbe43a34e51574f8023374e9b2d09c2881607be1242018cbddb6a80c5ebe36d14b0b9d32c56317a06db8367f

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+--format Fuubar
 --color

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem "pry-byebug"
   gem "pry-stack_explorer"
   gem "simplecov"
+  gem "fuubar"
 end

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.5.9)
+    magellan-cli (0.6.0)
       activesupport (~> 4.1.4)
       groovenauts-thor
       httpclient (~> 2.5)
       i18n
-      libmagellan (~> 0.2.2)
+      libmagellan (~> 0.2.4)
       nokogiri
       psych (>= 2.0.0, <= 2.0.8)
       text-table (~> 1.2.3)
@@ -20,7 +20,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.3.7)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     byebug (2.7.0)
@@ -34,12 +34,15 @@ GEM
     docile (1.1.5)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
     groovenauts-thor (0.19.1.1)
     httpclient (2.6.0.1)
     i18n (0.7.0)
     json (1.8.2)
     jwt (1.2.1)
-    libmagellan (0.2.3)
+    libmagellan (0.2.4)
       activesupport
       mqtt (~> 0.3.1)
       signet (~> 0.5.0)
@@ -75,6 +78,7 @@ GEM
     rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
+    ruby-progressbar (1.7.1)
     signet (0.5.1)
       addressable (>= 2.2.3)
       faraday (>= 0.9.0.rc5)
@@ -96,6 +100,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.6)
+  fuubar
   magellan-cli!
   pry
   pry-byebug

data/lib/magellan/cli.rb

@@ -6,11 +6,10 @@ module Magellan
     autoload :Command  , "magellan/cli/command"
 
     autoload :Base     , "magellan/cli/base"
-    autoload :Http     , "magellan/cli/http"
     autoload :Direct   , "magellan/cli/direct"
     autoload :Resources, "magellan/cli/resources"
 
-    autoload :Login    , "magellan/cli/login"
+    autoload :Http     , "magellan/cli/http"
     autoload :Ssl      , "magellan/cli/ssl"
 
     autoload :Messaging, "magellan/cli/messaging"

data/lib/magellan/cli/base.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "magellan/cli"
 
 require 'thor'
@@ -36,6 +37,9 @@ module Magellan
         def log_info(msg)
           self.class.log_info(msg)
         end
+        def log_warning(msg)
+          self.class.log_warning(msg)
+        end
         def log_success(msg)
           self.class.log_success(msg)
         end
@@ -53,8 +57,104 @@ module Magellan
           log_verbose("  " << e.backtrace.join("\n  "))
           exit(1)
         end
+
+        def http_conn
+          @http_conn ||= Cli::Http.new(self)
+        end
+
+        def login!(email, password)
+          logined = http_conn.api_login!(email, password)
+          if logined
+            log_success I18n.t(:success, scope: [:http, :login])
+          else
+            log_error I18n.t(:error, scope: [:http, :login])
+            exit(1)
+          end
+        end
+
+        def login_by_token!(email, token)
+          logined = http_conn.api_login_by_token!(email, token)
+          if logined
+            log_success I18n.t(:success, scope: [:http, :token])
+          else
+            log_error I18n.t(:error, scope: [:http, :token])
+            exit(1)
+          end
+        end
+
+        def http_access
+          if block_given?
+            http_conn.check_login_auth!
+            return yield(http_conn)
+          else
+            return log_success(I18n.t(:ok, scope: [:http, :access_api]))
+          end
+        end
+
+
+        # ログインしてGETします
+        # @param [String] rel_path http.base_url からの相対パス
+        # @param [Hash] params クエリ文字列
+        # @return [Object] レスポンスのBODYをJSONとしてパースした結果オブジェクト
+        def get_json(rel_path, params = {})
+          http_access do |api|
+            api.get_json(rel_path, params = {})
+          end
+        end
+
+        # ログインしてPOSTします
+        # @param [String] rel_path http.base_url からの相対パス
+        # @param [Hash] params POSTで渡されるパラメータ
+        # @return nil
+        def post(rel_path, params)
+          http_access do |api|
+            api.post(rel_path, params)
+          end
+        end
+
+        # ログインしてJSON形式のbodyをPOSTします
+        # @param [String] rel_path http.base_url からの相対パス
+        # @param [Hash] params POSTで渡されるパラメータ
+        # @return nil
+        def post_json(rel_path, params)
+          http_access do |api|
+            api.post_json(rel_path, params)
+          end
+        end
+
+        # ログインしてPUTします
+        # @param [String] rel_path http.base_url からの相対パス
+        # @param [Hash] params PUTで渡されるパラメータ
+        # @return nil
+        def put(rel_path, params)
+          http_access do |api|
+            api.put(rel_path, params)
+          end
+        end
+
+        # ログインしてJSON形式のbodyをPUTします
+        # @param [String] rel_path http.base_url からの相対パス
+        # @param [Hash] params PUTで渡されるパラメータ
+        # @return nil
+        def put_json(rel_path, params)
+          http_access do |api|
+            api.put_json(rel_path, params)
+          end
+        end
+
+        # ログインしてDELETEします
+        # @param [String] rel_path http.base_url からの相対パス
+        # @return nil
+        def delete(rel_path)
+          http_access do |api|
+            api.delete(rel_path)
+          end
+        end
+
       end
 
+
+
       class << self
         def puts_with_color(color_no, msg)
           $stderr.puts("\e[#{color_no}m#{msg}\e[0m")
@@ -66,6 +166,9 @@ module Magellan
         def log_info(msg)
           puts_with_color(0, msg)
         end
+        def log_warning(msg)
+          puts_with_color(33, msg)
+        end
         def log_success(msg)
           puts_with_color(32, msg)
         end
@@ -160,4 +263,3 @@ module Magellan
     end
   end
 end
-

data/lib/magellan/cli/command.rb

@@ -69,29 +69,45 @@ module Magellan
       desc "login", I18n.t(:login, scope: [:command, :cmd])
       method_option :email,    aliases: "-e", desc: I18n.t(:email, scope: [:command, :cmd_login])
       method_option :password, aliases: "-p", desc: I18n.t(:password, scope: [:command, :cmd_login])
+      method_option :authentication_token,    aliases: "-t", desc: I18n.t(:authentication_token, scope: [:command, :cmd_login])
       def login
         unless email = options[:email]
           print "email: "
           email = STDIN.gets.strip
         end
 
-        unless password = options[:password]
+        password = options[:password]
+        token    = options[:authentication_token]
+
+        if password.blank? && token.blank?
+          log_warning I18n.t(:warning, scope: :login)
           print "password: "
           password = STDIN.noecho(&:gets).chomp
           puts ""
         end
 
-        result = Magellan::Cli::Http.new.login!(email, password)
+        if password.blank? && token.blank?
+          print "authentication_token: "
+          token = STDIN.noecho(&:gets).chomp
+          puts ""
+        end
+
+        result =
+          if password.present?
+            login!(email, password)
+          else
+            login_by_token!(email, token)
+          end
+
         select_single_resources
         result
       end
 
       desc "info", I18n.t(:info, scope: [:command, :cmd])
       def info
-        cli = Magellan::Cli::Login.new
-        cli.check_login_auth!
+        http_conn.check_login_auth!
         selections = load_selections || {}
-        d = {"user" => cli.login_auth["email"] }
+        d = {"user" => http_conn.login_auth["email"] }
         Resources::MAPPING.each do |classname, name|
           klass = ::Magellan::Cli::Resources.const_get(classname)
           attr = klass.caption_attr

data/lib/magellan/cli/direct.rb

@@ -3,7 +3,7 @@ require "magellan/cli"
 
 module Magellan
   module Cli
-    class Direct < ::Magellan::Cli::Http
+    class Direct < ::Magellan::Cli::Base
 
       desc "get PATH", "Send GET request with PATH"
       def get(path)
@@ -29,4 +29,3 @@ module Magellan
     end
   end
 end
-

data/lib/magellan/cli/http.rb

@@ -1,149 +1,257 @@
 # -*- coding: utf-8 -*-
 require "magellan/cli"
 
+require 'httpclient'
+require 'json'
+require 'uri'
+require 'nokogiri'
+
+require 'active_support/core_ext/hash/keys'
+
 module Magellan
   module Cli
-    class Http < ::Magellan::Cli::Base
+    class Http
+      include Magellan::Cli::FileAccess
 
-      no_commands do
+      DEFAULT_HTTP_PORT  = (ENV['DEFAULT_HTTP_PORT' ] ||  80).to_i
+      DEFAULT_HTTPS_PORT = (ENV['DEFAULT_HTTPS_PORT'] || 443).to_i
 
-        def cli
-          @cli ||= Cli::Login.new
-        end
+      attr_reader :cmd
+      attr_reader :httpclient
+      attr_reader :base_url
 
-        def login!(email, password)
-          logined = cli.api_login!(email, password)
-          if logined
-            log_success I18n.t(:success, scope: [:http, :login])
-          else
-            log_error I18n.t(:error, scope: [:http, :login])
-            exit(1)
-          end
-        end
+      attr_reader :auth_token
+      attr_reader :login_auth
+
+      def self.base_url
+        @base_url ||= (ENV["MAGELLAN_SITE"] || "https://api-asia.magellanic-clouds.com")
+      end
 
-        def access_api
-          if block_given?
-            cli.check_login_auth!
-            return yield(cli)
+      # Magellan::Cli::Httpのコンストラクタです。
+      #
+      # @param [String] base_url_or_host 接続先の基準となるURLあるいはホスト名
+      # @param [Hash] options オプション
+      # @option options [String]  :api_version APIのバージョン。デフォルトは "1.0.0"
+      def initialize(cmd)
+        @cmd = cmd
+        base_url_or_host = self.class.base_url
+        if base_url_or_host =~ URI.regexp
+          @base_url = base_url_or_host.sub(/\/\Z/, '')
+          uri = URI.parse(@base_url)
+        else
+          if config_path = search_file(".magellan-cli.yml")
+            config = YAML.load_file_with_erb(config_path)
+            options = config[base_url_or_host.to_s].deep_symbolize_keys
           else
-            return log_success(I18n.t(:ok, scope: [:http, :access_api]))
+            options = {}
           end
+          uri = URI::Generic.build({scheme: "http", host: base_url_or_host, port: DEFAULT_HTTP_PORT}.update(options))
+          @base_url = uri.to_s
         end
 
-        def check_response(res)
-          case res.status
-          when 200...400 then
-            begin
-              r = JSON.parse(res.body)
-            rescue
-              # DELETE で 302 Found を返す時に HTML がレンダリングされることがあるので
-              # status code 300 台では JSON パースエラーを無視する
-              if res.status >= 300
-                return nil
-              end
-              raise
-            end
-            log_verbose(JSON.pretty_generate(r))
-            r
-          else
-            obj = JSON.parse(res.body) rescue nil
-            if obj and obj.is_a?(Hash) and obj["message"]
-              fatal(obj["message"])
-            else
-              msg = "HTTP Error: status=#{res.status}\n#{res.body}"
-              log_verbose(msg)
-            end
-          end
+        @httpclient = HTTPClient.new
+        @httpclient.debug_dev = ColorDebugDev.new($stderr) if cmd.verbose?
+        @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
+        @login_auth = load_selections["login"]
+      end
+
+      class ColorDebugDev
+        def initialize(dev)
+          @dev = dev
+        end
+        def <<(msg)
+          @dev << "\e[34m#{msg}\e[0m"
         end
+      end
 
-        # ログインしてGETします
-        # @param [String] rel_path cli.base_url からの相対パス
-        # @param [Hash] params クエリ文字列
-        # @return [Object] レスポンスのBODYをJSONとしてパースした結果オブジェクト
-        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("&")
-            end
-            log_verbose("GET #{url}")
-            # "Unknown key: max-age = 0" というメッセージを表示させないために$stderrを一時的に上書き
-            $stderr, bak = StringIO.new, $stderr
-            res = nil
-            begin
-              res = api.httpclient.get(url)
-            ensure
-              $stderr = bak
-            end
-            check_response(res)
-          end
+      def login_form_url
+        @login_form_url ||= base_url + "/users/sign_in.html"
+      end
+      def login_url
+        @login_url ||= base_url + "/api/sign_in.json"
+      end
+
+      def check_login_auth!
+        auth = login_auth
+        if auth.nil? || auth.empty?
+          raise Magellan::Cli::Error, I18n.t(:not_logged_in, scope: [:login, :check_login_auth], command: File.basename($0))
         end
+      end
 
-        # ログインしてPOSTします
-        # @param [String] rel_path cli.base_url からの相対パス
-        # @param [Hash] params POSTで渡されるパラメータ
-        # @return nil
-        def post(rel_path, params)
-          access_api do |api|
-            params = api.login_auth.update(params || {})
-            process_res(api, :post, rel_path, params)
-          end
+      # magellan-apiサーバに接続してログインの検証とアクセストークンの保存を行います。
+      #
+      # @return [boolean] login成功/失敗
+      def api_login!(email, password)
+        @auth_token ||= get_auth_token
+        params = {
+          "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) }
+
+        case res2.status
+        when 200...300 then logined = true
+        else logined = false
         end
 
-        # ログインしてJSON形式のbodyをPOSTします
-        # @param [String] rel_path cli.base_url からの相対パス
-        # @param [Hash] params POSTで渡されるパラメータ
-        # @return nil
-        def post_json(rel_path, params)
-          access_api do |api|
-            params = api.login_auth.update(params || {})
-            process_res(api, :post, rel_path, params.to_json, JSON_HEADER)
-          end
+        if logined
+          body = JSON.parse res2.body
+          write_login_info!(email, body["token"])
+        else
+          reset_login_info!
         end
+        logined
+      end
 
-        # ログインしてPUTします
-        # @param [String] rel_path cli.base_url からの相対パス
-        # @param [Hash] params PUTで渡されるパラメータ
-        # @return nil
-        def put(rel_path, params)
-          access_api do |api|
-            params = api.login_auth.update(params || {})
-            process_res(api, :put, rel_path, params)
+      def api_login_by_token!(email, token)
+        url = "#{base_url}/admin/magellan~auth~organization.json"
+        params = {"email" => email, "token" => token}
+        res = httpclient.get(url, params)
+
+        logined =
+          case res.status
+          when 200...400 then true
+          else false
           end
+
+        if logined
+          write_login_info!(email, token)
+        else
+          reset_login_info!
         end
+        logined
+      end
 
-        # ログインしてJSON形式のbodyをPUTします
-        # @param [String] rel_path cli.base_url からの相対パス
-        # @param [Hash] params PUTで渡されるパラメータ
-        # @return nil
-        def put_json(rel_path, params)
-          access_api do |api|
-            params = api.login_auth.update(params || {})
-            process_res(api, :put, rel_path, params.to_json, JSON_HEADER)
-          end
+
+      def write_login_info!(email, token)
+        update_selections("login" => {"email" => email, "token" => token })
+      end
+
+      def reset_login_info!
+        update_selections("login" => nil)
+      end
+
+      def get_auth_token
+        res = Ssl.retry_on_ssl_error("login_form"){ @httpclient.get(login_form_url) }
+        doc = Nokogiri::HTML.parse(res.body, login_form_url, res.body_encoding.to_s)
+        node = doc.xpath('//input[@name="authenticity_token"]').first
+        unless node
+          raise Cli::Error.new("fail to login Magellan")
         end
+        node.attribute('value').value
+      end
 
-        # ログインしてDELETEします
-        # @param [String] rel_path cli.base_url からの相対パス
-        # @return nil
-        def delete(rel_path)
-          access_api do |api|
-            params = api.login_auth
-            process_res(api, :delete, rel_path, params.to_json, JSON_HEADER)
+      # @httpclient.inspectの戻り値の文字列が巨大なので、inspectで出力しないようにします。
+      def inspect
+        r = "#<#{self.class.name}:#{self.object_id} "
+        fields = (instance_variables - [:@httpclient]).map{|f| "#{f}=#{instance_variable_get(f).inspect}"}
+        r << fields.join(", ") << ">"
+      end
+
+      def search_file(basename)
+        dirs = [".", "./config", ENV['HOME']].join(",")
+        Dir["{#{dirs}}/#{basename}"].select{|path| File.readable?(path)}.first
+      end
+      private :search_file
+
+
+      def check_response(res)
+        case res.status
+        when 200...400 then
+          begin
+            r = JSON.parse(res.body)
+          rescue
+            # DELETE で 302 Found を返す時に HTML がレンダリングされることがあるので
+            # status code 300 台では JSON パースエラーを無視する
+            if res.status >= 300
+              return nil
+            end
+            raise
+          end
+          r
+        else
+          obj = JSON.parse(res.body) rescue nil
+          if obj and obj.is_a?(Hash) and obj["message"]
+            fatal(obj["message"])
           end
         end
+      end
 
-        def process_res(api, http_method, rel_path, *args)
-          url = "#{api.base_url}#{rel_path}"
-          log_verbose("%s %s\n%s" % [http_method.to_s.upcase, url, args])
-          res = api.httpclient.send(http_method, url, *args)
-          check_response(res)
+      # ログインしてGETします
+      # @param [String] rel_path cli.base_url からの相対パス
+      # @param [Hash] params クエリ文字列
+      # @return [Object] レスポンスのBODYをJSONとしてパースした結果オブジェクト
+      def get_json(rel_path, params = {})
+        url = "#{base_url}#{rel_path}"
+        params.update(yield) if block_given?
+        params = 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
+        # "Unknown key: max-age = 0" というメッセージを表示させないために$stderrを一時的に上書き
+        $stderr, bak = StringIO.new, $stderr
+        res = nil
+        begin
+          res = httpclient.get(url)
+        ensure
+          $stderr = bak
         end
+        check_response(res)
+      end
+
+      # ログインしてPOSTします
+      # @param [String] rel_path cli.base_url からの相対パス
+      # @param [Hash] params POSTで渡されるパラメータ
+      # @return nil
+      def post(rel_path, params)
+        params = login_auth.update(params || {})
+        process_res(:post, rel_path, params)
+      end
+
+      # ログインしてJSON形式のbodyをPOSTします
+      # @param [String] rel_path cli.base_url からの相対パス
+      # @param [Hash] params POSTで渡されるパラメータ
+      # @return nil
+      def post_json(rel_path, params)
+        params = login_auth.update(params || {})
+        process_res(:post, rel_path, params.to_json, JSON_HEADER)
+      end
 
+      # ログインしてPUTします
+      # @param [String] rel_path cli.base_url からの相対パス
+      # @param [Hash] params PUTで渡されるパラメータ
+      # @return nil
+      def put(rel_path, params)
+        params = login_auth.update(params || {})
+        process_res(:put, rel_path, params)
       end
+
+      # ログインしてJSON形式のbodyをPUTします
+      # @param [String] rel_path cli.base_url からの相対パス
+      # @param [Hash] params PUTで渡されるパラメータ
+      # @return nil
+      def put_json(rel_path, params)
+        params = login_auth.update(params || {})
+        process_res(:put, rel_path, params.to_json, JSON_HEADER)
+      end
+
+      # ログインしてDELETEします
+      # @param [String] rel_path cli.base_url からの相対パス
+      # @return nil
+      def delete(rel_path)
+        params = login_auth
+        process_res(:delete, rel_path, params.to_json, JSON_HEADER)
+      end
+
+      def process_res(http_method, rel_path, *args)
+        url = "#{base_url}#{rel_path}"
+        res = httpclient.send(http_method, url, *args)
+        check_response(res)
+      end
+
     end
   end
 end
-

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

@@ -32,6 +32,7 @@ en:
     cmd_login:
       email: "email address for login"
       password: "password for login"
+      authentication_token: "authentication token for login"
     cmd_help:
       for_more_detail: "type `%{command} help RESOURCE` for more detail"
   file_access:
@@ -43,9 +44,13 @@ en:
       error: "Login failure"
     access_api:
       ok: "OK"
+    token:
+      success: "Authorized"
+      error: "Unauthorized"
   login:
     check_login_auth:
       not_logged_in: "Not logined yet. type `%{command} login`."
+    warning: "Please refer to the password empty if you want to login with authentication token."
   messaging:
     http:
       ping: "Send a HTTP request to check connection"

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

@@ -30,6 +30,7 @@ ja:
     cmd_login:
       email: "ログインするアカウントのメールアドレス"
       password: "ログインするアカウントのパスワード"
+      authentication_token: "ログインするアカウントの認証トークン"
     cmd_help:
       for_more_detail: "詳しくは `%{command} help RESOURCE` を実行してください"
   file_access:
@@ -41,9 +42,13 @@ ja:
       error: "ログインに失敗しました"
     access_api:
       ok: "OK"
+    token:
+      success: "認証しました"
+      error: "認証に失敗しました"
   login:
     check_login_auth:
       not_logged_in: "ログインしていません。`%{command} login` を実行してログインしてください"
+    warning: "認証トークンでログインする場合はパスワードを空にしてください"
   messaging:
     http:
       ping: "接続確認のリクエストを送信します"

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

@@ -7,7 +7,7 @@ require 'yaml'
 module Magellan
   module Cli
     module Messaging
-      class Base < Magellan::Cli::Http
+      class Base < Magellan::Cli::Base
         include Magellan::Cli::FileAccess
 
         no_commands do
@@ -18,7 +18,7 @@ module Magellan
           private
 
           def load_selection!(name, &block)
-            return access_api{ load_selection(name, &block) }
+            return http_access{ load_selection(name, &block) }
           end
 
           def find(klass, id = nil)
@@ -39,6 +39,7 @@ module Magellan
               client_version: client_version,
               mqtt_host: ENV["MAGELLAN_MQTT_SERVER_HOST"] || DEFAULT_MAGELLAN_MQTT_SERVER_HOST,
               mqtt_port: ENV["MAGELLAN_MQTT_SERVER_PORT"] || DEFAULT_MAGELLAN_MQTT_SERVER_PORT,
+              verbose: options[:verbose],
             }
             uri = ENV["MAGELLAN_HTTP_SERVER_URL"] || DEFAULT_MAGELLAN_HTTP_SERVER_URL
             log_verbose("HTTP URL    : #{uri.inspect}")

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

@@ -17,16 +17,16 @@ module Magellan
       class NotFound < Magellan::Cli::Error
       end
 
-      class Base < ::Magellan::Cli::Http
+      class Base < ::Magellan::Cli::Base
         include Magellan::Cli::FileAccess
 
         no_commands do
 
           def load_selection!(name, &block)
-            return access_api{ load_selection(name, &block) }
+            return http_access{ load_selection(name, &block) }
           end
           def update_selections!(hash = nil, &block)
-            return access_api{ update_selections(hash, &block) }
+            return http_access{ update_selections(hash, &block) }
           end
 
           def build_query(hash)
@@ -41,7 +41,7 @@ module Magellan
           end
 
           def default_query
-            access_api do |cli|
+            http_access do |cli|
               sel = load_selections
               q = {}
               (self.class.resource_dependency || {}).each do |f, res|
@@ -169,6 +169,9 @@ module Magellan
           def select(name)
             q = build_query(self.class.caption_attr => name).update(default_query)
             update_first_result(self.class.parameter_name, name, "/admin/#{self.class.resource_key}.json", q)
+            update_selections! do |s|
+              self.class.deselect_dependants(s)
+            end
           end
 
           def deselect

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

@@ -16,6 +16,7 @@ module Magellan
         self.caption_attr = "version"
 
         desc "create VERSION", I18n.t(:create, scope: [:resources, :client_version, :cmd], resource_name: resource_name)
+        method_option :domain, aliases: "-d", desc: I18n.t(:domain, scope: [:resources, :client_version, :cmd_create])
         def create(version)
           project = load_selection!(Project)
           stage = load_selection!(Stage)
@@ -24,12 +25,31 @@ module Magellan
             "stage_title_id" => stage["id"],
             "version" => version,
           }
+          if d = options[:domain]
+            attrs["domain"] = d
+          end
           params = { parameter_name => attrs }
           post_json("/admin/#{resource_key}/new.json", params)
           # TODO implement select method
           # select(version)
         end
 
+        desc "update ATTRIBUTES", I18n.t(:update, scope: [:resources, :client_version, :cmd], resource_name: resource_name)
+        def update(attrs)
+          if File.readable?(attrs)
+            attrs = YAML.load_file(attrs)
+          else
+            attrs = JSON.parse(attrs)
+          end
+          cv = load_selection!(self.class)
+          self.class.hidden_fields.each do |f| attrs.delete(f) end
+          self.class.field_associations.keys.each do |f| attrs.delete(f) end
+          params = {
+            parameter_name => attrs
+          }
+          put_json("/admin/#{resource_key}/#{cv["id"]}/edit.json", params)
+        end
+
         desc "delete VERSION", I18n.t(:delete, scope: [:resources, :client_version, :cmd], resource_name: resource_name)
         def delete(version)
           q = build_query("version" => version).update(default_query)

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.5.9"
+    VERSION = "0.6.0"
   end
 end

data/magellan-cli.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "text-table", "~> 1.2.3"
   spec.add_runtime_dependency "i18n"
   spec.add_runtime_dependency "psych", ">= 2.0.0", "<= 2.0.8"
-  spec.add_runtime_dependency "libmagellan", "~> 0.2.2"
+  spec.add_runtime_dependency "libmagellan", "~> 0.2.4"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/magellan/cli/command_spec.rb

@@ -10,7 +10,8 @@ describe Magellan::Cli::Command do
       before do
         $stdout = StringIO.new
         allow(command).to receive(:select_single_resources)
-        allow(Magellan::Cli::Http).to receive_message_chain(:new, :login!).and_return("OK")
+        allow(command).to receive(:login!).and_return("OK")
+        allow(command).to receive(:login_by_token!).and_return("OK")
       end
       it "nothing options" do
         allow($stdin).to receive(:gets).and_return(string).once
@@ -19,6 +20,13 @@ describe Magellan::Cli::Command do
         expect($stdout.string).to eq "email: password: \n"
       end
 
+      it "nothing options" do
+        allow($stdin).to receive(:gets  ).and_return(string).once # email
+        allow($stdin).to receive(:noecho).and_return("\n").twice  # password
+        expect(command.login).to eq "OK" 
+        expect($stdout.string).to eq "email: password: \nauthentication_token: \n"
+      end
+
       it "only email" do
         allow($stdin).to receive(:noecho).and_return(string).twice
         command.options = Thor::CoreExt::HashWithIndifferentAccess.new email: string
@@ -32,6 +40,13 @@ describe Magellan::Cli::Command do
         expect(command.login).to eq "OK"
         expect($stdout.string).to eq "email: "
       end
+
+      it "only authentication_token" do
+        allow($stdin).to receive(:gets).and_return(string).once
+        command.options = Thor::CoreExt::HashWithIndifferentAccess.new authentication_token: string
+        expect(command.login).to eq "OK"
+        expect($stdout.string).to eq "email: "
+      end
     end
   end
 end

data/spec/magellan/cli/http_spec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Magellan::Cli::Messaging::Http do
+
+  let(:cmd){ Magellan::Cli::Messaging::Http.new }
+
+  describe :login_by_token do
+    let(:email)    { "user1@example.com" }
+    let(:password) { "password" }
+    let(:success_res) { double(:success_res, status: 200) }
+    let(:error_res)   { double(:error_res, status: 401) }
+
+    it "success" do
+      allow(cmd.http_conn.httpclient).to receive(:get).and_return(success_res)
+      cmd.login_by_token!(email, password)
+    end
+
+    it "error" do
+      allow(cmd.http_conn.httpclient).to receive(:get).and_return(error_res)
+      expect{cmd.login_by_token!(email, password)}.to raise_error(SystemExit)
+    end
+  end
+end

data/spec/magellan/cli/login_spec.rb

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe Magellan::Cli::Login do
+describe Magellan::Cli::Http do
 
   describe :login! do
     let(:email){ "magellan@groovenauts.jp" }
     let(:password){ "password" }
     let(:auth_token){ "047bcCC1dnyVE+7DWE6YKIJF97L/qHk1mPrf2oaqWtE=" }
+    let(:cmd) do
+      cmd = double(:cmd)
+      allow(cmd).to receive(:verbose?).and_return(false)
+      cmd
+    end
 
     before do
       allow(File).to receive(:readable?).and_return(true)
@@ -14,7 +19,8 @@ describe Magellan::Cli::Login do
     end
 
     context :production do
-      let(:cli){ Magellan::Cli::Login.new("https://example.com") }
+      before{ allow(Magellan::Cli::Http).to receive(:base_url).and_return("https://example.com") }
+      let(:cli){ Magellan::Cli::Http.new(cmd) }
       before do
         res = double(:res)
         allow(cli.httpclient).to receive(:get).with("https://example.com/users/sign_in.html").and_return(res)
@@ -50,7 +56,8 @@ describe Magellan::Cli::Login do
     end
 
     context :development do
-      let(:cli){ Magellan::Cli::Login.new("http://localhost:3001") }
+      before{ allow(Magellan::Cli::Http).to receive(:base_url).and_return("http://localhost:3001") }
+      let(:cli){ Magellan::Cli::Http.new(cmd) }
       before do
         res = double(:res)
         allow(cli.httpclient).to receive(:get).with("http://localhost:3001/users/sign_in.html").and_return(res)

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

@@ -5,8 +5,8 @@ describe Magellan::Cli::Resources::ClientVersion do
 
   let(:cmd){ Magellan::Cli::Resources::ClientVersion.new }
 
-  let(:cli){ double(:cli, :check_login_auth! => nil) }
-  before{ allow(cmd).to receive(:cli).and_return(cli) }
+  let(:http_conn){ double(:http_conn, :check_login_auth! => nil) }
+  before{ allow(cmd).to receive(:http_conn).and_return(http_conn) }
 
   describe :list do
     before do
@@ -33,6 +33,17 @@ describe Magellan::Cli::Resources::ClientVersion do
       end
     end
 
+    describe :success_with_domain do
+      before do
+        allow(cmd).to receive(:load_selections).and_return({Magellan::Cli::Resources::Project.parameter_name => {"id" => 1, "name" => "ProjectA"}, Magellan::Cli::Resources::Stage.parameter_name => {"id" => 1, "name" => "StageA"} })
+        expect(cmd).to receive(:post_json).with("/admin/client_version/new.json", { "client_version" => { "project_id" => 1, "stage_title_id" => 1, "version" => "1.1.0", "domain" => "foo.example.com" } })
+      end
+      it do
+        cmd.options = {domain: "foo.example.com"}
+        cmd.create("1.1.0")
+      end
+    end
+
     describe :error do
       context "stage not selected" do
         before do
@@ -47,4 +58,22 @@ describe Magellan::Cli::Resources::ClientVersion do
     end
   end
 
+  describe :update do
+    let(:selections) do
+      {
+        Magellan::Cli::Resources::Project.parameter_name => {"id" => 1, "name" => "ProjectA"},
+        Magellan::Cli::Resources::ClientVersion.parameter_name => {"id" => 1, "version" => "Sandbox1"}
+      }
+    end
+    describe :success_to_update_domain do
+      before do
+        allow(cmd).to receive(:load_selections).and_return(selections)
+        expect(cmd).to receive(:put_json).with("/admin/client_version/1/edit.json", { "client_version" => { "domain" => "bar.example.com" } })
+      end
+      it do
+        cmd.update('{"domain": "bar.example.com"}')
+      end
+    end
+  end
+
 end

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

@@ -65,4 +65,17 @@ describe "deselect" do
     end
   end
 
+  describe Magellan::Cli::Resources::Organization do
+    context "select another one" do
+      it do
+        allow(subject).to receive(:get_json).
+          with("/admin/magellan~auth~organization.json", an_instance_of(Hash)).
+          and_return([{"id" => 5, "name" => "test3"}])
+        expect(YAML.load_file(work_yaml)).to include(Magellan::Cli::Resources::Project.parameter_name)
+        subject.select "test3"
+        expect(YAML.load_file(work_yaml)).to_not include(Magellan::Cli::Resources::Project.parameter_name)
+      end
+    end
+  end
+
 end

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

@@ -5,8 +5,8 @@ describe Magellan::Cli::Resources::Organization do
 
   let(:cmd){ Magellan::Cli::Resources::Organization.new }
 
-  let(:cli){ double(:cli, :check_login_auth! => nil) }
-  before{ allow(cmd).to receive(:cli).and_return(cli) }
+  let(:http_conn){ double(:http_conn, :check_login_auth! => nil) }
+  before{ allow(cmd).to receive(:http_conn).and_return(http_conn) }
 
   describe :list do
     before do

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

@@ -4,23 +4,21 @@ require 'spec_helper'
 describe Magellan::Cli::Resources::Project do
 
   let(:base_url){ "https://localhost:3000" }
+  before{ allow(Magellan::Cli::Http).to receive(:base_url).and_return(base_url) }
   let(:httpclient){ double(:httpclient) }
-  let(:cli) do
-    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, status: 200, body: {}.to_json) }
 
   let(:cmd){ Magellan::Cli::Resources::Project.new }
 
   before do
-    allow(cmd).to receive(:access_api).and_yield(cli)
+    allow(cmd.http_conn).to receive(:httpclient).and_return(httpclient)
+    allow(cmd.http_conn).to receive(:check_login_auth!)
+    allow(cmd.http_conn).to receive(:login_auth).and_return({})
   end
 
   describe :list do
     it do
-      expect(httpclient).to receive(:get).with(%r{\A#{base_url}/admin/project.json}).and_return(res)
+      expect(httpclient).to receive(:get).with(%{#{base_url}/admin/project.json}).and_return(res)
       expect($stdout).to receive(:puts)
       cmd.list
     end

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

@@ -5,8 +5,8 @@ describe Magellan::Cli::Resources::Team do
 
   let(:cmd){ Magellan::Cli::Resources::Team.new }
 
-  let(:cli){ double(:cli, :check_login_auth! => nil) }
-  before{ allow(cmd).to receive(:cli).and_return(cli) }
+  let(:http_conn){ double(:http_conn, :check_login_auth! => nil) }
+  before{ allow(cmd).to receive(:http_conn).and_return(http_conn) }
 
   describe :list do
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,6 @@ files:
 - lib/magellan/cli/i18n.rb
 - lib/magellan/cli/locales/en.yml
 - lib/magellan/cli/locales/ja.yml
-- lib/magellan/cli/login.rb
 - lib/magellan/cli/messaging.rb
 - lib/magellan/cli/messaging/base.rb
 - lib/magellan/cli/messaging/http.rb
@@ -246,6 +245,7 @@ files:
 - spec/magellan/cli/Magellan.yml
 - spec/magellan/cli/command_spec.rb
 - spec/magellan/cli/file_access_spec.rb
+- spec/magellan/cli/http_spec.rb
 - spec/magellan/cli/login_page.html
 - spec/magellan/cli/login_spec.rb
 - spec/magellan/cli/messaging/http_body.json
@@ -292,6 +292,7 @@ test_files:
 - spec/magellan/cli/Magellan.yml
 - spec/magellan/cli/command_spec.rb
 - spec/magellan/cli/file_access_spec.rb
+- spec/magellan/cli/http_spec.rb
 - spec/magellan/cli/login_page.html
 - spec/magellan/cli/login_spec.rb
 - spec/magellan/cli/messaging/http_body.json

data/lib/magellan/cli/login.rb

@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-require "magellan/cli"
-
-require 'httpclient'
-require 'json'
-require 'uri'
-require 'nokogiri'
-
-require 'active_support/core_ext/hash/keys'
-
-module Magellan
-  module Cli
-    class Login
-      include Magellan::Cli::FileAccess
-
-      PRODUCTION_HTTP_PORT  =  80
-      PRODUCTION_HTTPS_PORT = 443
-
-      DEFAULT_HTTP_PORT  = (ENV['DEFAULT_HTTP_PORT' ] ||  80).to_i
-      DEFAULT_HTTPS_PORT = (ENV['DEFAULT_HTTPS_PORT'] || 443).to_i
-
-      attr_reader :httpclient
-      attr_reader :base_url
-
-      attr_reader :auth_token
-      attr_reader :login_auth
-
-      # Magellan::Cli::Loginのコンストラクタです。
-      #
-      # @param [String] base_url_or_host 接続先の基準となるURLあるいはホスト名
-      # @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"] || "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)
-        else
-          if config_path = search_file(".magellan-cli.yml")
-            config = YAML.load_file_with_erb(config_path)
-            options = config[base_url_or_host.to_s].deep_symbolize_keys.update(options)
-          end
-          uri = URI::Generic.build({scheme: "http", host: base_url_or_host, port: DEFAULT_HTTP_PORT}.update(options))
-          @base_url = uri.to_s
-        end
-
-        @httpclient = HTTPClient.new
-        @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
-        @login_auth = load_selections["login"]
-      end
-
-      def login_form_url
-        @login_form_url ||= base_url + "/users/sign_in.html"
-      end
-      def login_url
-        @login_url ||= base_url + "/api/sign_in.json"
-      end
-
-      def check_login_auth!
-        auth = login_auth
-        if auth.nil? || auth.empty?
-          raise Magellan::Cli::Error, I18n.t(:not_logged_in, scope: [:login, :check_login_auth], command: File.basename($0))
-        end
-      end
-
-      # magellan-apiサーバに接続してログインの検証とアクセストークンの保存を行います。
-      #
-      # @return [boolean] login成功/失敗
-      def api_login!(email, password)
-        @auth_token ||= get_auth_token
-        params = {
-          "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) }
-
-        case res2.status
-        when 200...300 then logined = true
-        else logined = false
-        end
-
-        if logined
-          body = JSON.parse res2.body
-          update_selections("login" => {"email" => email, "token" => body["token"] })
-        else
-          update_selections("login" => nil)
-        end
-        logined
-      end
-
-      def get_auth_token
-        res = Ssl.retry_on_ssl_error("login_form"){ @httpclient.get(login_form_url) }
-        doc = Nokogiri::HTML.parse(res.body, login_form_url, res.body_encoding.to_s)
-        node = doc.xpath('//input[@name="authenticity_token"]').first
-        unless node
-          raise Cli::Error.new("fail to login Magellan")
-        end
-        node.attribute('value').value
-      end
-
-      # @httpclient.inspectの戻り値の文字列が巨大なので、inspectで出力しないようにします。
-      def inspect
-        r = "#<#{self.class.name}:#{self.object_id} "
-        fields = (instance_variables - [:@httpclient]).map{|f| "#{f}=#{instance_variable_get(f).inspect}"}
-        r << fields.join(", ") << ">"
-      end
-
-      def search_file(basename)
-        dirs = [".", "./config", ENV['HOME']].join(",")
-        Dir["{#{dirs}}/#{basename}"].select{|path| File.readable?(path)}.first
-      end
-      private :search_file
-
-    end
-  end
-end