xunlei 0.0.8 → 0.0.9

data/README.md

@@ -13,6 +13,8 @@ so please make sure you have Google Chrome installed first.
 It can automatically dump task file names and urls as well as browser cookies,
 so that it can delegate to wget to download files for you.
 
+Compatible with Ruby version 1.8.7 and 1.9+
+
 WARNING:
 it stores your USERNAME and PASSWORD for
 lixian.vip.xunlei.com as PLAINTEXT at ~/.xunlei/credentials.yml
@@ -47,7 +49,7 @@ Add ed2k or magnet link as new task
 Add all ed2k or magnet links on given web page as new tasks
 
     xunlei add_page http://page_with_a_chunk_load_of_links/
-    
+
 Google for ed2k and magnet links
 
     xunlei google Repulsion --with 720p

data/bin/xunlei

@@ -1,33 +1,18 @@
 #!/usr/bin/env ruby
 
 require "xunlei"
-# require File.expand_path("lib/xunlei/version.rb")
-# require File.expand_path("lib/xunlei/engine.rb")
-# require File.expand_path("lib/xunlei/search.rb")
-require "yaml"
 require "commander/import"
 
+require "xunlei/helpers/cli_helper"
+include Xunlei::Helper::CLIHelper
+
 program :name, "Xunlei"
 program :version, Xunlei::VERSION
 program :description, "lixian.vip.xunlei.com utility script"
 
-def filter_files(options = nil)
-  files = []
-  YAML.load_file(xunlei_tasks_path).each do |file|
-    if !options.only.nil?
-      files << file if file[:name] =~ /#{options.only}/i
-    elsif !options.except.nil?
-      files << file unless file[:name] =~ /#{options.except}/i
-    else
-      files << file
-    end
-  end
-  files
-end
-
 def execute_dump_action(args, options)
   options.default :driver => "chrome"
-  
+
   check_for_config_files
   check_for_chromedriver
   credentials = YAML.load_file(xunlei_credential_file_path)
@@ -51,158 +36,28 @@ def do_dump_cookies(c, &block)
   end
 end
 
