smart_s3_sync 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1767db822124a61f5d93e9b1bd028ef604ba68f9
-  data.tar.gz: 198cfd1033178569ae744a95e2e39a73a7666927
+  metadata.gz: c8613330fab8c1fb442c003b4b87604c41ea2f4d
+  data.tar.gz: 098e63dde5e0c5e6f692299efca4e463cd75f1f3
 SHA512:
-  metadata.gz: 2eabf0d9dc4cb0c6a5df75427599a8656d351c568989588a8642f3904ce047f23418f73c855e0403fb50e7ab174c8ba597a21089889181cb0536a051145ec8ac
-  data.tar.gz: 4850ffdd09ac303a9018a6108e3a5d734a2a3114414ce771acfbd5a6f27d5e60d10a86b35419343609ba96db2fce3ff875aaa1c0903b51c6e150e15836eadea0
+  metadata.gz: 984ab151ebac3d4dcab6e1423c7ed165c97943daf9ec7f22b9c01d31360ef439fd578bfd2950a78c11a7e72c15f1ffda3a691ddeeb1f0096fbeb4f7afec73b60
+  data.tar.gz: 99fbae0099fa91e898dfa225e54fa1a158efbffb42216c9f0db750b175c6a3defab50244d53e9cade8e2e3f1bc9ecbd4035f27135af3d2ef5a2eeae8dae40ee1

data/lib/smart_s3_sync.rb

@@ -13,17 +13,23 @@ module SmartS3Sync
       get(remote_dir, {:prefix => remote_prefix})
 
     # Add all files in the cloud to our map.
-    print "Checking Files: 0"
+    $stderr.print "Checking Files: "
     checked = 0
     bucket.files.each do |file|
       table.push(file)
-      print "\b" * checked.to_s.length
-      print (checked += 1).to_s
+      if $stderr.tty?
+        $stderr.print "\b" * checked.to_s.length unless checked == 0
+        $stderr.print (checked += 1).to_s
+      elsif (checked += 1) == 1
+        $stderr.print '...'
+      elsif checked % 1000 == 0
+        $stderr.print '.'
+      end
     end
 
-    puts "\n"
-    puts "Status: Need to download #{table.to_download.length} files (#{table.to_download.map(&:size).inject(&:+)} bytes)"
-    puts "Status: with an effective total of #{table.to_copy.inject(0){|coll, obj| coll + obj.destinations.length }} files (#{table.to_copy.map{|x| x.size * x.destinations.length }.inject(&:+)} bytes)"
+    $stderr.puts " done! (#{checked} files)\n"
+    $stderr.puts "Status: Need to download #{table.to_download.length} files (#{table.to_download.map(&:size).inject(&:+)} bytes)"
+    $stderr.puts "Status: with an effective total of #{table.to_copy.inject(0){|coll, obj| coll + obj.destinations.length }} files (#{table.to_copy.map{|x| x.size * x.destinations.length }.inject(&:+)} bytes)"
 
     # And copy them to the right places
     table.copy!(bucket)
@@ -31,14 +37,14 @@ module SmartS3Sync
     # sweep through and remove all files not in the cloud
     Dir[File.join(dir, '**/*')].each do |file|
       if !File.directory?(file)
-        File.unlink(file) and puts "DELETING: #{file}" unless table.keep?(file)
+        File.unlink(file) and $stderr.puts "DELETING: #{file}" unless table.keep?(file)
       end
     end
 
     # and then all empty directories
     Dir[File.join(dir, '**/*')].each do |file|
       if File.directory?(file) && Dir.entries(file).length == 0
-        puts "DELETING: #{file}"
+        $stderr.puts "DELETING: #{file}"
         Dir.rmdir(file)
       end
     end

data/lib/smart_s3_sync/file_target.rb

@@ -42,7 +42,7 @@ module SmartS3Sync
     private
 
     def copy_from_fog(fog_dir)
-      puts "Downloading #{remote_filename}"
+      $stderr.puts "Downloading #{remote_filename}"
       tries = 0
       file = nil
       begin
@@ -57,8 +57,8 @@ module SmartS3Sync
       rescue StandardError => e
         if tries < 5
           tries += 1
-          puts e
-          puts "retrying"
+          $stderr.puts e
+          $stderr.puts "retrying"
           retry
         else
           raise e
@@ -69,9 +69,9 @@ module SmartS3Sync
     end
 
     def copy_from_local(source)
-      puts "Linking #{destinations.join(', ')}"
+      $stderr.puts "Linking #{destinations.join(', ')}"
       destinations.each do |dest|
-        FileUtils.mkdir_p(File.dirname(dest))
+        FileUtils.mkdir_p(File.dirname(dest), :mode => 0755)
         FileUtils.ln(source, dest, :force => true)
         DigestCache.save_record(dest, File.mtime(dest).to_i, digest.to_s)
       end
@@ -101,6 +101,7 @@ module SmartS3Sync
           file.write chunk
         end
         file.close
+        File.chmod(0644, file.path)
       end
     end
   end

data/lib/smart_s3_sync/version.rb

@@ -1,3 +1,3 @@
 module SmartS3Sync
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_s3_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Chris Rhoden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3