s3cp 1.1.23 → 1.1.24

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.24 (2013-03-15)
+
+* Changed:  Commands now print a succint error code + message instead of
+            Ruby stacktrace.  (Stacktraces still available using --debug flag)
+
 === 1.1.23 (2013-03-15)
 
 * Added:   s3cat now accepts --head, --tail and --range arguments.

data/lib/s3cp/s3buckets.rb

@@ -27,6 +27,10 @@ op = OptionParser.new do |opts|
     options[:verbose] = true
   end
 
+  opts.on("--debug", "Verbose mode") do
+    options[:debug] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -36,8 +40,15 @@ op.parse!(ARGV)
 
 S3CP.load_config()
 
-s3 = S3CP.connect()
-s3.buckets.each do |bucket|
-  puts bucket.name
+begin
+  s3 = S3CP.connect()
+  s3.buckets.each do |bucket|
+    puts bucket.name
+  end
+rescue => e
+  $stderr.print "s3buckets: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
 end
 

data/lib/s3cp/s3cat.rb

@@ -73,70 +73,78 @@ if options[:debug]
   puts "Options: \n#{options.inspect}"
 end
 
-@bucket, @prefix = S3CP.bucket_and_key(url)
-fail "Your URL looks funny, doesn't it?" unless @bucket
+begin
+  @bucket, @prefix = S3CP.bucket_and_key(url)
+  fail "Your URL looks funny, doesn't it?" unless @bucket
 
-S3CP.load_config()
+  S3CP.load_config()
 
-read_options = {}
-read_options[:debug] = options[:debug]
-read_options[:head] = options[:head] if options[:head]
-read_options[:tail] = options[:tail] if options[:tail]
-read_options[:range_start] = options[:range_start] if options[:range_start]
-read_options[:range_end] = options[:range_end] if options[:range_end]
+  read_options = {}
+  read_options[:debug] = options[:debug]
+  read_options[:head] = options[:head] if options[:head]
+  read_options[:tail] = options[:tail] if options[:tail]
+  read_options[:range_start] = options[:range_start] if options[:range_start]
+  read_options[:range_end] = options[:range_end] if options[:range_end]
 
-@s3 = S3CP.connect().buckets[@bucket]
+  @s3 = S3CP.connect().buckets[@bucket]
 
 
-if options[:edit] && (options[:head] || options[:tail] || options[:range_start] || options[:range_end])
-  fail "--edit option is not intended to be used with --head, --tail nor --range"
-end
+  if options[:edit] && (options[:head] || options[:tail] || options[:range_start] || options[:range_end])
+    fail "--edit option is not intended to be used with --head, --tail nor --range"
+  end
 
-if options[:tty] || options[:edit]
-  # store contents to file to display with PAGER
-  size = @s3.objects[@prefix].content_length
+  if options[:tty] || options[:edit]
+    # store contents to file to display with PAGER
+    size = @s3.objects[@prefix].content_length
 
-  progress_bar = ProgressBar.new(File.basename(@prefix), size).tap do |p|
-    p.file_transfer_mode
-  end
+    progress_bar = ProgressBar.new(File.basename(@prefix), size).tap do |p|
+      p.file_transfer_mode
+    end
 
-  file = Tempfile.new(File.basename(@prefix) + '_')
-  out = File.new(file.path, "wb")
-  begin
-    @s3.objects[@prefix].read_as_stream(read_options) do |chunk|
-      out.write(chunk)
-      progress_bar.inc chunk.size
+    file = Tempfile.new(File.basename(@prefix) + '_')
+    out = File.new(file.path, "wb")
+    begin
+      @s3.objects[@prefix].read_as_stream(read_options) do |chunk|
+        out.write(chunk)
+        progress_bar.inc chunk.size
+      end
+      progress_bar.finish
+    ensure
+      out.close()
     end
-    progress_bar.finish
-  ensure
-    out.close()
-  end
-  if options[:edit]
-    before_md5 = S3CP.md5(file.path)
-    system "#{ENV['EDITOR'] || 'vi'} #{file.path}"
-    if ($? == 0)
-      if (S3CP.md5(file.path) != before_md5)
-        ARGV.clear
-        ARGV << file.path
-        ARGV << url
-        load "s3cp/s3cp.rb"
+    if options[:edit]
+      before_md5 = S3CP.md5(file.path)
+      system "#{ENV['EDITOR'] || 'vi'} #{file.path}"
+      if ($? == 0)
+        if (S3CP.md5(file.path) != before_md5)
+          ARGV.clear
+          ARGV << file.path
+          ARGV << url
+          load "s3cp/s3cp.rb"
+        else
+          puts "File unchanged."
+        end
       else
