cherrypicker 0.3.9 → 0.3.10

data/README.md

@@ -2,7 +2,7 @@ Cherrypicker
 =========
 
 	Cherrypicker was part of my final year project for university it
-	is a Ruby Gem that lets you download from; Rapidshare, Hotfile, Hotfile, Youtube, Vimeo & Megavideo
+	is a Ruby Gem that lets you download from; Rapidshare, Hotfile, rghost, Youtube, Vimeo & Megavideo
 	You can also utilise the LinkChecker to see if your files are alive on Rapidshare and Hotfile
 	
 	Enjoy!

data/bin/cherrypick

@@ -5,7 +5,7 @@ require 'getoptlong'
 require 'pathname'
 
 def usage()
-	puts "Cherrypicker lets you download from; Rapidshare, Hotfile, Youtube, Vimeo & Megavideo"
+	puts "Cherrypicker lets you download from; Rapidshare, Hotfile, rhost, Youtube, Vimeo & Megavideo"
 	puts "Usage: cherrypick link [--directory|-d] [--username|-u] [--password|-p]"
 	puts
 	puts "example: cherrypick http://www.youtube.com/watch?v=I5DCwN28y8o -d \"~/Movies\""
@@ -17,24 +17,47 @@ if not ARGV[0]
 	exit
 end
 
-#refactored by Hamac credit http://is.gd/sbxAwG
-options = {username: nil, password: nil, directory: nil}
-
 parser = GetoptLong.new 
