cherrypicker 0.1.1 → 0.1.2

data/cherrypicker.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  
+  s.add_dependency('progressbar', '~> 0.9')
 end

data/lib/cherrypicker/download.rb

@@ -2,26 +2,34 @@
 #
 # Download.new(hostname, url, username, password)
 require 'net/http'
+require 'progressbar'
 
 class Download
-  attr_accessor :hostname, :url, :filename
+  attr_accessor :hostname, :url, :filename, :size, :progress
   
-  def initialize(hostname, url, filename)
-     @hostname = hostname
-     @url      = url
-     @filename = filename
+  def initialize(hostname, url, filename, size = nil)
+    @hostname = hostname
+    @url      = url
+    @filename = filename
+    @size     = size
+    @progress = 0 
      
-     download
+    download_file
   end
   
 private
-  
-  def download
-     Net::HTTP.start("#{self.hostname}") { |http|
-       resp = http.get("#{self.url}")
-       open("#{self.filename}", "wb") { |file|
-         file.write(resp.body)
-        }
-     }
+
+  def download_file
+    http = Net::HTTP.new("#{self.hostname}")
+    http.request_get("#{self.url}") do |response|
+      bar = ProgressBar.new("#{self.url}", self.size.to_i)
+      File.open("#{self.filename}", "wb") do |file|
+        response.read_body do |segment|
+          self.progress += segment.length
+          bar.set(self.progress)
+          file.write(segment)
+        end
+      end
+    end
   end
 end

data/lib/cherrypicker/hotfile.rb

@@ -5,9 +5,9 @@
 # puts hotfile.hostname
 # hotfile.download
 class Hotfile
-  attr_accessor :link, :hostname, :filename, :username, :password
+  attr_accessor :link, :hostname, :filename, :username, :password, :size
 
-  def initialize(link, username, password)
+  def initialize(link, username, password, size = nil)
     if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
       @link = link[/(.*)\.html/, 1]
     else
@@ -17,10 +17,11 @@ class Hotfile
     @password = password
     @hostname = hostname
     @filename = filename
+    @size     = size
   end
 
   def download
-    Download.new(self.hostname, remote_url, self.filename)
+    Download.new(self.hostname, remote_url, self.filename, self.size)
   end
   
   def filename

data/lib/cherrypicker/rapidshare.rb

@@ -7,19 +7,20 @@
 # puts rapid.host
 # rapid.download
 class Rapidshare
-  attr_accessor :link, :fileid, :filename, :hostname, :username, :password
+  attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size
 
-  def initialize(link, username, password)
+  def initialize(link, username, password, size = nil)
     @link     = link
     @fileid   = fileid
     @filename = filename
     @hostname = hostname
     @username = username
     @password = password
+    @size     = size
   end
   
   def download
-    Download.new(self.hostname, remote_url, self.filename)
+    Download.new(self.hostname, remote_url, self.filename, self.size)
   end
   
   def fileid

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/unit/rapidshare_test.rb

@@ -5,7 +5,7 @@ class RapidshareTest < Test::Unit::TestCase
   context "Information request" do
          
       should "return response" do
-        response = Rapidshare.new("http://rapidshare.com/files/453165880/test_file.txt", "username", "password")
+        response = Rapidshare.new("http://rapidshare.com/files/453165880/test_file.txt", "6160038", "PXVA62ZY")
         assert response.fileid =~ /\d*/
         assert response.filename.length > 0
         assert response.hostname.length > 0

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -12,8 +12,18 @@ cert_chain: []
 
 date: 2011-03-21 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: progressbar
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.9"
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: 
 - Karl@Entwistle.com