cherrypicker 0.3.2 → 0.3.3

data/bin/cherrypick

@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'cherrypicker'
+require 'getoptlong'
+require 'pathname'
+
+def usage()
+	puts "Cherrypicker lets you download from; Rapidshare, Hotfile, Hotfile, 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\""
+	puts "example: cherrypick http://rapidshare.com/files/453165880/test_file.txt -u \"karlentwistle\" -p \"foobar\""
+end
+
+if not ARGV[0]
+	usage
+	exit
+end
+
+parser = GetoptLong.new 
+parser.set_options(
+  ["-d", "--directory", GetoptLong::REQUIRED_ARGUMENT],
+	["-u", "--username", GetoptLong::REQUIRED_ARGUMENT], 
+	["-p", "--password", GetoptLong::REQUIRED_ARGUMENT]
+) 
+
+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 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 != ""
+
+Cherrypicker::Cherrypick.new(ARGV[0], :location => directory, :username => username, :password => password)

data/lib/cherrypicker/cherrypick.rb

@@ -0,0 +1,24 @@
+require 'open-uri'
+
+module Cherrypicker
+  class Cherrypick
+    attr_accessor :link, :location, :username, :password
+
+    def initialize(link, opts={})
+      o = {
+        :location => nil, 
+        :username  => nil,
+        :password  => nil,
+      }.merge(opts)
+    
+      @link         = link
+      @username     = o[:username]
+      @password     = o[:password]
+      @directory    = o[:location]
+
+      classname = URI.parse(@link.to_s).host[/[^www\.]+/].capitalize
+      instance = Object.const_get('Cherrypicker').const_get("#{classname}")
+      instance.new(@link, :location => @location, :username => @username, :password => @password).download
+    end
+  end
+end

data/lib/cherrypicker/download.rb

@@ -7,52 +7,53 @@ require 'net/http'
 require 'net/https'
 require 'progressbar'
 require 'open-uri'
-
-class Download
-  attr_accessor :link, :size, :location, :progress, :filename, :finished
+module Cherrypicker
+  class Download
+    attr_accessor :link, :size, :location, :progress, :filename, :finished
   
-  def initialize(link, opts={})
-    o = {
-      :location => nil,
-      :size => nil,
-      :filename => nil
-    }.merge(opts)
+    def initialize(link, opts={})
+      o = {
+        :location => nil,
+        :size => nil,
+        :filename => nil
+      }.merge(opts)
     
-    @link = link
-    @size = o[:size]
-    @location = o[:location] ||= ""
-    @filename = o[:filename]
-    @progress = 0
-    @finished = false 
+      @link = link
+      @size = o[:size]
+      @location = o[:location] ||= ""
+      @filename = o[:filename]
+      @progress = 0
+      @finished = false 
     
-    download_file
-  end
+      download_file
+    end
 
-  def download_file
-    uri = URI.parse(@link.to_s)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == "https"
-    request = Net::HTTP::Get.new(uri.request_uri)
-    request.initialize_http_header({"User-Agent" => random_agent})
-    unless (uri.host.include? 'youtube.com') && (uri.request_uri.include? 'videoplayback') #youtube throws EOFError
-      head = http.request_head(URI.escape(uri.path))
-      case head
-      when Net::HTTPForbidden
-        @size = nil  #no content-length no progress bar
-      else
-        @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
+    def download_file
+      uri = URI.parse(@link.to_s)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == "https"
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request.initialize_http_header({"User-Agent" => Cherrypicker::random_agent})
+      unless (uri.host.include? 'youtube.com') && (uri.request_uri.include? 'videoplayback') #youtube throws EOFError
+        head = http.request_head(URI.escape(uri.path))
+        case head
+        when Net::HTTPForbidden
+          @size = nil  #no content-length no progress bar
+        else
+          @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
+        end
       end
-    end
-    http.request(request) do |response|
-      bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i) unless @size.nil?
-      File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
-        response.read_body do |segment|
-          @progress += segment.length
-          bar.set(@progress) unless @size.nil?
-          file.write(segment)
+      http.request(request) do |response|
+        bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i) unless @size.nil?
+        File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
+          response.read_body do |segment|
+            @progress += segment.length
+            bar.set(@progress) unless @size.nil?
+            file.write(segment)
+          end
         end
       end
