s3cp 1.1.29 → 1.1.30

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.30 (2013-05-15)
+
+* Changed:  Improved error handling -- all commands now exit with non-zero exit
+            code on error.  [Alexis Midon / alexism@github / Pull request #11]
+
+* Changed:  s3cp properly fails   when source key is not specified or does not exist.
+            [Alexis Midon / alexism@github / Pull request #11]
+
 === 1.1.29 (2013-05-15)
 
 * Added:  s3buckets command may now be used to delete buckets and enable/suspend

data/lib/s3cp/s3buckets.rb

@@ -58,10 +58,11 @@ op = OptionParser.new do |opts|
 end
 op.parse!(ARGV)
 
-S3CP.load_config()
+S3CP.standard_exception_handling(options) do
+
+  S3CP.load_config()
+  s3 = S3CP.connect()
 
-s3 = S3CP.connect()
-begin
   if options[:create]
     name = options[:create]
     create_options = {}
@@ -82,10 +83,5 @@ begin
       puts bucket.name
     end
   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,7 +73,7 @@ if options[:debug]
   puts "Options: \n#{options.inspect}"
 end
 
-begin
+S3CP.standard_exception_handling(options) do
   @bucket, @prefix = S3CP.bucket_and_key(url)
   fail "Your URL looks funny, doesn't it?" unless @bucket
 
@@ -134,17 +134,11 @@ begin
   else
     @s3.objects[@prefix].read_as_stream(read_options) do |chunk|
       begin
-        STDOUT.print(chunk)
+        $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]
-  STDERR.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]
-  STDERR.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]
-  STDERR.puts "sources: #{sources.inspect}"
-  STDERR.puts "destination: #{destination}"
-  STDERR.puts "Options: \n#{options.inspect}"
+  $stderr.puts "sources: #{sources.inspect}"
+  $stderr.puts "destination: #{destination}"
+  $stderr.puts "Options: \n#{options.inspect}"
 end
 
 class ProxyIO
@@ -282,7 +282,7 @@ def local_to_s3(bucket_to, key, file, options = {})
     when :not_found
       nil
     when :invalid
-      STDERR.puts "Warning: No MD5 checksum available and ETag not suitable due to multi-part upload; file will be force-copied."
+      $stderr.puts "Warning: No MD5 checksum available and ETag not suitable due to multi-part upload; file will be force-copied."
       nil
     else
       md5
@@ -297,7 +297,7 @@ def local_to_s3(bucket_to, key, file, options = {})
       end
       if retries > 0
         delay = options[:retry_delay] * (options[:retry_backoff] ** retries)
-        STDERR.puts "Sleeping #{"%0.2f" % delay} seconds.  Will retry #{options[:retries] - retries} more time(s)."
+        $stderr.puts "Sleeping #{"%0.2f" % delay} seconds.  Will retry #{options[:retries] - retries} more time(s)."
         sleep delay
       end
 
@@ -338,10 +338,10 @@ def local_to_s3(bucket_to, key, file, options = {})
           actual_md5 = s3_checksum(bucket_to, key)
           if actual_md5.is_a? String
             if actual_md5 != expected_md5
-              STDERR.puts "Warning: invalid MD5 checksum.  Expected: #{expected_md5} Actual: #{actual_md5}"
+              $stderr.puts "Warning: invalid MD5 checksum.  Expected: #{expected_md5} Actual: #{actual_md5}"
             end
           else
-            STDERR.puts "Warning: invalid MD5 checksum in metadata: #{actual_md5.inspect}; skipped checksum verification."
+            $stderr.puts "Warning: invalid MD5 checksum in metadata: #{actual_md5.inspect}; skipped checksum verification."
             actual_md5 = nil
           end
         end
@@ -349,10 +349,10 @@ def local_to_s3(bucket_to, key, file, options = {})
         actual_md5 = "bad"
         if progress_bar
           progress_bar.clear
