s3sync 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8672f843e8dfe49d8332c6ed8212679926efdca1
-  data.tar.gz: 3142cb4b5b510800de393dd1a42033805f251eca
+  metadata.gz: 1647d25f01e1d5890e51aaddee4f23008ccc2b19
+  data.tar.gz: 2afdf32ee7d8cc6c15cde88e75462ecb57278141
 SHA512:
-  metadata.gz: a937fce93d46e724f586fce116a922bf0c6e993a893054b596963f68ac4c8480ecab166097862232c6df771aece1760c9e03dd462fac43bb34d52d953d1b1933
-  data.tar.gz: a17295b31fbc18d2d5e9a5476d0ba1bf3c54509bfd1c4425aea8d910bca15b4c84e2b1fe657d4ee447310750166d6d33d2871d7a24cdd88db1cf157b8271f105
+  metadata.gz: d027fe656ebfccf76cb80c61b1d7ee9926868a8a425c37c502ad88b408ac2743962840b0435d2f698ef990b0a5b78032bd0cada915384f97205104b26444359c
+  data.tar.gz: 2b5d672c278b9527f9821c6159145ef392b1a47b7d0e66c2467c58c21dc1d16a8f42939fc8cbc02a572229d10584e91645663352d05bf87088f27c0aa3576dbb

data/lib/s3sync/cli.rb

@@ -25,7 +25,7 @@
 require 's3sync/version'
 require 's3sync/exceptions'
 require 's3sync/sync'
-require 'aws/s3'
+require 'aws-sdk'
 require 'cmdparse'
 
 
@@ -63,9 +63,9 @@ module S3Sync
         u.join ''
       end
 
-      def execute(args)
+      def execute(*args)
         # Connecting to amazon
-        s3 = AWS::S3.new
+        s3 = Aws::S3::Resource.new(client: Aws::S3::Client.new)
 
         # From the command line
         key, file = args
@@ -78,13 +78,13 @@ module S3Sync
         # of the common errors here, saving duplications in each command;
         begin
           run s3, bucket, key, file, args
-        rescue AWS::S3::Errors::AccessDenied
-          raise FailureFeedback.new("Access Denied")
-        rescue AWS::S3::Errors::NoSuchBucket
+        rescue Aws::S3::Errors::SignatureDoesNotMatch, Aws::S3::Errors::InvalidAccessKeyId => e
+          raise FailureFeedback.new("Access Denied: #{e.message}")
+        rescue Aws::S3::Errors::NoSuchBucket
           raise FailureFeedback.new("There's no bucket named `#{bucket}'")
-        rescue AWS::S3::Errors::NoSuchKey
+        rescue Aws::S3::Errors::NoSuchKey
           raise FailureFeedback.new("There's no key named `#{key}' in the bucket `#{bucket}'")
-        rescue AWS::S3::Errors::Base => exc
+        rescue Aws::S3::Errors::ServiceError => exc
           raise FailureFeedback.new("Error: `#{exc.message}'")
         end
       end
@@ -101,7 +101,7 @@ module S3Sync
 
     class ListBuckets < BaseCmd
       def initialize
-        super 'listbuckets', false, false, false
+        super 'listbuckets', takes_commands: false #, false, false
 
         @short_desc = "List all available buckets for your user"
       end
@@ -117,11 +117,11 @@ module S3Sync
       attr_accessor :acl
 
       def initialize
-        super 'createbucket', false, false
+        super 'createbucket', takes_commands: false #, false
 
         @short_desc = "Create a new bucket under your user account"
 
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
+        self.options do |opt|
           parse_acl(opt)
         end
       end
@@ -136,8 +136,8 @@ module S3Sync
             params.merge!({:acl => @acl})
           end
 
-          s3.buckets.create bucket, params
-        rescue AWS::S3::Errors::BucketAlreadyExists
+          s3.client.create_bucket(params.merge(bucket: bucket))
+        rescue Aws::S3::Errors::BucketAlreadyExists
           raise FailureFeedback.new("Bucket `#{bucket}' already exists")
         end
       end
@@ -147,13 +147,13 @@ module S3Sync
       attr_accessor :force
 
       def initialize
-        super 'deletebucket', false, false
+        super 'deletebucket', takes_commands: false #, false
 
         @short_desc = "Remove a bucket from your account"
 
         @force = false
 
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
+        self.options do |opt|
           opt.on("-f", "--force", "Clean the bucket then deletes it") {|f|
             @force = f
           }
@@ -164,7 +164,7 @@ module S3Sync
         raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
 
         # Getting the bucket
-        bucket_obj = s3.buckets[bucket]
+        bucket_obj = s3.bucket(bucket)
 
         # Do not kill buckets with content unless explicitly asked
         if not @force and bucket_obj.objects.count > 0
