viddl-rb 0.61 → 0.63

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    viddl-rb (0.6)
+    viddl-rb (0.61)
       nokogiri
 
 GEM
   remote: http://rubygems.org/
   specs:
-    mime-types (1.17.2)
-    minitest (2.11.3)
-    nokogiri (1.5.0)
+    mime-types (1.18)
+    minitest (2.12.1)
+    nokogiri (1.5.2)
+    nokogiri (1.5.2-java)
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/README.md

@@ -1,7 +1,7 @@
 __viddl-rb:__  
 Created by Marc Seeger (@rb2k)  
 Repo: http://github.com/rb2k/viddl-rb  
-[![Build Status](https://secure.travis-ci.org/rb2k/viddl-rb.png)](http://travis-ci.org/rb2k/viddl-rb)
+[![Build Status](https://secure.travis-ci.org/rb2k/viddl-rb.png)](http://travis-ci.org/rb2k/viddl-rb) [![Dependency Status](https://gemnasium.com/rb2k/viddl-rb.png)](https://gemnasium.com/rb2k/viddl-rb)
 
 
 
@@ -31,4 +31,5 @@ __Contributors:__
 * [kl](https://github.com/kl): Windows support (who knew!), bug fixes, veoh plugin, metacafe plugin   
 * [divout](https://github.com/divout) aka Ivan K: blip.tv plugin, bugfixes
 * Sniper: bugfixes
-* [Serabe](https://github.com/Serabe) aka Sergio Arbeo: packaging viddl as a binary
+* [Serabe](https://github.com/Serabe) aka Sergio Arbeo: packaging viddl as a binary
+* [laserlemon](https://github.com/laserlemon): Adding gemnasium images to readme

data/helper/download-helper.rb

@@ -1,4 +1,5 @@
 class DownloadHelper
+
 #usually not called directly
   def self.fetch_file(uri)
 
@@ -21,24 +22,33 @@ class DownloadHelper
   end
   
   #simple helper that will save a file from the web and save it with a progress bar
-  def self.save_file(file_uri, file_name)
+  def self.save_file(file_uri, file_name, amount_of_retries = 6)
+    trap("SIGINT") { puts "goodbye"; exit }
     unescaped_uri = CGI::unescape(file_uri)
-    result = false
-    if os_has?("wget")
-      puts "using wget"
-      result = system("wget \"#{unescaped_uri}\" -O #{file_name}")
-    elsif os_has?("curl")
-      puts "using curl"
-      #-L means: follow redirects, We set an agent because Vimeo seems to want one
-    	result = system("curl -A 'Wget/1.8.1' -L \"#{unescaped_uri}\" -o #{file_name}")
-    else
-    	puts "using net/http"
-      open(file_name, 'wb') { |file|   	      
-        file.write(fetch_file(unescaped_uri)); puts
-      }
-      result = true
-    end         
-    result
+    #Some providers seem to flake out every now end then
+    amount_of_retries.times do |i|
+      if os_has?("wget")
+        puts "using wget"
+        `wget \"#{unescaped_uri}\" -O #{file_name}`
+      elsif os_has?("curl")
+        puts "using curl"
+        #-L means: follow redirects, We set an agent because Vimeo seems to want one
+      	`curl -A 'Wget/1.8.1' -L \"#{unescaped_uri}\" -o #{file_name}`
+      else
+    	 puts "using net/http"
+        open(file_name, 'wb') { |file|   	      
+          file.write(fetch_file(unescaped_uri)); puts
+        }
+      end  
+      #we were successful, we're outta here
+      if $? == 0
+        break
+      else
+        puts "Download seems to have failed (retrying, attempt #{i+1}/#{amount_of_retries})"
+        sleep 2
+      end
+    end    
+    $? == 0
   end
   
   #checks to see whether the os has a certain utility like wget or curl

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 113
+  hash: 117
   prerelease: 
   segments: 
   - 0
-  - 61
-  version: "0.61"
+  - 63
+  version: "0.63"
 platform: ruby
 authors: 
 - Marc Seeger