everbox_client 0.0.11 → 0.0.12

data/{CHANGELOG.rdoc → NEWS.md}

@@ -1,23 +1,36 @@
-== 0.0.9 (2011-04-22)
+## 0.0.12 (2012-03-29)
+
+* BUG: not honor http_proxy env when put file. https://github.com/everbox/everbox-client-ruby/issues/3
+
+## 0.0.11 (2012-02-16)
+
+* honor http_proxy env.
+
+## 0.0.10 (2012-02-13)
+
+* use oauth login by default.
+
+## 0.0.9 (2011-04-22)
+
 * now works under ruby 1.9.
 * now works under Windows.
 * everbox cat use stream download (0.0.8 will print it to stdout after all data
   downloaded).
 
-== 0.0.8 (2011-04-22)
+## 0.0.8 (2011-04-22)
 
 * everbox help and everbox cat works.
 
-== 0.0.7 (2011-01-21)
+## 0.0.7 (2011-01-21)
 
 * everbox prepare_put works
 
-== 0.0.6 (2011-01-06)
+## 0.0.6 (2011-01-06)
 
 * everbox ls support argument as path
 * everbox config (print config or set config)
 
-== 0.0.5 (2010-12-02)
+## 0.0.5 (2010-12-02)
 
 * OAuth login: "everbox login --oauth"
 * show user info and space info: "everbox info"

data/{README.rdoc → README.md}

@@ -1,12 +1,13 @@
-= everbox_client - EverBox 命令行及调试工具
+# everbox_client - EverBox 命令行及调试工具
 
-== 安装
+## 安装
 
     $ gem install everbox_client
 
-== 使用方法
+## 使用方法
+
+### 列出全部可用命令
 
-=== 列出全部可用命令
     $ everbox
     Usage: everbox [options] <command>
 
@@ -27,13 +28,14 @@
        pwd            print working dir
        rm             delete file or directory
 
-=== 显示单个命令的帮助
+### 显示单个命令的帮助
+
     $ everbox help login
     Usage:
 
       everbox login
       登录 everbox, 登录完成后的 token 保存在 $HOME/.everbox_client/config
 
-=== 环境变量
+### 环境变量
 
     http_proxy: 用于设置代理，比如 export http_proxy="http://192.168.2.1:3128"

data/lib/everbox_client/cli.rb

@@ -1,5 +1,7 @@
 require 'pp'
 
+require 'restclient'
+
 require 'everbox_client/runner'
 
 module EverboxClient
@@ -45,6 +47,7 @@ module EverboxClient
       @stdin  = stdin
       @stderr = stderr
       extract_command_and_parse_options(arguments)
+      parse_env
 
       if valid_command?
         begin
@@ -60,23 +63,20 @@ module EverboxClient
         usage
       end
     end
-  protected
 
+    protected
+    def parse_env
+      RestClient.proxy = ENV['http_proxy'] if ENV['http_proxy']
+    end
 
     def extract_command_and_parse_options(arguments)
       parse_options(arguments)
       @command, *@args = ARGV
     end
+
     def option_parser(arguments = "")
       option_parser = OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename($0)} [options] <command>"
-
-        ## Common Options
-
-
-        #opts.on("--scope SCOPE", "Specifies the scope (Google-specific).") do |v|
-        #  options[:scope] = v
-        #end
       end
     end
 
@@ -88,7 +88,7 @@ module EverboxClient
       escaped_pairs = options[:params].collect do |pair|
         if pair =~ /:/
           Hash[*pair.split(":", 2)].collect do |k,v|
-            [CGI.escape(k.strip), CGI.escape(v.strip)] * "="
+          [CGI.escape(k.strip), CGI.escape(v.strip)] * "="
           end
         else
           pair

data/lib/everbox_client/version.rb

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

data/spec/everbox_client/cli_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+require 'everbox_client/cli'
+
+module EverboxClient
+  describe CLI do
+    context "#parse_env" do
+      before do
+        @cli = CLI.new
+      end
+
+      it "when ENV['http_proxy'] set" do
+        ENV['http_proxy'] = 'http://1.2.3.4:3128'
+        @cli.send :parse_env
+        RestClient.proxy.should == ENV['http_proxy']
+        RestClient.proxy = nil
+        ENV['http_proxy'] = nil
+      end
+
+
+      it "when ENV['http_proxy'] not set" do
+        ENV['http_proxy'] = nil
+        @cli.send :parse_env
+        RestClient.proxy.should be_nil
+      end
+    end
+  end
+end

data/spec/everbox_client/models/path_entry_spec.rb

@@ -16,14 +16,8 @@ module EverboxClient
       it { should_not be_file }
       it { should be_dir }
       it { should_not be_deleted }
-      describe :basename do
-        subject { @path_entry.basename }
-        it { should == "foo" }
-      end
-      describe :to_line do
-        subject { @path_entry.to_line }
-        it { should == "   1932891\tfoo/\n" }
-      end
+      its(:basename) { should == "foo" }
+      its(:to_line) { should == "   1932891\tfoo/\n" }
     end
 
     context "file" do
@@ -35,14 +29,8 @@ module EverboxClient
       it { should be_file }
       it { should_not be_dir }
       it { should_not be_deleted }
-      describe :basename do
-        subject { @path_entry.basename }
-        it { should == "foo" }
-      end
-      describe :to_line do
-        subject { @path_entry.to_line }
-        it { should == "   1932891\tfoo\n" }
-      end
+      its(:basename) { should == "foo" }
+      its(:to_line) { should == "   1932891\tfoo\n" }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everbox_client
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &7721640 !ruby/object:Gem::Requirement
+  requirement: &9762900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7721640
+  version_requirements: *9762900
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &7720400 !ruby/object:Gem::Requirement
+  requirement: &9762480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7720400
+  version_requirements: *9762480
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &7719960 !ruby/object:Gem::Requirement
+  requirement: &9762060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7719960
+  version_requirements: *9762060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &7719540 !ruby/object:Gem::Requirement
+  requirement: &9761640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7719540
+  version_requirements: *9761640
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &7719120 !ruby/object:Gem::Requirement
+  requirement: &9761220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7719120
+  version_requirements: *9761220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7718620 !ruby/object:Gem::Requirement
+  requirement: &9760720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *7718620
+  version_requirements: *9760720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7718200 !ruby/object:Gem::Requirement
+  requirement: &9760300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7718200
+  version_requirements: *9760300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7717680 !ruby/object:Gem::Requirement
+  requirement: &9759840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,16 +98,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7717680
+  version_requirements: *9759840
 description: EverBox Command Tool
 email:
 - lidaobing@gmail.com
 executables:
 - everbox
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- CHANGELOG.rdoc
+extra_rdoc_files: []
 files:
 - bin/everbox
 - lib/everbox_client/models/account.rb
@@ -120,10 +118,11 @@ files:
 - lib/everbox_client.rb
 - spec/everbox_client/models/path_entry_spec.rb
 - spec/everbox_client/runner_spec.rb
+- spec/everbox_client/cli_spec.rb
 - spec/spec_helper.rb
 - spec/everbox_client_spec.rb
-- README.rdoc
-- CHANGELOG.rdoc
+- README.md
+- NEWS.md
 homepage: http://www.everbox.com/
 licenses: []
 post_install_message: 
@@ -151,5 +150,6 @@ summary: EverBox Command Tool
 test_files:
 - spec/everbox_client/models/path_entry_spec.rb
 - spec/everbox_client/runner_spec.rb
+- spec/everbox_client/cli_spec.rb
 - spec/spec_helper.rb
 - spec/everbox_client_spec.rb