main 2.8.4 → 2.9.0

data/Rakefile

@@ -0,0 +1,241 @@
+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'
+
+task :default do
+  puts(Rake::Task.tasks.map{|task| task.name} - ['default'])
+end
+
+task :spec do
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList['spec/*_spec.rb']
+  end
+end
+
+task :gemspec do
+  ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
+  ignore_directories = 'pkg'
+  ignore_files = 'test/log'
+
+  shiteless = 
+    lambda do |list|
+      list.delete_if do |entry|
+        next unless test(?e, entry)
+        extension = File.basename(entry).split(%r/[.]/).last
+        ignore_extensions.any?{|ext| ext === extension}
+      end
+      list.delete_if do |entry|
+        next unless test(?d, entry)
+        dirname = File.expand_path(entry)
+        ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
+      end
+      list.delete_if do |entry|
+        next unless test(?f, entry)
+        filename = File.expand_path(entry)
+        ignore_files.any?{|file| File.expand_path(file) == filename}
+      end
+    end
+
+  lib         = This.lib
+  version     = This.version
+  files       = shiteless[Dir::glob("**/**")]
+  executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
+  has_rdoc    = true #File.exist?('doc')
+  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
+
+  extensions = This.extensions
+  if extensions.nil?
+    %w( Makefile configure extconf.rb ).each do |ext|
+      extensions << ext if File.exists?(ext)
+    end
+  end
+  extensions = [extensions].flatten.compact
+
+  template = 
+    if test(?e, 'gemspec.erb')
+      Template{ IO.read('gemspec.erb') }
+    else
+      Template {
+        <<-__
+          ## #{ lib }.gemspec
+          #
+
+          Gem::Specification::new do |spec|
+            spec.name = #{ lib.inspect }
+            spec.version = #{ version.inspect }
+            spec.platform = Gem::Platform::RUBY
+            spec.summary = #{ lib.inspect }
+
+            spec.files = #{ files.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 'lib', '>= version'
+            #spec.add_dependency 'fattr'
+
+            spec.extensions.push(*#{ extensions.inspect })
+
+            spec.rubyforge_project = #{ This.rubyforge_project.inspect }
+            spec.author = #{ This.author.inspect }
+            spec.email = #{ This.email.inspect }
+            spec.homepage = #{ This.homepage.inspect }
+          end
+        __
+      }
+    end
+
+  open("#{ lib }.gemspec", "w"){|fd| fd.puts template}
+  This.gemspec = "#{ lib }.gemspec"
+end
+
+task :gem => [:clean, :gemspec] do
+  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)
+end
+
+task :readme do
+  samples = ''
+  prompt = '~ > '
+  lib = This.lib
+  version = This.version
+
+  Dir['sample*/*'].sort.each do |sample|
+    samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
+
+    cmd = "cat #{ sample }"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
+    samples << Util.indent(`#{ cmd }`, 4) << "\n"
+
+    cmd = "ruby #{ sample }"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
+
+    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -Ilib #{ sample })'"
+    samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
+  end
+
+  template = 
+    if test(?e, 'readme.erb')
+      Template{ IO.read('readme.erb') }
+    else
+      Template {
+        <<-__
+          NAME
+            #{ lib }
+
+          DESCRIPTION
+
+          INSTALL
+            gem install #{ lib }
+
+          SAMPLES
+            #{ samples }
+        __
+      }
+    end
+
+  open("README", "w"){|fd| fd.puts template}
+end
+
+
+task :clean do
+  Dir[File.join(This.pkgdir, '**/**')].each{|entry| Fu.rm_rf(entry)}
+end
+
+
+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 }"
+  puts cmd
+  system cmd
+end
+
+
+
+
+
+BEGIN {
+  $VERBOSE = nil
+
+  require 'ostruct'
+  require 'erb'
+  require 'fileutils'
+
+  Fu = FileUtils
+
+  This = OpenStruct.new
+
+  This.file = File.expand_path(__FILE__)
+  This.dir = File.dirname(This.file)
+  This.pkgdir = File.join(This.dir, 'pkg')
+
+  lib = ENV['LIB']
+  unless lib
+    lib = File.basename(Dir.pwd)
+  end
+  This.lib = lib
+
+  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?)
+  end
+  This.version = version
+
+  abort('no lib') unless This.lib
+  abort('no version') unless This.version
+
+  module Util
+    def indent(s, n = 2)
+      s = unindent(s)
+      ws = ' ' * n
+      s.gsub(%r/^/, ws)
+    end
+
+    def unindent(s)
+      indent = nil
+      s.each do |line|
+      next if line =~ %r/^\s*$/
+      indent = line[%r/^\s*/] and break
+    end
+    indent ? s.gsub(%r/^#{ indent }/, "") : s
+  end
+    extend self
+  end
+
+  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)
+    end
+    alias_method 'to_s', 'expand'
+  end
+  def Template(*args, &block) Template.new(*args, &block) end
+
+  Dir.chdir(This.dir)
+}

