everbox_client 0.0.10 → 0.0.11

data/README.rdoc

@@ -33,3 +33,7 @@
 
       everbox login
       登录 everbox, 登录完成后的 token 保存在 $HOME/.everbox_client/config
+
+=== 环境变量
+
+    http_proxy: 用于设置代理，比如 export http_proxy="http://192.168.2.1:3128"

data/lib/everbox_client/runner.rb

@@ -45,14 +45,14 @@ module EverboxClient
       :consumer_secret => '9tego848novn68kboENkhW3gTy9rE2woHWpRwAwQ',
       :oauth_site => 'http://account.everbox.com',
       :fs_site => 'http://fs.everbox.com',
-      :chunk_size => 1024*1024*4
-
+      :chunk_size => 1024*1024*4,
+      :proxy => nil
     }
 
     def initialize(opts={})
       opts ||= {}
       config_file = opts[:config_file] || DEFAULT_OPTIONS[:config_file]
-      @options = DEFAULT_OPTIONS.merge(load_config(config_file)).merge(opts)
+      @options = DEFAULT_OPTIONS.merge(options_from_env).merge(load_config(config_file)).merge(opts)
     end
 
     def help(arg = nil)
@@ -516,6 +516,12 @@ DOC
     end
   protected
 
+    def options_from_env
+      res = {}
+      res[:proxy] ||= ENV['http_proxy']
+      res
+    end
+
     def fs(path)
       path = path.to_s
       path = '/' + path unless path.start_with? '/'
@@ -544,7 +550,8 @@ DOC
 
     def consumer
       OAuth::Consumer.new @options[:consumer_key], @options[:consumer_secret], {
-        :site => @options[:oauth_site]
+        :site => @options[:oauth_site],
+        :proxy => @options[:proxy]
       }
     end
 

data/lib/everbox_client/version.rb

@@ -1,3 +1,3 @@
 module EverboxClient
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/everbox_client/runner_spec.rb

@@ -7,5 +7,21 @@ module EverboxClient
     it "should works" do
       Runner.new.ls
     end
+
+    describe :initialize do
+      it "should honor :proxy" do
+        OAuth::Consumer.should_receive(:new).with(anything(), anything(), {:site=>"http://account.everbox.com", :proxy=>"http://127.0.0.1:80"})
+        runner = Runner.new :proxy => 'http://127.0.0.1:80'
+        runner.send :consumer
+      end
+
+      it "should honor :proxy from ENV" do
+        OAuth::Consumer.should_receive(:new).with(anything(), anything(), {:site=>"http://account.everbox.com", :proxy=>"http://127.0.0.1:81"})
+        @old_env = ENV['http_proxy']
+        ENV['http_proxy'] = 'http://127.0.0.1:81'
+        Runner.new.send :consumer
+        ENV['http_proxy'] = @old_env
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everbox_client
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &19275280 !ruby/object:Gem::Requirement
+  requirement: &7721640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19275280
+  version_requirements: *7721640
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &19274860 !ruby/object:Gem::Requirement
+  requirement: &7720400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19274860
+  version_requirements: *7720400
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &19274420 !ruby/object:Gem::Requirement
+  requirement: &7719960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19274420
+  version_requirements: *7719960
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19274000 !ruby/object:Gem::Requirement
+  requirement: &7719540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19274000
+  version_requirements: *7719540
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &19273540 !ruby/object:Gem::Requirement
+  requirement: &7719120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19273540
+  version_requirements: *7719120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19273020 !ruby/object:Gem::Requirement
+  requirement: &7718620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *19273020
+  version_requirements: *7718620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19272600 !ruby/object:Gem::Requirement
+  requirement: &7718200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19272600
+  version_requirements: *7718200
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19272060 !ruby/object:Gem::Requirement
+  requirement: &7717680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19272060
+  version_requirements: *7717680
 description: EverBox Command Tool
 email:
 - lidaobing@gmail.com