s3_meta_sync 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3976f983750855ddbbc8de6d7b7a38f8b25471dc
-  data.tar.gz: 2d707bbccab3b1b88b89191aae7ee9bf332b78d2
+  metadata.gz: fc959d3e973194fb4fbfb3deddef13cfa6e054df
+  data.tar.gz: 364d7b58956386524107f97306bca633289e6ee4
 SHA512:
-  metadata.gz: e771453d6350103c521afb15dc23c54e4884dc20aac8e7c26a2214f4a9d7f86012e341b7e7dcd4c88ddefaaa1b75c2d8a06e4aedbdf20c2864ec3098f4d67a95
-  data.tar.gz: c68eaf670258095a802683804ea301e68f2d644418507f56eb5b1d1af866c4ef5412b713ce1a80fddca3b81ee07b1552f1093e366adfde2aa77f1c5539eb2e07
+  metadata.gz: e828832357b51c5af7364d2b263e343de70a640b662b73f981f9c46577a265339857fda8baec7a0a1666053a44dac725583afb5f773d4a915adb696d12768fff
+  data.tar.gz: 7cda74fad51d1bb8c2ad83a71804d95cc85d812276ceb037fc772b59de8b1740239c4104774bbe0633957bb279568ce1f4770bca87384000e5a143e1a6299410

data.tar.gz.sig

@@ -1,4 +1 @@
-U�S�9>��;����׀b�����P/��2�&^"�g��Ӗf3��*��?���`\ϓ}�1�G��1�V
-k��b�!���7F뼖k5tA��y2B�8��Ƣ��"�X������n�bxRQ��,'9��K�������y\��dG/����<o�ߵdr��$�k~߁P@�����H%;�,DKϵ�|�[��5d�
-�|��_=D(�o��3�s��ϯY�֗ �ۖ�Q�2�E�Ru�n�|jY��P�im����
-
+�;B@�r)�`�"L�%��-\��e�A������>We�oշ�0�w�/�#�R ㇻB�X�&������<>�>�x����q�d�e��e$e=��o7��:�8״'�SM��]�z��Drچh^u�

data/lib/s3_meta_sync/syncer.rb

@@ -59,7 +59,6 @@ module S3MetaSync
     end
 
     def download(source, destination)
-      raise if @config[:zip]
       remote_meta = download_meta(source)
       local_files = ((@config[:no_local_changes] && read_meta(destination)) || meta_data(destination))[:files]
 
@@ -77,7 +76,7 @@ module S3MetaSync
           delete_empty_folders(staging_area)
           store_meta(staging_area, remote_meta)
 
-          verify_integrity!(staging_area, destination, remote_meta[:files])
+          verify_integrity!(staging_area, destination, download, remote_meta[:files])
           self.class.swap_in_directory(destination, staging_area)
           FileUtils.mkdir(staging_area) # mktmpdir tries to remove this directory
         end
@@ -111,16 +110,15 @@ module S3MetaSync
       FileUtils.remove_dir(delete)
     end
 
-    def verify_integrity!(staging_area, destination, remote)
-      actual = meta_data(staging_area)[:files]
+    def verify_integrity!(staging_area, destination, changed, remote)
+      local = md5_hash(staging_area, changed)
+      corrupted = local.select { |file, md5| remote[file] != md5 }.map(&:first)
+      return if corrupted.empty?
 
-      if remote != actual
-        corrupted = actual.select { |file, md5| remote[file] && remote[file] != md5 }.map(&:first)
-        File.write("#{destination}/#{CORRUPT_FILES_LOG}", corrupted.join("\n"))
-        message = "corrupted files downloaded:\n#{corrupted.join("\n")}"
-        log message, true
-        raise RemoteCorrupt, message
-      end
+      File.write("#{destination}/#{CORRUPT_FILES_LOG}", corrupted.join("\n"))
+      message = "corrupted files downloaded:\n#{corrupted.join("\n")}"
+      log message, true
+      raise RemoteCorrupt, message
     end
 
     def consume_corrupted_files(source)
@@ -173,15 +171,18 @@ module S3MetaSync
 
     def meta_data(source)
       return {files: {}} unless File.directory?(source)
-      files = Dir.chdir(source) do
-        files = Dir["**/*"].select { |f| File.file?(f) }
-        Hash[files.map { |file| [file, Digest::MD5.file(file).to_s] }]
-      end
-      result = {files: files}
+      result = {files: md5_hash(source)}
       result[:zip] = @config[:zip] if @config[:zip]
       result
     end
 
+    def md5_hash(source, files=nil)
+      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)
       file = "#{source}/#{META_FILE}"
       YAML.load(File.read(file)) if File.exist?(file)

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

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