cprobert-s3sync 1.3.6 → 1.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: ba1822eb603981cf34b82d2496e16a239f3b432d
4
- data.tar.gz: b4d1483f9b24e0ac741d9da04d3a84cd26128d49
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ OTgxNTQ0YzQ3OGFlNGMyNTkwNzM5MzIxZWExNTI1NmNhMzBkZDJmYw==
5
+ data.tar.gz: !binary |-
6
+ NTVlMzAxNGJjZGUwNGRlOWIxYTE5NWU1NzViNGI3Y2YzNmEyMDA3Ng==
5
7
  SHA512:
6
- metadata.gz: a5a5e264eeb50e6fd49ce84b5323d656b9190baac88641e92f3596435becc2cc49615b811ed6c1b2f40c05416f072028b94d198bb8bc0cc2d71b3bff70f78607
7
- data.tar.gz: 0e8a18876ccb5aa56ce72c5ec7c483e413a30b668dc704e1e1c6811556680d30d930e5ff2aa4a9713885a071840be188d84e6587496acdda367f4c6b52df247b
8
+ metadata.gz: !binary |-
9
+ N2E4ZmZkYWU2MzI1MzViZTQ4NTE3ZGViZWUyODk1YjIyNmFhMTczNTJhMGNk
10
+ OTY5NzFkM2RhY2U5OWFkNmQ5ZTNlZDg1NTU2ZmE5Njg3MGE4ZjQ5OWRjZDQy
11
+ ZjVhZmQxZjdhMmVhMmViZTNhODMxMzRhNzc1ZDJiMGVlYzQ5NGY=
12
+ data.tar.gz: !binary |-
13
+ Y2E5NWEwMzM3Yjk2N2FlMzQxNTM5NjRlZGVkMzhmZGU5ODhlN2E0YjViMTI3
14
+ NjA3YmNjZmJmODMxN2Y5ODQ3MzUxOTNlMTE2NThmODRkNDk5ODIzZmI2MjE0
15
+ ZDMxYmMzYzYyNzNhYzVjNzgwNmNlYWRhZGFlOWEzM2E3MjljMjY=
data/Rakefile CHANGED
@@ -5,7 +5,7 @@ begin
5
5
  require 'jeweler'
6
6
  Jeweler::Tasks.new do |gem|
7
7
  gem.name = "cprobert-s3sync"
8
- gem.summary = %Q{Fork of s3sync to be compatible with ruby 1.9.}
8
+ gem.summary = %Q{Fork of s3sync to be compatible with ruby 1.9.3}
9
9
  gem.email = "cprobert@gmail.com"
10
10
  gem.homepage = "http://s3sync.net"
11
11
  gem.authors = ["cprobert"]
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.6
1
+ 1.3.7
data/bin/s3sync CHANGED
@@ -305,16 +305,19 @@ ENDUSAGE
305
305
  # get rid of the big s3 objects asap, just save light-weight nodes and strings
306
306
  items = tItems.collect do |item|
307
307
  if item.respond_to?('key')
308
- key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
308
+ #key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
309
+ key = item.key.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "-").join
309
310
  Node.new(key, item.size, item.etag, item.last_modified)
310
311
  else
311
- Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
312
+ #Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
313
+ item.prefix.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "-").join
312
314
  end
313
315
  end
314
316
  nextPage = d.properties.is_truncated
315
317
  marker = (d.properties.next_marker)? d.properties.next_marker : ((d.entries.length > 0)? d.entries.last.key : '')
316
318
  # get this into native char set (because when we feed it back to s3 that's what it will expect)
317
- marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join
319
+ #marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join
320
+ marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "-").join
318
321
  tItems = nil
319
322
  d = nil # get rid of this before recursing; it's big
320
323
  item = nil
@@ -39,7 +39,10 @@ module S3ExtendCGI
39
39
 
40
40
  def S3Extend_escape(string)
41
41
  result = string
42
- result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape
42
+
43
+ result = string.encode(@nativeCharacterEncoding, :invalid => :replace, :undef => :replace, :replace => "-") if @useUTF8InEscape
44
+ #result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape
45
+
43
46
  result = S3Extend_escape_orig(result)
44
47
  result.gsub!(/%2f/i, "/") if @exemptSlashesInEscape
45
48
  result.gsub!("+", "%20") if @usePercent20InEscape
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cprobert-s3sync
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.6
4
+ version: 1.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - cprobert
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-07 00:00:00.000000000 Z
11
+ date: 2013-10-24 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description:
14
14
  email: cprobert@gmail.com
@@ -61,8 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
61
61
  version: '0'
62
62
  requirements: []
63
63
  rubyforge_project:
64
- rubygems_version: 2.0.3
64
+ rubygems_version: 2.1.9
65
65
  signing_key:
66
66
  specification_version: 4
67
- summary: Fork of s3sync to be compatible with ruby 1.9.
67
+ summary: Fork of s3sync to be compatible with ruby 1.9.3
68
68
  test_files: []