data/lib/main.rb

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

data/lib/main/base.rb

@@ -87,11 +87,11 @@ module Main
       fattr( 'stderr' ){ $stderr } 
       fattr( 'logger' ){ stderr } 
       fattr( 'logger_level' ){ Logger::INFO } 
-      fattr( 'exit_status' ){ EXIT_SUCCESS } 
-      fattr( 'exit_success' ){ EXIT_SUCCESS } 
-      fattr( 'exit_failure' ){ EXIT_FAILURE } 
-      fattr( 'exit_warn' ){ EXIT_WARN } 
-      inheritable_fattr( 'parameters' ){ Parameter::List[] }
+      fattr( 'exit_status' ){ Main::EXIT_SUCCESS } 
+      fattr( 'exit_success' ){ Main::EXIT_SUCCESS } 
+      fattr( 'exit_failure' ){ Main::EXIT_FAILURE } 
+      fattr( 'exit_warn' ){ Main::EXIT_WARN } 
+      inheritable_fattr( 'parameters' ){ Main::Parameter::List[] }
       inheritable_fattr( 'can_has_hash' ){ Hash.new }
       inheritable_fattr( 'mixin_table' ){ Hash.new }
 

data/lib/main/parameter.rb

@@ -88,7 +88,7 @@ module Main
 
         name
       end
-      @names = @names.sort.reverse
+      @names = @names.sort_by{|name| name.size}.reverse
       @names[1..-1].each do |name|
         raise ArgumentError, "only one long name allowed (#{ @names.inspect })" if
           name.size > 1

data/lib/main/usage.rb

@@ -20,9 +20,6 @@ module Main
       fields.clear
     end
 
-    def delete_at key
-      self[key] = nil
-    end
     alias_method 'delete', 'delete_at'
 
     def self.default_synopsis main

data/main.gemspec

@@ -0,0 +1,28 @@
+## main.gemspec
+#
+
+Gem::Specification::new do |spec|
+  spec.name = "main"
+  spec.version = "2.9.0"
+  spec.platform = Gem::Platform::RUBY
+  spec.summary = "main"
+
+  spec.files = ["lib", "lib/main", "lib/main/base.rb", "lib/main/cast.rb", "lib/main/factories.rb", "lib/main/getoptlong.rb", "lib/main/logger.rb", "lib/main/mode.rb", "lib/main/parameter.rb", "lib/main/softspoken.rb", "lib/main/stdext.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", "test", "test/main.rb", "TODO"]
+  spec.executables = []
+  
+  
+  spec.require_path = "lib"
+  
+
+  spec.has_rdoc = true
+  spec.test_files = "test/main.rb"
+  #spec.add_dependency 'lib', '>= version'
+  #spec.add_dependency 'fattr'
+
+  spec.extensions.push(*[])
+
+  spec.rubyforge_project = "codeforpeople"
+  spec.author = "Ara T. Howard"
+  spec.email = "ara.t.howard@gmail.com"
+  spec.homepage = "http://github.com/ahoward/main/tree/master"
+end

data/test/main.rb

@@ -467,6 +467,17 @@ class T < Test::Unit::TestCase
     }
     assert foo.value == 42 
   end
