main 4.6.0 → 4.7.0

data/Rakefile

@@ -1,23 +1,69 @@
+This.rubyforge_project = 'codeforpeople'
 This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
-This.homepage = "http://github.com/ahoward/#{ This.lib }/tree/master"
-This.rubyforge_project = 'codeforpeople'
+This.homepage = "https://github.com/ahoward/#{ This.lib }"
+
+task :license do
+  open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
+end
 
 task :default do
-  puts(Rake::Task.tasks.map{|task| task.name} - ['default'])
+  puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
 end
 
-task :spec do
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_files = FileList['spec/*_spec.rb']
+task :test do
+  run_tests!
+end
+
+namespace :test do
+  task(:unit){ run_tests!(:unit) }
+  task(:functional){ run_tests!(:functional) }
+  task(:integration){ run_tests!(:integration) }
+end
+
+def run_tests!(which = nil)
+  which ||= '**'
+  test_dir = File.join(This.dir, "test")
+  test_glob ||= File.join(test_dir, "#{ which }/**_test.rb")
+  test_rbs = Dir.glob(test_glob).sort
+        
+  div = ('=' * 119)
+  line = ('-' * 119)
+
+  test_rbs.each_with_index do |test_rb, index|
+    testno = index + 1
+    command = "#{ This.ruby } -I ./lib -I ./test/lib #{ test_rb }"
+
+    puts
+    say(div, :color => :cyan, :bold => true)
+    say("@#{ testno } => ", :bold => true, :method => :print)
+    say(command, :color => :cyan, :bold => true)
+    say(line, :color => :cyan, :bold => true)
+
+    system(command)
+
+    say(line, :color => :cyan, :bold => true)
+
+    status = $?.exitstatus
+
+    if status.zero? 
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("SUCCESS", :color => :green, :bold => true)
+    else
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("FAILURE", :color => :red, :bold => true)
+    end
+    say(line, :color => :cyan, :bold => true)
+
+    exit(status) unless status.zero?
   end
 end
 
+
 task :gemspec do
-  ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
-  ignore_directories = 'pkg'
-  ignore_files = 'test/log'
+  ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
 
   shiteless = 
     lambda do |list|
@@ -39,14 +85,18 @@ task :gemspec do
     end
 
   lib         = This.lib
+  object      = This.object
   version     = This.version
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
-  has_rdoc    = true #File.exist?('doc')
+  #has_rdoc    = true #File.exist?('doc')
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
+  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
+  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
 
-  extensions = This.extensions
-  if extensions.nil?
+  if This.extensions.nil?
+    This.extensions = []
+    extensions = This.extensions
     %w( Makefile configure extconf.rb ).each do |ext|
       extensions << ext if File.exists?(ext)
     end
@@ -64,23 +114,20 @@ task :gemspec do
 
           Gem::Specification::new do |spec|
             spec.name = #{ lib.inspect }
-            spec.description = 'a class factory and dsl for generating command line programs real quick'
             spec.version = #{ version.inspect }
             spec.platform = Gem::Platform::RUBY
             spec.summary = #{ lib.inspect }
+            spec.description = #{ description.inspect }
 
-            spec.files = #{ files.inspect }
+            spec.files =\n#{ files.sort.pretty_inspect }
             spec.executables = #{ executables.inspect }
             
-            <% if test(?d, 'lib') %>
             spec.require_path = "lib"
-            <% end %>
 
-            spec.has_rdoc = #{ has_rdoc.inspect }
             spec.test_files = #{ test_files.inspect }
