smart_s3_sync 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b681c8704ec7dedf9b0f913627c599c3f432cdb
-  data.tar.gz: d4d746948fb98f23fb27663be869a7c16d26fc18
+  metadata.gz: 14666867e372ebd1ca9f50414a68f497d84fe1d4
+  data.tar.gz: a650d738ab17f11d126b11ea54b4f6e1ced3398c
 SHA512:
-  metadata.gz: 0b5a509bbaf42a85515108f0619608c9f2facebfd2a41455ecbb19f3f5cba3ae544e2e91589a4893018e0f3e749572d176b8aadba8076eb093ea2e7174d231d8
-  data.tar.gz: cc2fc30d19637dffea7f738b894d16ead18f4b55de0dd45bffe5d151057bd74797feaae39b9fb3ef0f56bfee7162982217c0a66ffb3d0bd07430c6dd08973b52
+  metadata.gz: e1341e63a50e8d14192964a78514fdba32262fc304ca0951cf99b23b6b7a5820d129966f01835166f76065c3fda76179aaacad56f5e138b624a698de7996b79a
+  data.tar.gz: 62a25fa9228c46df83961d11aa3265138ab9798e52f3276a9fe5fac460ff8866ca38173068db441ef9050c2d1754e95756150a29839d95adcf02027d4731b5f6

data/bin/s5

@@ -8,11 +8,11 @@ def quit(message)
   exit 1
 end
 
-if ARGV.length != 2
-  quit "Usage: #{File.basename($0)} REMOTE_URI LOCAL_DIR"
+if ARGV.length < 2
+  quit "Usage: #{File.basename($0)} REMOTE_URI LOCAL_DIR [options]"
 end
 
-remote_uri, local_dir = ARGV
+remote_uri, local_dir = ARGV[0], ARGV[1]
 
 remote_uri = URI.parse(remote_uri)
 
@@ -33,8 +33,17 @@ if !(access_key_id && access_key_secret)
   quit "S3_ACCESS_KEY_ID and S3_SECRET_ACCESS_KEY environment variables are required"
 end
 
+options = {}
+
+if ARGV.length > 2
+  ARGV[2, ARGV.length-2].each do |opt|
+    name, val = opt.split('=', 2)
+    options[name.sub(/^--/, '')] = val
+  end
+end
+
 SmartS3Sync.sync(local_dir, bucket, {
   provider: 'AWS',
   aws_access_key_id: access_key_id,
   aws_secret_access_key: access_key_secret
-  }, prefix)
+  }, prefix, options)

data/lib/smart_s3_sync.rb

@@ -6,7 +6,7 @@ Fog.credentials = { :path_style => true }
 
 module SmartS3Sync
 
-  def self.sync(dir, remote_dir, connection_options, remote_prefix=nil)
+  def self.sync(dir, remote_dir, connection_options, remote_prefix=nil, sync_options={})
     table = FileTable.new(dir, remote_prefix)
 
     bucket = Fog::Storage.new(connection_options).directories.
@@ -32,7 +32,7 @@ module SmartS3Sync
     $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)
+    table.copy!(bucket, sync_options)
 
     # sweep through and remove all files not in the cloud
     Dir.glob(File.join(dir, '**/*')) do |file|

data/lib/smart_s3_sync/file_table.rb

@@ -17,13 +17,13 @@ module SmartS3Sync
       @map[digest].add_destination(destination_filename) # and add local path to the target
     end
 
-    def copy!(fog_dir)
+    def copy!(fog_dir, sync_options={})
       @map.sort_by do |(k, target)|
         1_000_000_000 * (target.local_source.nil? ? 0 : -1) -
             1_000_000 * target.destinations.length +
           1/1_048_576 * target.size
       end.each do |(k, target)|
-        target.copy!(fog_dir)
+        target.copy!(fog_dir, sync_options)
       end
     end
 

data/lib/smart_s3_sync/file_target.rb

@@ -26,33 +26,33 @@ module SmartS3Sync
       end
     end
 
-    def copy!(fog_dir)
+    def copy!(fog_dir, sync_options={})
       # If every copy in the cloud is already present, the
       # number of destinations will be 0 - there is no work
       # left to do.
       if destinations.length > 0
         if local_source.nil?     # we prefer to not have to download
-          copy_from_fog(fog_dir)
+          copy_from_fog(fog_dir, sync_options)
         else
-          copy_from_local(local_source)
+          copy_from_local(local_source, sync_options)
         end
       end
     end
 
     private
 
-    def copy_from_fog(fog_dir)
+    def copy_from_fog(fog_dir, sync_options={})
       $stderr.puts "Downloading #{remote_filename}"
       tries = 0
       file = nil
       begin
-        file = download(fog_dir) # basically, just try.
+        file = download(fog_dir, sync_options) # basically, just try.
 
         if file_hash(file.path) != digest.to_s
           raise "Hash mismatch downloading #{remote_filename}"
         end
 
-        copy_from_local(file.path) # with a copy locally, the job is the same
+        copy_from_local(file.path, sync_options) # with a copy locally, the job is the same
         @local_source = destinations.shift # we now have a local copy!
       rescue StandardError => e
         if tries < 5
@@ -68,7 +68,7 @@ module SmartS3Sync
       end
     end
 
-    def copy_from_local(source)
+    def copy_from_local(source, sync_options={})
       $stderr.puts "Linking #{destinations.join(', ')}"
       destinations.each do |dest|
         FileUtils.mkdir_p(File.dirname(dest), :mode => 0755)
@@ -89,11 +89,11 @@ module SmartS3Sync
       DigestCache.digest(path)
     end
 
-    def download(fog_dir)
+    def download(fog_dir, sync_options={})
       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|
+        rfile = fog_dir.files.get(remote_filename) do |chunk, left, total|
           if (chunk.size + left == total) # fog might restart in the middle
             file.rewind
           end
@@ -102,6 +102,11 @@ module SmartS3Sync
         end
         file.close
         File.chmod(0644, file.path)
+        if sync_options.has_key?('set-timestamp-from-metadata')
+          time = rfile.metadata[sync_options['set-timestamp-from-metadata']]
+          time &&= Time.at(time.to_i)
+          time && File.utime(time, time, file)
+        end
       end
     end
   end

data/lib/smart_s3_sync/version.rb

@@ -1,3 +1,3 @@
 module SmartS3Sync
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

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