main 2.8.1 → 2.8.2

data/README

@@ -364,14 +364,77 @@ SAMPLES
     
 
 
+  <========< samples/g.rb >========>
+
+  ~ > cat samples/g.rb
+
+    require 'main'
+    
+    ARGV.replace %w( 42 ) if ARGV.empty?
+    
+    Main {
+      argument( 'foo' )
+      option( 'bar' )
+    
+      run { puts "This is what to_options produces: #{params.to_options.inspect}" }
+    }
+
+  ~ > ruby samples/g.rb
+
+    This is what to_options produces: {"help"=>nil, "foo"=>"42", "bar"=>nil}
+
+  ~ > ruby samples/g.rb --help
+
+    NAME
+      g.rb
+    
+    SYNOPSIS
+      g.rb foo [options]+
+    
+    PARAMETERS
+      foo (1 -> foo) 
+      --bar 
+      --help, -h 
+    
+
+
 DOCS
   test/main.rb
 
-  find ./lib |xargs vim -o
+  vim -p lib/main.rb lib/main/*rb
 
   API section below
 
 HISTORY
+  2.8.2
+    - fixes and tests for negative arity/attr arguments, options, eg
+
+        argument(:foo){
+          arity -1  
+        }
+
+        def run  # ARGV == %w( a b c )
+          p foo  #=> %w( a b c )
+        end
+
+      thanks nathan
+
+  2.8.1
+    - move from attributes.rb to fattr.rb
+
+  2.8.0 
+    - added 'to_options' method for Parameter::Table.  this allows you to convert
+      all the parameters to a simple hash.  
+      for example
+
+        Main {
+          option 'foo'
+          argument 'baz'
+
+          run { puts params.to_options.inspect } 
+
+        }
+
   2.7.0
     - removed bundled arrayfields and attributes.  these are now dependancies
       mananged by rubygems.  a.k.a. you must have rubygems installed for main

data/lib/main.rb

@@ -2,7 +2,7 @@ module Main
 #
 # top level constants
 #
-  Main::VERSION = '2.8.0' unless
+  Main::VERSION = '2.8.2' unless
     defined? Main::VERSION
   def self.version() Main::VERSION end
 

data/lib/main/parameter.rb

@@ -516,9 +516,9 @@ puts
         new(param).evaluate(&block)
       end
 
-      # attr 'p'
       attr 'param'
       alias_method 'evaluate', 'instance_eval'
+
       def initialize param
         @param = param
       end
@@ -532,7 +532,7 @@ puts
       alias_method 'attribute', 'fattr'
 
       def fattr_block_for name, &block
-        block ||= lambda{|param| param.arity.abs <= 1 ? param.value : param.values }
+        block ||= lambda{|param| [0,1].include?(param.arity) ? param.value : param.values }
         lambda{ block.call self.param[name] }
       end
 
@@ -642,11 +642,15 @@ puts
       end
 
       def arity value
+        raise Arity if value.nil?
         value = -1 if value.to_s == '*'
-        param.arity = Integer value
+        value = Integer value
+        raise Arity if value.zero?
+        param.arity = value
         if param.arity == -1
           optional true
         end
+        value
       end
       def arity?
         param.arity?

data/test/main.rb

@@ -7,6 +7,7 @@ require 'stringio'
 require 'test/unit'
 require 'main'
 
+
 class T < Test::Unit::TestCase
   fattr 'status'
   fattr 'logger'
@@ -59,7 +60,7 @@ class T < Test::Unit::TestCase
     main
   end
 
-#
+ 
 # basic test
 #
   def test_0000
@@ -78,7 +79,7 @@ class T < Test::Unit::TestCase
     }
     assert x == 42
   end
-#
+ 
 # exit status
 #
   def test_0020
@@ -140,7 +141,7 @@ class T < Test::Unit::TestCase
     }
     assert status == 42 
   end
-#
+ 
 # parameter parsing 
 #
   def test_0080
@@ -466,7 +467,7 @@ class T < Test::Unit::TestCase
     }
     assert foo.value == 42 
   end
-#
+ 
 # usage
 #
   def test_0280
@@ -526,7 +527,7 @@ class T < Test::Unit::TestCase
         assert u['name2'] == nil
     }
   end
-#
+ 
 # io redirection
 #
   class ::Object
@@ -611,7 +612,7 @@ class T < Test::Unit::TestCase
     assert_nothing_raised{ m.stdout.rewind }
     assert m.stdout.read == "42\n" 
   end
-#
+ 
 # main ctor
 #
   def test_0380
@@ -642,10 +643,10 @@ class T < Test::Unit::TestCase
     assert argv == $argv 
   end
 
-#
+ 
 # negative/globbing arity
 #
-  def test_4000
+  def test_0400
     m = nil
     argv = %w( a b c )
     assert_nothing_raised{
@@ -656,7 +657,18 @@ class T < Test::Unit::TestCase
     }
     assert m.param['zero_or_more'].values == argv
   end 
-  def test_4010
+  def test_0401
+    m = nil
+    argv = %w( a b c )
+    assert_nothing_raised{
+      main(argv.dup) {
+        argument('zero_or_more'){ arity -1 }
+        run{ m = self }
+      }
+    }
+    assert m.param['zero_or_more'].values == argv
+  end 
+  def test_0410
     m = nil
     argv = %w( a b c )
     assert_nothing_raised{
@@ -667,7 +679,7 @@ class T < Test::Unit::TestCase
     }
     assert m.param['zero_or_more'].values == argv
   end 
-  def test_4020
+  def test_0420
     m = nil
     argv = %w( a b c )
     assert_nothing_raised{
@@ -678,7 +690,7 @@ class T < Test::Unit::TestCase
     }
     assert m.param['one_or_more'].values == argv
   end 
-  def test_4030
+  def test_0430
     m = nil
     argv = %w( a b c )
     assert_nothing_raised{
@@ -689,7 +701,7 @@ class T < Test::Unit::TestCase
     }
     assert m.param['two_or_more'].values == argv
   end 
-  def test_4040
+  def test_0440
     m = nil
     argv = %w()
     assert_nothing_raised{
@@ -700,7 +712,7 @@ class T < Test::Unit::TestCase
     }
     assert m.param['zero_or_more'].values == argv
   end 
-  def test_4050
+  def test_0450
     m = nil
     argv = %w()
     assert_raises(Main::Parameter::NotGiven){
@@ -710,7 +722,7 @@ class T < Test::Unit::TestCase
       }
     }
   end 
-  def test_4060
+  def test_0460
     m = nil
     argv = %w( a )
     assert_raises(Main::Parameter::Arity){
@@ -720,7 +732,7 @@ class T < Test::Unit::TestCase
       }
     }
   end 
-  def test_4070
+  def test_0470
     m = nil
     argv = %w( a )
     assert_raises(Main::Parameter::Arity){
@@ -730,10 +742,10 @@ class T < Test::Unit::TestCase
       }
     }
   end 
-#
+ 
 # sub-command/mode functionality
 #
-  def test_4080
+  def test_0480
     m = nil
     argv = %w( a b )
     assert_nothing_raised{
@@ -746,7 +758,7 @@ class T < Test::Unit::TestCase
     }
     assert m.param['b'].value == 'b'
   end 
-  def test_4090
+  def test_0490
     m = nil
     argv = %w( a b c )
     assert_nothing_raised{
@@ -762,6 +774,77 @@ class T < Test::Unit::TestCase
     assert m.param['c'].value == 'c'
   end 
 
+ 
+# parameter attr/fattr/attribute 
+#
+  def test_0500
+    name = 'arity_zero_paramter_attr'
+    m = nil
+    argv = %w( )
+    assert_raises(Main::Parameter::Arity){
+      main(argv.dup) {
+        argument(name){ arity 0 }
+        run{ m = self }
+      }
+    }
+  end 
+  def test_0510
+    name = 'arity_one_paramter_attr'
+    m = nil
+    argv = %w( a )
+    assert_nothing_raised{
+      main(argv.dup) {
+        argument(name){ arity 1; attr }
+        run{ m = send(name) }
+      }
+    }
+    assert m == argv.first
+  end 
+  def test_0520
+    name = 'arity_more_than_one_paramter_attr'
+    m = nil
+    argv = %w( a b c d)
+    [2, 3, 4].each do |a|
+      assert_nothing_raised{
+        main(argv.dup) {
+          argument(name){ arity a; attr }
+          run{ m = send(name) }
+        }
+      }
+      assert m == argv.first(a)
+    end
+  end 
+  def test_0530
+    name = 'arity_negative_one_paramter_attr'
+    m = nil
+    argvs = %w( ), %w( a ), %w( a b ), %w( a b c )
+    argvs.each do |argv|
+      assert_nothing_raised{
+        main(argv.dup) {
+          argument(name){ arity -1; attr }
+          run{ m = send(name) }
+        }
+      }
+      assert m == argv
+    end
+  end 
+  def test_0540
+    name = 'arity_negative_more_than_one_paramter_attr'
+    m = nil
+    argvs = %w(a b), %w( a b c), %w( a b c d )
+    argvs.each do |argv|
+      [-2, -3].each do |a|
+        assert_nothing_raised{
+          main(argv.dup) {
+            argument(name){ arity a; attr }
+            run{ m  = send(name) }
+          }
+        }
+        assert m == argv
+      end
+    end
+  end 
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-11 00:00:00 -06:00
+date: 2008-07-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ files:
 - lib/main/usage.rb
 - lib/main/util.rb
 - lib/main.rb
-- main-2.8.1.gem
 - README
 - samples
 - samples/a.rb