@@ -179,7 +179,7 @@ module S3Sync
       attr_accessor :max_entries
 
       def initialize
-        super 'list', false, false
+        super 'list', takes_commands: false #, false
 
         @short_desc = "List items filed under a given bucket"
 
@@ -189,7 +189,7 @@ module S3Sync
 
         @has_prefix = true
 
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
+        self.options do |opt|
           opt.on("-m", "--max-entries=NUM", "Limit the number of entries to output") {|m|
             @max_entries = m
           }
@@ -203,7 +203,7 @@ module S3Sync
       def run s3, bucket, key, file, args
         raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
 
-        collection = s3.buckets[bucket].objects.with_prefix(key || "")
+        collection = s3.bucket(bucket).objects( prefix: (key || "") )
 
         if @max_entries > 0
           collection = collection.page(:per_page => @max_entries)
@@ -223,7 +223,7 @@ module S3Sync
 
     class Delete < BaseCmd
       def initialize
-        super 'delete', false, false
+        super 'delete', takes_commands: false #, false
 
         @short_desc = "Delete a key from a bucket"
 
@@ -233,7 +233,7 @@ module S3Sync
       def run s3, bucket, key, file, args
         raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
         raise WrongUsage.new(nil, "You need to inform a key") if not key
-        s3.buckets[bucket].objects[key].delete
+        s3.buckets(bucket).object(key).delete
       end
     end
 
@@ -242,7 +242,7 @@ module S3Sync
       attr_accessor :secure
 
       def initialize
-        super 'url', false, false
+        super 'url', takes_commands: false #, false
 
         @short_desc = "Generates public urls or authenticated endpoints for the object"
         @description = "Notice that --method and --public are mutually exclusive"
@@ -252,7 +252,7 @@ module S3Sync
         @expires_in = false
         @has_prefix = 'required'
 
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
+        self.options do |opt|
           opt.on("-m", "--method=METHOD", "Options: #{AVAILABLE_METHODS.join ', '}") {|m|
             @method = m
           }
@@ -295,17 +295,17 @@ module S3Sync
         opts.merge!({:secure => @secure})
 
         if @public
-          puts s3.buckets[bucket].objects[key].public_url(opts).to_s
+          puts s3.bucket(bucket).object(key).public_url(opts).to_s
         else
           opts.merge!({:expires => @expires_in}) if @expires_in
-          puts s3.buckets[bucket].objects[key].url_for(method.to_sym, opts).to_s
+          puts s3.bucket(bucket).object(key).presigned_url(method.to_sym, opts).to_s
         end
       end
     end
 
     class Put < BaseCmd
       def initialize
-        super 'put', false, false
+        super 'put', takes_commands: false #, false
 
         @short_desc = 'Upload a file to a bucket under a certain prefix'
         @has_prefix = true
@@ -320,13 +320,13 @@ module S3Sync
         raise WrongUsage.new(nil, "You need to inform a file") if not file
 
         name = S3Sync.safe_join [key, File.basename(file)]
-        s3.buckets[bucket].objects[name].write Pathname.new(file)
+        s3.bucket(bucket).object(name).upload_file(Pathname.new(file))
       end
     end
 
     class Get < BaseCmd
       def initialize
-        super 'get', false, false
+        super 'get', takes_commands: false #, false
         @short_desc = "Retrieve an object and save to the specified file"
         @has_prefix = 'required'
       end
@@ -345,7 +345,7 @@ module S3Sync
         path = File.absolute_path file
         path = S3Sync.safe_join [path, File.basename(key)] if File.directory? path
         File.open(path, 'wb') do |f|
-          s3.buckets[bucket].objects[key].read do |chunk| f.write(chunk) end
+          s3.bucket(bucket).object(key).get do |chunk| f.write(chunk) end
         end
       end
     end
@@ -359,7 +359,7 @@ module S3Sync
       attr_accessor :acl
 
       def initialize
-        super 'sync', false, false
+        super 'sync', takes_commands: false #, false
 
         @short_desc = "Synchronize an S3 and a local folder"
         @s3 = nil
@@ -368,7 +368,7 @@ module S3Sync
         @dry_run = false
         @verbose = false
 
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
+        self.options do |opt|
           opt.on("-x EXPR", "--exclude=EXPR", "Skip copying files that matches this pattern. (Ruby REs)") {|v|
             @exclude = v
           }
@@ -425,22 +425,16 @@ END
     end
 
     def run conf
-      cmd = CmdParse::CommandParser.new true
-      cmd.program_name = File.basename $0
-      cmd.program_version = S3Sync::VERSION
+      cmd = CmdParse::CommandParser.new handle_exceptions: true
+      cmd.main_options do |opt|
+        opt.program_name = File.basename $0
+        opt.version = S3Sync::VERSION
+      end
 