-def all_downloaded_tasks
-  system("touch #{xunlei_downloaded_tasks_path}")
-  
-  YAML.load_file(xunlei_downloaded_tasks_path) || []
-end
-
-def xunlei_cookies_path
-  File.join(xunlei_folder_path, "cookies.txt")
-end
-
-def xunlei_tasks_path
-  File.join(xunlei_folder_path, "all_tasks.yml")
-end
-
-def xunlei_credential_file_path
-  File.join(xunlei_folder_path, "credentials.yml")
-end
-
-def xunlei_downloaded_tasks_path
-  File.join(xunlei_folder_path, "downloaded.yml")
-end
-
-def xunlei_folder_name
-  "~/.xunlei"
-end
-
-def xunlei_folder_path
-  File.expand_path(xunlei_folder_name)
-end
-
-def xunlei_folder_exists?
-  Dir.exists?(xunlei_folder_path)
-end
-
-def credential_file_exists?
-  File.exists?(xunlei_credential_file_path)
-end
-
-def create_xunlei_folder
-  Dir.mkdir(xunlei_folder_path)
-end
-
-def ask_for_credentials
-  puts "#{xunlei_credential_file_path} not exists. Now creating one."
-  puts "*** WARNING: your USERNAME and PASSWORD will be stored as PLAINTEXT at #{xunlei_credential_file_path} ***"
-    
-  username = ask("Username: ")
-  password = ask("Password: ") { |q| q.echo = "*" }
-  File.open(xunlei_credential_file_path, "w") do |file|
-    file.write({ :username => username, :password => password }.to_yaml)
-  end
-  
-  puts "#{xunlei_credential_file_path} successfully created."
-end
-
-def check_for_credentials
-  ask_for_credentials unless credential_file_exists?
-end
-
-def chromedriver_zip_name
-  "chromedriver_mac.zip"
-end
-
-def check_for_chromedriver
-  unless system("which chromedriver > /dev/null 2>&1")
-    puts "chromedriver not found in your PATH"
-    if agree("Would you like me to try download it for you? (yes or no)")
-      if system("wget 'http://chromium.googlecode.com/files/chromedriver_mac_16.0.902.0.zip' -O #{chromedriver_zip_name}")
-        if system("unzip #{chromedriver_zip_name}")
-          puts "moving chromedriver to /usr/local/bin ..."
-          system("mv -v chromedriver /usr/local/bin")
-          
-          puts "deleting temporary files..."
-          system("rm -v #{chromedriver_zip_name}")
-        else
-          puts "`unzip` not found in your PATH. Try manually unzip #{chromedriver_zip_name} and move it to /usr/local/bin"
-          exit
-        end
-      end
-    else
-      puts "OK. You can download it manually here: http://code.google.com/p/chromium/downloads"
-      exit
-    end
-  end
-end
-
-def check_for_config_files
-  create_xunlei_folder unless xunlei_folder_exists?
-  check_for_credentials
-end
-
-def move_to_downloaded_file(task)
-  puts "#{task[:name]} successfully downloaded."
-  
-  downloaded = all_downloaded_tasks
-  downloaded << task[:name]
-  File.open(xunlei_downloaded_tasks_path, "w") do |file|
-    file.write(downloaded.to_yaml)
-  end
-  
-  all_tasks = YAML.load_file(xunlei_tasks_path)
-  all_tasks.delete(task)
-  File.open(xunlei_tasks_path, "w") do |file|
-    file.write(all_tasks.to_yaml)
-  end
-end
-
-def total_size(file_sizes)
-  total_megabytes = 0
-  
-  file_sizes.each do |file_size|
-    if file_size =~ /G/
-      total_megabytes += 1000 * file_size.to_f
-    else
-      total_megabytes += file_size.to_f
-    end
-  end
-  
-  total_megabytes
-end
-
-def show_files(files)
-  files.each do |file|
-    puts "#{file[:size]}\t#{file[:name]}"
-  end
-  
-  puts
-  puts "Total: #{files.size} files, #{total_size(files.map { |file| file[:size] })} MB (estimated)"
-end
-
 command :dump_tasks do |c|
   c.syntax= "dump_tasks"
   c.description = "dump all files to #{xunlei_tasks_path}"
-  
+
   do_dump_cookies(c) do |engine, args|
     tasks = engine.dump_tasks
-    
+
     current_downloaded_tasks = all_downloaded_tasks & tasks.map { |task| task[:name] }
     tasks.reject! { |task| current_downloaded_tasks.include?(task[:name]) }
-    
+
     File.open(xunlei_tasks_path, "w") do |file|
       file.write(tasks.to_yaml)
     end
-    
+
     puts "Successfully dumped following tasks:"
     puts
     show_files(tasks)
-    
+
     puts
-    
+
     unless current_downloaded_tasks.empty?
-      puts "Finished downloads: (you should delete them on website)"
+      puts "#{current_downloaded_tasks.count} finished downloads: (you should delete them on website)"
       puts
       current_downloaded_tasks.each do |task_name|
         puts task_name
@@ -214,7 +69,7 @@ end
 command :add do |c|
   c.syntax= "add KEYWORD"
   c.description = "add new task(s)."
-  
+
   do_dump_cookies(c) do |engine, args|
     engine.add_task(args.first)
   end
@@ -223,7 +78,7 @@ end
 command :dump_cookies do |c|
   c.syntax = "dump_cookies"
   c.description = "dump cookies to #{xunlei_cookies_path}"
-  
+
   do_dump_cookies(c)
 end
 
@@ -233,30 +88,28 @@ command :download do |c|
   c.option "--only PATTERN", String, "only download files which names include PATTERN"
   c.option "--except PATTERN", String, "do not download files which names include PATTERN"
   c.option "--reverse", "download files in reverse order"