-          STDERR.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
+        $stderr.puts e
       end
       retries += 1
     end until options[:checksum] == false || actual_md5.nil? || expected_md5 == actual_md5
@@ -364,6 +364,7 @@ end
 
 def s3_to_local(bucket_from, key_from, dest, options = {})
   log("#{operation(options)} s3://#{bucket_from}/#{key_from} to #{dest}")
+  raise ArgumentError, "source key may not be blank" if key_from.to_s.empty?
 
   retries = 0
   begin
@@ -374,17 +375,17 @@ def s3_to_local(bucket_from, key_from, dest, options = {})
     if retries > 0
       delay = options[:retry_delay] * (options[:retry_backoff] ** retries)
       delay = delay.to_i
-      STDERR.puts "Sleeping #{"%0.2f" % delay} seconds.  Will retry #{options[:retries] - retries} more time(s)."
+      $stderr.puts "Sleeping #{"%0.2f" % delay} seconds.  Will retry #{options[:retries] - retries} more time(s)."
       sleep delay
     end
     begin
       expected_md5 = if options[:checksum] || options[:sync]
         md5 = s3_checksum(bucket_from, key_from)
         if options[:sync] && !md5.is_a?(String)
-          STDERR.puts "Warning: invalid MD5 checksum in metadata; file will be force-copied."
+          $stderr.puts "Warning: invalid MD5 checksum in metadata; file will be force-copied."
           nil
         elsif !md5.is_a? String
-          STDERR.puts "Warning: invalid MD5 checksum in metadata; skipped checksum verification."
+          $stderr.puts "Warning: invalid MD5 checksum in metadata; skipped checksum verification."
           nil
         else
           md5
@@ -420,14 +421,15 @@ def s3_to_local(bucket_from, key_from, dest, options = {})
         return
       end
     rescue => e
+      raise e if e.is_a?(AWS::S3::Errors::NoSuchKey)
       raise e unless options[:checksum]
-      STDERR.puts e
+      $stderr.puts e
     end
 
     if options[:checksum] && expected_md5 != nil
       actual_md5 = S3CP.md5(dest)
       if actual_md5 != expected_md5
-        STDERR.puts "Warning: invalid MD5 checksum.  Expected: #{expected_md5} Actual: #{actual_md5}"
+        $stderr.puts "Warning: invalid MD5 checksum.  Expected: #{expected_md5} Actual: #{actual_md5}"
       end
     end
 
@@ -487,7 +489,7 @@ def copy(from, to, options)
         if match(key)
           dest = key_path key_to, relative(key_from, key)
           if !options[:overwrite] && s3_exist?(bucket_to, dest)
-            STDERR.puts "Skipping s3://#{bucket_to}/#{dest} - already exists."
+            $stderr.puts "Skipping s3://#{bucket_to}/#{dest} - already exists."
           else
             s3_to_s3(bucket_from, key, bucket_to, dest, options)
           end
@@ -496,7 +498,7 @@ def copy(from, to, options)
     else
       key_to += File.basename(key_from) if key_to[-1..-1] == "/"
       if !options[:overwrite] && s3_exist?(bucket_to, key_to)
-        STDERR.puts "Skipping s3://#{bucket_to}/#{key_to} - already exists."
+        $stderr.puts "Skipping s3://#{bucket_to}/#{key_to} - already exists."
       else
         s3_to_s3(bucket_from, key_from, bucket_to, key_to, options)
       end
@@ -511,7 +513,7 @@ def copy(from, to, options)
           #puts "relative(from, f) #{relative(from, f)}"
           key = key_path key_to, relative(from, f)
           if !options[:overwrite] && s3_exist?(bucket_to, key)
-            STDERR.puts "Skipping s3://#{bucket_to}/#{key} - already exists."
+            $stderr.puts "Skipping s3://#{bucket_to}/#{key} - already exists."
           else
             local_to_s3(bucket_to, key, File.expand_path(f), options)
           end
