s3_meta_sync 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7eb9e8cfbb4fba93e16b088470bc62f9d32795
-  data.tar.gz: 0998403f3dea548319c2f793da82333e3eaf50da
+  metadata.gz: 86108185353e54e6adf0bc50b1c5661b30056ab3
+  data.tar.gz: d0f3ecc3597c3d4095106e12cbc690f2486ed716
 SHA512:
-  metadata.gz: 0dd7baa033fbac76e2f5f85bdcc5d9206a57684c45b0cc444114821e39d8c7b3b8fdc543d7c5fc9b82f82bb4813a194a0c05b778887e64f9beaa77f45da55f85
-  data.tar.gz: c74e6809f4c2cf48e6aa6eec94358e1ccd4663bf45bb3d04d5ac0cc7bb7a5d18457f0d33856a301649e30081a38989d7424e17f07be67daffbdcd71a8708928f
+  metadata.gz: 587e5b34cf058fb84d488632eec7e0a3322c440395e7e24ca62d0741977beba613cea4b2a10fd2481c0e705a6239b32fbad2f6b06634859496552dac17d0a637
+  data.tar.gz: 4025e4bdf77f15b72d5922e6a1c3ab8ad2974090444bb860be8dfdad2e9f6e4df2bd14fd0bba6e1b097d96c414c1c5bb187a1bd0f341f24cb36f74d3f5bbe21c

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-G�^_`�ގ��	�����Gc��ɶT:�-��K3˜L��B��x˩s���/0�2�ʌ��J3��y6ZPߕ�®�fowg�d�i/�����ȴ�8ur?���t���R���4�Cc�ȴ	�6
+%w1�"無%h%���x�2)1�D8��98zR���5�W�G1��:�ogx�崗����
{��4X
+YQm��C	���3��cL�8��Ƣ0
�����f�[����*L�}�r��:���͏Q��׼X

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/s3_meta_sync.rb

@@ -76,7 +76,7 @@ module S3MetaSync
           download_file(source, META_FILE, staging_area)
           verify_integrity!(staging_area, destination)
           delete_empty_folders(staging_area)
-          swap_in_directory(destination, staging_area)
+          self.class.swap_in_directory(destination, staging_area)
         end
       end
     end
@@ -85,10 +85,24 @@ module S3MetaSync
       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
+    # almost atomic when destination and temp dir are not on the same device
+    def self.swap_in_directory(destination, dir)
+      next_dir = ".#{destination}-next"
+      delete = ".#{destination}-delete"
+
+      # clean up potential leftovers from last run
+      FileUtils.remove_dir(next_dir) if File.exist?(next_dir)
+      FileUtils.remove_dir(delete) if File.exist?(delete)
+
+      # move onto the same device
+      FileUtils.mv(dir, next_dir)
+
+      # swap
+      FileUtils.mv(destination, delete)
+      FileUtils.mv(next_dir, destination)
+
+      # cleanup old
+      FileUtils.remove_dir(delete)
     end
 
     def verify_integrity!(staging_area, destination)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,20 +30,20 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -66,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sync folders with s3 using a metadata file and md5 diffs