s3_meta_sync 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af37ab3cb7681f53fb7386ab6e5f2cd01ede102e
-  data.tar.gz: 5e134534e2320694b539f01782fea1ec4cd1a28c
+  metadata.gz: 0a33ceb0ed10477f0a45cd231188300ccfde41c3
+  data.tar.gz: 19330b094cea80dff0e1a7b3a6ef0a92bc60ac7a
 SHA512:
-  metadata.gz: 0857b2fe31a03ee712481464269c98076588cf6c0c09b5cd8b6b8425115440d9b072059b620a268bcfc7c36855e80a040063eed5bc954d733fdd9dc8e5e32abf
-  data.tar.gz: 8561e7cfa0020541cb912c7f7913a954287b45f47cceb93e7649322a9262b39158ac0ee1936656643f5d518bd019c4ba5c4821b92025f4bc33ed119f0c680639
+  metadata.gz: 69f2e949443b2feb0dea0250cf2a463fbc2008522c543a990e2f6fe27ae5a3c765594402e6362079963f377777eff989b9d7ca898d5f48fcd5f2d012dcb8c828
+  data.tar.gz: d3fb512003d77ce462c88eda21b1de52a5731fb26d86a7420cf5b4858f5be4e8619c9569d0d00351e6daa4bfd9baaad6f218a673156be2e156c54b366551682b

data/bin/s3-meta-sync

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
-require "rubygems" if RUBY_VERSION < "1.9"
 require "s3_meta_sync"
 exit S3MetaSync.run(ARGV)

data/lib/s3_meta_sync/syncer.rb

@@ -4,15 +4,7 @@ require "digest/md5"
 require "fileutils"
 require "tmpdir"
 
-require "aws/s3"
-
-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
-
+require "aws-sdk"
 require "s3_meta_sync/zip"
 
 module S3MetaSync
@@ -139,12 +131,17 @@ module S3MetaSync
       log "Uploading #{path}"
       content = File.read("#{source}/#{path}")
       content = Zip.zip(content) if @config[:zip] && path != META_FILE
-      s3.objects["#{destination}/#{path}"].write content, :acl => :public_read
+      s3.object("#{destination}/#{path}").put body: content, :acl => 'public-read'
     end
 
     def delete_remote_files(remote, paths)
       paths.each { |path| log "Deleting #{@bucket}:#{remote}/#{path}" }
-      s3.objects.delete paths.map { |path| "#{remote}/#{path}" }
+      if paths.any?
+        s3.delete_objects(
+          delete: { objects: paths.map { |path| {key: "#{remote}/#{path}"} } },
+          request_payer: "requester"
+        )
+      end
     end
 
     def delete_local_files(local, paths)
@@ -154,10 +151,11 @@ module S3MetaSync
     end
 
     def s3
-      @s3 ||= ::AWS::S3.new(
+      @s3 ||= ::Aws::S3::Resource.new(
         access_key_id: @config[:key],
-        secret_access_key: @config[:secret]
-      ).buckets[@bucket]
+        secret_access_key: @config[:secret],
+        region: @config[:region] || 'us-west-2'
+      ).bucket(@bucket)
     end
 
     def generate_meta(source)

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: 
 email: michael@grosser.it
 executables:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Sync folders with s3 using a metadata file and md5 diffs