@@ -520,7 +522,7 @@ def copy(from, to, options)
     else
       key_to += File.basename(from) if key_to[-1..-1] == "/"
       if !options[:overwrite] && s3_exist?(bucket_to, key_to)
-        STDERR.puts "Skipping s3://#{bucket_to}/#{key_to} - already exists."
+        $stderr.puts "Skipping s3://#{bucket_to}/#{key_to} - already exists."
       else
         local_to_s3(bucket_to, key_to, File.expand_path(from), options)
       end
@@ -539,7 +541,7 @@ def copy(from, to, options)
           FileUtils.mkdir_p dir unless File.exist? dir
           fail "Destination path is not a directory: #{dir}" unless File.directory?(dir)
           if !options[:overwrite] && File.exist?(dest)
-            STDERR.puts "Skipping #{dest} - already exists."
+            $stderr.puts "Skipping #{dest} - already exists."
           else
             s3_to_local(bucket_from, key, dest, options)
           end
@@ -549,7 +551,7 @@ def copy(from, to, options)
       dest = File.expand_path(to)
       dest = File.join(dest, File.basename(key_from)) if File.directory?(dest)
       if !options[:overwrite] && File.exist?(dest)
-        STDERR.puts "Skipping #{dest} - already exists."
+        $stderr.puts "Skipping #{dest} - already exists."
       else
         s3_to_local(bucket_from, key_from, dest, options)
       end
@@ -568,13 +570,8 @@ def copy(from, to, options)
   end
 end
 
-begin
+S3CP.standard_exception_handling(options) do
   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

@@ -67,9 +67,6 @@ url = ARGV[0]
 @bucket, @prefix = S3CP.bucket_and_key(url)
 fail "Your URL looks funny, doesn't it?" unless @bucket
 
-S3CP.load_config()
-
-@s3 = S3CP.connect()
 
 def depth(path)
   path.count("/")
@@ -98,56 +95,57 @@ def print(key, size)
   puts ("%#{7 + @options[:precision]}s " % size) + key
 end
 
-begin
-  s3_options = Hash.new
-  s3_options[:bucket_name] = @bucket
-  s3_options[:prefix] = @prefix
-
-  begin
-    response = @s3.client.list_objects(s3_options)
-    response[:contents].each do |object|
-
-      key  = object[:key]
-      size = object[:size].to_i
+S3CP.standard_exception_handling(options) do
 
-      if options[:regex].nil? || options[:regex].match(key)
-        current_key = if actual_depth
-          pos = nth_occurrence(key, "/", actual_depth)
-          (pos != -1) ? key[0..pos-1] : key
-        end
+  S3CP.load_config()
+  @s3 = S3CP.connect()
 
-        if (last_key && last_key != current_key)
-          print(last_key, subtotal_size)
-          subtotal_size = size
-        else
-          subtotal_size += size
+  begin
+    s3_options = Hash.new
+    s3_options[:bucket_name] = @bucket
+    s3_options[:prefix] = @prefix
+
+    begin
+      response = @s3.client.list_objects(s3_options)
+      response[:contents].each do |object|
+
+        key  = object[:key]
+        size = object[:size].to_i
+
+        if options[:regex].nil? || options[:regex].match(key)
+          current_key = if actual_depth
+            pos = nth_occurrence(key, "/", actual_depth)
+            (pos != -1) ? key[0..pos-1] : key
+          end
+
+          if (last_key && last_key != current_key)
+            print(last_key, subtotal_size)
+            subtotal_size = size
+          else
+            subtotal_size += size
+          end
+
+          last_key = current_key
+          total_size += size
         end
-
-        last_key = current_key
-        total_size += size
       end
-    end
 
-    break if response[:contents].empty?
+      break if response[:contents].empty?
 
-    s3_options.merge!(:marker => response[:contents].last[:key])
-  end while response[:truncated]
+      s3_options.merge!(:marker => response[:contents].last[:key])
+    end while response[:truncated]
 
