smart_s3_sync 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb96961e17f6b5f47c93c3ad6987719746b8465
-  data.tar.gz: 7d26d10a49ac44897d77eac3223857f20f89d8ec
+  metadata.gz: dd521af6d2f61c2e97cdb862c4e9a30245763f6e
+  data.tar.gz: 3245d05505cc8d1cc34cf7d232e8dee78e8bd0c0
 SHA512:
-  metadata.gz: 10bd450070e40a6b8224a6453f29659b1cd76c3f1da16b686d4121e90366a52f07452cfed3fa38b8d84d21edcede0b227aca86050bc4c8ed04d590ba0729fecf
-  data.tar.gz: 68313a3c35ed073772900647845c43e98a79912ad4cdf653da9fe6b5e177e19245079e9eb98d1e11cc6d40e4c1653e8bd712e28a71d6dfc3632cb2e38c7612aa
+  metadata.gz: 035b640a1f397c45fd805514126ddf1a9b7d40689bcd64746e1a681742d979a6787b44e08adc61c3b84d5caf06424c4941ce006e7a933fe2af2b3b9066023380
+  data.tar.gz: 4328af61ad2d9ab704631f9585e64eeea878a9191d4f267897dbeda46dc1e44a01ecd83a5fe46b4889458e03bd58b21a4ee08084240dab9f70e873ca15afd0d7

data/lib/smart_s3_sync/file_target.rb

@@ -18,7 +18,6 @@ module SmartS3Sync
         # we don't add it to the list of destinations and instead
         # mark it as a local source.
         if File.exists?(file) && file_hash(file) == digest.to_s
-          puts "#{file} is up to date"
           @local_source = file
         else
           destinations.push(file)
@@ -34,7 +33,7 @@ module SmartS3Sync
         if local_source.nil?     # we prefer to not have to download
           copy_from_fog(fog_dir)
         else
-          copy_from_local(source)
+          copy_from_local(local_source)
         end
       end
     end
@@ -81,32 +80,22 @@ module SmartS3Sync
     end
 
     def download(fog_dir)
-      file = Tempfile.new(digest.to_s)
-      done = 0
-      now = Time.now.to_i
-
-      fog_dir.files.get(remote_filename) do |chunk, left, total|
-        if (chunk.bytes.size + left == total) # fog might restart in the middle
-          file.rewind
-          if done !=0
-            puts " ERROR ... retrying"
-            done = 0
+      dir = File.dirname(destinations[0])
+      FileUtils.mkdir_p(dir)
+      Tempfile.new(".#{digest}", dir).tap do |file|
+        fog_dir.files.get(remote_filename) do |chunk, left, total|
+          if (chunk.size + left == total) # fog might restart in the middle
+            file.rewind
+            if done !=0
+              puts " ERROR ... retrying"
+              done = 0
+            end
           end
-        end
 
-        file.write chunk
-        (((1 - (left.to_f / total)) * 50).to_i - done).times do
-          done += 1
-          print "#"
-        end
-        if done == 50
-          done = total / 1048576.to_f
+          file.write chunk
         end
+        file.close
       end
-
-      puts " #{((done / [Time.now.to_i - now, 0.5].max) * 100).to_i / 100.0} MB/s"
-      file.close
-      file
     end
   end
 end

data/lib/smart_s3_sync/version.rb

@@ -1,3 +1,3 @@
 module SmartS3Sync
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_s3_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chris Rhoden