-            spec.add_dependency 'fattr', '>= 2.1.0'
-            spec.add_dependency 'arrayfields', '>= 4.7.4'
-            spec.add_dependency 'map', '>= 2.0.0'
+
+          ### spec.add_dependency 'lib', '>= version'
+          #### spec.add_dependency 'map'
 
             spec.extensions.push(*#{ extensions.inspect })
 
@@ -94,19 +141,20 @@ task :gemspec do
     end
 
   Fu.mkdir_p(This.pkgdir)
-  This.gemspec = File.join(This.pkgdir, "gemspec.rb")
-  open("#{ This.gemspec }", "w"){|fd| fd.puts(template)}
+  gemspec = "#{ lib }.gemspec"
+  open(gemspec, "w"){|fd| fd.puts(template)}
+  This.gemspec = gemspec
 end
 
 task :gem => [:clean, :gemspec] do
-  Fu.mkdir_p This.pkgdir
+  Fu.mkdir_p(This.pkgdir)
   before = Dir['*.gem']
   cmd = "gem build #{ This.gemspec }"
   `#{ cmd }`
   after = Dir['*.gem']
   gem = ((after - before).first || after.first) or abort('no gem!')
   Fu.mv(gem, This.pkgdir)
-  This.gem = File.basename(gem)
+  This.gem = File.join(This.pkgdir, File.basename(gem))
 end
 
 task :readme do
@@ -125,7 +173,7 @@ task :readme do
     cmd = "ruby #{ sample }"
     samples << Util.indent(prompt + cmd, 2) << "\n\n"
 
-    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -Ilib #{ sample })'"
+    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{ sample })'"
     samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
   end
 
@@ -162,9 +210,18 @@ task :release => [:clean, :gemspec, :gem] do
   gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
   raise "which one? : #{ gems.inspect }" if gems.size > 1
   raise "no gems?" if gems.size < 1
-  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.pkgdir }/#{ This.gem }"
+
+  cmd = "gem push #{ This.gem }"
+  puts cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+
+  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
   puts cmd