-parser.set_options(*options.keys.map{|opt| ["--#{opt.to_s}", "-#{opt.to_s[0]}", GetoptLong::REQUIRED_ARGUMENT]}
+parser.set_options(
+  ["-d", "--directory", GetoptLong::REQUIRED_ARGUMENT],
+  ["-u", "--username", GetoptLong::REQUIRED_ARGUMENT], 
+  ["-p", "--password", GetoptLong::REQUIRED_ARGUMENT]
 ) 
 
-parser.each{|opt, arg| options[opt.gsub('--', '').to_sym] = arg unless arg == ''}
+username = ""
+password = ""
+directory = ""
+
+loop do 
+  opt, arg = parser.get
+  break if not opt
+      
+  case opt
+    when "-u"
+      username = arg
+    when "-p"
+      password = arg
+    when "-d"
+      directory = arg
+    end
+end
+
+unless directory == "" || nil?
+  p path = Pathname.new(directory) 
 
-if options[:directory] && !File.directory?(options[:directory]) then
-  puts "Directory not found " + options[:directory]
-  puts
-  usage 
-  exit
+  if not path.directory?
+        puts "Directory not found " + path.to_s
+        usage 
+        exit
+  end
 end
 
+username = nil unless username != ""
+password = nil unless password != ""
+directory = nil unless directory != ""
+
 if ARGV[0].include?("rapidshare.com/files/") or ARGV[0].include?("hotfile.com/dl/")
-  unless options[:username] and options[:password] != nil?
+  unless username and password != nil?
     puts "Host required username / password" 
     puts 
     usage
@@ -42,4 +65,4 @@ if ARGV[0].include?("rapidshare.com/files/") or ARGV[0].include?("hotfile.com/dl
   end
 end
 
-Cherrypicker::Cherrypick.new(ARGV[0], :location => options[:directory], :username => options[:username], :password => options[:password])
+Cherrypicker::Cherrypick.new(ARGV[0], :location => directory, :username => username, :password => password)

data/lib/cherrypicker.rb

@@ -7,3 +7,4 @@ require 'cherrypicker/plugins/rapidshare'
 require 'cherrypicker/plugins/hotfile'
 require 'cherrypicker/plugins/youtube'
 require 'cherrypicker/plugins/megavideo'
+require "cherrypicker/plugins/rghost"

data/lib/cherrypicker/download.rb

@@ -29,7 +29,7 @@ module Cherrypicker
     
       download_file
     end
-
+    
     def download_file
       uri = URI.parse(@link.to_s)
       http = Net::HTTP.new(uri.host, uri.port)

data/lib/cherrypicker/plugins/rghost.rb

@@ -0,0 +1,39 @@
+# Class that can download from rghost
+# Rghost.new("http://rghost.net/5420316", :location => "/Volumes/Storage/Desktop/cherrytest/").download
+require 'open-uri'
+
+module Cherrypicker
+  class Rghost
+    attr_accessor :link, :filename, :location, :download_url
+
+    def initialize(link, opts={})
+    
+      o = {
+        :location => nil,
+      }.merge(opts)
+    
+      @link         = link
+      @filename     = ""
+      @location     = o[:location]
+      @download_url = ""
+          
+      #the rghost ID consists of decimal numbers in the URL
+  	  rghost_id = @link[/\d+/]
+      response = Cherrypicker::remote_query("http://rghost.net/#{rghost_id}")
+      
+      @filename = response.body[/<title>(.*\.[a-zA-Z]*).*RGhost/, 1]
+      download_url = URI.encode(response.body[/<a href="(.*)" class=\"(file_link|download_link)\"/, 1])
+      
+      reply = Cherrypicker::remote_query("#{download_url}")
+    	if reply.response['location']
+    		@download_url = reply.response['location']
+    	else
+    		@download_url = download_url
+    	end
+    end
+  
+    def download
+      Download.new(@download_url, :location => @location)
+    end
+  end
+end

data/lib/cherrypicker/plugins/youtube.rb

@@ -57,8 +57,15 @@ module Cherrypicker
   		format_ext["17"] = ["3gp", "3gp"]
   		format_ext["5"] = ["flv", "old default?"]
 
-      @download_url = video_info_hash["fmt_url_map"][formats.first]
-  		@filename = video_info_hash["title"].delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[formats.first].first		
+      download_url = video_info_hash["fmt_url_map"][formats.first]
+  		@filename = video_info_hash["title"].delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[formats.first].first
+  		
+  		reply = Cherrypicker::remote_query("#{download_url}")
+  		if reply.response['location']
+  		  @download_url = reply.response['location']
+  		else
+  		  @download_url = download_url
+  		end
     end
   
     def download

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/test/unit/rghost_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Cherrypicker
+  class RghostTest < Test::Unit::TestCase
+  
+    context "Information request" do
+         
+      should "Standard download test" do
+        response = Rghost.new("http://rghost.net/5420316")
+        assert response.link =~ /\d*/
+        assert response.filename.length > 0
+        assert response.filename == "cherrypicker2.png"
+        assert UrlAvailable?(response.download_url)
+      end
+      
+      should "Standard download test" do
+        response = Rghost.new("http://rghost.net/5420928")
+        assert response.link =~ /\d*/
+        assert response.filename.length > 0
+        assert response.filename == "aimqpad.rar"
+        assert UrlAvailable?(response.download_url)
+      end
+
+      should "Standard download test" do
+        response = Rghost.new("http://rghost.net/5421019")
+        assert response.link =~ /\d*/
+        assert response.filename.length > 0
+        assert response.filename == "saw.ogg"
+        assert UrlAvailable?(response.download_url)
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +01:00
+date: 2011-05-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - lib/cherrypicker/plugins/hotfile.rb
 - lib/cherrypicker/plugins/megavideo.rb
 - lib/cherrypicker/plugins/rapidshare.rb
+- lib/cherrypicker/plugins/rghost.rb
 - lib/cherrypicker/plugins/vimeo.rb
 - lib/cherrypicker/plugins/youtube.rb
 - lib/cherrypicker/version.rb
@@ -55,8 +56,10 @@ files:
 - test/unit/hotfile_test.rb
 - test/unit/megavideo_test.rb
 - test/unit/rapidshare_test.rb
+- test/unit/rghost_test.rb
 - test/unit/vimeo_test.rb
 - test/unit/youtube_test.rb
+- uml.png
 has_rdoc: true
 homepage: http://karl.entwistle.info/
 licenses: []
@@ -90,5 +93,6 @@ test_files:
 - test/unit/hotfile_test.rb
 - test/unit/megavideo_test.rb
 - test/unit/rapidshare_test.rb
+- test/unit/rghost_test.rb
 - test/unit/vimeo_test.rb
 - test/unit/youtube_test.rb