-  
+
   c.action do |args, options|
     options.default :only => nil, :except => nil
-    
-    files = filter_files(options)
-    
+
+    files = filter_files(YAML.load_file(xunlei_tasks_path), options)
+
     files.reverse! if options.reverse
-    
+
     if files.empty?
       puts "Nothing to do."
     else
       puts "\nAbout to download following files:"
       puts
-      files.each do |file|
-        puts file[:name]
-      end
-      
+      show_files(files)
+
       if agree("\nConfirm? (yes or no)")
         files.each do |file|
           cmd = "wget --load-cookies=#{xunlei_cookies_path} '#{file[:url]}' -c -O \"#{file[:name]}\""
           if system(cmd)
-            move_to_downloaded_file(file)
+            mark_as_downloaded(file)
           else
-            break
+            raise "Download failed"
           end
         end
       end
@@ -267,12 +120,12 @@ end
 command :show do |c|
   c.syntax = "show"
   c.description = "show files in #{xunlei_tasks_path}"
-  
+
   c.action do |args, options|
     options.default :only => nil, :except => nil
     puts "You have following files in your #{xunlei_tasks_path}:"
     puts
-    files = filter_files(options)
+    files = filter_files(YAML.load_file(xunlei_tasks_path), options)
     show_files(files)
   end
 end
@@ -327,7 +180,7 @@ command :lucky do |c|
     links = search.google_simplecd(args, options)
     puts
     puts "#{links.count} links found."
-    
+
     execute_dump_action(args, options) do |engine, args|
       links.each do |link|
         engine.add_task(link)
@@ -349,7 +202,7 @@ command :add_page do |c|
     links = search.add_page(args.first, options)
     puts
     puts "#{links.count} links found."
-    
+
     execute_dump_action(args, options) do |engine, args|
       links.each do |link|
         engine.add_task(link)

data/lib/xunlei/configurator.rb

@@ -0,0 +1,34 @@
+module Xunlei
+  module Configurator
+
+    def xunlei_folder_name
+      "~/.xunlei"
+    end
+
+    def xunlei_folder_path
+      File.expand_path(xunlei_folder_name)
+    end
+
+    def xunlei_cookies_path
+      File.join(xunlei_folder_path, "cookies.txt")
+    end
+
+    def xunlei_tasks_path
+      File.join(xunlei_folder_path, "all_tasks.yml")
+    end
+
+    def xunlei_credential_file_path
+      File.join(xunlei_folder_path, "credentials.yml")
+    end
+
+    def xunlei_downloaded_tasks_path
+      File.join(xunlei_folder_path, "downloaded.yml")
+    end
+
+    def chromedriver_zip_name
+      "chromedriver_mac.zip"
+    end
+  end
+
+  Config = Configurator
+end

data/lib/xunlei/helpers/cli_helper.rb

