lib/dl/dl.rb in dl-1.2.3 vs lib/dl/dl.rb in dl-1.2.4
- old
+ new
@@ -1,27 +1,23 @@
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
private