main 0.0.1 → 0.0.2

data/lib/main/factories.rb

@@ -1,14 +1,15 @@
 module Main
   def self.new *a, &b
-    m = Class.new Base
-    m.default_options!
-    m.class_eval &b if b
-    m.new
+    klass = Class.new Base
+    klass.default_options!
+    klass.class_eval &b if b
+    main = klass.new *a, &b
+    Proxy.new main
   end
 
   module ::Kernel
     def Main *a, &b
-      ::Main.new(*a, &b).__run__
+      ::Main.new(*a, &b).run
     end
     alias_method 'main', 'Main'
   end

data/lib/main/parameter.rb

@@ -354,7 +354,8 @@ module Main
           #p.add_value p.default if(p.default? and (not p.given?)) 
           if(p.defaults? and (not p.given?)) 
             p.defaults.each do |default|
-              p.add_value default
+              #p.add_value default
+              p.values << default # so as NOT to set given?
             end
           end
         end

data/lib/main/proxy.rb

@@ -0,0 +1,54 @@
+module Main
+  class Proxy
+    instance_methods.each{|m| undef_method m unless m[%r/__/]}
+
+    attribute 'main'
+
+    def initialize main
+      @main = main
+    end
+
+    def as_main &b
+      @main.instance_eval &b
+    end
+
+    def run 
+      as_main do
+        parse_parameters
+
+        if params['help'] and params['help'].given?
+          print usage.to_s
+          exit
+        end
+
+        pre_run
+
+        begin
+          run
+        rescue Exception => e
+          if SystemExit === e
+            exit_status(( e.status ))
+          else
+            fatal{ e }
+            exit_status(( EXIT_FAILURE )) if exit_status == exit_success
+          end
+        end
+
+        post_run
+
+        finalize
+
+        exit_status(( Integer(exit_status) rescue(exit_status ? 0 : 1) ))
+        exit exit_status
+      end
+    end
+
+    def method_missing m, *a, &b
+      if @main.respond_to? m
+        @main.send m, *a, &b
+      else
+        raise
+      end
+    end
+  end
+end

data/test/main.rb

@@ -29,7 +29,7 @@ class T < Test::Unit::TestCase
     begin
       main = Object::Main.new(&b)
       main.logger = @logger
-      main.__run__
+      main.run
     rescue Exception => e 
       if SystemExit === e
         @status = e.status
@@ -517,6 +517,121 @@ class T < Test::Unit::TestCase
         assert u['name2'] == nil
     }
   end
+#
+# io redirection
+#
+  class ::Object
+    require 'tempfile'
+    def infile buf
+      t = Tempfile.new rand.to_s
+      t << buf
+      t.close
+      open t.path, 'r+'
+    end
+    def outfile
+      t = Tempfile.new rand.to_s
+      t.close
+      open t.path, 'w+'
+    end
+  end
+  def test_0330
+    s = "foo\nbar\n"
+    sio = StringIO.new s 
+    $buf = nil
+    assert_nothing_raised{
+      main{
+        stdin sio
+        def run
+          $buf = STDIN.read
+        end
+      }
+    }
+    assert $buf == s
+  end
+  def test_0340
+    s = "foo\nbar\n"
+    $sio = StringIO.new s 
+    $buf = nil
+    assert_nothing_raised{
+      main{
+        def run
+          self.stdin = $sio
+          $buf = STDIN.read
+        end
+      }
+    }
+    assert $buf == s
+  end
+  def test_0350
+    s = "foo\nbar\n"
+    $buf = nil
+    assert_nothing_raised{
+      main{
+        stdin infile(s) 
+        def run
+          $buf = STDIN.read
+        end
+      }
+    }
+    assert $buf == s
+  end
+  def test_0360
+    sout = outfile
+    assert_nothing_raised{
+      main{
+        stdout sout 
+        def run
+          puts 42
+        end
+      }
+    }
+    assert test(?e, sout.path)
+    assert IO.read(sout.path) == "42\n" 
+  end
+  def test_0370
+    m = nil
+    assert_nothing_raised{
+      m = main{
+        stdout StringIO.new 
+        def run
+          puts 42
+        end
+      }
+    }
+    assert m
+    assert_nothing_raised{ m.stdout.rewind }
+    assert m.stdout.read == "42\n" 
+  end
+#
+# main ctor
+#
+  def test_0380
+    argv = %w( a b c )
+    $argv = nil
+    assert_nothing_raised{
+      main(argv){
+        def run
+          $argv = @argv
+        end
+      }
+    }
+    assert argv == $argv 
+  end
+  def test_0390
+    argv = %w( a b c )
+    env = {'key' => 'val', 'foo' => 'bar'}
+    $argv = nil
+    $env = nil
+    assert_nothing_raised{
+      main(argv, env){
+        def run
+          $argv = @argv
+          $env = @env
+        end
+      }
+    }
+    assert argv == $argv 
+  end
 
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: main
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-03-20 00:00:00 -06:00
+  version: 0.0.2
+date: 2007-03-23 00:00:00 -06:00
 summary: main
 require_paths: 
 - lib
@@ -29,7 +29,6 @@ post_install_message:
 authors: 
 - Ara T. Howard
 files: 
-- a.rb
 - lib
 - lib/main
 - lib/main/factories.rb
@@ -39,13 +38,15 @@ files:
 - lib/main/usage.rb
 - lib/main/base.rb
 - lib/main/getoptlong.rb
+- lib/main/proxy.rb
+- lib/main/attributes.rb
+- lib/main/arrayfields.rb
 - lib/main.rb
 - test
 - test/main.rb
 - gemspec.rb
 - README.tmpl
 - README
-- main-0.0.1.gem
 - gen_readme.rb
 - install.rb
 - samples

data/a.rb

@@ -1,33 +0,0 @@
-require 'main'
-
-ENV['BARFOO'] = 'true,false,false'
-ARGV.replace %w( 42 bar=40 bar=2 --foobar=a )
-
-Main {
-  argument('foo'){
-    cast :int
-  }
-
-  keyword('bar'){
-    arity 2
-    cast :float
-    defaults 0.0, 1.0
-  }
-
-  option('foobar'){
-    argument :optional
-    description 'the foobar option is very handy'
-  }
-
-  environment('BARFOO'){
-    cast :list_of_bool
-    synopsis 'export barfoo=value'
-  }
-
-  def run
-    p params['foo'].value
-    p params['bar'].values
-    p params['foobar'].value
-    p params['BARFOO'].value
-  end
-}