drydock 0.5.3 → 0.5.4

data/CHANGES.txt

@@ -6,6 +6,11 @@ DRYDOCK, CHANGES
 * Inline commands aliases. command :cmd1, :cmd2 do; ...; end
 
 
+#### 0.5.4 (2009-04-15) #############################
+
+* ADDED: Better error handling with new Drydock::ArgError and Drydock::OptError
+
+
 #### 0.5.3 (2009-04-05) #############################
 
 * FIXED: Command actions were not being handled correctly. Added rdocs to 

data/drydock.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{drydock}
-  s.version = "0.5.3"
-  s.date = %q{2009-04-05}
+  s.version = "0.5.4"
+  s.date = %q{2009-04-15}
   s.specification_version = 1 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 

data/lib/drydock.rb

@@ -34,7 +34,21 @@ module Drydock
     end
   end
   
-    
+  class ArgError < RuntimeError
+    attr_reader :arg, :cmd, :msg
+    def initialize(*args)
+      @msg = args.shift if args.size == 1
+      @arg, @cmd, @msg = *args
+      @cmd ||= 'COMMAND'
+      @msg = nil if @msg.empty?
+    end
+    def message; @msg || "Error: No #{@arg} provided"; end
+    def usage; "See: #{$0} #{@cmd} -h"; end
+  end
+  class OptError < ArgError
+    def message; @msg || "Error: No #{@arg} provided"; end
+  end
+  
   # The base class for all command objects. There is an instance of this class
   # for every command defined. Global and command-specific options are added
   # as attributes to this class dynamically. 
@@ -831,7 +845,7 @@ end
 
 
 trap ("SIGINT") do
-  puts "#{$/}Exiting..."
+  puts "#{$/}Exiting... "
   exit 1
 end
 
@@ -845,8 +859,10 @@ at_exit {
     end 
     Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
   rescue => ex
-    STDERR.puts "ERROR: #{ex.message}"
+    STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
     STDERR.puts ex.backtrace if Drydock.debug?
+  rescue SystemExit
+    # Don't balk
   end
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drydock
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -04:00
+date: 2009-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: []