-  if last_key != nil
-    print(last_key, subtotal_size)
-  end
+    if last_key != nil
+      print(last_key, subtotal_size)
+    end
 
-  if options[:depth] > 0
-    print("", total_size)
-  else
-    puts S3CP.format_filesize(total_size, :unit => options[:unit], :precision => options[:precision])
-  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"
+    if options[:depth] > 0
+      print("", total_size)
+    else
+      puts S3CP.format_filesize(total_size, :unit => options[:unit], :precision => options[:precision])
+    end
+  rescue Errno::EPIPE
+    # ignore
   end
 end
 

data/lib/s3cp/s3lifecycle.rb

@@ -71,9 +71,6 @@ if ARGV.size == 0
   exit
 end
 
-S3CP.load_config()
-@s3 = S3CP.connect()
-
 def time_or_date_str(msg, t)
   if t.is_a?(Fixnum) || t.to_s =~ /^\d+$/
     "%s after %d days" % [msg, t.to_i]
@@ -91,83 +88,88 @@ def rule_to_str(r)
     [ r.prefix || "[root]", r.id, r.status, "???"]
   end
 end
+S3CP.standard_exception_handling(options) do
+
+  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
-
-  case
-
-    when options[:expire]
-      @s3.buckets[bucket].lifecycle_configuration.update do
-        rule_options = {}
-        rule_options[:id] = options[:name] if options[:name]
-        rule_options[:expiration_time] = S3CP.parse_days_or_date(options[:expire])
-        add_rule(key, rule_options)
-      end
-
-    when options[:glacier]
-      @s3.buckets[bucket].lifecycle_configuration.update do
-        rule_options = {}
-        rule_options[:id] = options[:name] if options[:name]
-        rule_options[:glacier_transition_time] = S3CP.parse_days_or_date(options[:glacier])
-        add_rule(key, rule_options)
-      end
-
-    when options[:enable]
-      success = false
-      @s3.buckets[bucket].lifecycle_configuration.update do
-        self.rules.each do |r|
-          if (r.prefix == key) || (r.id == options[:name])
-            r.enable!
-            puts "Enabled rule: "
-            puts S3CP.tableify([rule_to_str(r)])
-            success = true
+    case
+
+      when options[:expire]
+        @s3.buckets[bucket].lifecycle_configuration.update do
+          rule_options = {}
+          rule_options[:id] = options[:name] if options[:name]
+          rule_options[:expiration_time] = S3CP.parse_days_or_date(options[:expire])
+          add_rule(key, rule_options)
+        end
+
+      when options[:glacier]
+        @s3.buckets[bucket].lifecycle_configuration.update do
+          rule_options = {}
+          rule_options[:id] = options[:name] if options[:name]
+          rule_options[:glacier_transition_time] = S3CP.parse_days_or_date(options[:glacier])
+          add_rule(key, rule_options)
+        end
+
+      when options[:enable]
+        success = false
+        @s3.buckets[bucket].lifecycle_configuration.update do
+          self.rules.each do |r|
+            if (r.prefix == key) || (r.id == options[:name])
+              r.enable!
+              puts "Enabled rule: "
+              puts S3CP.tableify([rule_to_str(r)])
+              success = true
+            end
           end
         end
-      end
-      fail "Rule or prefix not found" unless success
-
-    when options[:disable]
-      success = false
-      @s3.buckets[bucket].lifecycle_configuration.update do
-        self.rules.each do |r|
-          if (r.prefix == key) || (r.id == options[:name])
-            r.disabled!
-            puts "Disabled rule: "
-            puts S3CP.tableify([rule_to_str(r)])
-            success = true
+        fail "Rule or prefix not found" unless success
+
+      when options[:disable]
+        success = false
+        @s3.buckets[bucket].lifecycle_configuration.update do
+          self.rules.each do |r|
+            if (r.prefix == key) || (r.id == options[:name])
+              r.disabled!
+              puts "Disabled rule: "
+              puts S3CP.tableify([rule_to_str(r)])
+              success = true
+            end
           end
         end
