main 4.2.0 → 4.3.0

data/LICENSE

@@ -0,0 +1 @@
+same as Ruby's

data/a.rb

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

data/lib/main.rb

@@ -2,7 +2,7 @@ module Main
 #
 # top level constants
 #
-  Main::VERSION = '4.2.0' unless
+  Main::VERSION = '4.3.0' unless
     defined? Main::VERSION
   def self.version() Main::VERSION end
 
@@ -19,6 +19,9 @@ module Main
   require 'logger'
   require 'enumerator'
   require 'set'
+  require 'uri'
+  require 'time'
+  require 'date'
 #
 # use gems to pick up dependancies
 #
@@ -28,6 +31,12 @@ module Main
     42
   end
 
+  begin
+    require 'chronic'
+  rescue LoadError
+    42
+  end
+
   require 'fattr'
   require 'arrayfields'
 #

data/lib/main/parameter.rb

@@ -184,14 +184,6 @@ module Main
 
       arity = min
 
-=begin
-puts
-p :values => values
-p :arity => arity
-p :argument_required => argument_required?
-p :argument_none => argument_none?
-puts
-=end
       if values.size < arity
         if argument_optional?
           raise ex, "#{ typename }) #{ values.size }/#{ sign }#{ arity }" if(values.size < arity and values.size > 0)
@@ -204,8 +196,14 @@ puts
     def apply_casting 
       if cast?
         op = cast.respond_to?('call') ? cast : Cast[cast]
-        values.map! do |val|
-          Parameter.wrap_errors{ op.call val }
+        case op.arity
+          when -1
+            replacement = Parameter.wrap_errors{ op.call(*values) }
+            values.replace(replacement)
+          else
+            values.map! do |val|
+              Parameter.wrap_errors{ op.call val }
+            end
         end
       end
     end

data/lib/main/program/instance_methods.rb

@@ -12,6 +12,7 @@ module Main
       fattr('stderr'){ main.stderr }
       fattr('logger'){ main.logger }
       fattr('params')
+      fattr('finalizers')
 
       %w( 
         program name synopsis description author version
@@ -50,6 +51,7 @@ module Main
 
       def setup_finalizers
         @finalizers ||= []
+        finalizers = @finalizers
         ObjectSpace.define_finalizer(self) do
           while((f = finalizers.pop)); f.call; end
         end
@@ -237,7 +239,7 @@ module Main
 
       def fcall(object, method, *argv, &block)
         method = object.method(method)
-        arity = m.arity
+        arity = method.arity
         if arity >= 0
           argv = argv[0, arity]
         else

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.2.0"
+  spec.version = "4.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "main"
 
-  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.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", "LICENSE", "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 = []
   
   

data/test/main.rb

@@ -230,7 +230,7 @@ class T < Test::Unit::TestCase
   def test_0150
     param = nil
     assert_nothing_raised{
-      main(%w[--foo=42 --bar=42.0 --foobar=true --barfoo=false --uri=http://foo --x=s]){
+      main(%w[--foo=42 --bar=42.0 --foobar=true --barfoo=false --uri=http://foo --x=s --y=a,b,c]){
         option('foo'){ 
           required
           argument_required
@@ -256,15 +256,21 @@ class T < Test::Unit::TestCase
           argument_required
           cast{|x| x.to_s.upcase}
         }
+        option('y'){ 
+          argument_required
+          process{|*values| values.join.split(',').map{|value| value.upcase}}
+        }
         define_method('run'){ param = params }
       }
     }
     assert param['foo'].value == 42
     assert param['bar'].value == 42.0
-    assert param['foobar'].value == true 
-    assert param['barfoo'].value == 'false' 
-    assert param['uri'].value == URI.parse('http://foo') 
-    assert param['x'].value == 'S' 
+    assert param['foobar'].value == true
+    assert param['barfoo'].value == 'false'
+    assert param['uri'].value == URI.parse('http://foo')
+    assert param['x'].value == 'S'
+    assert param['y'].value == 'A'
+    assert param['y'].values == %w( A B C )
   end
   def test_0160
     p = nil 
@@ -873,6 +879,18 @@ class T < Test::Unit::TestCase
     }
     assert( p.nil?, "p should not be set, help should have run" )
   end
+
+  def test_0600
+    src = 'finalizers should run'
+    dst = nil
+    argv = []
+    assert_nothing_raised{
+      main(argv){
+        define_method('run'){ finalizers.push(lambda{ dst = src }) }
+      }
+    }
+    assert( src==dst, "appears finalizer did not run!?" )
+  end
 end
 
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  version: 4.2.0
+  hash: 51
+  prerelease: false
+  segments: 
+  - 4
+  - 3
+  - 0
+  version: 4.3.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -07:00
+date: 2010-11-07 01:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fattr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: arrayfields
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 7
+        - 4
         version: 4.7.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: a class factory and dsl for generating command line programs real quick
 email: ara.t.howard@gmail.com
 executables: []
@@ -58,6 +76,7 @@ files:
 - lib/main/usage.rb
 - lib/main/util.rb
 - lib/main.rb
+- LICENSE
 - main.gemspec
 - Rakefile
 - README
@@ -83,21 +102,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: main