aoj 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4adde6041ce0861a081f0910853c28aec90c4f
-  data.tar.gz: c5b0ce8c52d08de49405420b78f9df09181d04d4
+  metadata.gz: 449266fb56333786a7e8ee152e4dfab57b245027
+  data.tar.gz: 3c74831e04c44d5d4af266bbb353cd45adf7a314
 SHA512:
-  metadata.gz: e75454d297acd4c916e22c8a9080bb21d5f523a61e91d1fe3c2d816d95f55619ab8cefc64987ff61ae3704c547d67d618a22e42e449e79fca5a895eb1ec1dcf5
-  data.tar.gz: 5aa5d533558a9d548602198205754358753a00aec72c29a296caf07ba7fe08830cb4fcdfc751e92ffcbd725491d0ae113df1bb26ea40e0ee158911c19f09fbb3
+  metadata.gz: 3308c88f00e9a2a672836311754469a75be365719110e3f31aad85f5c4b73986dbf4637a8a0062aab9e24de3cd7d8b14cdf805c5ed10f13fae19ff813f29395d
+  data.tar.gz: ebe6e094de834312214e66b7f008e9df335552698669a3a9b22c8799377df7e39683d0a31662952fc2a742eca38440ab46cdb63c593aefb27e02043fb2eeda38

data/aoj.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = AOJ::VERSION
   spec.authors       = ["na-o-ys"]
   spec.email         = ["naoyoshi0511@gmail.com"]
-  spec.summary       = %q{aoj submitter}
-  spec.description   = %q{This is a submitter program which submits your source to AOJ(Aizu Online Judge) and retrieves result of judgement.}
+  spec.summary       = %q{aoj command-line tool}
+  spec.description   = %q{AOJ is a command-line tool for AOJ(Aizu Online Judge). You can submit your source to AOJ and check the result of judgement without opening browser or copy & paste..}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/aoj/cli.rb

@@ -48,6 +48,11 @@ module AOJ
 
     desc "omikuji", "今日の 1 問"
     def omikuji
+      unless conf.has_credential?
+        input_credentials
+        puts
+      end
+
       problem = AOJ::Problem.random_icpc(conf['username'])
       title = "ID #{problem.id}"
       width = title.size

data/lib/aoj/env.rb

