choosy 0.4.6 → 0.4.7

data/lib/VERSION.yml

@@ -1,6 +1,6 @@
 --- 
 date: 31/03/2011
 version: 
-  tiny: 6
+  tiny: 7
   major: 0
   minor: 4

data/lib/choosy/base_command.rb

@@ -53,6 +53,15 @@ module Choosy
       end
     end
 
+    def execute!(args)
+      begin
+        execute(args)
+      rescue Choosy::ClientExecutionError => e
+        $stderr << "#{@name}: #{e.message}\n"
+        exit 1
+      end
+    end
+
     def finalize!
       if @printer.nil?
         builder.printer :standard
@@ -68,6 +77,10 @@ module Choosy
       # Override in subclasses
     end
 
+    def execute(args)
+      # Override in subclasses
+    end
+
     def handle_help(hc)
       # Override in subclasses
     end

data/lib/choosy/command.rb

@@ -20,16 +20,6 @@ module Choosy
       raise Choosy::ConfigurationError.new("Parent must be a super command") unless Choosy::SuperCommand
     end
     
-    def execute!(args)
-      raise Choosy::ConfigurationError.new("No executor given for: #{name}") unless executor
-      result = parse!(args)
-      if executor.is_a?(Proc)
-        executor.call(result.args, result.options)
-      else
-        executor.execute!(result.args, result.options)
-      end
-    end
-
     def subcommand?
       !@parent.nil?
     end
@@ -53,5 +43,15 @@ module Choosy
     
       result
     end
+
+    def execute(args)
+      raise Choosy::ConfigurationError.new("No executor given for: #{name}") unless executor
+      result = parse!(args)
+      if executor.is_a?(Proc)
+        executor.call(result.args, result.options)
+      else
+        executor.execute!(result.args, result.options)
+      end
+    end
   end
 end

data/lib/choosy/errors.rb

@@ -9,4 +9,5 @@ module Choosy
   ParseError         = Class.new(Choosy::Error)
   SuperParseError    = Class.new(Choosy::Error)
   VersionError       = Class.new(Choosy::Error)
+  ClientExecutionError = Class.new(Choosy::Error)
 end

data/lib/choosy/super_command.rb

@@ -24,26 +24,6 @@ module Choosy
       @parsimonious ||= false
     end
 
-    def execute!(args)
-      super_result = parse!(args)
-      super_result.subresults.each do |result|
-        cmd = result.command
-        if cmd.executor.nil?
-          raise Choosy::ConfigurationError.new("No executor given for: #{cmd.name}")
-        end
-      end
-
-      super_result.subresults.each do |result|
-        executor = result.command.executor
-
-        if executor.is_a?(Proc)
-          executor.call(result.args, result.options)
-        else
-          executor.execute!(result.args, result.options)
-        end
-      end
-    end
-
     def has_default?
       !@default_command.nil?
     end
@@ -63,6 +43,26 @@ module Choosy
       parser.parse!(args)
     end
 
+    def execute(args)
+      super_result = parse!(args)
+      super_result.subresults.each do |result|
+        cmd = result.command
+        if cmd.executor.nil?
+          raise Choosy::ConfigurationError.new("No executor given for: #{cmd.name}")
+        end
+      end
+
+      super_result.subresults.each do |result|
+        executor = result.command.executor
+
+        if executor.is_a?(Proc)
+          executor.call(result.args, result.options)
+        else
+          executor.execute!(result.args, result.options)
+        end
+      end
+    end
+
     def handle_help(hc)
       command_name = hc.message
 

data/lib/choosy/terminal.rb

@@ -107,7 +107,11 @@ module Choosy
     end
 
     def die(message)
-      raise Choosy::ValidationError.new(message)
+      raise Choosy::ClientExecutionError.new(message)
+    end
+
+    def self.die(message)
+      raise Choosy::ClientExecutionError.new(message)
     end
 
     private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Gabe McArthur