main 4.0.0 → 4.2.0

data/Rakefile

@@ -78,8 +78,8 @@ task :gemspec do
 
             spec.has_rdoc = #{ has_rdoc.inspect }
             spec.test_files = #{ test_files.inspect }
-            spec.add_dependency 'fattr', '>= 1.0.3'
-            spec.add_dependency 'arrayfields', '>= 4.5.0'
+            spec.add_dependency 'fattr', '>= 2.1.0'
+            spec.add_dependency 'arrayfields', '>= 4.7.4'
 
             spec.extensions.push(*#{ extensions.inspect })
 

data/a.rb

@@ -0,0 +1,14 @@
+require 'main'
+
+Main {
+ mode( :foo ) {
+   argument( :bar ) {
+     required
+     default 42
+   }
+   run {
+     puts "Doing something with #{params['bar'].value}"
+   }
+ }
+}
+

data/lib/main.rb

@@ -2,7 +2,7 @@ module Main
 #
 # top level constants
 #
-  Main::VERSION = '4.0.0' unless
+  Main::VERSION = '4.2.0' unless
     defined? Main::VERSION
   def self.version() Main::VERSION end
 
@@ -44,25 +44,4 @@ module Main
   require libdir + 'mode'
   require libdir + 'program'
   require libdir + 'factories'
-
-  class << Main
-    def push_ios!
-      @ios ||= []
-      @ios.push({
-        :STDIN => STDIN.dup, :STDOUT => STDOUT.dup, :STDERR => STDERR.dup
-      })
-    end
-
-    def pop_ios!
-      @ios ||= []
-      (@ios.pop||{}).each do |const, dup|
-        dst = eval(const.to_s)
-        begin
-          dst.reopen(dup)
-        rescue
-          ::Object.const_set(const, dup)
-        end
-      end
-    end
-  end
 end

data/lib/main/factories.rb

@@ -1,20 +1,20 @@
 module Main
-  def Main.factory(&block)
-    Program.factory(&block)
-  end
-
   def Main.create(&block)
     factory(&block)
   end
 
+  def Main.factory(&block)
+    Program.factory(&block)
+  end
+
   def Main.new(*args, &block)
-    main_class = factory(&block).build(*args)
-    main_class.new()
+    program = factory(&block).build(*args)
+    program.new()
   end
 
   def Main.run(*args, &block)
-    main_class = factory(&block).build(*args)
-    main = main_class.new()
+    program = factory(&block).build(*args)
+    main = program.new()
     main.run()
   end
 end

data/lib/main/parameter.rb

@@ -322,6 +322,8 @@ puts
           (argv.size - stop).times{ argv.pop }
         end
 
+        argv.push "--#{ argv.shift }" if argv.first == 'help'
+
         parse_options argv
 
         return 'help' if detect{|p| p.name.to_s == 'help' and p.given?}

data/lib/main/program/class_methods.rb

@@ -7,6 +7,8 @@ module Main
       fattr('description')
       fattr('usage'){ Main::Usage.default_usage(self) }
       fattr('modes'){ Main::Mode.list }
+      fattr('depth_first_modes'){ Main::Mode.list }
+      fattr('breadth_first_modes'){ Main::Mode.list }
 
       fattr('author')
       fattr('version')
@@ -95,16 +97,18 @@ module Main
     # extend the class based on modules given in argv
     #
       def dynamically_extend_via_commandline_modes!
+        self.breadth_first_modes = modes.dup
         size = modes.size
-        depth_first_modes = Array.fields
 
         loop do
           modes.each do |mode|
             arg = argv.first && %r/^#{ argv.first }/
             if arg and mode.name =~ arg
               argv.shift
-              modes.clear
+              modes.clear()
+              breadth_first_modes.clear()
               evaluate(&mode)
+              self.breadth_first_modes = modes.dup
               depth_first_modes[mode.name] = mode
               break
             end
@@ -118,7 +122,7 @@ module Main
           break unless more_modes
         end
 
-        self.modes = depth_first_modes
+        self.modes = depth_first_modes.dup
       end
 
     # wrap up users run method to handle errors, etc
@@ -134,7 +138,7 @@ module Main
                   parse_parameters
 
                   if help?
-                    puts(usage)
+                    puts(usage.to_s)
                     exit
                   end
 
@@ -160,12 +164,12 @@ module Main
 
 # TODO
       def fully_qualified_mode
-        modes.map{|mode| mode.name}.join(' ')
+        modes.map{|mode| mode.name}
       end
 
       def mode_name
         return 'main' if modes.empty?
-        fully_qualified_mode
+        fully_qualified_mode.join(' ')
       end
 
       undef_method 'usage'
@@ -203,8 +207,9 @@ module Main
 
       def mode(name, &block)
         name = name.to_s
-        modes[name] = block
         block.fattr(:name => name)
+        modes[name] = block
+        breadth_first_modes[name] = block
         block
       end
 

data/lib/main/program/instance_methods.rb

@@ -112,7 +112,8 @@ module Main
             STDIN.reopen(@stdin)
           rescue
             $stdin = @stdin
-            ::Object.const_set('STDIN', @stdin)
+            ::Object.send(:remove_const, 'STDIN')
+            ::Object.send(:const_set, 'STDIN', @stdin)
           end
         end
       end
@@ -132,7 +133,8 @@ module Main
             STDOUT.reopen(@stdout)
           rescue
             $stdout = @stdout
-            ::Object.const_set('STDOUT', @stdout)
+            ::Object.send(:remove_const, 'STDOUT')
+            ::Object.send(:const_set, 'STDOUT', @stdout)
           end
         end
       end
@@ -152,7 +154,8 @@ module Main
             STDERR.reopen(@stderr)
           rescue
             $stderr = @stderr
-            ::Object.const_set('STDERR', @stderr)
+            ::Object.send(:remove_const, 'STDERR')
+            ::Object.send(:const_set, 'STDERR', @stderr)
           end
         end
       end

data/lib/main/test.rb

@@ -0,0 +1,89 @@
+
+module Main
+  class << Main
+    def test(options = {}, &block)
+#    at_exit{ exit! }
+      opts = {}
+      options.each do |key, val|
+        opts[key.to_s.to_sym] = val
+      end
+      options.replace(opts)
+
+      argv = options[:argv]
+      env = options[:env]
+      logger = options[:logger]
+      stdin = options[:stdin]
+      stdout = options[:stdout]
+      stderr = options[:stderr]
+
+      Main.push_ios!
+
+      factory = Main.factory(&block)
+
+      program = factory.build(argv, env)
+
+      main = program.new
+
+      program.evaluate do
+        define_method :handle_exception do |exception|
+          if exception.respond_to?(:status)
+            main.status = exception.status
+          else
+            raise(exception)
+          end
+        end
+
+        define_method :handle_exit do |status|
+          main.status = status
+        end
+      end
+
+      keys = [:logger, :stdin, :stdout, :stderr]
+      keys.each do |key|
+        if options.has_key?(key)
+          val = options[key]
+          main.send("#{ key }=", val) if options.has_key?(key)
+        end
+      end
+
+      run = main.method(:run)
+
+      singleton_class =
+        class << main
+          self
+        end
+
+      singleton_class.module_eval do
+        define_method(:run) do
+          begin
+            run.call()
+          ensure
+            Main.pop_ios!
+          end
+        end
+      end
+
+      main
+    end
+
+    def push_ios!
+      @ios ||= []
+      @ios.push({
+        :STDIN => STDIN.dup, :STDOUT => STDOUT.dup, :STDERR => STDERR.dup
+      })
+    end
+
+    def pop_ios!
+      @ios ||= []
+      (@ios.pop||{}).each do |const, dup|
+        dst = eval(const.to_s)
+        begin
+          dst.reopen(dup)
+        rescue
+          ::Object.send(:remove_const, const)
+          ::Object.send(:const_set, const, dup)
+        end
+      end
+    end
+  end
+end

data/lib/main/usage.rb

@@ -31,8 +31,12 @@ module Main
         s << " #{ main.fully_qualified_mode.join ' ' }"
       end
 
-      unless main.modes.empty?
-        modes = main.modes.keys.join('|')
+#p 'main.breadth_first_modes' => main.breadth_first_modes.map{|m| m.name}
+#p 'main.depth_first_modes' => main.depth_first_modes.map{|m| m.name}
+#p 'main.modes' => main.modes.map{|m| m.name}
+
+      unless main.breadth_first_modes.empty?
+        modes = main.breadth_first_modes.map{|mode| mode.name}.join('|')
         s << " (#{ modes })"
       end
 

data/main.gemspec

@@ -4,11 +4,11 @@
 Gem::Specification::new do |spec|
   spec.name = "main"
   spec.description = 'a class factory and dsl for generating command line programs real quick'
-  spec.version = "4.0.0"
+  spec.version = "4.2.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "main"
 
-  spec.files = ["lib", "lib/main", "lib/main/cast.rb", "lib/main/dsl.rb", "lib/main/factories.rb", "lib/main/getoptlong.rb", "lib/main/logger.rb", "lib/main/mode.rb", "lib/main/parameter.rb", "lib/main/program", "lib/main/program/class_methods.rb", "lib/main/program/instance_methods.rb", "lib/main/program.rb", "lib/main/softspoken.rb", "lib/main/stdext.rb", "lib/main/usage.rb", "lib/main/util.rb", "lib/main.rb", "main.gemspec", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "samples/h.rb", "test", "test/main.rb", "TODO"]
+  spec.files = ["a.rb", "lib", "lib/main", "lib/main/cast.rb", "lib/main/dsl.rb", "lib/main/factories.rb", "lib/main/getoptlong.rb", "lib/main/logger.rb", "lib/main/mode.rb", "lib/main/parameter.rb", "lib/main/program", "lib/main/program/class_methods.rb", "lib/main/program/instance_methods.rb", "lib/main/program.rb", "lib/main/softspoken.rb", "lib/main/stdext.rb", "lib/main/test.rb", "lib/main/usage.rb", "lib/main/util.rb", "lib/main.rb", "main.gemspec", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "samples/h.rb", "samples/j.rb", "test", "test/main.rb", "TODO"]
   spec.executables = []
   
   
@@ -17,8 +17,8 @@ Gem::Specification::new do |spec|
 
   spec.has_rdoc = true
   spec.test_files = "test/main.rb"
-  spec.add_dependency 'fattr', '>= 1.0.3'
-  spec.add_dependency 'arrayfields', '>= 4.5.0'
+  spec.add_dependency 'fattr', '>= 2.1.0'
+  spec.add_dependency 'arrayfields', '>= 4.7.4'
 
   spec.extensions.push(*[])
 

data/samples/j.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'main'
+
+Main {
+  mode( :foo ) {
+    argument( :bar ) {
+      required
+      default 42
+    }
+    run {
+      puts "Doing something with #{params['bar'].value}"
+    }
+  }
+}

data/test/main.rb

@@ -6,6 +6,7 @@ $:.unshift('../lib')
 require('stringio')
 require('test/unit')
 require('main')
+require('main/test')
 
 
 class T < Test::Unit::TestCase
@@ -23,45 +24,19 @@ class T < Test::Unit::TestCase
   end
 
   def main(argv=[], env={}, &block)
-    at_exit{ exit! }
+    options = {}
+    options[:argv] = argv
+    options[:env] = env
+    options[:logger] = logger
 
-    $VERBOSE=nil
-    ARGV.replace argv
-    ENV.clear
-    env.each{|k,v| ENV[k.to_s]=v.to_s}
-
-    Main.push_ios!
+    main = Main.test(options, &block)
 
     test = self
-
-    factory = Main.factory(&block)
-
-    program = factory.build(argv, env)
-
-    main = program.new
-
-    program.evaluate do
-      define_method :handle_exception do |exception|
-        if exception.respond_to?(:status)
-          test.status = main.status = exception.status
-        else
-          test.status = main.status
-          raise(exception)
-        end
-      end
-      define_method :handle_exit do |status|
-        test.status = main.status = status
-      end
+    begin
+      main.run()
+    ensure
+      test.status = main.status
     end
-
-    main.logger = logger
-
-    main.run
-
-    test.status ||= main.exit_status
-
-    Main.pop_ios!
-
     main
   end
 
@@ -884,6 +859,20 @@ class T < Test::Unit::TestCase
     end
   end 
 
+  def test_0550
+    name  = 'mode_argument_with_help_parameter_outputs_help'
+    p = nil
+    argv = %w( foo help )
+    assert_nothing_raised{
+      main(argv){
+        mode( 'foo' ) {
+          argument 'bar'
+          define_method('run'){ p = param['bar'] }
+        }
+      }
+    }
+    assert( p.nil?, "p should not be set, help should have run" )
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -06:00
+date: 2009-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: 2.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: arrayfields
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.5.0
+        version: 4.7.4
     version: 
 description: a class factory and dsl for generating command line programs real quick
 email: ara.t.howard@gmail.com
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- a.rb
 - lib/main/cast.rb
 - lib/main/dsl.rb
 - lib/main/factories.rb
@@ -53,6 +54,7 @@ files:
 - lib/main/program.rb
 - lib/main/softspoken.rb
 - lib/main/stdext.rb
+- lib/main/test.rb
 - lib/main/usage.rb
 - lib/main/util.rb
 - lib/main.rb
@@ -68,6 +70,7 @@ files:
 - samples/f.rb
 - samples/g.rb
 - samples/h.rb
+- samples/j.rb
 - test/main.rb
 - TODO
 has_rdoc: true