cprobert-s3sync 1.3.7 → 1.3.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTgxNTQ0YzQ3OGFlNGMyNTkwNzM5MzIxZWExNTI1NmNhMzBkZDJmYw==
+    ZGRlOTNhOTIwYWE4YmEzODhiNzU1ZDczYjNlZGFiMGJkMDViNDkzNQ==
   data.tar.gz: !binary |-
-    NTVlMzAxNGJjZGUwNGRlOWIxYTE5NWU1NzViNGI3Y2YzNmEyMDA3Ng==
+    NjU5NzJiZDVjNWRjZWFlMjcxNWEzNzExNTdhM2Q2ZTBkMmMzODRmZQ==
 SHA512:
   metadata.gz: !binary |-
-    N2E4ZmZkYWU2MzI1MzViZTQ4NTE3ZGViZWUyODk1YjIyNmFhMTczNTJhMGNk
-    OTY5NzFkM2RhY2U5OWFkNmQ5ZTNlZDg1NTU2ZmE5Njg3MGE4ZjQ5OWRjZDQy
-    ZjVhZmQxZjdhMmVhMmViZTNhODMxMzRhNzc1ZDJiMGVlYzQ5NGY=
+    YTRjZTA2OGJjYmFiNDNlOTgzMWQzYWQyMzI4NDY0YjA3NzJkM2JlOTRhODUw
+    ZDEwM2M2N2VjMjc1OWQ1NmQ1NWZmZTUyMWVkYmJlOWVkMWQ4OTVjMjE0ZTA0
+    NzNmY2ZmOGYzMmZmZjY1ZjNiMWViNjQ5YmJiYzk3NDkzM2M1OTM=
   data.tar.gz: !binary |-
-    Y2E5NWEwMzM3Yjk2N2FlMzQxNTM5NjRlZGVkMzhmZGU5ODhlN2E0YjViMTI3
-    NjA3YmNjZmJmODMxN2Y5ODQ3MzUxOTNlMTE2NThmODRkNDk5ODIzZmI2MjE0
-    ZDMxYmMzYzYyNzNhYzVjNzgwNmNlYWRhZGFlOWEzM2E3MjljMjY=
+    NWVlMTJjNWE4YzU4ODRiYzc5ZWZkZjVmZmQ5MTZlZDQ2ZjgxOWNiY2JkOGEw
+    MDc4NDNmNzFiYzZhODVmMzIzNmVkYTJhZjE0NWRlMGRmZDgyNzlkOTA0NDNm
+    OWNiZDJiOGE5NGVjMGZkMGU5ODJhNGIyNzE5YzFhMWEyZmU0Nzk=

data/README.rdoc

@@ -1,4 +1,7 @@
 
+== CHANGED from original to be compatible with 1.9.3
+Removed Iconv dependancy - changed to string.encode
+
 == CHANGED from original to be compatible with 1.9.2
 * require 'md5' 
 Instead require "digest/md5"

data/VERSION

@@ -1 +1 @@
-1.3.7
+1.3.9

data/bin/s3cmd

@@ -114,7 +114,8 @@ 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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          key = item.key.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "")
           $stderr.puts "delete #{bucket}:#{key} #{headers.inspect if headers}" if $S3syncOptions['--verbose']
           S3try(:delete, bucket, key) unless $S3syncOptions['--dryrun']
         end
@@ -122,7 +123,8 @@ 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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+        marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "") if marker
       end
 
     when "list"
@@ -138,19 +140,22 @@ 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, :invalid => :replace, :undef => :replace, :replace => "")
+            #puts "dir: " + Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
           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, :invalid => :replace, :undef => :replace, :replace => "")
+          #puts Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
         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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+          marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "") if marker
         else
           more = false
         end
@@ -264,7 +269,8 @@ 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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          path = item.key.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "")
 
           file = path.gsub(src_path, dest_key)
 
@@ -284,7 +290,8 @@ 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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+        marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "") if marker
       end
 
     when "headers"
@@ -300,7 +307,8 @@ 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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+          key = item.key.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "")
 
           tmpHeaders = headers.merge({
             "x-amz-copy-source" => "/#{bucket}/#{URI.escape(key)}",
@@ -322,7 +330,8 @@ 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 = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join if marker
+        marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "") if marker
       end
 
 

data/bin/s3sync

@@ -11,7 +11,7 @@
 module S3sync
 
   $S3SYNC_MIME_TYPES_FILE = (ENV["S3SYNC_MIME_TYPES_FILE"] or '/etc/mime.types')
-  $S3SYNC_VERSION = '1.3.1'
+  $S3SYNC_VERSION = '1.3.8'
 
   # always look "here" for include files (thanks aktxyz)
   $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), "../lib/")
@@ -306,18 +306,18 @@ ENDUSAGE
           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, :invalid => :replace, :undef => :replace, :replace => "-").join
+              key = item.key.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "")
               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, :invalid => :replace, :undef => :replace, :replace => "-").join
+              item.prefix.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "")
             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, :invalid => :replace, :undef => :replace, :replace => "-").join
+          marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "")
           tItems = nil
           d = nil # get rid of this before recursing; it's big
           item = nil

data/cprobert-s3sync.gemspec

@@ -0,0 +1,50 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: cprobert-s3sync 1.3.9 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "cprobert-s3sync"
+  s.version = "1.3.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["cprobert"]
+  s.date = "2013-10-25"
+  s.email = "cprobert@gmail.com"
+  s.executables = ["s3sync", "s3cmd"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "History.txt",
+    "Manifest.txt",
+    "PostInstall.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/s3cmd",
+    "bin/s3sync",
+    "cprobert-s3sync.gemspec",
+    "docs/README.txt",
+    "docs/README_s3cmd.txt",
+    "docs/s3config.yml.example",
+    "lib/s3sync.rb",
+    "lib/s3sync/HTTPStreaming.rb",
+    "lib/s3sync/S3.rb",
+    "lib/s3sync/S3_s3sync_mod.rb",
+    "lib/s3sync/S3encoder.rb",
+    "lib/s3sync/s3config.rb",
+    "lib/s3sync/s3try.rb",
+    "script/console",
+    "script/destroy",
+    "script/generate",
+    "test/test_helper.rb",
+    "test/test_s3sync.rb"
+  ]
+  s.homepage = "http://s3sync.net"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.1.10"
+  s.summary = "Fork of s3sync to be compatible with ruby 1.9.3"
+end
+

data/lib/s3sync/S3encoder.rb

@@ -14,7 +14,7 @@
 # to the underlying lib this stuff will need updating.
 
 require 'cgi'
-require 'iconv' # for UTF-8 conversion
+##require 'iconv' # for UTF-8 conversion
 
 # thanks to http://www.redhillconsulting.com.au/blogs/simon/archives/000326.html
 module S3ExtendCGI
@@ -40,7 +40,7 @@ module S3ExtendCGI
 		def S3Extend_escape(string)
 			result = string
 			
-			result = string.encode(@nativeCharacterEncoding, :invalid => :replace, :undef => :replace, :replace => "-") if @useUTF8InEscape 
+			result = string.encode(@nativeCharacterEncoding, :invalid => :replace, :undef => :replace, :replace => "") if @useUTF8InEscape 
 			#result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape 
 			
 			result = S3Extend_escape_orig(result)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cprobert-s3sync
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.9
 platform: ruby
 authors:
 - cprobert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: cprobert@gmail.com
@@ -27,6 +27,7 @@ files:
 - VERSION
 - bin/s3cmd
 - bin/s3sync
+- cprobert-s3sync.gemspec
 - docs/README.txt
 - docs/README_s3cmd.txt
 - docs/s3config.yml.example
@@ -61,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Fork of s3sync to be compatible with ruby 1.9.3