magellan-cli 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ffea5bcd7bf13121cbf9e58662b75de1ace8694
-  data.tar.gz: 22b93face9e89b75cbe2ebfd5ea7a9f92a5f8c24
+  metadata.gz: 7cd91c5264b5b8b3aa6e0a7172e7b68fef0bfd82
+  data.tar.gz: 419ff7705b031d3ff303fa133656db92d6c6ff08
 SHA512:
-  metadata.gz: 4d7ac5841f949b8728266a25bf6b8fb3767dd74fb5f0dae2d51c1ab58d3e7b86675dd9f5ecf434ab2d06ab60097d32a62d42d73206afcf70b248a3377ad8b438
-  data.tar.gz: 0ad0a1baab410fde48a00034c8515248e0cf13f65573a408c207068539a839f6e6796685b2b48a1663ed034d9d7cc7e1866777e6e64de96e027ad5db5fcba1e5
+  metadata.gz: 28d06fad824df305db85e0d3e8d2ebe0bc0deba5931f4389a8a8f237ac5f3a00c0f14d4f70eff6d942f111568043cc72fc6d812c92ad2c3e8a3ed21d0f2ae2c0
+  data.tar.gz: 42b3ec7c4912d5528da0b0fc6c91572528b308043bd553380af37fa6fe370a684b2f7376fdf95b6873d1bd3ad299c07436150cfde3f211b5bbd891fee4594607

data/Gemfile.lock

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

data/lib/magellan/cli/http.rb

@@ -143,12 +143,29 @@ module Magellan
 
       def get_auth_token
         res = Ssl.retry_on_ssl_error("login_form"){ debug_lf{ @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
+        case res.status
+        when 200
+          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
+        when 503
+          begin
+            obj = JSON.parse(res.body)
+            if obj and obj["message"]
+              err_message = obj["message"]
+            else
+              err_message = "Under Maintenance"
+            end
+          rescue
+            err_message = "Under Maintenance"
+          end
+          raise Cli::Error.new("Under Maintenance")
+        else
           raise Cli::Error.new("fail to login Magellan")
         end
-        node.attribute('value').value
       end
 
       # @httpclient.inspectの戻り値の文字列が巨大なので、inspectで出力しないようにします。

data/lib/magellan/cli/script.rb

@@ -2,16 +2,36 @@ require 'magellan/cli'
 
 require 'shellwords'
 
-def cli(args, options = {})
-  args = Shellwords.split(args) if args.is_a?(String)
-  args << "-V" if ARGV.include?("-V")
-  $PROGRAM_NAME, backup = "magellan-cli", $PROGRAM_NAME
-  puts "[CLI] `#{$PROGRAM_NAME} #{args.join(' ')}`"
-  begin
-    Magellan::Cli::Command.start(args) do |e|
-      exit(1) unless e.message =~ options[:allow]
+module Magellan::Cli
+  module Script
+    SETTINGS = [:io, :prompt, :program_name]
+    class << self
+      attr_accessor *SETTINGS
     end
-  ensure
-    $PROGRAM_NAME = backup
+    self.io = $stdout
+    self.prompt = "[CLI] "
+    self.program_name = "magellan-cli"
+
+    SETTINGS.each do |name|
+      module_eval("def #{name}; Magellan::Cli::Script.#{name}; end")
+    end
+
+    def cli(args, options = {})
+      args = Shellwords.split(args) if args.is_a?(String)
+      args << "-V" if ARGV.include?("-V")
+      $PROGRAM_NAME, backup = program_name, $PROGRAM_NAME
+      self.io.puts "#{prompt}#{$PROGRAM_NAME} #{args.join(' ')}"
+      begin
+        Magellan::Cli::Command.start(args) do |e|
+          exit(1) unless e.message =~ options[:allow]
+        end
+      ensure
+        $PROGRAM_NAME = backup
+      end
+    end
+    module_function :cli
+
   end
 end
+
+include Magellan::Cli::Script

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.7.10"
+    VERSION = "0.7.11"
   end
 end

data/spec/magellan/cli/login_spec.rb

@@ -53,6 +53,15 @@ describe Magellan::Cli::Http do
         allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
         expect(cli.api_login!(email, password)).to eq false
       end
+
+      it :login_under_maintenance do
+        res = double(:res)
+        allow(cli.httpclient).to receive(:get).with("https://example.com/users/sign_in.html").and_return(res)
+        allow(res).to receive(:status).and_return(503)
+        allow(res).to receive(:body).and_return({"success" => false, "message" => "Under Maintenance"}.to_json)
+        allow(res).to receive(:body_encoding).and_return(Encoding.find("UTF-8"))
+        expect{cli.api_login!(email, password)}.to raise_error(Magellan::Cli::Error, "Under Maintenance")
+      end
     end
 
     context :development do

data/spec/magellan/cli/script_spec.rb

@@ -4,6 +4,10 @@ require 'magellan/cli/script'
 
 describe Magellan::Cli do
   describe "cli" do
+    before do
+      Magellan::Cli::Script.io = StringIO.new
+    end
+
     it "pass args to Magellan::Cli::Command.start" do
       expect(Magellan::Cli::Command).to receive(:start).with(%w[foo bar])
       cli %w[foo bar]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient