main 2.8.2 → 2.8.3

data/TODO

@@ -1,4 +1,14 @@
 
+* support pathname casts
+* support uri casts
+* support filename casts
+* support directory costs
+* support io cast '-' (:input, :output)
+
+* fix weird super bug jeremy found
+
+* figure out how to support '-' ??
+
 * clean up warnings under 'ruby -d'
 * error reporting weird for some errors
 

data/lib/main.rb

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

data/lib/main/base.rb

@@ -402,7 +402,7 @@ module Main
     def parse_parameters
       pre_parse_parameters
 
-      self.class.parameters.parse @argv, @env
+      self.class.parameters.parse self
       @params = Parameter::Table.new
       self.class.parameters.each{|p| @params[p.name.to_s] = p}
 

data/lib/main/parameter.rb

@@ -305,21 +305,36 @@ puts
     end
 
     class List < ::Array
-      def parse argv, env
+      fattr :main
+      fattr :argv
+      fattr :env
+
+      def parse main
+        @main, @argv, @env = main, main.argv, main.env
+
         ignore, stop = [], argv.index('--')
+
         if stop
           ignore = argv[stop .. -1]
           (argv.size - stop).times{ argv.pop }
         end
+
         parse_options argv
+
         return 'help' if detect{|p| p.name.to_s == 'help' and p.given?}
+
         parse_keywords argv
         parse_arguments argv
         parse_environment env
+
         defaults!
         validate!
+
         argv.push *ignore[1 .. -1] unless ignore.empty? 
-        self
+
+        return self
+      ensure
+        @main, @argv, @env = nil
       end
 
       def parse_options argv, params = nil
@@ -463,7 +478,7 @@ puts
         each do |p|
           if(p.defaults? and (not p.given?)) 
             p.defaults.each do |default|
-              p.values << default # so as NOT to set 'given?'
+              p.values << (default.respond_to?('to_proc') ? main.instance_eval(&default) : default) # so as NOT to set 'given?'
             end
           end
         end
@@ -624,19 +639,19 @@ puts
       end
       alias_method 'desc', 'description'
 
-      def default value, *values
-        param.defaults.push value 
-        param.defaults.push *values
-        param.defaults
-      end
-      def defaults?
-        param.defaults?
-      end
-      def defaults value, *values 
-        param.defaults.push value 
-        param.defaults.push *values
+      def default *values, &block
+        if block.nil? and values.empty?
+          raise ArgumentError, 'no default'
+        end
+        unless values.empty?
+          param.defaults.push *values
+        end
+        unless block.nil?
+          param.defaults.push block
+        end
         param.defaults
       end
+      alias_method 'defaults', 'default'
       def defaults?
         param.defaults?
       end

data/samples/h.rb

@@ -0,0 +1,34 @@
+require 'main'
+
+#
+# ./h.rb   #=> forty-two
+# ./h.rb a #=> 42 
+# ./h.rb b #=> 42.0 
+#
+
+Main {
+  fattr :default_for_foobar => 'forty-two' 
+
+  option(:foobar) do
+    default{ default_for_foobar }
+  end
+
+  mixin :foo do
+    fattr :default_for_foobar => 42
+  end
+
+  mixin :bar do
+    fattr :default_for_foobar => 42.0
+  end
+
+
+  run{ p params[:foobar].value }
+
+  mode :a do
+    mixin :foo
+  end
+
+  mode :b do
+    mixin :bar
+  end
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-13 00:00:00 -06:00
+date: 2008-10-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fattr
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: arrayfields
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -65,6 +67,7 @@ files:
 - samples/e.rb
 - samples/f.rb
 - samples/g.rb
+- samples/h.rb
 - test
 - test/main.rb
 - TODO
@@ -90,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: main