dl 1.2.3 → 1.2.4

data/.gitignore

@@ -1,2 +1,4 @@
 pkg/
 .rake_tasks~
+syntaxer.rb
+.syntaxer

data/bin/dl

@@ -24,7 +24,7 @@ EOS
   opt :file, "Output to a specific filename, will not work in conjunction with the --raw option.", :type => :string
 end
 
-if opts[:raw] == true and opts[:file] != nil
+if opts[:raw] == true and !opts[:file].nil?  
   puts "Error: --raw and --file cannot be used in conjunction"
   exit 1
 end

data/dl.gemspec

@@ -15,6 +15,5 @@ Gem::Specification.new do |s|
   s.email             = "mrman208@me.com"
   s.rubyforge_project = s.name
 
-  s.add_dependency "patron"
   s.add_dependency "trollop"
 end

data/lib/dl.rb

@@ -1,9 +1,9 @@
-require 'patron'
+require 'net/http'
 
 require 'dl/dl'
 
 module Dl
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 
   @@be_quiet = false
   @@file = ""

data/lib/dl/dl.rb

@@ -1,26 +1,22 @@
 module Dl
   def self.download(url, raw = false)
-    session = Patron::Session.new
+    if !(url =~ /^https?:/i)
+      parsed_url = "http://" + url
+    end
 
     output "Downloading #{url}..."
+    parsed_url = URI.parse(parsed_url)
+    req = Net::HTTP::Get.new(parsed_url.path.empty? ? '/' : parsed_url.path)
+    res = Net::HTTP.start(parsed_url.host, parsed_url.port) {|http|
+      http.request(req)
+    }
 
-    begin
-      response = session.get url
-    rescue Patron::Error => e
-      $stderr.puts e.message
-      exit 1
-    end
+    output "#{url} downloaded to the file #{url.split("/").last}"
 
     if raw == true
-      puts response.body
+      puts res.body
     else
-      if Dl::file != nil
-        filename = Dl::file
-      else
-        filename = response.url.split('/').pop
-      end
-      output "Downloaded to file #{filename}!"
-      File.new(filename, 'w').write(response.body)
+      File.new(url.split("/").last, "w").write(res.body)
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: dl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Mark Szymanski
@@ -10,10 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 Z
+date: 2011-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: patron
+  name: trollop
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -23,17 +23,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 description: 
 email: mrman208@me.com
 executables: 
@@ -75,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dl
-rubygems_version: 1.7.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A simple tool to download files, almost like wget or curl. But much simpler.