frahugo-s3sync 1.3.8 → 1.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ec03e93ec835de16b422d1443343e91988810eff
+  data.tar.gz: b90aaf12ff814d70a54b85d8d4fbe24c3fabd80b
+SHA512:
+  metadata.gz: e42b61fe6b1f9b6800805c9ffeb3a66ae6ff18726de9a493425f102299c4ea1eb827a51a3b1fbf80910c4c18c2175f0d5ea6d64e45b495215951bdc0aff85414
+  data.tar.gz: 42068a9f5c51a1f625ae9154db7ee4c0e1fe23b4f5189ce0bd9314581b655e849dbea17a7b0e1d463691dc2b332e54a5dad624a5dbc623828b504d0f61d5c60c

data/README.rdoc

@@ -1,18 +1,31 @@
+== CHANGES from version 1.3.8 for Ruby 2
+
+* Use String#encode instead of Iconv#iconv
+* Use Digest instead of Digest::Digest
+
+== CHANGES from original to be compatible with 1.9.2
+
+* require 'md5'
 
-== CHANGED from original to be compatible with 1.9.2
-* require 'md5' 
 Instead require "digest/md5"
+
 * Thread.critical
+
 Thread.critical is not used since 1.9
-* Dir#collect 
+
+* Dir#collect
+
 In 1.9.2 Dir#collect is not Array but Enumerator
+
 * Array#to_s
+
 The result of [1,2].to_s is different from 1.8. Instead of to_s, used join
+
 * use Enumerator instead of thread_generator
 
 == DESCRIPTION:
 
-Welcome to s3sync.rb         
+Welcome to s3sync.rb
 --------------------
 Home page, wiki, forum, bug reports, etc: http://s3sync.net
 
@@ -57,7 +70,7 @@ get/puts.
 
 
 About Directories, the bane of any S3 sync-er
---------------------------------------------- 
+---------------------------------------------
 In S3 there's no actual concept of folders, just keys and nodes. So, every tool
 uses its own proprietary way of storing dir info (my scheme being the best
 naturally) and in general the methods are not compatible.
@@ -76,7 +89,7 @@ s3sync's normal operation is to compare the file size and MD5 hash of each item
 to decide whether it needs syncing.  On the S3 side, these hashes are stored and
 returned to us as the "ETag" of each item when the bucket is listed, so it's
 very easy.  On the local side, the MD5 must be calculated by pushing every byte
-in the file through the MD5 algorithm.  This is CPU and IO intensive!  
+in the file through the MD5 algorithm.  This is CPU and IO intensive!
 
 Thus you can specify the option --no-md5. This will compare the upload time on
 S3 to the "last modified" time on the local item, and not do md5 calculations
@@ -91,7 +104,7 @@ behavior.
 A word on SSL_CERT_DIR:
 -----------------------
 On my debian install I didn't find any root authority public keys.  I installed
-some by running this shell archive: 
+some by running this shell archive:
 http://mirbsd.mirsolutions.de/cvs.cgi/src/etc/ssl.certs.shar
 (You have to click download, and then run it wherever you want the certs to be
 placed).  I do not in any way assert that these certificates are good,
@@ -114,7 +127,7 @@ using more than one CA.
 Getting started:
 ----------------
 Invoke by typing s3sync.rb and you should get a nice usage screen.
-Options can be specified in short or long form (except --delete, which has no 
+Options can be specified in short or long form (except --delete, which has no
 short form)
 
 ALWAYS TEST NEW COMMANDS using --dryrun(-n) if you want to see what will be
@@ -138,10 +151,10 @@ the command line you specify is not going to do something terrible to your
 cherished and irreplaceable data.
 
 
-Updates and other discussion: 
------------------------------ 
+Updates and other discussion:
+-----------------------------
 The latest version of s3sync should normally be at:
-	http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz 
+	http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz
 and the Amazon S3 forums probably have a few threads going on it at any given
 time. I may not always see things posted to the threads, so if you want you can
 contact me at gbs-s3@10forward.com too.
@@ -153,7 +166,7 @@ contact me at gbs-s3@10forward.com too.
 
 == SYNOPSIS:
 
-Examples: 
+Examples:
 ---------
 (using S3 bucket 'mybucket' and prefix 'pre')
   Put the local etc directory itself into S3
@@ -181,19 +194,19 @@ Create a new bucket:
 
 Create a new bucket in the EU:
 	s3cmd.rb createbucket BucketName EU
-   
+
 Find out the location constraint of a bucket:
    s3cmd.rb location BucketName
 
 Delete an old bucket you don't want any more:
 	s3cmd.rb deletebucket BucketName
-	
+
 Find out what's in a bucket, 10 lines at a time:
 	s3cmd.rb list BucketName 10
-	
+
 Only look in a particular prefix:
 	s3cmd.rb list BucketName:startsWithThis
-	
+
 Look in the virtual "directory" named foo;
 lists sub-"directories" and keys that are at this level.
 Note that if you specify a delimiter you must specify a max before it.
@@ -205,17 +218,17 @@ Delete a key:
 
 Delete all keys that match (like a combo between list and delete):
 	s3cmd.rb deleteall BucketName:SomePrefix
-	
-Only pretend you're going to delete all keys that match, but list them: 
+
+Only pretend you're going to delete all keys that match, but list them:
 	s3cmd.rb  --dryrun  deleteall  BucketName:SomePrefix
-	
+
 Delete all keys in a bucket (leaving the bucket):
 	s3cmd.rb deleteall BucketName
-	
+
 Get a file from S3 and store it to a local file
 	s3cmd.rb get BucketName:TheFileOnS3.txt  ALocalFile.txt
-	
-Put a local file up to S3 
+
+Put a local file up to S3
 Note we don't automatically set mime type, etc.
 NOTE that the order of the options doesn't change. S3 stays first!
 	s3cmd.rb put BucketName:TheFileOnS3.txt ALocalFile.txt
@@ -250,7 +263,7 @@ gem 'frahugo-s3sync', :git => 'git://github.com/frahugo/s3sync.git'
 
 Your environment:
 -----------------
-s3sync needs to know several interesting values to work right.  It looks for 
+s3sync needs to know several interesting values to work right.  It looks for
 them in the following environment variables -or- a s3config.yml file.
 In the yml case, the names need to be lowercase (see example file).
 Furthermore, the yml is searched for in the following locations, in order:
@@ -261,7 +274,7 @@ Furthermore, the yml is searched for in the following locations, in order:
 Required:
 	AWS_ACCESS_KEY_ID
 	AWS_SECRET_ACCESS_KEY
-	
+
 	If you don't know what these are, then s3sync is probably not the
 	right tool for you to be starting out with.
 Optional:
@@ -276,19 +289,19 @@ Optional:
    AWS_CALLING_FORMAT - Defaults to REGULAR
        REGULAR   # http://s3.amazonaws.com/bucket/key
        SUBDOMAIN # http://bucket.s3.amazonaws.com/key
-       VANITY    # http://<vanity_domain>/key  
+       VANITY    # http://<vanity_domain>/key
 
 Important: For EU-located buckets you should set the calling format to SUBDOMAIN
-Important: For US buckets with CAPS or other weird traits set the calling format 
+Important: For US buckets with CAPS or other weird traits set the calling format
 to REGULAR
 
-I use "envdir" from the daemontools package to set up my env 
+I use "envdir" from the daemontools package to set up my env
 variables easily: http://cr.yp.to/daemontools/envdir.html
 For example:
 	envdir /root/s3sync/env /root/s3sync/s3sync.rb -etc etc etc
-I know there are other similar tools out there as well.  
+I know there are other similar tools out there as well.
 
-You can also just call it in a shell script where you have exported the vars 
+You can also just call it in a shell script where you have exported the vars
 first such as:
 #!/bin/bash
 export AWS_ACCESS_KEY_ID=valueGoesHere

data/VERSION

@@ -1 +1 @@
-1.3.8
+1.4.1

data/bin/s3cmd

@@ -40,7 +40,7 @@ module S3sync
   --help    -h        --verbose     -v     --dryrun    -n
   --ssl     -s        --debug       -d     --progress
   --expires-in=( <# of seconds> | [#d|#h|#m|#s] )
-  
+
 Commands:
 #{name}  listbuckets  [headers]
 #{name}  createbucket  <bucket>  [constraint (i.e. EU)]
@@ -86,7 +86,7 @@ ENDUSAGE
     # ---------- COMMAND PROCESSING ---------- #
     command, path, file = ARGV
 
-    s3cmdUsage("You didn't set up your environment variables; see README.txt") if not($AWS_ACCESS_KEY_ID and $AWS_SECRET_ACCESS_KEY) 
+    s3cmdUsage("You didn't set up your environment variables; see README.txt") if not($AWS_ACCESS_KEY_ID and $AWS_SECRET_ACCESS_KEY)
     s3cmdUsage("Need a command (etc)") if not command
 
     path = '' unless path
@@ -114,7 +114,7 @@ ENDUSAGE
         res = s3cmdList(bucket, path, nil, nil, marker)
         res.entries.each do |item|
           # the s3 commands (with my modified UTF-8 conversion) expect native char encoding input
-          key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          key = item.key.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
           $stderr.puts "delete #{bucket}:#{key} #{headers.inspect if headers}" if $S3syncOptions['--verbose']
           S3try(:delete, bucket, key) unless $S3syncOptions['--dryrun']
         end
@@ -122,7 +122,7 @@ ENDUSAGE
         more = res.properties.is_truncated
         marker = (res.properties.next_marker)? res.properties.next_marker : ((res.entries.length > 0) ? res.entries.last.key : nil)
         # get this into local charset; when we pass it to s3 that is what's expected
-        marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+        marker = marker.encode($S3SYNC_NATIVE_CHARSET, "UTF-8") if marker
       end
 
     when "list"
@@ -138,19 +138,19 @@ ENDUSAGE
         res = s3cmdList(bucket, path, max, delim, marker, headers)
         if delim
           res.common_prefix_entries.each do |item|
-            puts "dir: " + Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
+            puts "dir: " + item.prefix.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
           end
           puts "--------------------"
         end
         res.entries.each do |item|
-          puts Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          puts item.key.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
         end
         if res.properties.is_truncated
           printf "More? Y/n: "
           more = (STDIN.gets.match('^[Yy]?$'))
           marker = (res.properties.next_marker)? res.properties.next_marker : ((res.entries.length > 0) ? res.entries.last.key : nil)
           # get this into local charset; when we pass it to s3 that is what's expected
-          marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+          marker = marker.encode($S3SYNC_NATIVE_CHARSET, "UTF-8") if marker
         else
           more = false
         end
@@ -264,7 +264,7 @@ ENDUSAGE
         res = s3cmdList(bucket, path, nil, nil, marker)
         res.entries.each do |item|
           # the s3 commands (with my modified UTF-8 conversion) expect native char encoding input
-          path = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          path = item.key.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
 
           file = path.gsub(src_path, dest_key)
 
@@ -284,7 +284,7 @@ ENDUSAGE
         more = res.properties.is_truncated
         marker = (res.properties.next_marker)? res.properties.next_marker : ((res.entries.length > 0) ? res.entries.last.key : nil)
         # get this into local charset; when we pass it to s3 that is what's expected
-        marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+        marker = marker.encode($S3SYNC_NATIVE_CHARSET, "UTF-8") if marker
       end
 
     when "headers"
@@ -300,7 +300,7 @@ ENDUSAGE
         res = s3cmdList(bucket, path, nil, nil, marker)
         res.entries.each do |item|
           # the s3 commands (with my modified UTF-8 conversion) expect native char encoding input
-          key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          key = item.key.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
 
           tmpHeaders = headers.merge({
             "x-amz-copy-source" => "/#{bucket}/#{URI.escape(key)}",
@@ -322,7 +322,7 @@ ENDUSAGE
         more = res.properties.is_truncated
         marker = (res.properties.next_marker)? res.properties.next_marker : ((res.entries.length > 0) ? res.entries.last.key : nil)
         # get this into local charset; when we pass it to s3 that is what's expected
-        marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+        marker = marker.encode($S3SYNC_NATIVE_CHARSET, "UTF-8") if marker
       end
 
 

data/bin/s3sync

@@ -60,18 +60,18 @@ module S3sync
                                    [ '--public-read','-p', GetoptLong::NO_ARGUMENT ],
                                    [ '--delete',			GetoptLong::NO_ARGUMENT ],
                                    [ '--verbose', '-v',	GetoptLong::NO_ARGUMENT ],
-                                   [ '--dryrun',  '-n',	GetoptLong::NO_ARGUMENT ], 
+                                   [ '--dryrun',  '-n',	GetoptLong::NO_ARGUMENT ],
                                    [ '--debug',   '-d',	GetoptLong::NO_ARGUMENT ],
                                    [ '--memory',   '-m',	GetoptLong::NO_ARGUMENT ],
                                    [ '--progress',	GetoptLong::NO_ARGUMENT ],
                                    [ '--expires',        GetoptLong::REQUIRED_ARGUMENT ],
                                    [ '--cache-control',  GetoptLong::REQUIRED_ARGUMENT ],
                                    [ '--exclude',        GetoptLong::REQUIRED_ARGUMENT ],
-                                   [ '--gzip',      	GetoptLong::REQUIRED_ARGUMENT ], 
+                                   [ '--gzip',      	GetoptLong::REQUIRED_ARGUMENT ],
                                    [ '--key', '-k',        GetoptLong::REQUIRED_ARGUMENT],
                                    [ '--secret',     GetoptLong::REQUIRED_ARGUMENT],
                                    [ '--make-dirs',	GetoptLong::NO_ARGUMENT ],
-                                   [ '--no-md5',	GetoptLong::NO_ARGUMENT ]           
+                                   [ '--no-md5',	GetoptLong::NO_ARGUMENT ]
                                    )
 
     def S3sync.usage(message = nil)
@@ -79,11 +79,11 @@ module S3sync
       name = $0.split('/').last
       $stderr.puts <<-ENDUSAGE
 #{name} [options] <source> <destination>\t\tversion #{$S3SYNC_VERSION}
-  --help    -h          --verbose     -v     --dryrun    -n	
+  --help    -h          --verbose     -v     --dryrun    -n
   --ssl     -s          --recursive   -r     --delete
   --public-read -p      --expires="<exp>"    --cache-control="<cc>"
   --exclude="<regexp>"  --progress           --debug   -d
-  --key     -k          --secret      -s     --make-dirs           
+  --key     -k          --secret      -s     --make-dirs
   --no-md5  --gzip
 One of <source> or <destination> must be of S3 format, the other a local path.
 Reminders:
@@ -108,13 +108,13 @@ ENDUSAGE
     if $S3syncOptions['--key']
       $AWS_ACCESS_KEY_ID = $S3syncOptions['--key']
     end
-    
+
     if $S3syncOptions['--secret']
       $AWS_SECRET_ACCESS_KEY = $S3syncOptions['--secret']
     end
 
     # ---------- CONNECT ---------- #
-    S3sync::s3trySetup 
+    S3sync::s3trySetup
 
     # ---------- PREFIX PROCESSING ---------- #
     def S3sync.s3Prefix?(pre)
@@ -122,7 +122,7 @@ ENDUSAGE
       pre.include?(':') and not pre.match('^[A-Za-z]:[\\\\/]')
     end
     sourcePrefix, destinationPrefix = ARGV
-    usage("You didn't set up your environment variables; see README.txt") if not($AWS_ACCESS_KEY_ID and $AWS_SECRET_ACCESS_KEY) 
+    usage("You didn't set up your environment variables; see README.txt") if not($AWS_ACCESS_KEY_ID and $AWS_SECRET_ACCESS_KEY)
     usage('Need a source and a destination') if sourcePrefix == nil or destinationPrefix == nil
     usage('Both arguments can\'t be on S3') if s3Prefix?(sourcePrefix) and s3Prefix?(destinationPrefix)
     usage('One argument must be on S3') if !s3Prefix?(sourcePrefix) and !s3Prefix?(destinationPrefix)
@@ -161,7 +161,7 @@ ENDUSAGE
     # canonicalize the local stuff
     # but that can kill a trailing slash, which we need to preserve long enough to know whether we mean "the dir" or "its contents"
     # it will get re-stripped by the local generator after expressing this knowledge
-    localTrailingSlash = localPrefix.match(%r{/$}) 
+    localTrailingSlash = localPrefix.match(%r{/$})
     localPrefix.replace(File.expand_path(localPrefix))
     localPrefix += '/' if localTrailingSlash
     debug("localPrefix #{localPrefix}")
@@ -181,7 +181,7 @@ ENDUSAGE
         debug("localTreeRecurse #{prefix} #{path}")
         #if $S3syncOptions['--memory']
         #	$stderr.puts "Starting local recurse"
-        #	stats = ostats stats 
+        #	stats = ostats stats
         #end
         d = nil
         begin
@@ -198,7 +198,7 @@ ENDUSAGE
         # the following sleight of hand is to make the recursion match the way s3 sorts
         # take for example the directory 'foo' and the file 'foo.bar'
         # when we encounter the dir we would want to recurse into it
-        # but S3 would just say 'period < slash' and sort 'foo.bar' between the dir node 
+        # but S3 would just say 'period < slash' and sort 'foo.bar' between the dir node
         # and the contents in that 'dir'
         #
         # so the solution is to not recurse into the directory until the point where
@@ -252,7 +252,7 @@ ENDUSAGE
         end
         #if $S3syncOptions['--memory']
         #	$stderr.puts "Ending local recurse"
-        #	stats = ostats stats 
+        #	stats = ostats stats
         #end
       end
       # a bit of a special case for local, since "foo/" and "foo" are essentially treated the same by file systems
@@ -266,10 +266,10 @@ ENDUSAGE
       else
         # trailing slash, so ignore the root itself, and just go into the first level
         localPrefixTrim.sub!(%r{/$}, "") # strip the slash because of how we do local node slash accounting in the recurse above
-        localTreeRecurse(g, localPrefixTrim, "") 
+        localTreeRecurse(g, localPrefixTrim, "")
       end
     end
-    
+
     # a generator that will return the nodes in the S3 tree one by one
     # sorted and decorated for easy comparison with the local tree
     s3Tree = Enumerator.new do |g|
@@ -305,16 +305,16 @@ ENDUSAGE
           # get rid of the big s3 objects asap, just save light-weight nodes and strings
           items = tItems.collect do |item|
             if item.respond_to?('key')
-              key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+              key = item.key.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
               Node.new(key, item.size, item.etag, item.last_modified)
             else
-              Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
+              item.prefix.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
             end
           end
           nextPage = d.properties.is_truncated
           marker = (d.properties.next_marker)? d.properties.next_marker : ((d.entries.length > 0)? d.entries.last.key : '')
           # get this into native char set (because when we feed it back to s3 that's what it will expect)
-          marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join
+          marker = marker.encode($S3SYNC_NATIVE_CHARSET, "UTF-8")
           tItems = nil
           d = nil # get rid of this before recursing; it's big
           item = nil
@@ -338,7 +338,7 @@ ENDUSAGE
                 debug("skipping prefix #{excludePath} due to --exclude")
               else
                 debug("prefix found: #{partialPath}")
-                s3TreeRecurse(g, bucket, prefix, partialPath) if $S3syncOptions['--recursive'] 
+                s3TreeRecurse(g, bucket, prefix, partialPath) if $S3syncOptions['--recursive']
               end
             end
           end
@@ -386,7 +386,7 @@ ENDUSAGE
         if $S3syncOptions['--delete']
           if destinationNode.directory?
             # have to wait
-            nodesToDelete.push(destinationNode) 
+            nodesToDelete.push(destinationNode)
           else
             puts "Remove node #{destinationNode.name}" if $S3syncOptions['--verbose']
             destinationNode.delete unless $S3syncOptions['--dryrun']
@@ -398,7 +398,7 @@ ENDUSAGE
           puts "Update node #{sourceNode.name}" if $S3syncOptions['--verbose']
           destinationNode.updateFrom(sourceNode) unless $S3syncOptions['--dryrun']
         elsif $S3syncOptions['--debug']
-          $stderr.puts "Node #{sourceNode.name} unchanged" 
+          $stderr.puts "Node #{sourceNode.name} unchanged"
         end
         sourceNode = sourceNode.nil? ? nil : sourceTree.next rescue nil
         destinationNode = destinationNode.nil? ? nil : destinationTree.next rescue nil
@@ -509,7 +509,7 @@ ENDUSAGE
           headers['Cache-Control'] = $S3syncOptions['--cache-control'] if $S3syncOptions['--cache-control']
           fType = @path.split('.').last
           if ($S3syncOptions['--gzip'] || "gz").split(",").include? fType
-            headers['Content-Encoding'] = "gzip" 
+            headers['Content-Encoding'] = "gzip"
             fType = @path.split('.')[-2]
           end
           debug("File extension: #{fType}")
@@ -644,12 +644,12 @@ ENDUSAGE
           f = File.open(fName, 'wb')
           f = ProgressStream.new(f, fromNode.size) if $S3syncOptions['--progress']
 
-          fromNode.to_stream(f) 
+          fromNode.to_stream(f)
           f.close
         end
         # get original item out of the way
         File.unlink(@path) if File.exist?(@path)
-        if fromNode.symlink? 
+        if fromNode.symlink?
           linkTo = ''
           File.open(fName, 'rb'){|f| linkTo = f.read}
           debug("#{@path} will be a symlink to #{linkTo}")

data/lib/s3sync/S3.rb

@@ -78,7 +78,7 @@ module S3
     if not bucket.empty?
       buf << "/#{bucket}"
     end
-    # append the key (it might be empty string) 
+    # append the key (it might be empty string)
     # append a slash regardless
     buf << "/#{path}"
 
@@ -102,7 +102,7 @@ module S3
   # url encode the result of that to protect the string if it's going to
   # be used as a query string parameter.
   def S3.encode(aws_secret_access_key, str, urlencode=false)
-    digest = OpenSSL::Digest::Digest.new('sha1')
+    digest = OpenSSL::Digest.new('sha1')
     b64_hmac =
       Base64.encode64(
                       OpenSSL::HMAC.digest(digest, aws_secret_access_key, str)).strip
@@ -235,9 +235,9 @@ module S3
         # does not make sense for vanity domains
         server = @server
       elsif @calling_format == CallingFormat::SUBDOMAIN
-        server = "#{bucket}.#{@server}" 
+        server = "#{bucket}.#{@server}"
       elsif @calling_format == CallingFormat::VANITY
-        server = bucket 
+        server = bucket
       else
         server = @server
       end
@@ -252,10 +252,10 @@ module S3
       path << "/#{key}"
 
       # build the path_argument string
-      # add the ? in all cases since 
+      # add the ? in all cases since
       # signature and credentials follow path args
       path << '?'
-      path << S3.path_args_hash_to_string(path_args) 
+      path << S3.path_args_hash_to_string(path_args)
 
       http = Net::HTTP.new(server, @port)
       http.use_ssl = @is_secure
@@ -329,15 +329,15 @@ module S3
     # by default, expire in 1 minute
     DEFAULT_EXPIRES_IN = 60
 
-    def initialize(aws_access_key_id, aws_secret_access_key, is_secure=true, 
-                   server=DEFAULT_HOST, port=PORTS_BY_SECURITY[is_secure], 
+    def initialize(aws_access_key_id, aws_secret_access_key, is_secure=true,
+                   server=DEFAULT_HOST, port=PORTS_BY_SECURITY[is_secure],
                    format=CallingFormat::REGULAR)
       @aws_access_key_id = aws_access_key_id
       @aws_secret_access_key = aws_secret_access_key
       @protocol = is_secure ? 'https' : 'http'
       @server = server
       @port = port
-      @calling_format = format 
+      @calling_format = format
       # by default expire
       @expires_in = DEFAULT_EXPIRES_IN
     end
@@ -443,7 +443,7 @@ module S3
       path_args["Signature"] = encoded_canonical.to_s
       path_args["Expires"] = expires.to_s
       path_args["AWSAccessKeyId"] = @aws_access_key_id.to_s
-      arg_string = S3.path_args_hash_to_string(path_args) 
+      arg_string = S3.path_args_hash_to_string(path_args)
 
       return "#{url}/#{key}?#{arg_string}"
     end

data/lib/s3sync/S3encoder.rb

@@ -1,9 +1,9 @@
-# This software code is made available "AS IS" without warranties of any        
-# kind.  You may copy, display, modify and redistribute the software            
-# code either by itself or as incorporated into your code; provided that        
-# you do not remove any proprietary notices.  Your use of this software         
+# This software code is made available "AS IS" without warranties of any
+# kind.  You may copy, display, modify and redistribute the software
+# code either by itself or as incorporated into your code; provided that
+# you do not remove any proprietary notices.  Your use of this software
 # code is at your own risk and you waive any claim against the author
-# with respect to your use of this software code. 
+# with respect to your use of this software code.
 # (c) 2007 s3sync.net
 #
 
@@ -14,7 +14,6 @@
 # to the underlying lib this stuff will need updating.
 
 require 'cgi'
-require 'iconv' # for UTF-8 conversion
 
 # thanks to http://www.redhillconsulting.com.au/blogs/simon/archives/000326.html
 module S3ExtendCGI
@@ -36,10 +35,10 @@ module S3ExtendCGI
 		attr_writer :nativeCharacterEncoding
 		@@useUTF8InEscape = false
 		attr_writer :useUTF8InEscape
-		
+
 		def S3Extend_escape(string)
 			result = string
-			result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape 
+			result = string.encode("UTF-8", @nativeCharacterEncoding) if @useUTF8InEscape
 			result = S3Extend_escape_orig(result)
 			result.gsub!(/%2f/i, "/") if @exemptSlashesInEscape
 			result.gsub!("+", "%20") if @usePercent20InEscape

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: frahugo-s3sync
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 8
-  version: 1.3.8
+version: !ruby/object:Gem::Version
+  version: 1.4.1
 platform: ruby
-authors: 
+authors:
 - frahugo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-16 00:00:00 -05:00
-default_executable: 
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: hugo@cekoya.com
-executables: 
+executables:
 - s3sync
 - s3cmd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -51,38 +42,30 @@ files:
 - script/generate
 - test/test_helper.rb
 - test/test_s3sync.rb
-has_rdoc: true
-homepage: http://s3sync.net
+homepage: https://github.com/frahugo/s3sync
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
-summary: Fork of s3sync to be compatible with ruby 1.9.
-test_files: 
+summary: Fork of s3sync to be compatible with ruby 1.9 & 2
+test_files:
 - test/test_helper.rb
 - test/test_s3sync.rb