-      cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+      cmd.global_options do |opt|
         opt.separator "Global options:"
       end
 
-      cmd.main_command.short_desc = 'Tool belt for managing your S3 buckets'
-      cmd.main_command.description =<<END.strip
-S3Sync provides a list of commands that will allow you to manage your content
-stored in S3 buckets. To learn about each feature, please use the `help`
-command:
-
-    $ #{File.basename $0} help sync"
-END
       # Commands used more often
       cmd.add_command List.new
       cmd.add_command Delete.new

data/lib/s3sync/config.rb

@@ -43,7 +43,7 @@ module S3Sync
 
   class Config < Hash
 
-    REQUIRED_VARS = [:AWS_ACCESS_KEY_ID, :AWS_SECRET_ACCESS_KEY]
+    REQUIRED_VARS = [:AWS_ACCESS_KEY_ID, :AWS_SECRET_ACCESS_KEY, :AWS_REGION]
 
     CONFIG_PATHS = ["#{ENV['S3SYNC_PATH']}", "#{ENV['HOME']}/.s3sync.yml", "/etc/s3sync.yml"]
 

data/lib/s3sync/sync.rb

@@ -172,6 +172,7 @@ module S3Sync
     end
 
     def initialize args, source, destination
+      # @args.s3 should be of type Aws::S3::Resource
       @args = args
       @source = source
       @destination = destination
@@ -302,11 +303,14 @@ module S3Sync
       dir += '/' if not dir.empty? and not dir.end_with?('/')
 
       nodes = {}
-      @args.s3.buckets[location.bucket].objects.with_prefix(dir || "").to_a.collect do |obj|
+
+      @args.s3.bucket(location.bucket).objects(prefix: (dir || "")).to_a.collect do |obj|
         # etag comes back with quotes (obj.etag.inspcet # => "\"abc...def\""
         small_comparator = lambda { obj.etag[/[a-z0-9]+/] }
         node = Node.new(location.path, obj.key, obj.content_length, small_comparator)
-        nodes[node.path] = node
+        # The key is relative path from dir.
+        key = node.path[(dir || "").length,node.path.length - 1]
+        nodes[key] = node
       end
       return nodes
     end
@@ -326,12 +330,12 @@ module S3Sync
     def upload_files remote, list
       list.each do |e|
         if @args.verbose
-          puts " + #{e.full} => #{remote}#{e.path}"
+          puts " + #{e.full} => #{remote.path}#{e.path}"
         end
 
         unless @args.dry_run
           remote_path = "#{remote.path}#{e.path}"
-          @args.s3.buckets[remote.bucket].objects[remote_path].write Pathname.new(e.full), :acl => @args.acl
+          @args.s3.bucket(remote.bucket).object(remote_path).upload_file(Pathname.new(e.full), acl: @args.acl)
         end
       end
     end
@@ -344,7 +348,9 @@ module S3Sync
       end
 
       unless @args.dry_run
-        @args.s3.buckets[remote.bucket].objects.delete_if { |obj| list.map(&:path).include? obj.key }
+        list.map(&:path).each do |object_key|
+          @args.s3.bucket(remote.bucket).object(object_key).delete
+        end
       end
     end
 
@@ -354,11 +360,11 @@ module S3Sync
         path = File.join destination.path, e.path
 
         if @args.verbose
-          puts " + #{source}#{e.path} => #{path}"
+          puts " + #{source.bucket}:#{e.path} => #{path}"
         end
 
         unless @args.dry_run
-          obj = @args.s3.buckets[source.bucket].objects[e.path]
+          obj = @args.s3.bucket(source.bucket).object(e.path)
 
           # Making sure this new file will have a safe shelter
           FileUtils.mkdir_p File.dirname(path)
@@ -371,14 +377,10 @@ module S3Sync
           else
             # Downloading and saving the files
             File.open(path, 'wb') do |file|
-              begin
-                obj.read do |chunk|
-                  file.write chunk
-                end
-              rescue AWS::Core::Http::NetHttpHandler::TruncatedBodyError => e
-                $stderr.puts "WARNING: (retryable) TruncatedBodyError occured, retrying in a second #{file.basename}"
-                sleep 1
-                retry
+              # By default Aws::S3::Client will retry 3 times if there is a network error.
+              # To increase this number or disable it, set :retry_limit when instantiating the S3 client.
+              obj.get do |chunk|
+                file.write chunk
               end
             end
           end

data/lib/s3sync/version.rb

@@ -23,5 +23,5 @@
 # THE SOFTWARE.
 
 module S3Sync
-  VERSION = "2.0.2"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: s3sync
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Lincoln de Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2016-08-14 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'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: cmdparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -134,9 +134,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: s3sync is a library that aggregates a good range of features for managing