-      end
-      fail "Rule or prefix not found" unless success
-
-    when options[:delete]
-      success = false
-      @s3.buckets[bucket].lifecycle_configuration.update do
-        self.rules.each do |r|
-          if (r.prefix == key) || (r.id == options[:name])
-            remove_rule(r)
-            puts "Deleted rule: "
-            puts S3CP.tableify([rule_to_str(r)])
-            success = true
+        fail "Rule or prefix not found" unless success
+
+      when options[:delete]
+        success = false
+        @s3.buckets[bucket].lifecycle_configuration.update do
+          self.rules.each do |r|
+            if (r.prefix == key) || (r.id == options[:name])
+              remove_rule(r)
+              puts "Deleted rule: "
+              puts S3CP.tableify([rule_to_str(r)])
+              success = true
+            end
           end
         end
-      end
-      fail "Rule or prefix not found" unless success
+        fail "Rule or prefix not found" unless success
 
-    else
-      rules = @s3.buckets[bucket].lifecycle_configuration.rules.to_a
-      if rules.empty?
-        puts "#{bucket} - no lifecycle rules"
       else
-        puts "#{bucket} - lifecycle rules:"
-        begin
-          puts S3CP.tableify(rules.map { |r| rule_to_str(r) })
-        rescue => e
-          puts rules.inspect
-          raise e
+        rules = @s3.buckets[bucket].lifecycle_configuration.rules.to_a
+        if rules.empty?
+          puts "#{bucket} - no lifecycle rules"
+        else
+          puts "#{bucket} - lifecycle rules:"
+          begin
+            puts S3CP.tableify(rules.map { |r| rule_to_str(r) })
+          rescue => e
+            puts rules.inspect
+            raise e
+          end
         end
-      end
+    end
   end
 end

data/lib/s3cp/s3ls.rb

@@ -90,75 +90,74 @@ if options[:debug]
   puts "key #{@key}"
 end
 
-S3CP.load_config()
-
-@s3 = S3CP.connect()
 
 keys = 0
 rows = 0
 directories = true
 
-begin
-  display = lambda do |entry|
-    # add '---' separator line between directories and files
-    if options[:delimiter] && directories && entry.is_a?(AWS::S3::Tree::LeafNode)
-      directories = false
-      puts "---"
+S3CP.standard_exception_handling(options) do
+
+  S3CP.load_config()
+
+  @s3 = S3CP.connect()
+
+  begin
+    display = lambda do |entry|
+      # add '---' separator line between directories and files
+      if options[:delimiter] && directories && entry.is_a?(AWS::S3::Tree::LeafNode)
+        directories = false
+        puts "---"
+      end
+
+      key = "s3://#{@bucket}/#{entry.respond_to?(:key) ? entry.key : entry.prefix}"
+      if options[:long_format] && entry.last_modified && entry.content_length
+        size = entry.content_length
+        size = S3CP.format_filesize(size, :unit => options[:unit], :precision => options[:precision])
+        size = ("%#{7 + options[:precision]}s " % size)
+        puts "#{entry.last_modified.strftime(options[:date_format])} #{size} #{key}"
+      else
+        puts key
+      end
+      rows += 1
+      keys += 1
+      response = ''
+
+      if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
+        begin
+          print "Continue? (Y/n) "
+          response = STDIN.gets.chomp.downcase
+        end until response == 'n' || response == 'y' || response == ''
+      end
+      (response == 'n')
     end
 