@@ -0,0 +1,34 @@
+module AOJ
+  class Env
+
+    def initialize(env = ENV)
+      @env = env
+    end
+
+    # parse proxy from String
+    # param str : [http://][user:pass@]host[:port]
+    def parse_proxy_info
+      raw = @env["HTTP_PROXY"] || @env["http_proxy"]
+      return {} unless raw
+
+      main_str = raw
+        .strip
+        .sub(/^http:\/\//, "")
+        .sub(/\/+$/, "")
+
+      auth_str = main_str.match(/(.*)@/).to_a[1].to_s
+      host_str = main_str.sub(/^.*@/, "")
+      {
+        host: host_str.sub(/:.*$/, ""),
+        port: host_str.match(/:(.*)/).to_a[1].try(:to_i), # int or nil
+        user: auth_str.sub(/:.*$/, ""),
+        pass: auth_str.sub(/^.*:/, "")
+      }.select { |_, value| value.present? }
+    end
+
+    def proxy_specified?
+      parse_proxy_info != {}
+    end
+
+  end
+end

data/lib/aoj/http.rb

@@ -3,33 +3,12 @@ require 'net/http'
 module AOJ
 
   HTTP = -> do
-    # set proxy if specified
-    # [http://][user:pass@]host:port
-    env = ENV["HTTP_PROXY"] || ENV["http_proxy"]
-    break ::Net::HTTP unless env
-
-    info = parse_proxy_info(env)
+    proxy_info = Env.new.parse_proxy_info
     ::Net::HTTP::Proxy(
-      info[:host],
-      info[:port],
-      info[:user],
-      info[:pass]
+      proxy_info[:host],
+      proxy_info[:port],
+      proxy_info[:user],
+      proxy_info[:pass]
     )
   end.call
-
-  private
-  # TODO: test
-  def self.parse_proxy_info(str)
-    {}.tap do |i|
-      str.sub!(/http:\/\//, "")
-      str.sub!(/\/+$/, "")
-      if str.include?("@")
-        auth, str = str.split("@")
-        i[:user], i[:pass] = auth.split(":")
-      end
-      i[:host], port_str = str.split(":")
-      i[:port] = port_str.sub(/\//, "").to_i
-      i[:uri] = "http://" + str
-    end
-  end
 end

data/lib/aoj/version.rb

@@ -1,3 +1,3 @@
 module AOJ 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/aoj/env_spec.rb

@@ -0,0 +1,72 @@
+require "spec_helper"
+
+describe AOJ::Env do
+  describe 'parse_proxy_info' do
+    context 'when only host given' do
+      let(:env) { create_env("HTTP_PROXY" => "http://hoge.co.jp/") }
+
+      it { expect(env.parse_proxy_info).to eq(host: "hoge.co.jp") }
+    end
+
+    context 'when host and port given' do
+      let(:env) { create_env("HTTP_PROXY" => "http://hoge.co.jp:8080/") }
+
+      it {
+        expect(env.parse_proxy_info).to eq(
+          host: "hoge.co.jp",
+          port: 8080
+        )
+      }
+    end
+
+    context 'when user, pass, host given' do
+      let(:env) { create_env("HTTP_PROXY" => "http://nao:secret@hoge.co.jp/") }
+
+      it {
+        expect(env.parse_proxy_info).to eq(
+          host: "hoge.co.jp",
+          user: "nao",
+          pass: "secret"
+        )
+      }
+    end
+
+    context 'when user, pass, host and port given' do
+      let(:env) { create_env("HTTP_PROXY" => "http://nao:secret@hoge.co.jp:8080/") }
+
+      it {
+        expect(env.parse_proxy_info).to eq(
+          host: "hoge.co.jp",
+          port: 8080,
+          user: "nao",
+          pass: "secret"
+        )
+      }
+    end
+
+    context 'when no proxy info given' do
+      let(:env) { AOJ::Env.new({}) }
+
+      it { expect(env.parse_proxy_info).to eq({}) }
+    end
+  end
+
+  describe 'proxy_specified?' do
+    context 'when proxy info given' do
+      let(:env) { create_env("HTTP_PROXY" => "http://hoge.co.jp") }
+
+      it { expect(env.proxy_specified?).to be_truthy }
+    end
+
+    context 'when no proxy info given' do
+      let(:env) { AOJ::Env.new({}) }
+
+      it { expect(env.proxy_specified?).to be_falsy }
+    end
+  end
+
+  def create_env(hash)
+    hash.each { |key, value| value.freeze }
+    AOJ::Env.new(hash)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aoj
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - na-o-ys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.14'
-description: This is a submitter program which submits your source to AOJ(Aizu Online
-  Judge) and retrieves result of judgement.
+description: AOJ is a command-line tool for AOJ(Aizu Online Judge). You can submit
+  your source to AOJ and check the result of judgement without opening browser or
+  copy & paste..
 email:
 - naoyoshi0511@gmail.com
 executables:
@@ -130,6 +131,7 @@ files:
 - lib/aoj/cli/helper.rb
 - lib/aoj/conf.rb
 - lib/aoj/credential.rb
+- lib/aoj/env.rb
 - lib/aoj/error/api_error.rb
 - lib/aoj/error/fetch_result_error.rb
 - lib/aoj/error/file_open_error.rb
@@ -145,6 +147,7 @@ files:
 - lib/aoj/version.rb
 - spec/lib/aoj/api_spec.rb
 - spec/lib/aoj/conf_spec.rb
+- spec/lib/aoj/env_spec.rb
 - spec/lib/aoj/language_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -170,9 +173,10 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: aoj submitter
+summary: aoj command-line tool
 test_files:
 - spec/lib/aoj/api_spec.rb
 - spec/lib/aoj/conf_spec.rb
+- spec/lib/aoj/env_spec.rb
 - spec/lib/aoj/language_spec.rb
 - spec/spec_helper.rb