+      @finished = true
     end
-    @finished = true
   end
 end

data/lib/cherrypicker/helpers.rb

@@ -4,36 +4,38 @@ require 'net/http'
 require 'net/https'
 require 'open-uri'
 
-def remote_query(url)  
-  begin
-    uri = URI.parse(url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == "https"
-    http.open_timeout = 3 # seconds
-    http.read_timeout = 3 # seconds
-    request = Net::HTTP::Get.new(uri.request_uri)
-    request.initialize_http_header({"User-Agent" => random_agent})
-    response = http.request(request)
-    if response["X-APICPU"]
-      if (response["X-APICPU"][/(\d*)\/\d*/, 1]).to_i > 9500
-        sleep 60  # seconds
+module Cherrypicker
+  def self.remote_query(url)  
+    begin
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == "https"
+      http.open_timeout = 3 # seconds
+      http.read_timeout = 3 # seconds
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request.initialize_http_header({"User-Agent" => random_agent})
+      response = http.request(request)
+      if response["X-APICPU"]
+        if (response["X-APICPU"][/(\d*)\/\d*/, 1]).to_i > 9500
+          sleep 60  # seconds
+        end
       end
+      return response
+    rescue SocketError
+      $stderr.print "IO failed: " + $!
+      raise
     end
-    return response
-  rescue SocketError
-    $stderr.print "IO failed: " + $!
-    raise
   end
-end
 
-def hash_to_url(hash)
-  hash.keys.inject('') do |query_string, key|
-    query_string << '&' unless key == hash.keys.first
-    query_string << "#{URI.encode(key.to_s)}=#{URI.encode(hash[key])}"
+  def self.hash_to_url(hash)
+    hash.keys.inject('') do |query_string, key|
+      query_string << '&' unless key == hash.keys.first
+      query_string << "#{URI.encode(key.to_s)}=#{URI.encode(hash[key])}"
+    end
   end
-end
 
-def random_agent
-  @useragent = ["Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24"]
-  return @useragent[0]
+  def self.random_agent
+    @useragent = ["Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24"]
+    return @useragent[0]
+  end
 end

data/lib/cherrypicker/linkchecker.rb

@@ -6,115 +6,116 @@
 # puts rapid.filename
 # puts rapid.host
 # rapid.download
+module Cherrypicker
+  class LinkChecker
+    attr_accessor :links, :status
 
-class LinkChecker
-  attr_accessor :links, :status
-
-  def initialize(links)
-    @links = links
-    if links[0] =~ /^http(s|):\/\/(www.|)rapidshare.com/
-      @status = rapidshare
-    else
-      @status = hotfile
+    def initialize(links)
+      @links = links
+      if links[0] =~ /^http(s|):\/\/(www.|)rapidshare.com/
+        @status = rapidshare
+      else
+        @status = hotfile
+      end
     end
-  end
   
-  def rapidshare
-    links = self.links
-    files = Array.new 
-    filenames = Array.new
-    singlelinks = Array.new
+    def rapidshare
+      links = self.links
+      files = Array.new 
+      filenames = Array.new
+      singlelinks = Array.new
     
-    self.links.each do |link|
-      files << link[/files\/(\d*)\//, 1]
-      filenames << link[/files\/\d*\/(.*)/, 1]
-    end
+      self.links.each do |link|
+        files << link[/files\/(\d*)\//, 1]
+        filenames << link[/files\/\d*\/(.*)/, 1]
+      end
 
-    query = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=checkfiles&" + 
-    hash_to_url({
-      :files  =>      files.join(","),
-      :filenames  =>  filenames.join(","),
-      :incmd5  =>     '0'
-    })
+      query = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=checkfiles&" + 
+      Cherrypicker::hash_to_url({
+        :files  =>      files.join(","),
+        :filenames  =>  filenames.join(","),
+        :incmd5  =>     '0'
+      })
 
-    check = remote_query(query).body.split("\n")
+      check = Cherrypicker::remote_query(query).body.split("\n")
     
-    #"452966383,ROT007-WEB-2011.rar,23635847,23,1,tl2,0"  
-    check.each_with_index do |c, index|
-      c[/([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)/]
-      size = Regexp.last_match(3)
-      if Regexp.last_match(5) == "1"
-        status = "Alive" 
-      else 
-        status = "Dead"
+      #"452966383,ROT007-WEB-2011.rar,23635847,23,1,tl2,0"  
+      check.each_with_index do |c, index|
+        c[/([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)\,([^,]+)/]
+        size = Regexp.last_match(3)
+        if Regexp.last_match(5) == "1"
+          status = "Alive" 
+        else 
+          status = "Dead"
+        end
+        singlelinks << Cherrypicker::SingleLink.new(links[index], "#{status}", size)
       end
-      singlelinks << SingleLink.new(links[index], "#{status}", size)
-    end
 
-    links = {}
-    singlelinks.each do |a|
-      links[a.status] ||= []
-      links[a.status] << [a.link, a.size]
+      links = {}
+      singlelinks.each do |a|
+        links[a.status] ||= []
+        links[a.status] << [a.link, a.size]
+      end
+      return links   
     end
-    return links   
-  end
   
-  def hotfile
-    links = self.links
-    ids = Array.new 
-    keys = Array.new
-    singlelinks = Array.new
+    def hotfile
+      links = self.links
+      ids = Array.new 
+      keys = Array.new
+      singlelinks = Array.new
     
-    links.each do |link|
-      link[/http\:\/\/hotfile\.com\/dl\/([^\/]+)\/([^\/]+)\/([^\/]+)/]
-      ids << Regexp.last_match(1)
-      keys << Regexp.last_match(2)
-    end
+      links.each do |link|
+        link[/http\:\/\/hotfile\.com\/dl\/([^\/]+)\/([^\/]+)\/([^\/]+)/]
+        ids << Regexp.last_match(1)
+        keys << Regexp.last_match(2)
+      end
     
-    query = "http://api.hotfile.com/?action=checklinks&" + 
-    hash_to_url({
-      :links  =>   links.join(","),
-      :id  =>      ids.join(","),
-      :keys  =>    keys.join(","),
-      :files  =>  "id,status,size"
-    })
+      Cherrypicker::query = "http://api.hotfile.com/?action=checklinks&" + 
+      hash_to_url({
+        :links  =>   links.join(","),
+        :id  =>      ids.join(","),
+        :keys  =>    keys.join(","),
+        :files  =>  "id,status,size"
+      })
     
-    check = remote_query(query).body.split("\n")
+      check = Cherrypicker::remote_query(query).body.split("\n")
     
-    unless check.size == 0
-      #"111044909,1,Playaz-Sub_Zero-PLAYAZ015-WEB-2011-EGM.rar "  
-      check.each_with_index do |c, index|
-        c[/([^,]+)\,([^,]+)\,([^,]+)/]
-        name = Regexp.last_match(3)
-        size = Regexp.last_match(1)
-        if Regexp.last_match(2) == "1"
-          status = "Alive"
-        else
-          status = "Dead"
+      unless check.size == 0
+        #"111044909,1,Playaz-Sub_Zero-PLAYAZ015-WEB-2011-EGM.rar "  
+        check.each_with_index do |c, index|
+          c[/([^,]+)\,([^,]+)\,([^,]+)/]
+          name = Regexp.last_match(3)
+          size = Regexp.last_match(1)
+          if Regexp.last_match(2) == "1"
+            status = "Alive"
+          else
+            status = "Dead"
+          end
+          singlelinks << Cherrypicker::SingleLink.new(links[index], "#{status}", size)
+        end
+      else
+        links.each do |link|
+          singlelinks << Cherrypicker::SingleLink.new(link, "Dead", nil)
         end
-        singlelinks << SingleLink.new(links[index], "#{status}", size)
-      end
-    else
-      links.each do |link|
-        singlelinks << SingleLink.new(link, "Dead", nil)
       end
-    end
 
-    links = {}
-    singlelinks.each do |a|
-      links[a.status] ||= []
-      links[a.status] << [a.link, a.size]
+      links = {}
+      singlelinks.each do |a|
+        links[a.status] ||= []
+        links[a.status] << [a.link, a.size]
+      end
+      return links
     end
-    return links
   end
-end
 
-class SingleLink
-  attr_accessor :link, :status, :size
+  class SingleLink
+    attr_accessor :link, :status, :size
 
-  def initialize(link, status, size)
-    @size = size
-    @link = link
-    @status = status
+    def initialize(link, status, size)
+      @size = size
+      @link = link
+      @status = status
+    end
   end
 end

data/lib/cherrypicker/plugins/hotfile.rb

@@ -4,44 +4,45 @@
 # hotfile.download
 
 require 'open-uri'
-
-class Hotfile
-  attr_accessor :link, :hostname, :filename, :username, :password, :size, :location, :query
+module Cherrypicker
+  class Hotfile
+    attr_accessor :link, :hostname, :filename, :username, :password, :size, :location, :query
   
-  def initialize(link, username, password, opts={})
-    if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
-      @link = link[/(.*)\.html/, 1] #remove .html from link
-    else
-      @link = link
-    end
+    def initialize(link, username, password, opts={})
+      if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
+        @link = link[/(.*)\.html/, 1] #remove .html from link
+      else
+        @link = link
+      end
     
-    uri = URI.parse(@link)
+      uri = URI.parse(@link)
     
-    o = {
-      :location => nil,
-      :size => nil,
-    }.merge(opts)
+      o = {
+        :location => nil,
+        :size => nil,
+      }.merge(opts)
     
-    @username = username
-    @password = password
-    @size     = o[:size]
-    @location = o[:location]
-    @filename = File.basename(uri.path)
-  end
+      @username = username
+      @password = password
+      @size     = o[:size]
+      @location = o[:location]
+      @filename = File.basename(uri.path)
+    end
 
-  def download
-    Download.new(download_url, :location => @location, :size => @size, :filename =>  @filename)
-  end
+    def download
+      Download.new(download_url, :location => @location, :size => @size, :filename =>  @filename)
+    end
   
-  def create_url
-    hash_to_url({
-      :link  =>  @link,
-      :username  =>  @username.to_s,
-      :password  =>  @password.to_s,
-    })
-  end
+    def create_url
+      Cherrypicker::hash_to_url({
+        :link  =>  @link,
+        :username  =>  @username.to_s,
+        :password  =>  @password.to_s,
+      })
+    end
   
-  def download_url
-    remote_query("http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url).response.body.gsub(/\n/,'')
+    def download_url
+      Cherrypicker::remote_query("http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url).response.body.gsub(/\n/,'')
+    end
   end
 end

data/lib/cherrypicker/plugins/megavideo.rb

@@ -2,94 +2,95 @@
 # Megavideo.new("http://www.megavideo.com/?v=2PEKD0YS", :location => "/Volumes/Storage/Desktop/cherrytest/").download
 
 require 'open-uri'
+module Cherrypicker
+  class Megavideo
+    attr_accessor :link, :filename, :location, :download_url
 
-class Megavideo
-  attr_accessor :link, :filename, :location, :download_url
-
-  def initialize(link, opts={})
-    o = {
-      :location => nil,
-    }.merge(opts)
+    def initialize(link, opts={})
+      o = {
+        :location => nil,
+      }.merge(opts)
     
-    @link         = link
-    @filename     = ""
-    @location     = o[:location]
-    @download_url = ""
-    @size         = 0
+      @link         = link
+      @filename     = ""
+      @location     = o[:location]
+      @download_url = ""
+      @size         = 0
     
-    video_id = @link[/v[\/=](\w*)&?/, 1]
+      video_id = @link[/v[\/=](\w*)&?/, 1]
     
-    #credit http://stackoverflow.com/questions/5748876/build-array-of-flashvars-using-hpricot
-    html = open("http://megavideo.com/?v=#{video_id}").read
-    flashvars = Hash[ html.scan( /flashvars\.(\w+)\s*=\s*["']?(.+?)["']?;/ ) ]
+      #credit http://stackoverflow.com/questions/5748876/build-array-of-flashvars-using-hpricot
+      html = open("http://megavideo.com/?v=#{video_id}").read
+      flashvars = Hash[ html.scan( /flashvars\.(\w+)\s*=\s*["']?(.+?)["']?;/ ) ]
 
-    key_s =  flashvars["s"]
-    key_un = flashvars["un"]
-    key_k1 = flashvars["k1"]
-    key_k2 = flashvars["k2"]
+      key_s =  flashvars["s"]
+      key_un = flashvars["un"]
+      key_k1 = flashvars["k1"]
+      key_k2 = flashvars["k2"]
     
-		title = flashvars["title"]
-		@size = flashvars["size"].to_i * 1024 * 1024
+  		title = flashvars["title"]
+  		@size = flashvars["size"].to_i * 1024 * 1024
 
-		@download_url = "http://www#{key_s}.megavideo.com/files/#{decrypt(key_un,key_k1,key_k2)}/#{title}.flv"
-		@filename = title + ".flv"
-  end
+  		@download_url = "http://www#{key_s}.megavideo.com/files/#{decrypt(key_un,key_k1,key_k2)}/#{title}.flv"
+  		@filename = title + ".flv"
+    end
     
-  def decrypt(un,k1,k2) #credit http://userscripts.org/scripts/review/42944
-    k1 = k1.to_i
-    k2 = k2.to_i
+    def decrypt(un,k1,k2) #credit http://userscripts.org/scripts/review/42944
+      k1 = k1.to_i
+      k2 = k2.to_i
 
-    #convert the hex "un" to binary
-    location1 = Array.new
-    un.each_char do |char|
-      #puts "#{char} => #{char.to_i(16).to_s(2)}"
-      location1 << ("000" + char.to_i(16).to_s(2))[-4,4]
-    end
+      #convert the hex "un" to binary
+      location1 = Array.new
+      un.each_char do |char|
+        #puts "#{char} => #{char.to_i(16).to_s(2)}"
+        location1 << ("000" + char.to_i(16).to_s(2))[-4,4]
+      end
 
-    location1 = location1.join("").split("")
+      location1 = location1.join("").split("")
 
-    location6 = Array.new
-    0.upto(383) do |n|
-      k1 = (k1 * 11 + 77213) % 81371
-      k2 = (k2 * 17 + 92717) % 192811
-      location6[n] = (k1 + k2) % 128
-    end
+      location6 = Array.new
+      0.upto(383) do |n|
+        k1 = (k1 * 11 + 77213) % 81371
+        k2 = (k2 * 17 + 92717) % 192811
+        location6[n] = (k1 + k2) % 128
+      end
 
-    location3 = Array.new
-    location4 = Array.new
-    location5 = Array.new
-    location8 = Array.new
+      location3 = Array.new
+      location4 = Array.new
+      location5 = Array.new
+      location8 = Array.new
 
-    256.downto(0) do |n|
-      location5 = location6[n]
-      location4 = n % 128		
-      location8 = location1[location5]
-      location1[location5] = location1[location4]
-      location1[location4] = location8
-    end
+      256.downto(0) do |n|
+        location5 = location6[n]
+        location4 = n % 128		
+        location8 = location1[location5]
+        location1[location5] = location1[location4]
+        location1[location4] = location8
+      end
 
-    0.upto(127) do |n|
-      location1[n] = location1[n].to_i ^ location6[n+256] & 1
-    end
+      0.upto(127) do |n|
+        location1[n] = location1[n].to_i ^ location6[n+256] & 1
+      end
 
-    location12 = location1.join("")
-    location7 = Array.new
+      location12 = location1.join("")
+      location7 = Array.new
 
-    n = 0
-    while (n < location12.length) do
-      location9 = location12[n,4]
-      location7 << location9
-      n+=4
-    end
+      n = 0
+      while (n < location12.length) do
+        location9 = location12[n,4]
+        location7 << location9
+        n+=4
+      end
 
-    result = ""
-    location7.each do |bin|
-      result = result + bin.to_i(2).to_s(16)
+      result = ""
+      location7.each do |bin|
+        result = result + bin.to_i(2).to_s(16)
+      end
+      result
     end
-    result
-  end
     
-  def download
-    Download.new(@download_url, :location => @location, :size => @size)
+    def download
+      Download.new(@download_url, :location => @location, :size => @size)
+    end
   end
 end

data/lib/cherrypicker/plugins/rapidshare.rb

@@ -3,51 +3,52 @@
 # rapid = Rapidshare.new("http://rapidshare.com/files/329036215/The.Matrix.bandaa25.part06.rar", "username", "password")
 # rapid.download
 require 'open-uri'
-
-class Rapidshare
-  attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location
+module Cherrypicker
+  class Rapidshare
+    attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location
   
-  def initialize(link, username, password, opts={})
-    uri = URI.parse(link)
+    def initialize(link, username, password, opts={})
+      uri = URI.parse(link)
     
-    o = {
-      :location => nil,
-      :size => nil,
-    }.merge(opts)
+      o = {
+        :location => nil,
+        :size => nil,
+      }.merge(opts)
     
-    @link     = link
-    @username = username
-    @password = password
-    @fileid   = fileid
-    @size     = o[:size]
-    @location = o[:location]
-    @filename = File.basename(uri.path)
-    @hostname = hostname
-  end
+      @link     = link
+      @username = username
+      @password = password
+      @fileid   = fileid
+      @size     = o[:size]
+      @location = o[:location]
+      @filename = File.basename(uri.path)
+      @hostname = hostname
+    end
   
-  def download
-    Download.new(@hostname + remote_url, :location => @location, :size => @size, :filename =>  @filename)
-  end
+    def download
+      Download.new(@hostname + remote_url, :location => @location, :size => @size, :filename =>  @filename)
+    end
   
-  def fileid
-    @link[/files\/(\d*)\//, 1]
-  end
+    def fileid
+      @link[/files\/(\d*)\//, 1]
+    end
     
-  def remote_url
-    "/cgi-bin/rsapi.cgi?sub=download&" + create_url
-  end
+    def remote_url
+      "/cgi-bin/rsapi.cgi?sub=download&" + create_url
+    end
     
-  def create_url
-   hash_to_url({
-      :fileid  =>   @fileid,
-      :filename  => @filename,
-      :login  =>    @username.to_s,
-      :password  => @password.to_s,
-    })
-  end
+    def create_url
+     Cherrypicker::hash_to_url({
+        :fileid  =>   @fileid,
+        :filename  => @filename,
+        :login  =>    @username.to_s,
+        :password  => @password.to_s,
+      })
+    end
   
-  def hostname
-    query = remote_query("http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&" + create_url)
-    query.response.response["Location"][/(.*).rapidshare.com/, 1] + ".rapidshare.com"
-  end  
+    def hostname
+      query = Cherrypicker::remote_query("http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&" + create_url)
+      query.response.response["Location"][/(.*).rapidshare.com/, 1] + ".rapidshare.com"
+    end  
+  end
 end

data/lib/cherrypicker/plugins/vimeo.rb

@@ -8,43 +8,44 @@
 #    \_/ |_|_| |_| |_|\___|\___/
 #               you know, for videos
 #-->
+module Cherrypicker
+  class Vimeo
+    attr_accessor :link, :filename, :location, :download_url
 
-class Vimeo
-  attr_accessor :link, :filename, :location, :download_url
-
-  def initialize(link, opts={})
+    def initialize(link, opts={})
     
-    o = {
-      :location => nil,
-    }.merge(opts)
+      o = {
+        :location => nil,
+      }.merge(opts)
     
-    @link         = link
-    @filename     = ""
-    @location     = o[:location]
-    @download_url = ""
+      @link         = link
+      @filename     = ""
+      @location     = o[:location]
+      @download_url = ""
     
-    hostname = "http://www.vimeo.com/moogaloop/play/clip"
+      hostname = "http://www.vimeo.com/moogaloop/play/clip"
     
-    #the vimeo ID consists of decimal numbers in the URL
-	  vimeo_id = @link[/\d+/]
-    response = remote_query("http://www.vimeo.com/moogaloop/load/clip:#{vimeo_id}")
-    title = response.body[/<caption>(.*)<\/caption>/, 1] 
-    request_signature = response.body[/<request_signature>(.*)<\/request_signature>/, 1] 
-    request_signature_expires = response.body[/<request_signature_expires>(\d+)<\/request_signature_expires>/, 1]	
-    hd = response.body[/<isHD>(.*)<\/isHD>/, 1] 
+      #the vimeo ID consists of decimal numbers in the URL
+  	  vimeo_id = @link[/\d+/]
+      response = Cherrypicker::remote_query("http://www.vimeo.com/moogaloop/load/clip:#{vimeo_id}")
+      title = response.body[/<caption>(.*)<\/caption>/, 1] 
+      request_signature = response.body[/<request_signature>(.*)<\/request_signature>/, 1] 
+      request_signature_expires = response.body[/<request_signature_expires>(\d+)<\/request_signature_expires>/, 1]	
+      hd = response.body[/<isHD>(.*)<\/isHD>/, 1] 
     
-    if hd.to_i == 0
-		  download_url = ":#{vimeo_id}/#{request_signature}/#{request_signature_expires}"
-	  else
-	    download_url = ":#{vimeo_id}/#{request_signature}/#{request_signature_expires}/?q=hd"
-    end
+      if hd.to_i == 0
+  		  download_url = ":#{vimeo_id}/#{request_signature}/#{request_signature_expires}"
+  	  else
+  	    download_url = ":#{vimeo_id}/#{request_signature}/#{request_signature_expires}/?q=hd"
+      end
     
-		@filename = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + ".flv"
-    reply = remote_query("#{hostname}#{download_url}")
-		@download_url = reply.response['location']
-  end
+  		@filename = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + ".flv"
+      reply = Cherrypicker::remote_query("#{hostname}#{download_url}")
+  		@download_url = reply.response['location']
+    end
   
-  def download
-    Download.new(@download_url, :location => @location)
+    def download
+      Download.new(@download_url, :location => @location)
+    end
   end
 end

data/lib/cherrypicker/plugins/youtube.rb

@@ -1,67 +1,68 @@
 # Class that can download from Vimeo
 # Youtube.new("http://www.youtube.com/watch?v=SF6I5VSZVqc", :location => "/Volumes/Storage/Desktop/cherrytest/").download
+require 'cgi'
 
-require "cgi"
+module Cherrypicker
+  class Youtube
+    attr_accessor :link, :filename, :location, :download_url
 
-class Youtube
-  attr_accessor :link, :filename, :location, :download_url
-
-  def initialize(link, opts={})
+    def initialize(link, opts={})
     
-    o = {
-      :location => nil,
-    }.merge(opts)
+      o = {
+        :location => nil,
+      }.merge(opts)
     
-    @link         = link
-    @filename     = ""
-    @location     = o[:location]
-    @download_url = ""
+      @link         = link
+      @filename     = ""
+      @location     = o[:location]
+      @download_url = ""
     
-		video_id = @link[/v[\/=](.*)/,1]
-    video_info = remote_query("http://www.youtube.com/get_video_info?video_id=#{video_id}").body
+  		video_id = @link[/v[\/=](.*)/,1]
+      video_info = Cherrypicker::remote_query("http://www.youtube.com/get_video_info?video_id=#{video_id}").body
     
-		#converting the huge infostring into a hash. simply by splitting it at the & and then splitting it into key and value arround the =
-		#credit https://github.com/rb2k/viddl-rb/blob/master/plugins/youtube.rb
-		video_info_hash = Hash[*video_info.split("&").collect { |v| 
-      key, value = v.split "="
-      value = CGI::unescape(value) if value
-      if key =~ /_map/
-        value = value.split(",")
-        value = if key == "fmt_map"
-            Hash[*value.collect{ |v| 
-              k2, *v2 = v.split("/")
-              [k2, v2]
-            }.flatten(1)]
-          elsif key == "fmt_url_map" || key == "fmt_stream_map"
-            Hash[*value.collect { |v| v.split("|")}.flatten]
+  		#converting the huge infostring into a hash. simply by splitting it at the & and then splitting it into key and value arround the =
+  		#credit https://github.com/rb2k/viddl-rb/blob/master/plugins/youtube.rb
+  		video_info_hash = Hash[*video_info.split("&").collect { |v| 
+        key, value = v.split "="
+        value = CGI::unescape(value) if value
+        if key =~ /_map/
+          value = value.split(",")
+          value = if key == "fmt_map"
+              Hash[*value.collect{ |v| 
+                k2, *v2 = v.split("/")
+                [k2, v2]
+              }.flatten(1)]
+            elsif key == "fmt_url_map" || key == "fmt_stream_map"
+              Hash[*value.collect { |v| v.split("|")}.flatten]
+          end
         end
-      end
-			[key, value]
-		}.flatten]
+  			[key, value]
+  		}.flatten]
 
-		#Standard = 34 <- flv
-		#Medium = 18 <- mp4
-		#High = 35 <- flv
-		#720p = 22 <- mp4
-		#1080p = 37 <- mp4
-		#mobile = 17 <- 3gp
-		# --> 37 > 22 > 35 > 18 > 34 > 17
-		formats = video_info_hash["fmt_map"].keys
+  		#Standard = 34 <- flv
+  		#Medium = 18 <- mp4
+  		#High = 35 <- flv
+  		#720p = 22 <- mp4
+  		#1080p = 37 <- mp4
+  		#mobile = 17 <- 3gp
+  		# --> 37 > 22 > 35 > 18 > 34 > 17
+  		formats = video_info_hash["fmt_map"].keys
 
-		format_ext = {}
-		format_ext["37"] = ["mp4", "MP4 Highest Quality 1920x1080"]
-		format_ext["22"] = ["mp4", "MP4 1280x720"]
-		format_ext["35"] = ["flv", "FLV 854x480"]
-		format_ext["34"] = ["flv", "FLV 640x360"]
-		format_ext["18"] = ["mp4", "MP4 480x270"]
-		format_ext["17"] = ["3gp", "3gp"]
-		format_ext["5"] = ["flv", "old default?"]
+  		format_ext = {}
+  		format_ext["37"] = ["mp4", "MP4 Highest Quality 1920x1080"]
+  		format_ext["22"] = ["mp4", "MP4 1280x720"]
+  		format_ext["35"] = ["flv", "FLV 854x480"]
+  		format_ext["34"] = ["flv", "FLV 640x360"]
+  		format_ext["18"] = ["mp4", "MP4 480x270"]
+  		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		
-  end
+      @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		
+    end
   
-  def download
-    Download.new(@download_url, :location => @location, :filename  => @filename)
+    def download
+      Download.new(@download_url, :location => @location, :filename  => @filename)
+    end
   end
 end

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/cherrypicker.rb

@@ -1,8 +1,9 @@
+require 'cherrypicker/cherrypick'
 require 'cherrypicker/download'
 require 'cherrypicker/linkchecker'
 require 'cherrypicker/helpers'
-require "cherrypicker/plugins/vimeo"
-require "cherrypicker/plugins/rapidshare"
-require "cherrypicker/plugins/hotfile"
-require "cherrypicker/plugins/youtube"
-require "cherrypicker/plugins/megavideo"
+require 'cherrypicker/plugins/vimeo'
+require 'cherrypicker/plugins/rapidshare'
+require 'cherrypicker/plugins/hotfile'
+require 'cherrypicker/plugins/youtube'
+require 'cherrypicker/plugins/megavideo'

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 +01:00
+date: 2011-04-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
 description: 
 email: 
 - Karl@Entwistle.com
-executables: []
-
+executables: 
+- cherrypick
 extensions: []
 
 extra_rdoc_files: []
@@ -38,8 +38,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/cherrypick
 - cherrypicker.gemspec
 - lib/cherrypicker.rb
+- lib/cherrypicker/cherrypick.rb
 - lib/cherrypicker/download.rb
 - lib/cherrypicker/helpers.rb
 - lib/cherrypicker/linkchecker.rb