s3cp 1.0.5 → 1.0.6

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.
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ === 1.0.6 / (2012-07-23)
2
+
3
+ * Fixed: s3cp would exit with errorlevel 0 despite errors when running in
4
+ interactive mode.
5
+
1
6
  === 1.0.5 / (2012-06-25)
2
7
 
3
8
  * Added: New command 's3mv' to move files; s3mv is an alias to s3cp --move.
@@ -0,0 +1,4 @@
1
+
2
+
3
+ Voulez-vous coucher avec moi ce soir?
4
+
data/lib/s3cp/s3cp.rb CHANGED
@@ -291,7 +291,8 @@ def local_to_s3(bucket_to, key, file, options = {})
291
291
  p.file_transfer_mode
292
292
  end
293
293
  class << f
294
- attr_accessor :progress_bar
294
+ attr_accessor :progress_bar
295
+
295
296
  def read(length, buffer=nil)
296
297
  begin
297
298
  result = @target.read(length, buffer)
@@ -323,7 +324,12 @@ def local_to_s3(bucket_to, key, file, options = {})
323
324
  end
324
325
  end
325
326
  rescue => e
326
- raise e unless options[:checksum]
327
+ actual_md5 = "bad"
328
+ if progress_bar
329
+ progress_bar.clear
330
+ puts "Error copying #{file} to s3://#{bucket_to}/#{key}"
331
+ end
332
+ raise e if !options[:checksum] || e.to_s =~ /Denied/
327
333
  STDERR.puts e
328
334
  ensure
329
335
  f.close()
data/lib/s3cp/version.rb CHANGED
@@ -16,5 +16,5 @@
16
16
  # the License.
17
17
 
18
18
  module S3CP
19
- VERSION = "1.0.5"
19
+ VERSION = "1.0.6"
20
20
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: s3cp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 29
4
+ hash: 27
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 5
10
- version: 1.0.5
9
+ - 6
10
+ version: 1.0.6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-06-25 00:00:00 Z
18
+ date: 2012-07-23 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  prerelease: false
@@ -151,6 +151,7 @@ extra_rdoc_files:
151
151
  files:
152
152
  - lib/s3cp/completion.rb
153
153
  - lib/s3cp/s3ls.rb
154
+ - lib/s3cp/#Untitled-2#
154
155
  - lib/s3cp/version.rb
155
156
  - lib/s3cp/s3du.rb
156
157
  - lib/s3cp/s3mod.rb