zhangmen 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -3,17 +3,22 @@ GEM
   specs:
     diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.6.2)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.2)
-    mechanize (1.0.0)
-      nokogiri (>= 1.2.1)
-    nokogiri (1.4.5)
+    json (1.5.3)
+    mechanize (2.0.1)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (~> 1.8)
+      nokogiri (~> 1.4)
+      webrobots (~> 0.0, >= 0.0.9)
+    net-http-digest_auth (1.1.1)
+    net-http-persistent (1.8)
+    nokogiri (1.5.0)
     rake (0.9.2)
     rcov (0.9.9)
-    rdoc (3.6.1)
+    rdoc (3.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -22,6 +27,8 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    webrobots (0.0.10)
+      nokogiri (>= 1.4.4)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -20,8 +20,26 @@ Or, if you're feeling undecided, grab the entire library.
 
     zhangmen all
     
+Feeling lazy? Download the entire catalog.
+
+    zhangmen all
+
 The songs will be downloaded in the current directory. One directory will be made for each artist, and all that artist's songs will be saved there.
 
+If you're not in Mainland China, you can use a proxy to get your music fix.
+
+    http_proxy=google.for.a.proxy:1234 zhangmen fetch 602
+
+== Testing
+
+The tests are written in RSpec. Run them like this.
+
+   rake spec
+
+If you're not in Mainland China, set http_proxy so the downloading tests pass.
+
+    http_proxy=google.for.a.proxy:1234 rake spec
+
 == Known Issues
 
 Some songs might not download. The Flash player skips over those songs too, so it seems to be a server issue.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/zhangmen/cli.rb

@@ -103,7 +103,11 @@ class Cli
   
   # Runs a command.
   def run(args)
-    @client = Zhangmen::Client.new
+    options = {}
+    if proxy_server = ENV['http_proxy'] || ENV['all_proxy']
+      options[:proxy] = proxy_server
+    end
+    @client = Zhangmen::Client.new options
     @client.cache = client_cache
     
     case args[0]

data/lib/zhangmen/client.rb

@@ -8,8 +8,12 @@ module Zhangmen
   
 # Wraps a client session for accessing Baidu's streaming music service.
 class Client
-  def initialize
-    @mech = mechanizer
+  # New client session.
+  #
+  # The options hash accepts the following keys:
+  #   :proxy:: "host:port" string
+  def initialize(options = {})
+    @mech = mechanizer options
     @cache = {}
   end
   
@@ -144,9 +148,14 @@ class Client
   end
   
   # Mechanize instance customized to maximize fetch success.
-  def mechanizer
+  def mechanizer(options = {})
     mech = Mechanize.new
     mech.user_agent_alias = 'Linux Firefox'
+    if options[:proxy]
+      host, _, port_str = *options[:proxy].rpartition(':')
+      port_str ||= 80
+      mech.set_proxy host, port_str.to_i
+    end
     mech
   end
 end  # class Zhangmen::Client

data/spec/zhangmen/client_spec.rb

@@ -2,7 +2,29 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Zhangmen::Client do
-  let(:client) { Zhangmen::Client.new }
+  describe 'mechanizer' do
+    let(:empty_client) { Zhangmen::Client.new }
+    
+    it 'returns a Mechanize instance' do
+      empty_client.mechanizer.should be_kind_of(Mechanize)
+    end
+    
+    describe 'with a proxy option' do
+      let(:mech) do
+        empty_client.mechanizer :proxy => '127.0.0.1:3306'
+      end
+      
+      it 'parses the address correctly' do
+        mech.proxy_addr.should == '127.0.0.1'
+      end
+      
+      it 'parses the port correctly' do
+        mech.proxy_port.should == 3306
+      end
+    end
+  end
+
+  let(:client) { Zhangmen::Client.new :proxy => ENV['http_proxy'] }
   
   describe 'op_url' do
     it 'encodes everything correctly' do

data/zhangmen.gemspec

@@ -5,14 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zhangmen}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Victor Costan}]
-  s.date = %q{2011-07-09}
+  s.authors = ["Victor Costan"]
+  s.date = %q{2011-07-17}
+  s.default_executable = %q{zhangmen}
   s.description = %q{CLI and library for downloading music from Baidu}
   s.email = %q{victor@costan.us}
-  s.executables = [%q{zhangmen}]
+  s.executables = ["zhangmen"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -37,9 +38,9 @@ Gem::Specification.new do |s|
     "zhangmen.gemspec"
   ]
   s.homepage = %q{http://github.com/pwnall/zhangmen}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{CLI and library for downloading music from Baidu}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zhangmen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-09 00:00:00.000000000Z
+date: 2011-07-17 00:00:00.000000000 -04:00
+default_executable: zhangmen
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &26919700 !ruby/object:Gem::Requirement
+  requirement: &23012660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26919700
+  version_requirements: *23012660
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &26919100 !ruby/object:Gem::Requirement
+  requirement: &23012160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26919100
+  version_requirements: *23012160
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &26918520 !ruby/object:Gem::Requirement
+  requirement: &23011680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26918520
+  version_requirements: *23011680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &26917940 !ruby/object:Gem::Requirement
+  requirement: &23011200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: 3.6.0
   type: :development
   prerelease: false
-  version_requirements: *26917940
+  version_requirements: *23011200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26917340 !ruby/object:Gem::Requirement
+  requirement: &23010720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *26917340
+  version_requirements: *23010720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26916760 !ruby/object:Gem::Requirement
+  requirement: &23010240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *26916760
+  version_requirements: *23010240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &26916200 !ruby/object:Gem::Requirement
+  requirement: &23009740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +88,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *26916200
+  version_requirements: *23009740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &26915680 !ruby/object:Gem::Requirement
+  requirement: &23009220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26915680
+  version_requirements: *23009220
 description: CLI and library for downloading music from Baidu
 email: victor@costan.us
 executables:
@@ -125,6 +126,7 @@ files:
 - spec/zhangmen/client_spec.rb
 - spec/zhangmen_spec.rb
 - zhangmen.gemspec
+has_rdoc: true
 homepage: http://github.com/pwnall/zhangmen
 licenses:
 - MIT
@@ -140,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1290430065827447959
+      hash: -1826109697642044863
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CLI and library for downloading music from Baidu