-    key = "s3://#{@bucket}/#{entry.respond_to?(:key) ? entry.key : entry.prefix}"
-    if options[:long_format] && entry.last_modified && entry.content_length
-      size = entry.content_length
-      size = S3CP.format_filesize(size, :unit => options[:unit], :precision => options[:precision])
-      size = ("%#{7 + options[:precision]}s " % size)
-      puts "#{entry.last_modified.strftime(options[:date_format])} #{size} #{key}"
+    if options[:delimiter]
+      @s3.buckets[@bucket].objects.with_prefix(@key).as_tree(:delimier => options[:delimiter], :append => false).children.each do |entry|
+        break if display.call(entry)
+      end
     else
-      puts key
-    end
-    rows += 1
-    keys += 1
-    response = ''
+      Struct.new("S3Entry", :key, :last_modified, :content_length)
 
-    if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
-      begin
-        print "Continue? (Y/n) "
-        response = STDIN.gets.chomp.downcase
-      end until response == 'n' || response == 'y' || response == ''
-    end
-    (response == 'n')
-  end
+      s3_options = Hash.new
+      s3_options[:bucket_name] = @bucket
+      s3_options[:prefix] = @key
+      s3_options[:limit] = options[:max_keys] if options[:max_keys]
 
-  if options[:delimiter]
-    @s3.buckets[@bucket].objects.with_prefix(@key).as_tree(:delimier => options[:delimiter], :append => false).children.each do |entry|
-      break if display.call(entry)
+      stop = false
+
+      begin
+        response = @s3.client.list_objects(s3_options)
+        response[:contents].each do |object|
+          entry = Struct::S3Entry.new(object[:key], object[:last_modified], object[:size].to_i)
+          stop = display.call(entry)
+          break if stop
+        end
+        break if stop || response[:contents].empty?
+        s3_options.merge!(:marker => response[:contents].last[:key])
+      end while response[:truncated]
     end
-  else
-    Struct.new("S3Entry", :key, :last_modified, :content_length)
-
-    s3_options = Hash.new
-    s3_options[:bucket_name] = @bucket
-    s3_options[:prefix] = @key
-    s3_options[:limit] = options[:max_keys] if options[:max_keys]
-
-    stop = false
-
-    begin
-      response = @s3.client.list_objects(s3_options)
-      response[:contents].each do |object|
-        entry = Struct::S3Entry.new(object[:key], object[:last_modified], object[:size].to_i)
-        stop = display.call(entry)
-        break if stop
-      end
-      break if stop || response[:contents].empty?
-      s3_options.merge!(:marker => response[:contents].last[:key])
-    end while response[:truncated]
-  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"
+  rescue Errno::EPIPE
+    # ignore
   end
 end
 

data/lib/s3cp/s3mod.rb

@@ -91,7 +91,7 @@ if !options[:acl] && paths.size > 1 && S3CP::LEGAL_MODS.include?(paths.last)
   options[:acl] = S3CP.validate_acl(paths.pop);
 end
 
-begin
+S3CP.standard_exception_handling(options) do
   S3CP.load_config()
   @s3 = S3CP.connect()
 
@@ -112,9 +112,4 @@ begin
       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

@@ -102,7 +102,7 @@ end
 include_regex = options[:include_regex] ? Regexp.new(options[:include_regex]) : nil
 exclude_regex = options[:exclude_regex] ? Regexp.new(options[:exclude_regex]) : nil
 
-begin
+S3CP.standard_exception_handling(options) do
   S3CP.load_config()
 
   @s3 = S3CP.connect()
@@ -147,10 +147,5 @@ begin
       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/s3stat.rb

@@ -45,19 +45,21 @@ permission = ARGV.last
 @bucket, @key = S3CP.bucket_and_key(source)
 fail "Your URL looks funny, doesn't it?" unless @bucket
 
-S3CP.load_config()
+S3CP.standard_exception_handling(options) do
+  S3CP.load_config()
 
-@s3 = S3CP.connect().buckets[@bucket]
+  @s3 = S3CP.connect().buckets[@bucket]
 
-obj = @s3.objects[@key]
+  obj = @s3.objects[@key]
 
-metadata = obj.head
-metadata.to_h.keys.sort { |k1, k2| k1.to_s <=> k2.to_s}.each do |k|
-  puts "#{"%30s" % k} #{metadata[k].is_a?(Hash) ? metadata[k].inspect : metadata[k].to_s}"
-end
+  metadata = obj.head
+  metadata.to_h.keys.sort { |k1, k2| k1.to_s <=> k2.to_s}.each do |k|
+    puts "#{"%30s" % k} #{metadata[k].is_a?(Hash) ? metadata[k].inspect : metadata[k].to_s}"
+  end
 
-if @options[:acl]
-  puts
-  xml = Nokogiri::XML(obj.acl.to_s)
-  puts xml.to_s
+  if @options[:acl]
+    puts
+    xml = Nokogiri::XML(obj.acl.to_s)
+    puts xml.to_s
+  end
 end

data/lib/s3cp/s3tree.rb

@@ -68,104 +68,101 @@ 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().buckets[@bucket]
 
 keys = 0
 rows = 0
 
-begin
-  # find last index of character `ch` in `str`.
-  last_index_of = lambda do |str, ch|
-    case
-      when str[ch] then str.length-(str.reverse.index(ch)+1)
-      else -1
-    end
-  end
+S3CP.standard_exception_handling(options) do
+  S3CP.load_config()
+  @s3 = S3CP.connect().buckets[@bucket]
 
-  # displays the next line, returns true if user interrupts or max keys shown
-  display_line = lambda do |line|
-    puts line
-    keys += 1
-    if options[:max_keys] && keys > options[:max_keys]
-      return true
-    end
-    rows += 1
-    response = ''
-    if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
-      begin
-        print "Continue? (Y/n) "
-        response = STDIN.gets.chomp.downcase
-      end until response == 'n' || response == 'y' || response == ''
+  begin
+    # find last index of character `ch` in `str`.
+    last_index_of = lambda do |str, ch|
+      case
+        when str[ch] then str.length-(str.reverse.index(ch)+1)
+        else -1
+      end
     end
-    (response == 'n')
-  end
 
-  # returns relative path against @key
-  #
-  # e.g. relative.call("foo/bar") => "bar"   (assuming @key = "foo/")
-  #
-  relative = lambda do |key|
-    last_delimiter = last_index_of.call(@key, options[:delimiter])
-    (last_delimiter != -1) ? key[last_delimiter..-1] : key
-  end
+    # displays the next line, returns true if user interrupts or max keys shown
+    display_line = lambda do |line|
+      puts line
+      keys += 1
+      if options[:max_keys] && keys > options[:max_keys]
+        return true
+      end
+      rows += 1
+      response = ''
+      if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
+        begin
+          print "Continue? (Y/n) "
+          response = STDIN.gets.chomp.downcase
+        end until response == 'n' || response == 'y' || response == ''
+      end
+      (response == 'n')
+    end
 
-  # trim up to the last delimiter
-  #
-  # e.g. trim.call("foo/bar") => "foo/"
-  #
-  trim = lambda do |key|
-    last_delimiter = last_index_of.call(key, options[:delimiter])
-    (last_delimiter != -1) ? key[0..last_delimiter] : ""
-  end
+    # returns relative path against @key
+    #
+    # e.g. relative.call("foo/bar") => "bar"   (assuming @key = "foo/")
+    #
+    relative = lambda do |key|
+      last_delimiter = last_index_of.call(@key, options[:delimiter])
+      (last_delimiter != -1) ? key[last_delimiter..-1] : key
+    end
 