@@ -0,0 +1,121 @@
+require "yaml"
+
+module Xunlei
+  module Helper
+    module CLIHelper
+      require "xunlei/configurator"
+      include ::Xunlei::Config
+
+      def filtered?(file, options)
+        return false unless options
+        return true if !options.only.nil? and !(file[:name] =~ /#{options.only}/i)
+        return true if !options.except.nil? and file[:name] =~ /#{options.except}/i
+        false
+      end
+
+      def filter_files(files, options=nil)
+        files.select{ |file| !filtered?(file, options) }.inject([], :<<)
+      end
+
+      def total_size(file_sizes)
+        file_sizes.inject(0) do |total_megabytes, file_size|
+          if file_size =~ /G/i
+            total_megabytes + 1000 * file_size.to_f
+          elsif file_size =~ /M/i
+            total_megabytes + file_size.to_f
+          else
+            total_megabytes + 1
+          end
+        end
+      end
+
+      def show_files(files)
+        files.each do |file|
+          puts "#{file[:size]}\t#{file[:name]}"
+        end
+
+        puts
+        puts "Total: #{files.size} files, #{total_size(files.map { |file| file[:size] })} MB (estimated)"
+      end
+
+      def mark_as_downloaded(task)
+        puts "#{task[:name]} successfully downloaded."
+
+        downloaded = all_downloaded_tasks
+        downloaded << task[:name]
+        File.open(xunlei_downloaded_tasks_path, "w") do |file|
+          file.write(downloaded.to_yaml)
+        end
+
+        all_tasks = YAML.load_file(xunlei_tasks_path)
+        all_tasks.delete(task)
+        File.open(xunlei_tasks_path, "w") do |file|
+          file.write(all_tasks.to_yaml)
+        end
+      end
+
+      def all_downloaded_tasks
+        system("touch #{xunlei_downloaded_tasks_path}") # touch it in case it's non-existent
+
+        YAML.load_file(xunlei_downloaded_tasks_path) || []
+      end
+
+      def ask_for_credentials
+        puts "#{xunlei_credential_file_path} not exists. Now creating one."
+        puts "*** WARNING: your USERNAME and PASSWORD will be stored as PLAINTEXT at #{xunlei_credential_file_path} ***"
+
+        username = ask("Username: ")
+        password = ask("Password: ") { |q| q.echo = "*" }
+        File.open(xunlei_credential_file_path, "w") do |file|
+          file.write({ :username => username, :password => password }.to_yaml)
+        end
+
+        puts "#{xunlei_credential_file_path} successfully created."
+      end
+
+      def check_for_credentials
+        ask_for_credentials unless credential_file_exists?
+      end
+
+      def create_xunlei_folder
+        Dir.mkdir(xunlei_folder_path)
+      end
+
+      def xunlei_folder_exists?
+        File.directory?(xunlei_folder_path)
+      end
+
+      def credential_file_exists?
+        File.exists?(xunlei_credential_file_path)
+      end
+
+      def check_for_chromedriver
+        unless system("which chromedriver > /dev/null 2>&1")
+          puts "chromedriver not found in your PATH"
+          if agree("Would you like me to try download it for you? (yes or no)")
+            if system("wget 'http://chromium.googlecode.com/files/chromedriver_mac_16.0.902.0.zip' -O #{chromedriver_zip_name}")
+              if system("unzip #{chromedriver_zip_name}")
+                puts "moving chromedriver to /usr/local/bin ..."
+                system("mv -v chromedriver /usr/local/bin")
+
+                puts "deleting temporary files..."
+                system("rm -v #{chromedriver_zip_name}")
+              else
+                puts "`unzip` not found in your PATH. Try manually unzip #{chromedriver_zip_name} and move it to /usr/local/bin"
+                exit
+              end
+            end
+          else
+            puts "OK. You can download it manually here: http://code.google.com/p/chromium/downloads"
+            exit
+          end
+        end
+      end
+
+      def check_for_config_files
+        create_xunlei_folder unless xunlei_folder_exists?
+        check_for_credentials
+      end
+    end
+  end
+end

data/lib/xunlei/version.rb

@@ -1,3 +1,3 @@
 module Xunlei
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 require "simplecov"
 SimpleCov.start
 
-Dir["./lib/xunlei/*.rb"].each { |file| require file }
+Dir["./lib/xunlei/**/*.rb"].each { |file| require file }

data/spec/xunlei/helpers/cli_helper_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+require "ostruct"
+
+describe Xunlei::Helper::CLIHelper do
+  before(:each) do
+    @main = Class.new
+    @main.class_eval { extend Xunlei::Helper::CLIHelper }
+
+    @options_only = OpenStruct.new :only => "matrix"
+    @options_except = OpenStruct.new :except => "matrix"
+    @options_nil = OpenStruct.new
+  end
+
+  describe "filtered?" do
+    before(:each) do
+      @file = { :name => "MatRiX" }
+    end
+
+    it "should have a filtered? method" do
+      @main.should respond_to(:filtered?)
+    end
+
+    it "should filter correctly" do
+      @main.filtered?(@file, nil).should be_false
+      @main.filtered?(@file, @options_only).should be_false
+      @main.filtered?(@file, @options_except).should be_true
+      @main.filtered?(@file, @options_nil).should be_false
+    end
+  end
+
+  describe "filter_files" do
+    before(:each) do
+      @files = [{:name => "LOTR"}, {:name => "MatRix"}, {:name => "Bourne"}]
+    end
+    it "should have a filter_files method" do
+      @main.should respond_to(:filter_files)
+    end
+
+    it "should filter correctly" do
+      @main.filter_files(@files, @options_only).count.should == 1
+      @main.filter_files(@files, @options_except).count.should == 2
+      @main.filter_files(@files, @options_nil).count.should == 3
+      @main.filter_files(@files, nil).count.should == 3
+    end
+  end
+
+  describe "total_size" do
+    it "should have a total_size method" do
+      @main.should respond_to(:total_size)
+    end
+    
+    it "should calculate total size correctly" do
+      @main.total_size(%w{1.1G 300M 512K}).should == 1.1 * 1000 + 300 + 1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xunlei
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70151191992140 !ruby/object:Gem::Requirement
+  requirement: &70294552163660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151191992140
+  version_requirements: *70294552163660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151191991700 !ruby/object:Gem::Requirement
+  requirement: &70294552163200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151191991700
+  version_requirements: *70294552163200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70151191991240 !ruby/object:Gem::Requirement
+  requirement: &70294552162180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151191991240
+  version_requirements: *70294552162180
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70151191990800 !ruby/object:Gem::Requirement
+  requirement: &70294552158400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151191990800
+  version_requirements: *70294552158400
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70151191990360 !ruby/object:Gem::Requirement
+  requirement: &70294552157820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151191990360
+  version_requirements: *70294552157820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70151191989900 !ruby/object:Gem::Requirement
+  requirement: &70294552157200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151191989900
+  version_requirements: *70294552157200
 description: A browser script to access lixian.vip.xunlei.com tasks automatically
 email:
 - afu@forresty.com
@@ -89,17 +89,18 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.ci
-- Guardfile
 - README.md
 - Rakefile
 - bin/xunlei
 - lib/xunlei.rb
+- lib/xunlei/configurator.rb
 - lib/xunlei/engine.rb
+- lib/xunlei/helpers/cli_helper.rb
 - lib/xunlei/search.rb
 - lib/xunlei/version.rb
 - spec/spec_helper.rb
 - spec/xunlei/engine_spec.rb
-- spec/xunlei/search_spec.rb
+- spec/xunlei/helpers/cli_helper_spec.rb
 - xunlei.gemspec
 homepage: ''
 licenses: []
@@ -115,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -893131726371942937
+      hash: 2673392163945726222
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -893131726371942937
+      hash: 2673392163945726222
 requirements: []
 rubyforge_project: xunlei
 rubygems_version: 1.8.11
@@ -134,4 +135,4 @@ summary: A browser script to access lixian.vip.xunlei.com tasks automatically
 test_files:
 - spec/spec_helper.rb
 - spec/xunlei/engine_spec.rb
-- spec/xunlei/search_spec.rb
+- spec/xunlei/helpers/cli_helper_spec.rb

data/Guardfile

@@ -1,5 +0,0 @@
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end

data/spec/xunlei/search_spec.rb

@@ -1,16 +0,0 @@
-require "spec_helper"
-
-describe Xunlei::Search do
-  before(:each) do
-    $stdout.stub(:puts)
-  end
-  
-  describe "Google" do
-    it "should find some ed2k links" do
-      search = Xunlei::Search.new
-      links = search.google("Repulsion", "720p")
-      
-      links.should_not be_empty
-    end
-  end
-end