-        puts "File unchanged."
+        puts "Edit aborted (result code #{$?})."
       end
     else
-      puts "Edit aborted (result code #{$?})."
+      system "#{ENV['PAGER'] || 'less'} #{file.path}"
     end
+    file.delete()
   else
-    system "#{ENV['PAGER'] || 'less'} #{file.path}"
-  end
-  file.delete()
-else
-  @s3.objects[@prefix].read_as_stream(read_options) do |chunk|
-    begin
-      STDOUT.print(chunk)
-    rescue Errno::EPIPE
-      break
+    @s3.objects[@prefix].read_as_stream(read_options) do |chunk|
+      begin
+        STDOUT.print(chunk)
+      rescue Errno::EPIPE
+        break
+      end
     end
   end
+
+rescue => e
+  $stderr.print "s3cat: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
 end
 

data/lib/s3cp/s3cp.rb

@@ -148,12 +148,12 @@ if ARGV.size < 2
 end
 
 if options[:include_regex].any? && !options[:recursive]
-  puts "-i (--include regex) option requires -r (recursive) option."
+  STDERR.puts "-i (--include regex) option requires -r (recursive) option."
   exit(1)
 end
 
 if options[:exclude_regex].any? && !options[:recursive]
-  puts "-x (--exclude regex) option requires -r (recursive) option."
+  STDERR.puts "-x (--exclude regex) option requires -r (recursive) option."
   exit(1)
 end
 
@@ -161,9 +161,9 @@ destination = ARGV.last
 sources = ARGV[0..-2]
 
 if options[:debug]
-  puts "sources: #{sources.inspect}"
-  puts "destination: #{destination}"
-  puts "Options: \n#{options.inspect}"
+  STDERR.puts "sources: #{sources.inspect}"
+  STDERR.puts "destination: #{destination}"
+  STDERR.puts "Options: \n#{options.inspect}"
 end
 
 class ProxyIO
@@ -347,7 +347,7 @@ def local_to_s3(bucket_to, key, file, options = {})
         actual_md5 = "bad"
         if progress_bar
           progress_bar.clear
-          puts "Error copying #{file} to s3://#{bucket_to}/#{key}"
+          STDERR.puts "Error copying #{file} to s3://#{bucket_to}/#{key}"
         end
         raise e if !options[:checksum] || e.is_a?(AWS::S3::Errors::AccessDenied)
         STDERR.puts e
@@ -496,9 +496,9 @@ def copy(from, to, options)
       files = Dir[from + "/**/*"]
       files.each do |f|
         if File.file?(f) && match(f)
-          puts "bucket_to #{bucket_to}"
-          puts "no_slash(key_to) #{no_slash(key_to)}"
-          puts "relative(from, f) #{relative(from, f)}"
+          #puts "bucket_to #{bucket_to}"
+          #puts "no_slash(key_to) #{no_slash(key_to)}"
+          #puts "relative(from, f) #{relative(from, f)}"
           key = key_path key_to, relative(from, f)
           local_to_s3(bucket_to, key, File.expand_path(f), options) unless !options[:overwrite] && s3_exist?(bucket_to, key)
         end
@@ -542,7 +542,13 @@ def copy(from, to, options)
   end
 end
 
-sources.each do |source|
-  copy(source, destination, options)
+begin
+  sources.each do |source|
+    copy(source, destination, options)
+  end
+rescue => e
+  $stderr.print "s3cp: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
 end
-

data/lib/s3cp/s3du.rb

@@ -44,6 +44,10 @@ op = OptionParser.new do |opts|
     options[:regex] = Regexp.new(regex)
   end
 
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -140,5 +144,10 @@ begin
   end
 rescue Errno::EPIPE
   # ignore
+rescue => e
+  $stderr.print "s3du: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
 end
 

data/lib/s3cp/s3ls.rb

@@ -39,6 +39,10 @@ op = OptionParser.new do |opts|
     options[:verbose] = true
   end
 
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
   opts.on("--rows ROWS", "Rows per page") do |rows|
     options[:rows_per_page] = rows.to_i
   end
@@ -73,7 +77,7 @@ end
 
 url = ARGV[0]
 
-if options[:verbose]
+if options[:debug]
   puts "URL: #{url}"
   puts "Options: #{options.inspect}"
 end
@@ -81,7 +85,7 @@ end
 @bucket, @key = S3CP.bucket_and_key(url)
 fail "Your URL looks funny, doesn't it?" unless @bucket
 
-if options[:verbose]
+if options[:debug]
   puts "bucket #{@bucket}"
   puts "key #{@key}"
 end
@@ -151,5 +155,10 @@ begin
   end
 rescue Errno::EPIPE
   # ignore
+rescue => e
+  $stderr.print "s3ls: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
 end
 

data/lib/s3cp/s3mod.rb

@@ -55,6 +55,10 @@ op = OptionParser.new do |opts|
     options[:verbose] = true
   end
 
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
   opts.on('--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3." ) do |h|
     options[:headers] += h
   end
@@ -87,23 +91,30 @@ if !options[:acl] && paths.size > 1 && S3CP::LEGAL_MODS.include?(paths.last)
   options[:acl] = S3CP.validate_acl(paths.pop);
 end
 
-S3CP.load_config()
-@s3 = S3CP.connect()
+begin
+  S3CP.load_config()
+  @s3 = S3CP.connect()
 
-paths.each do |path|
-  bucket,key = S3CP.bucket_and_key(path)
-  fail "Invalid bucket/key: #{path}" unless key
+  paths.each do |path|
+    bucket,key = S3CP.bucket_and_key(path)
+    fail "Invalid bucket/key: #{path}" unless key
 
-  S3CP.objects_by_wildcard(@s3.buckets[bucket], key) { | obj |
-    puts "s3://#{bucket}/#{obj.key}"
+    S3CP.objects_by_wildcard(@s3.buckets[bucket], key) { | obj |
+      puts "s3://#{bucket}/#{obj.key}"
 
-    if options[:headers].size > 0
-      current_medata = obj.metadata
-      object_metadata = S3CP.set_header_options(current_medata, S3CP.headers_array_to_hash(options[:headers]))
-    end
+      if options[:headers].size > 0
+        current_medata = obj.metadata
+        object_metadata = S3CP.set_header_options(current_medata, S3CP.headers_array_to_hash(options[:headers]))
+      end
 
-    if options[:acl]
-      obj.acl = options[:acl]
-    end
-  }
-end
+      if options[:acl]
+        obj.acl = options[:acl]
+      end
+    }
+  end
+rescue => e
+  $stderr.print "s3mod: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
+end

data/lib/s3cp/s3rm.rb

@@ -58,6 +58,10 @@ op = OptionParser.new do |opts|
     options[:verbose] = true
   end
 
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -98,47 +102,55 @@ end
 include_regex = options[:include_regex] ? Regexp.new(options[:include_regex]) : nil
 exclude_regex = options[:exclude_regex] ? Regexp.new(options[:exclude_regex]) : nil
 
-S3CP.load_config()
+begin
+  S3CP.load_config()
 
-@s3 = S3CP.connect()
+  @s3 = S3CP.connect()
 
-if options[:recursive]
-  matching_keys = []
+  if options[:recursive]
+    matching_keys = []
 
-  @s3.buckets[@bucket].objects.with_prefix(@key).each do |entry|
-    key = "s3://#{@bucket}/#{entry.key}"
+    @s3.buckets[@bucket].objects.with_prefix(@key).each do |entry|
+      key = "s3://#{@bucket}/#{entry.key}"
 
-    matching = true
-    matching = false if include_regex && !include_regex.match(entry.key)
-    matching = false if exclude_regex && exclude_regex.match(entry.key)
+      matching = true
+      matching = false if include_regex && !include_regex.match(entry.key)
+      matching = false if exclude_regex && exclude_regex.match(entry.key)
 
-    puts "#{key} => #{matching}" if options[:verbose]
+      puts "#{key} => #{matching}" if options[:verbose]
 
-    if matching
-      matching_keys << entry.key
-      puts key unless options[:silent] || options[:verbose]
+      if matching
+        matching_keys << entry.key
+        puts key unless options[:silent] || options[:verbose]
+      end
     end
-  end
 
-  if options[:fail_if_not_exist] && matching_keys.length == 0
-    puts "No matching keys."
-    exit(1)
-  end
+    if options[:fail_if_not_exist] && matching_keys.length == 0
+      puts "No matching keys."
+      exit(1)
+    end
 
-  # if any of the objects failed to delete, a BatchDeleteError will be raised with a summary of the errors
-  @s3.buckets[@bucket].objects.delete(matching_keys) unless options[:test]
-else
-  # delete a single file; check if it exists
-  if options[:fail_if_not_exist] && !@s3.buckets[@bucket].objects[@key].exist?
-    key = "s3://#{@bucket}/#{@key}"
-    puts "#{key} does not exist."
-    exit(1)
-  end
+    # if any of the objects failed to delete, a BatchDeleteError will be raised with a summary of the errors
+    @s3.buckets[@bucket].objects.delete(matching_keys) unless options[:test]
+  else
+    # delete a single file; check if it exists
+    if options[:fail_if_not_exist] && !@s3.buckets[@bucket].objects[@key].exist?
+      key = "s3://#{@bucket}/#{@key}"
+      puts "#{key} does not exist."
+      exit(1)
+    end
 
-  begin
-    @s3.buckets[@bucket].objects[@key].delete() unless options[:test]
-  rescue => e
-    puts e.to_s
-    raise e unless e.is_a? AWS::S3::Errors::NoSuchKey
+    begin
+      @s3.buckets[@bucket].objects[@key].delete() unless options[:test]
+    rescue => e
+      puts e.to_s
+      raise e unless e.is_a? AWS::S3::Errors::NoSuchKey
+    end
+  end
+rescue => e
+  $stderr.print "s3rm: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
   end
 end
+

data/lib/s3cp/s3tree.rb

@@ -47,6 +47,10 @@ op = OptionParser.new do |opts|
     options[:delimiter] = delimiter
   end
 
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -158,5 +162,10 @@ begin
   display_tree.call(prefix, root.children, depth)
 rescue Errno::EPIPE
   # ignore
+rescue => e
+  $stderr.print "s3tree: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
+  end
 end
 

data/lib/s3cp/s3up.rb

@@ -41,6 +41,10 @@ op = OptionParser.new do |opts|
     options[:acl] = S3CP.validate_acl(permission)
   end
 
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
   opts.separator "        e.g.,"
   opts.separator "              HTTP headers: \'Content-Type: image/jpg\'"
   opts.separator "               AMZ headers: \'x-amz-acl: public-read\'"
@@ -65,33 +69,41 @@ url = ARGV[0]
 bucket, key = S3CP.bucket_and_key(url)
 fail "Your URL looks funny, doesn't it?" unless bucket
 
-S3CP.load_config()
-
-@s3 = S3CP.connect()
+begin
+  S3CP.load_config()
+
+  @s3 = S3CP.connect()
+
+  # copy all of STDIN to a temp file
+  temp = Tempfile.new('s3cp')
+  while true
+    begin
+      data = STDIN.sysread(4 * 1024)
+      temp.syswrite(data)
+    rescue EOFError => e
+      break
+    end
+  end
+  temp.close
+  temp.open
 
-# copy all of STDIN to a temp file
-temp = Tempfile.new('s3cp')
-while true
+  # upload temp file
   begin
-    data = STDIN.sysread(4 * 1024)
-    temp.syswrite(data)
-  rescue EOFError => e
-    break
+    s3_options = {}
+    S3CP.set_header_options(s3_options, @headers)
+    s3_options[:acl] = options[:acl]
+    @s3.buckets[bucket].objects[key].write(temp, s3_options)
+    STDERR.puts "s3://#{bucket}/#{key} => #{S3CP.format_filesize(temp.size)} "
+  ensure
+    # cleanup
+    temp.close
+    temp.delete
+  end
+rescue => e
+  $stderr.print "s3up: [#{e.class}] #{e.message}\n"
+  if options[:debug]
+    $stderr.print e.backtrace.join("\n") + "\n"
   end
 end
-temp.close
-temp.open
 
-# upload temp file
-begin
-  s3_options = {}
-  S3CP.set_header_options(s3_options, @headers)
-  s3_options[:acl] = options[:acl]
-  @s3.buckets[bucket].objects[key].write(temp, s3_options)
-  STDERR.puts "s3://#{bucket}/#{key} => #{S3CP.format_filesize(temp.size)} "
-ensure
-  # cleanup
-  temp.close
-  temp.delete
-end
 

data/lib/s3cp/version.rb

@@ -16,5 +16,5 @@
 # the License.
 
 module S3CP
-  VERSION = "1.1.23"
+  VERSION = "1.1.24"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 35
   prerelease: 
   segments: 
   - 1
   - 1
-  - 23
-  version: 1.1.23
+  - 24
+  version: 1.1.24
 platform: ruby
 authors: 
 - Alex Boisvert