s3_meta_sync 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ceaef9f69b6086aa41a91dcace544edd6854d81
-  data.tar.gz: aae6b965be96ecb24486b3ff49daef5146fa8b0a
+  metadata.gz: 0452dfe946a8a1e9c79d516b1755435c6c46cdeb
+  data.tar.gz: fb29c38c0508f48a69a505fed4c14d9a2b382579
 SHA512:
-  metadata.gz: 210869b7b243c91ef66750024edabff48643e03bf0fa487baa3345957ca33cceac43feb965dd2339019f9f4c718c6bea3144f368b51911b1e8095c242f2e0228
-  data.tar.gz: dc0c3e89c49f7b58cc78d45079a6f50e73ac8651619867c1e4ef8a1ad673a21e9c6f896a2a3d6fc8ba64414c41f0855025bb92e1230deffa324db97b014342bd
+  metadata.gz: 974de199c5fc3ea6c2f94972a9353f3613eadb51c054a0d067848c47721237d528a134532ec534fee1cfed7c6023f2251b1745cdfc9f3663e16268691ed5a804
+  data.tar.gz: 5d0e8eeb264463f5a551143efb0675044896742886072074565c7385b4723aed7a6b2cbd80d2644e507abe5d19cc4d30dd5ddb1114c4f8eeefb1b28898974e8f

data/lib/s3_meta_sync/syncer.rb

@@ -43,8 +43,7 @@ module S3MetaSync
         log "Remote has no .s3-meta-sync, uploading everything", true
         {files: {}}
       end
-      generate_meta(source)
-      local_files = read_meta(source)[:files]
+      local_files = generate_meta(source)[:files]
       remote_files = remote_meta[:files]
       upload = if @config[:zip] == remote_meta[:zip]
         local_files.select { |path, md5| remote_files[path] != md5 || corrupted.include?(path) }
@@ -62,7 +61,8 @@ module S3MetaSync
     def download(source, destination)
       raise if @config[:zip]
       remote_meta = download_meta(source)
-      local_files = meta_data(destination)[:files]
+      local_files = ((@config[:no_local_changes] && read_meta(destination)) || meta_data(destination))[:files]
+
       download = remote_meta[:files].select { |path, md5| local_files[path] != md5 }.map(&:first)
       delete = local_files.keys - remote_meta[:files].keys
 
@@ -167,6 +167,7 @@ module S3MetaSync
       file = "#{source}/#{META_FILE}"
       FileUtils.mkdir_p(File.dirname(file))
       File.write(file, meta.to_yaml)
+      meta
     end
 
     def meta_data(source)
@@ -180,7 +181,7 @@ module S3MetaSync
 
     def read_meta(source)
       file = "#{source}/#{META_FILE}"
-      File.exist?(file) ? YAML.load(File.read(file)) : {}
+      YAML.load(File.read(file)) if File.exist?(file)
     end
 
     def download_meta(destination)

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/s3_meta_sync.rb

@@ -41,6 +41,7 @@ module S3MetaSync
         opts.on("-p", "--parallel COUNT", Integer, "Use COUNT threads for download/upload default: 10") { |c| options[:parallel] = c }
         opts.on("--ssl-none", "Do not verify ssl certs") { options[:ssl_none] = true }
         opts.on("-z", "--zip", "Zip when uploading to save bandwidth") { options[:zip] = true }
+        opts.on("--no-local-changes", "Do not md5 all the local files, they did not change") { options[:no_local_changes] = true }
         opts.on("-V", "--verbose", "Verbose mode"){ options[:verbose] = true }
         opts.on("-h", "--help", "Show this.") { puts opts; exit }
         opts.on("-v", "--version", "Show Version"){ puts VERSION; exit}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk