main 2.3.0 → 2.4.0

data/README

@@ -370,6 +370,12 @@ DOCS
   API section below
 
 HISTORY
+  2.4.0
+    - fixed bug where 'abort("message")' would print "message" twice on exit
+      if running under a nested mode.
+
+    - allowed parameters to be overridden completely in subclasses (modes)
+
   2.3.0
     - re-worked Main.new such that client code may define an #initialize
       methods and the class will continue to work.  that is to say it's fine

data/a.rb

@@ -1,17 +1,17 @@
 require 'main'
 
 Main {
+  option 'bar'
 
   mode 'foo' do
+    option('bar'){ required }
+
     def run
-      p mode
-      p @a
+      p params
     end
   end
 
-  def initialize
-    @a = 42
+  def run 
+    p params
   end
-  
-  run(){ p @a; p @argv; p @env; }
 }

data/lib/main/base.rb

@@ -6,12 +6,12 @@ module Main
 
         class_eval do
           def run *a, &b
+            argv.push "--#{ argv.shift }" if argv.first == 'help'
+            return mode_run! if mode_given?
+
             status =
               catch :exit do
                 begin
-                  argv.push "--#{ argv.shift }" if argv.first == 'help'
-
-                  return mode_run! if mode_given?
 
                   parse_parameters
 
@@ -139,7 +139,7 @@ module Main
 
     module DSL
       def parameter *a, &b
-        parameters << Parameter.new(*a, &b)
+        (parameters << Parameter.create(:parameter, *a, &b)).last
       end
 
       def option *a, &b
@@ -354,6 +354,10 @@ module Main
       exit(status)
     end
 
+    def abort message = 'exit'
+      raise SystemExit.new(message)
+    end
+
     def handle_exception e
       if e.respond_to?(:error_handler_before)
         fcall(e, :error_handler_before, self)

data/lib/main/parameter.rb

@@ -29,7 +29,7 @@ module Main
         end
       end
 
-      Types = []
+      Types = [ Parameter ]
       def inherited other
         Types << other
       end
@@ -443,6 +443,22 @@ module Main
           end
         end
       end
+
+      def delete name, *names
+        name, *names = name.names if Parameter === name
+        names = Cast.list_of_string name, *names
+        keep = []
+        each do |param|
+          common = Cast.list_of_string(param.names) & names 
+          keep << param if common.empty?
+        end
+        replace keep
+      end
+
+      def << *a 
+        delete *a
+        super
+      end
     end
 
     class DSL

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: main
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
-date: 2007-10-27 00:00:00 -06:00
+  version: 2.4.0
+date: 2007-11-02 00:00:00 -06:00
 summary: main
 require_paths: 
 - lib