-  # recursively display tree elements
-  #
-  # +prefix+: line prefix
-  # +children+: children of the current directory
-  # +depth+: current directory depth
-  display_tree = lambda do |prefix, children, depth|
-    stop = false
-    children = children.to_a  # aws-sdk returns a sucky ChildCollection object
-    children.each_with_index do |node, index|
-      node = node
-      if options[:directories_only] && node.leaf?
-        next
-      end
+    # trim up to the last delimiter
+    #
+    # e.g. trim.call("foo/bar") => "foo/"
+    #
+    trim = lambda do |key|
+      last_delimiter = last_index_of.call(key, options[:delimiter])
+      (last_delimiter != -1) ? key[0..last_delimiter] : ""
+    end
 
-      last = (index == children.size - 1)
-      has_siblings = (children.size > 1)
-      key = node.branch? ? node.prefix : node.key
-      parts = relative.call(key).split(options[:delimiter])
-      postfix = last ? '└── ' : '├── '
+    # recursively display tree elements
+    #
+    # +prefix+: line prefix
+    # +children+: children of the current directory
+    # +depth+: current directory depth
+    display_tree = lambda do |prefix, children, depth|
+      stop = false
+      children = children.to_a  # aws-sdk returns a sucky ChildCollection object
+      children.each_with_index do |node, index|
+        node = node
+        if options[:directories_only] && node.leaf?
+          next
+        end
+
+        last = (index == children.size - 1)
+        has_siblings = (children.size > 1)
+        key = node.branch? ? node.prefix : node.key
+        parts = relative.call(key).split(options[:delimiter])
+        postfix = last ? '└── ' : '├── '
+
+        stop = display_line.call(prefix + postfix + parts.last)
+        break if stop
 
-      stop = display_line.call(prefix + postfix + parts.last)
-      break if stop
+        if node.branch? && depth < options[:max_depth]
+          new_prefix = prefix + (has_siblings ? "│    " : "    ")
+          stop = display_tree.call(new_prefix, node.children, depth + 1)
+          break if stop
+        end
 
-      if node.branch? && depth < options[:max_depth]
-        new_prefix = prefix + (has_siblings ? "│    " : "    ")
-        stop = display_tree.call(new_prefix, node.children, depth + 1)
         break if stop
       end
-
-      break if stop
+      stop
     end
-    stop
-  end
 
-  display_line.call("s3://#{@bucket}/#{trim.call(@key)}")
-
-  prefix = ""
-  root = @s3.objects.with_prefix(@key).as_tree( :delimier => options[:delimiter], :append => false)
-  depth = 1
-  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"
+    display_line.call("s3://#{@bucket}/#{trim.call(@key)}")
+
+    prefix = ""
+    root = @s3.objects.with_prefix(@key).as_tree( :delimier => options[:delimiter], :append => false)
+    depth = 1
+    display_tree.call(prefix, root.children, depth)
+  rescue Errno::EPIPE
+    # ignore
   end
 end
 

data/lib/s3cp/s3up.rb

@@ -69,9 +69,8 @@ url = ARGV[0]
 bucket, key = S3CP.bucket_and_key(url)
 fail "Your URL looks funny, doesn't it?" unless bucket
 
-begin
+S3CP.standard_exception_handling(options) do
   S3CP.load_config()
-
   @s3 = S3CP.connect()
 
   # copy all of STDIN to a temp file
@@ -93,17 +92,12 @@ begin
     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)} "
+    $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
 
 

data/lib/s3cp/utils.rb

@@ -250,6 +250,20 @@ module S3CP
       yield bucket.objects[key]
     end
   end
+
+  def standard_exception_handling(options)
+    begin
+      yield
+    rescue Exception => ex
+      cmd_name ||= File.basename(caller[1].split(/:/)[0], '.*')
+      $stderr.print "#{cmd_name} [#{ex.class}] #{ex.message}\n"
+      if options[:debug]
+        $stderr.print ex.backtrace.join("\n") + "\n"
+      end
+      exit 1
+    end
+  end
+
 end
 
 # Monkey-patch S3 object for download streaming

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 1
   - 1
-  - 29
-  version: 1.1.29
+  - 30
+  version: 1.1.30
 platform: ruby
 authors: 
 - Alex Boisvert