+
+# parameter declaration 
+#
+  def test_0271
+    assert_nothing_raised{
+      main([]){
+        option('--a-sorts-first', '-b')
+        run{}
+      }
+    }
+  end
  
 # usage
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  version: 2.8.4
+  version: 2.9.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,29 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -06:00
+date: 2009-09-23 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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: arrayfields
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 4.5.0
-    version: 
+dependencies: []
+
 description: 
 email: ara.t.howard@gmail.com
 executables: []
@@ -41,9 +22,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- gemspec.rb
-- gen_readme.rb
-- install.rb
 - lib
 - lib/main
 - lib/main/base.rb
@@ -58,7 +36,10 @@ files:
 - lib/main/usage.rb
 - lib/main/util.rb
 - lib/main.rb
+- main.gemspec
+- Rakefile
 - README
+- README.erb
 - samples
 - samples/a.rb
 - samples/b.rb
@@ -71,8 +52,8 @@ files:
 - test
 - test/main.rb
 - TODO
-has_rdoc: false
-homepage: http://codeforpeople.com/lib/ruby/main/
+has_rdoc: true
+homepage: http://github.com/ahoward/main/tree/master
 post_install_message: 
 rdoc_options: []
 

data/gemspec.rb

@@ -1,36 +0,0 @@
-lib, version = File::basename(File::dirname(File::expand_path(__FILE__))).split %r/-/, 2
-
-require 'rubygems'
-
-Gem::Specification::new do |spec|
-  $VERBOSE = nil
-
-  shiteless = lambda do |list|
-    list.delete_if do |file|
-      file =~ %r/\.svn/ or
-      file =~ %r/\.tmp/
-    end
-  end
-
-  spec.name = lib 
-  spec.version = version 
-  spec.platform = Gem::Platform::RUBY
-  spec.summary = lib 
-
-  spec.files = shiteless[Dir::glob("**/**")]
-  spec.executables = shiteless[Dir::glob("bin/*")].map{|exe| File::basename exe}
-  
-  spec.require_path = "lib" 
-
-  spec.has_rdoc = File::exist? "doc" 
-  spec.test_suite_file = "test/#{ lib }.rb" if File::directory? "test"
-  spec.add_dependency 'fattr', '>= 1.0.3'
-  spec.add_dependency 'arrayfields', '>= 4.5.0'
-
-  spec.extensions << "extconf.rb" if File::exists? "extconf.rb"
-
-  spec.author = "Ara T. Howard"
-  spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://codeforpeople.com/lib/ruby/#{ lib }/"
-  spec.rubyforge_project = 'codeforpeople'
-end

data/gen_readme.rb

@@ -1,42 +0,0 @@
-require 'pathname'
-
-$VERBOSE=nil
-
-def indent s, n = 2
-  ws = ' ' * n
-  s.gsub %r/^/, ws 
-end
-
-template = IO::read 'README.tmpl'
-
-samples = ''
-prompt = '~ > '
-
-skip = %w[ e.rb f.rb ]
-
-Dir['sample*/*'].sort.each do |sample|
-  next if skip.include? File.basename(sample)
-
-  samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
-
-  cmd = "cat #{ sample }" 
-  samples << indent(prompt + cmd, 2) << "\n\n" 
-  samples << indent(`#{ cmd }`, 4) << "\n" 
-
-  cmd = "ruby #{ sample }" 
-  samples << indent(prompt + cmd, 2) << "\n\n" 
-
-  cmd = "ruby -Ilib #{ sample }" 
-  samples << indent(`#{ cmd } 2>&1`, 4) << "\n" 
-
-  cmd = "ruby #{ sample } --help" 
-  samples << indent(prompt + cmd, 2) << "\n\n" 
-
-  cmd = "ruby -Ilib #{ sample } --help" 
-  samples << indent(`#{ cmd } 2>&1`, 4) << "\n" 
-end
-
-#samples.gsub! %r/^/, '  '
-
-readme  = template.gsub %r/^\s*@samples\s*$/, samples
-print readme