-  system cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 end
 
 
@@ -172,44 +229,63 @@ end
 
 
 BEGIN {
+# support for this rakefile
+#
   $VERBOSE = nil
 
   require 'ostruct'
   require 'erb'
   require 'fileutils'
+  require 'rbconfig'
+  require 'pp'
 
+# fu shortcut
+#
   Fu = FileUtils
 
+# cache a bunch of stuff about this rakefile/environment
+#
   This = OpenStruct.new
 
   This.file = File.expand_path(__FILE__)
   This.dir = File.dirname(This.file)
   This.pkgdir = File.join(This.dir, 'pkg')
 
+# grok lib
+#
   lib = ENV['LIB']
   unless lib
-    lib = File.basename(Dir.pwd)
+    lib = File.basename(Dir.pwd).sub(/[-].*$/, '')
   end
   This.lib = lib
 
+# grok version
+#
   version = ENV['VERSION']
   unless version
-    name = lib.capitalize
-    library = "./lib/#{ lib }.rb"
-    program = "./bin/#{ lib }"
-    if test(?e, library)
-      require library
-      version = eval(name).send(:version)
-    elsif test(?e, program)
-      version = `#{ program } --version`.strip
-    end
-    abort('no version') if(version.nil? or version.empty?)
+    require "./lib/#{ This.lib }"
+    This.name = lib.capitalize
+    This.object = eval(This.name)
+    version = This.object.send(:version)
   end
   This.version = version
 
+# we need to know the name of the lib an it's version
+#
   abort('no lib') unless This.lib
   abort('no version') unless This.version
 
+# discover full path to this ruby executable
+#
+  c = Config::CONFIG
+  bindir = c["bindir"] || c['BINDIR']
+  ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
+  ruby_ext = c['EXEEXT'] || ''
+  ruby = File.join(bindir, (ruby_install_name + ruby_ext))
+  This.ruby = ruby
+
+# some utils
+#
   module Util
     def indent(s, n = 2)
       s = unindent(s)
@@ -219,7 +295,7 @@ BEGIN {
 
     def unindent(s)
       indent = nil
-      s.each do |line|
+      s.each_line do |line|
       next if line =~ %r/^\s*$/
       indent = line[%r/^\s*/] and break
     end
@@ -228,17 +304,71 @@ BEGIN {
     extend self
   end
 
+# template support
+#
   class Template
     def initialize(&block)
       @block = block
       @template = block.call.to_s
     end
     def expand(b=nil)
-      ERB.new(Util.unindent(@template)).result(b||@block)
+      ERB.new(Util.unindent(@template)).result((b||@block).binding)
     end
     alias_method 'to_s', 'expand'
   end
   def Template(*args, &block) Template.new(*args, &block) end
 
+# colored console output support
+#
+  This.ansi = {
+    :clear      => "\e[0m",
+    :reset      => "\e[0m",
+    :erase_line => "\e[K",
+    :erase_char => "\e[P",
+    :bold       => "\e[1m",
+    :dark       => "\e[2m",
+    :underline  => "\e[4m",
+    :underscore => "\e[4m",
+    :blink      => "\e[5m",
+    :reverse    => "\e[7m",
+    :concealed  => "\e[8m",
+    :black      => "\e[30m",
+    :red        => "\e[31m",
+    :green      => "\e[32m",
+    :yellow     => "\e[33m",
+    :blue       => "\e[34m",
+    :magenta    => "\e[35m",
+    :cyan       => "\e[36m",
+    :white      => "\e[37m",
+    :on_black   => "\e[40m",
+    :on_red     => "\e[41m",
+    :on_green   => "\e[42m",
+    :on_yellow  => "\e[43m",
+    :on_blue    => "\e[44m",
+    :on_magenta => "\e[45m",
+    :on_cyan    => "\e[46m",
+    :on_white   => "\e[47m"
+  }
+  def say(phrase, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    options[:color] = args.shift.to_s.to_sym unless args.empty?
+    keys = options.keys
+    keys.each{|key| options[key.to_s.to_sym] = options.delete(key)}
+
+    color = options[:color]
+    bold = options.has_key?(:bold)
+
+    parts = [phrase]
+    parts.unshift(This.ansi[color]) if color
+    parts.unshift(This.ansi[:bold]) if bold
+    parts.push(This.ansi[:clear]) if parts.size > 1
+
+    method = options[:method] || :puts
+
+    Kernel.send(method, parts.join)
+  end
+
+# always run out of the project dir
+#
   Dir.chdir(This.dir)
 }

data/lib/main.rb

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

data/lib/main/parameter.rb

@@ -564,14 +564,14 @@ module Main
       def fattr a = nil, &block
         name = param.name
         a ||= name
-        b = fattr_block_for name, &block 
+        b = fattr_block_for(name, &block)
         @param.main.module_eval{ fattr(*a, &b) }
       end
       alias_method 'attribute', 'fattr'
 
       def fattr_block_for name, &block
         block ||= lambda{|param| [0,1].include?(param.arity) ? param.value : param.values }
-        lambda{ block.call self.param[name] }
+        lambda{|*args| block.call(self.param[name]) }
       end
 
       def attr(*a, &b)

data/test/{main.rb → main_test.rb}

@@ -812,12 +812,12 @@ class T < Test::Unit::TestCase
     name = 'arity_one_paramter_attr'
     m = nil
     argv = %w( a )
-    assert_nothing_raised{
+    #assert_nothing_raised{
       main(argv.dup) {
         argument(name){ arity 1; attr }
         run{ m = send(name) }
       }
-    }
+    #}
     assert m == argv.first
   end 
   def test_0520

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  hash: 39
   prerelease: 
-  segments: 
-  - 4
-  - 6
-  - 0
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,58 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: fattr
-  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
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: arrayfields
-  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
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: map
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :runtime
-  version_requirements: *id003
-description: a class factory and dsl for generating command line programs real quick
+date: 2011-08-16 00:00:00 Z
+dependencies: []
+
+description: "description: main kicks the ass"
 email: ara.t.howard@gmail.com
 executables: []
 
@@ -75,6 +22,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- LICENSE
+- README
+- README.erb
+- Rakefile
+- TODO
+- lib/main.rb
 - lib/main/cast.rb
 - lib/main/dsl.rb
 - lib/main/factories.rb
@@ -82,19 +35,14 @@ files:
 - lib/main/logger.rb
 - lib/main/mode.rb
 - lib/main/parameter.rb
+- lib/main/program.rb
 - 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
-- Rakefile
-- README
-- README.erb
 - samples/a.rb
 - samples/b.rb
 - samples/c.rb
@@ -104,10 +52,8 @@ files:
 - samples/g.rb
 - samples/h.rb
 - samples/j.rb
-- test/main.rb
-- TODO
-has_rdoc: true
-homepage: http://github.com/ahoward/main/tree/master
+- test/main_test.rb
+homepage: https://github.com/ahoward/main
 licenses: []
 
 post_install_message: 
@@ -120,25 +66,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: main
-test_files: 
-- test/main.rb
+test_files: []
+