s3_meta_sync 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb6d1dc57f85fef0460036cf18f1df63e232b6b
-  data.tar.gz: 4d6af32ae754e74e35fb422ca4e4484e606877b9
+  metadata.gz: 8ceaef9f69b6086aa41a91dcace544edd6854d81
+  data.tar.gz: aae6b965be96ecb24486b3ff49daef5146fa8b0a
 SHA512:
-  metadata.gz: a24e1133a839b8d8bf4a9a6d2daee8424f4a571649ae0b026d2ccd51a62e6746c5cedd968c3e4b7d022c94713968a8894989ec7e830b257814dd677650370bd3
-  data.tar.gz: 0a6be6d291a061d7d156e3640c1475067495fec34eefdffe0def1fa6137a9dc0ff1ec94dead58b99f57bac393ff504db890d1fb2adf532c241d6ed9df1fa633e
+  metadata.gz: 210869b7b243c91ef66750024edabff48643e03bf0fa487baa3345957ca33cceac43feb965dd2339019f9f4c718c6bea3144f368b51911b1e8095c242f2e0228
+  data.tar.gz: dc0c3e89c49f7b58cc78d45079a6f50e73ac8651619867c1e4ef8a1ad673a21e9c6f896a2a3d6fc8ba64414c41f0855025bb92e1230deffa324db97b014342bd

data/lib/s3_meta_sync/syncer.rb

@@ -62,8 +62,7 @@ module S3MetaSync
     def download(source, destination)
       raise if @config[:zip]
       remote_meta = download_meta(source)
-      generate_meta(destination)
-      local_files = read_meta(destination)[:files]
+      local_files = 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
 
@@ -71,14 +70,16 @@ module S3MetaSync
 
       unless download.empty? && delete.empty?
         Dir.mktmpdir do |staging_area|
+          FileUtils.mkdir_p(destination)
           copy_content(destination, staging_area)
           download_files(source, staging_area, download, remote_meta[:zip])
           delete_local_files(staging_area, delete)
-          download_file(source, META_FILE, staging_area, false)
-          verify_integrity!(staging_area, destination, remote_meta[:files])
           delete_empty_folders(staging_area)
+          store_meta(staging_area, remote_meta)
+
+          verify_integrity!(staging_area, destination, remote_meta[:files])
           self.class.swap_in_directory(destination, staging_area)
-          FileUtils.mkdir(staging_area)
+          FileUtils.mkdir(staging_area) # mktmpdir tries to remove this directory
         end
       end
     end
@@ -159,13 +160,17 @@ module S3MetaSync
     end
 
     def generate_meta(source)
+      store_meta(source, meta_data(source))
+    end
+
+    def store_meta(source, meta)
       file = "#{source}/#{META_FILE}"
       FileUtils.mkdir_p(File.dirname(file))
-      File.write(file, meta_data(source).to_yaml)
+      File.write(file, meta.to_yaml)
     end
 
     def meta_data(source)
-      return {} unless File.directory?(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] }]

data/lib/s3_meta_sync/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Michael Grosser

metadata.gz.sig

@@ -1,3 +1 @@
-��,�WM��A��ɫ
-5_i�nS�af���b�P�p�Ʈ�a�i����r�Q�5oh/ ʸw��繚�w� �
ė�޾R�E��~�>VAfcXm��
-�S�G/�	j`=��r�����X�������o�ҡ)��V8H@�m�ു͵
+5����jL_`������5