rhcf-utils 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9909d07e5aa545cbf9b72db81d6149001d00e90a
-  data.tar.gz: eae25b18c3232384492b5cae2e580680e360f99e
+  metadata.gz: 9bbb18233c4eb4dee23a92dc24406682cd1e17b6
+  data.tar.gz: 90ddbf00c82e1965d2894816b01b75bfe10950b2
 SHA512:
-  metadata.gz: 811297382e1341960a989f99da58968501a9c3efca6966fb0abb34d07f309f483d759af9ce2acbac0a5866ee9a14767cba60ebc61a2f87b1eca70c3e06e9a812
-  data.tar.gz: 9f1e833fd8bd6acf277febc0cde75fe934ba2918f79e533dbe0e6936a1677585eaffa7f928c83e73201609a8816eda14e4eabfeeca5e807db725c0b9fa40f517
+  metadata.gz: a5951a56a503f1e80dac9d927acc992b3d460683761700c99146a3324c6df788bf2e9bd00bf8fa38408166eccab635db01daa2cd927738b2ee28fbd4a9054d05
+  data.tar.gz: dc5a16c1d983e8d97e94196b78ca0664abdbc13f45229144d40c5a9b207e22678d16f130f515b1bf0c2f3970aae01e82c2e2c48d6a58c828152bf091d077f835

data/lib/rhcf/utils/download_cache.rb

@@ -1,5 +1,5 @@
 require 'uri'
-require 'open-uri'
+require 'net/http'
 require 'fileutils'
 require 'digest/md5'
 
@@ -22,12 +22,22 @@ module Rhcf
  
 
       def download!(url, outfile)
-        open(url, "rb") do |down|
+        uri = URI(url)
+        expected_file_size = nil
+        Net::HTTP.start(uri.host) do |http|
+          resp = http.get(uri.path)
+
+          expected_file_size = resp.body.size
           mkdir_p(File.dirname(outfile))
           File.open(outfile, 'wb') do |fd|
-            fd.write(down.read)
+            fd.write(resp.body)
           end
         end
+
+        if expected_file_size != File.size(outfile)
+          raise "Different file size expected: '%d' bytes got: '%d' bytes " % [expected_file_size, File.size(outfile)]
+        end
+        raise "Empty file" if File.zero?(outfile)
         outfile
       end 
 
@@ -38,7 +48,7 @@ module Rhcf
   
       def self.hit_fname?(fname, ttl)
         
-        if File.exist?(fname) 
+        if File.exist?(fname) and !File.zero?(fname)
           if ttl
             File::Stat.new(fname).ctime > Time.now - ttl
           else 

data/lib/rhcf/utils/version.rb

@@ -1,5 +1,5 @@
 module Rhcf
   module Utils
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/rhcf/utils/download_cache_spec.rb

@@ -32,7 +32,7 @@ describe Rhcf::Utils::DownloadCache do
     before(:each) do
       FileUtils.rm_rf "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/a/e/a/aea455b4b37a2d4240a6b054ca0b0d5f8"
       FileUtils.mkdir_p "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440"
-      FileUtils.touch "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg"
+      IO.write("/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg", 'noempty')
     end
     it "should return true if file downloaded and ttl is null" do
       cache_of_30s.filename_for(img_url).should == '/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhcf-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Romeu Fonseca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler