s3_meta_sync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85122789e5f9115e5e5feae13687496fe84afc6
-  data.tar.gz: 934425dbaa4f5555e418f6ccaade64144d888b99
+  metadata.gz: d7642bf36775b6d4208777739adb5bc3f569f5a0
+  data.tar.gz: fa9e52f99fd14dc3fb7ae8b45aa6fb05e539954c
 SHA512:
-  metadata.gz: 3ea26c334b2aceda1df5f55cf17e66c5cb1f3a5cfb2d5246a09059f6bfc9246f17b7eb24680f492a461a40ebb9b98644b5fdb40cccf027fdf3ef93544219e6d8
-  data.tar.gz: 1067bb5ff41eae7fed797b291bdeb936cb19bf7060bf4b7d36ea46ea5ef5994653c54d1715f8e764a7ba821e40aed7e05c1c22ea3e8c3d1c89fe1c5cba672558
+  metadata.gz: 8975619183d2678b7aea13118fe3ade6d5f7d6e3492f5e663b64f65392005c814a4e8be96f57705e061243c29e888b874e0db1ac887f656112e3bf1df163e345
+  data.tar.gz: 503dd14f0784246ac2ac636dc86ae544421d7baa98d41c259812dfc84226cd4b8162481567fb2c51f4036b748ac73e781a7a1b28f32b2eabb3299bfcd9171c75

data/lib/s3_meta_sync.rb

@@ -5,11 +5,14 @@ require "digest/md5"
 require "optparse"
 require "fileutils"
 
-# need to require these or upload in multiple threads will fail on systems with high load
 require "aws/s3"
-require "aws/s3/s3_object"
-require "aws/core/response"
-require "aws/s3/object_collection"
+
+if RUBY_VERSION < "2.0.0"
+  # need to require these or upload in multiple threads will fail on systems with high load
+  require "aws/s3/s3_object"
+  require "aws/core/response"
+  require "aws/s3/object_collection"
+end
 
 module S3MetaSync
   RemoteWithoutMeta = Class.new(Exception)
@@ -142,13 +145,13 @@ module S3MetaSync
     def in_multiple_threads(data)
       threads = [@config[:parallel] || 10, data.size].min
       data = data.dup
-      threads.times do
+      (0...threads).to_a.map do
         Thread.new do
           while slice = data.shift
             yield slice
           end
         end
-      end
+      end.each(&:join)
     end
 
     def log(text, important=false)

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

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