s3_meta_sync 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66fd72c5fa08fc841c1eabff28d2edcf17d1f9e7
-  data.tar.gz: 84ebb0bcc5ea31e17f7963434d16901f96b92f81
+  metadata.gz: 5656a323ca7eaad2a794b645ff158819a2d1edd6
+  data.tar.gz: 47323041dbc94b89b34aa8dc821eb54dd9be3880
 SHA512:
-  metadata.gz: 8ad3f56ec2eba6491ceb9c42d5aa60c563ce286d573799959861309e966af77fe7bcff0788ddf11a567fd9de66be101b1091d8eed70d00c90437f3e1f62fa3f4
-  data.tar.gz: b69b8d36b3e2211ed6c8f9b11505fa5c5d00116096c5eaef5ef0bda4e9ed59ce51ed0c6d138fa30a2940d260cc647f15d6a51bd13868adbb95864ad39ba3d20c
+  metadata.gz: 3b8037f17c549849ab87b37c4587c68cdaaafe70d0532f556dbfd7e30a6f6d9a42ab1d28ffa6668d401e07ecfd2328282b94b366c54e94f3e0d740536e480ce5
+  data.tar.gz: 37130dbe101aa047ad4fdd30163a5cd20754985368eb2db6b4db98d84e72ae2a84e4fad4b99ea64d62d637d04cb89c0c20744ea6aec5c59eb4569079e2a16431

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/s3_meta_sync.rb

@@ -4,6 +4,7 @@ require "yaml"
 require "digest/md5"
 require "optparse"
 require "fileutils"
+require "tmpdir"
 
 require "aws/s3"
 
@@ -16,6 +17,7 @@ end
 
 module S3MetaSync
   RemoteWithoutMeta = Class.new(Exception)
+  RemoteCorrupt = Class.new(Exception)
   META_FILE = ".s3-meta-sync"
 
   class Syncer
@@ -64,10 +66,40 @@ module S3MetaSync
 
       log "Downloading: #{download.size} Deleting: #{delete.size}", true
 
-      download_files(source, destination, download)
-      delete_local_files(destination, delete)
-      download_file(source, META_FILE, destination)
-      delete_empty_folders(destination)
+      unless download.empty? && delete.empty?
+        Dir.mktmpdir do |dir|
+          copy_content(destination, dir)
+          download_files(source, dir, download)
+          delete_local_files(dir, delete)
+          download_file(source, META_FILE, dir)
+          verify_integrity!(dir)
+          delete_empty_folders(dir)
+          swap_in_directory(destination, dir)
+        end
+      end
+    end
+
+    def copy_content(destination, dir)
+      system "cp -R #{destination}/* #{dir} 2>/dev/null"
+    end
+
+    def swap_in_directory(destination, dir)
+      Dir.mktmpdir { |landfill| FileUtils.mv(destination, landfill) }
+      FileUtils.mv(dir, destination)
+      FileUtils.mkdir(dir) # make ensure in outside mktmpdir not blow up
+    end
+
+    def verify_integrity!(source)
+      file = "#{source}/#{META_FILE}"
+      old = File.read(file)
+      generate_meta(source)
+      new = File.read(file)
+      if new != old
+        log "old meta:\n#{old}\n\nnew meta:\n#{new}", true
+        raise RemoteCorrupt
+      end
+    ensure
+      File.write(file, old) if old
     end
 
     def upload_file(source, path, destination)
@@ -91,12 +123,17 @@ module S3MetaSync
     end
 
     def generate_meta(source)
-      meta = Hash[Dir["#{source}/**/*"].select { |f| File.file?(f) }.map do |file|
-        [file.sub("#{source}/", ""), Digest::MD5.file(file).to_s]
-      end]
       file = "#{source}/#{META_FILE}"
       FileUtils.mkdir_p(File.dirname(file))
-      File.write(file, meta.to_yaml)
+      File.write(file, meta_data(source).to_yaml)
+    end
+
+    def meta_data(source)
+      return {} unless File.directory?(source)
+      Dir.chdir(source) do
+        files = Dir["**/*"].select { |f| File.file?(f) }
+        Hash[files.map { |file| [file, Digest::MD5.file(file).to_s] }]
+      end
     end
 
     def read_meta(source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
   YWVsMRcwFQYKCZImiZPyLGQBGRYHZ3Jvc3NlcjESMBAGCgmSJomT8ixkARkWAml0
-  MB4XDTEzMDIwMzE4MTMxMVoXDTE0MDIwMzE4MTMxMVowPzEQMA4GA1UEAwwHbWlj
+  MB4XDTE0MDIwNDIwMjk0MVoXDTE1MDIwNDIwMjk0MVowPzEQMA4GA1UEAwwHbWlj
   aGFlbDEXMBUGCgmSJomT8ixkARkWB2dyb3NzZXIxEjAQBgoJkiaJk/IsZAEZFgJp
   dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMorXo/hgbUq97+kII9H
   MsQcLdC/7wQ1ZP2OshVHPkeP0qH8MBHGg6eYisOX2ubNagF9YTCZWnhrdKrwpLOO
@@ -20,16 +20,17 @@ cert_chain:
   6vHvcIHdzvc/OUkICttLbH+1qb6rsHUceqh+JrH4GrsJ5H4hAfIdyS2XMK7YRKbh
   h+IBu6dFWJJByzFsYmV1PDXln3UBmgAt65cmCu4qPfThioCGDzbSJrGDGLmw/pFX
   FPpVCm1zgYSb1v6Qnf3cgXa2f2wYGm17+zAVyIDpwryFru9yF/jJxE38z/DRsd9R
-  /88CAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUsiNnXHtKeMYYcr4yJVmQ
-  WONL+IwwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQAlyN7kKo/NQCQ0
-  AOzZLZ3WAePvStkCFIJ53tsv5Kyo4pMAllv+BgPzzBt7qi605mFSL6zBd9uLou+W
-  Co3s48p1dy7CjjAfVQdmVNHF3MwXtfC2OEyvSQPi4xKR8iba8wa3xp9LVo1PuLpw
-  /6DsrChWw74HfsJN6qJOK684hJeT8lBYAUfiC3wD0owoPSg+XtyAAddisR+KV5Y1
-  NmVHuLtQcNTZy+gRht3ahJRMuC6QyLmkTsf+6MaenwAMkAgHdswGsJztOnNnBa3F
-  y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
-  ycwMXfl0
+  /88CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFLIj
+  Z1x7SnjGGHK+MiVZkFjjS/iMMB0GA1UdEQQWMBSBEm1pY2hhZWxAZ3Jvc3Nlci5p
+  dDAdBgNVHRIEFjAUgRJtaWNoYWVsQGdyb3NzZXIuaXQwDQYJKoZIhvcNAQEFBQAD
+  ggEBAExBcUWfGuamYn+IddOA0Ws8jUKwB14RXoZRDrTiTAlMm3Bkg2OKyxS3uJXa
+  6Z+LwFiZwVYk62yHXqNzEJycQk4SEmY+xDWLj0p7X6qEeU4QZKwR1TwJ5z3PTrZ6
+  irJgM3q7NIBRvmTzRaAghWcQn+Eyr5YLOfMksjVBMUMnzh5/ZDgq53LphgJbGwvz
+  ScJAgfNclLHnjk9q1mT1s0e1FPWbiAL3siBIR5HpH8qtSEiivTf2ntciebOqS93f
+  F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
+  /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk