viddl-rb 0.4.1 → 0.4.2

data/CHANGELOG.txt

@@ -1,4 +1,4 @@
-=== 0.4
+=== 0.4.x
 * New Features
   * Use wget or curl (if present)
 

data/bin/viddl-rb

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'helper')
 
+require "rubygems"
+require "nokogiri"
+require "cgi"
+require "open-uri"
 require "download-helper.rb"
 require "plugin-helper.rb"
 
-
 if ARGV.first.nil?
 	puts "Usage: viddl-rb [URL]!"
 	exit

data/helper/download-helper.rb

@@ -25,14 +25,12 @@ def self.save_file(file_uri, file_name)
   unescaped_uri = CGI::unescape(file_uri)
   result = false
   if `which wget`.include?("wget")
-	puts "using wget"
-  	IO.popen("wget \"#{unescaped_uri}\" -O #{file_name}", "r") { |pipe| pipe.each {|line| print line}}
-  	result = ($?.exitstatus == 0)
+	  puts "using wget"
+  	result = system("wget \"#{unescaped_uri}\" -O #{file_name}")
   elsif `which curl`.include?("curl")
     puts "using curl"  
     #-L means: follow redirects, We set an agent because Vimeo seems to want one
-    IO.popen("curl -A 'Mozilla/2.02 (OS/2; U)' -L \"#{unescaped_uri}\" -o #{file_name}", "r") { |pipe| pipe.each {|line| print line }}
-  	result = ($?.exitstatus == 0)
+  	result = system("curl -A 'Mozilla/2.02 (OS/2; U)' -L \"#{unescaped_uri}\" -o #{file_name}")
   else
     open(file_name, 'wb') { |file|   	
       file.write(fetch_file(unescaped_uri)); puts

data/plugins/megavideo.rb

@@ -1,8 +1,4 @@
 class Megavideo < PluginBase
-	require "cgi"
-	require "open-uri"
-	require "nokogiri"
-
 	#this will be called by the main app to check weather this plugin is responsible for the url passed
 	def self.matches_provider?(url)
 		url.include?("megavideo.com")

data/plugins/vimeo.rb

@@ -1,7 +1,4 @@
 class Vimeo < PluginBase
-	require "nokogiri"
-	require "open-uri"
-
 	#this will be called by the main app to check weather this plugin is responsible for the url passed
 	def self.matches_provider?(url)
 		url.include?("vimeo.com")

data/plugins/youtube.rb

@@ -1,8 +1,4 @@
 class Youtube < PluginBase
-	require "cgi"
-	require "open-uri"
-	require "nokogiri"
-
 	#this will be called by the main app to check weather this plugin is responsible for the url passed
 	def self.matches_provider?(url)
 		url.include?("youtube.com")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viddl-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70145693005120 !ruby/object:Gem::Requirement
+  requirement: &70157981935280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70145693005120
+  version_requirements: *70157981935280
 description: An extendable commandline video downloader for flash video sites. Includes
   plugins for vimeo, youtube and megavideo
 email: mail@marc-seeger.de