main 6.2.2 → 6.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWI1M2RiNjdkN2U2MjdlODRiYmJkYTI0NmFmMTU3MmQzZDJhM2JjMQ==
-  data.tar.gz: !binary |-
-    NzQ0ZDRkYzc1MDVlMjAwMGRkYzUxNGU0Y2I1MmRhNzJjYzlkNjY1NQ==
+SHA256:
+  metadata.gz: 7b6289d780438645efdd78c3c1dd205d93af94185ee591e7abbccd7f9092637f
+  data.tar.gz: 566196b12fb4268421df5f0a87ed1fdafb46424688b62bfedae86f477bb8a610
 SHA512:
-  metadata.gz: !binary |-
-    N2Q2MzAxY2JlNDUxNDczMGE0M2Y4MmJjYjAxMGQzYzllYTkxOTRjNmNmOGZl
-    YzhlMDRkZTMyY2EwZTcwN2Q4YmU1NmQ1MGRlZTU3MGUxNDkwMDc4MTM5M2Ix
-    ZTg3OTdjMWE0YmZmYzA3YjlkNzI5ZWJmNTRhYTNhZWYwMTkyYzY=
-  data.tar.gz: !binary |-
-    OTVjZjcwODE3ODIyODk5Yzk4NzQxYTc4Zjk4MTVhNTY3MjFlMTVjMzA2MTBi
-    MzE2YzI3NzRkM2IyN2ZkNGIzNzE2NjI2OWUzZmQ4ZDY2MzdkODBiYWMwZTcx
-    ZTU5YmE2ZGM0MzI1YTgyNzNiMGMyMzBlZTNjNjQ5ZmEzMTZiNjk=
+  metadata.gz: dcf296c3b1d49b6f4c001ac582d108cda0a12547827ef63c3310ff52342fca6c4b9c73556c19e68e7933cc688c74fd83cae3631f1b0fa3d576a1aabbd6f1205c
+  data.tar.gz: e064f2590b78ac9a900716f09771254599084d307356d5c8ffca51acf69790f62068d561bb3d98d7210b71737d896b47d7f30392585212a295ac2d3c13aa58c2

data/Rakefile

@@ -1,4 +1,3 @@
-This.rubyforge_project = 'codeforpeople'
 This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
 This.homepage = "https://github.com/ahoward/#{ This.lib }"
@@ -145,7 +144,6 @@ task :gemspec do
 
             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 %>
@@ -230,12 +228,6 @@ task :release => [:clean, :gemspec, :gem] do
   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
-  puts
-  system(cmd)
-  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 end
 
 

data/lib/main/cast.rb

@@ -7,10 +7,15 @@ module Main
 
     List = []
 
-    def self.cast m, &b
-      define_method m, &b
-      export m
-      List << m.to_s
+    def Cast.cast(*args, &block)
+      if args.first && block
+        method = args.shift
+        define_method(method, &block)
+        export(method)
+        List << (method.to_s)
+      else
+        Cast.send(*args)
+      end
     end
 
     cast :boolean do |obj|
@@ -152,12 +157,7 @@ module Main
         m
       raise ArgumentError, "ambiguous cast: #{ sym.inspect } (#{ List.join ',' })" unless
         candidates.empty? or m.to_s == sym.to_s
-      this = self
       lambda{|obj| method(m).call obj}
     end
-
-    def Cast.cast(which, *args, &block)
-      Cast.send(which, *args, &block)
-    end
   end
 end

data/lib/main/daemon.rb

@@ -225,7 +225,7 @@ module Main
         begin
           cmd_stop
           break
-        rescue Object => e
+        rescue Object
           if alive?
             sleep(rand)
           else

data/lib/main/mode.rb

@@ -20,7 +20,6 @@ module Main
       end
 
       def find_by_mode m, options = {}
-        quiet = options['quiet'] || options[:quiet]
         each_pair do |mode, klass|
           return mode if mode == m
         end

data/lib/main/parameter.rb

@@ -240,8 +240,6 @@ module Main
           self
         end
 
-      this = self
-
       %w[ before instead after ].each do |which|
         getter = "error_handler_#{ which }"
         query = "error_handler_#{ which }?"
@@ -462,7 +460,7 @@ module Main
             i += 1
             b = argv[idx + 1]
             s = "#{ a }#{ b }"
-            m, key, *ignored = kre.match(s).to_a
+            m, key, * = kre.match(s).to_a
             if m
               replacements[i] ||= a.gsub %r/^\s*#{ key }/, opt
               next

data/lib/main/program/class_methods.rb

@@ -71,6 +71,7 @@ module Main
             define_method(:run, &block) if block
             wrap_run!
           end
+
           program
         end
 
@@ -78,6 +79,9 @@ module Main
 
       def new()
         instance = allocate
+
+        setup_finalizers(instance)
+
         instance.instance_eval do
           pre_initialize()
           before_initialize()
@@ -86,9 +90,18 @@ module Main
           after_initialize()
           post_initialize()
         end
+
         instance
       end
 
+      def setup_finalizers(instance)
+        instance.finalizers = (finalizers = [])
+
+        ObjectSpace.define_finalizer(instance) do
+          while((f = finalizers.pop)); f.call; end
+        end
+      end
+
       def params
         parameters
       end
@@ -107,7 +120,6 @@ module Main
     #
       def dynamically_extend_via_commandline_modes!
         self.breadth_first_modes = modes.dup
-        size = modes.size
 
         loop do
           modes.each do |mode|
@@ -185,7 +197,7 @@ module Main
       def usage(*args, &block)
         usage! unless defined? @usage 
         return @usage if args.empty? and block.nil?
-        key, value, *ignored = args
+        key, value, * = args
         value = block.call if block
         @usage[key.to_s] = value.to_s
       end
@@ -367,7 +379,7 @@ module Main
                 else
                   []
               end
-            dash = lines.shift if lines.first.to_s =~ /^---/
+            lines.shift if lines.first.to_s =~ /^---/
             require 'fileutils' unless defined?(FileUtils)
             FileUtils.mkdir_p(File.dirname(config_path))
             open(config_path, 'w') do |fd|

data/lib/main/program/instance_methods.rb

@@ -12,8 +12,8 @@ module Main
       fattr('stderr'){ main.stderr }
       fattr('logger'){ main.logger }
       fattr('script'){ main.script }
-      fattr('params')
-      fattr('finalizers')
+      fattr('params'){ Parameter::Table.new }
+      fattr('finalizers'){ [] }
 
       %w( 
         program name synopsis description author version
@@ -51,16 +51,11 @@ module Main
       def post_initialize() :hook end
 
       def setup_finalizers
-        @finalizers ||= []
-        finalizers = @finalizers
-        ObjectSpace.define_finalizer(self) do
-          while((f = finalizers.pop)); f.call; end
-        end
+        self.class.setup_finalizers(self)
       end
 
       def finalize
-        @finalizers ||= []
-        while((f = @finalizers.pop)); f.call; end
+        while((f = finalizers.pop)); f.call; end
       end
 
       def setup_io_redirection
@@ -92,10 +87,9 @@ module Main
       end
 
       def setup_io_restoration
-        @finalizers ||= []
         [STDIN, STDOUT, STDERR].each do |io|
           dup = io.dup
-          @finalizers.push(
+          finalizers.push(
             lambda do
               io.reopen(dup)
             end
@@ -111,7 +105,7 @@ module Main
               io
             else
               fd = open(io.to_s, 'r+')
-              @finalizers.push(lambda{ fd.close })
+              finalizers.push(lambda{ fd.close })
               fd
             end
           begin
@@ -132,7 +126,7 @@ module Main
               io
             else
               fd = open(io.to_s, 'w+')
-              @finalizers.push(lambda{ fd.close })
+              finalizers.push(lambda{ fd.close })
               fd
             end
           begin
@@ -153,7 +147,7 @@ module Main
               io
             else
               fd = open(io.to_s, 'w+')
-              @finalizers.push(lambda{ fd.close })
+              finalizers.push(lambda{ fd.close })
               fd
             end
           begin
@@ -173,8 +167,7 @@ module Main
         before_parse_parameters
 
         self.class.parameters.parse(self)
-        @params = Parameter::Table.new
-        self.class.parameters.each{|p| @params[p.name.to_s] = p}
+        self.class.parameters.each{|p| params[p.name.to_s] = p}
 
         after_parse_parameters
         post_parse_parameters

data/lib/main/test.rb

@@ -11,10 +11,10 @@ module Main
 
       argv = options[:argv]
       env = options[:env]
-      logger = options[:logger]
-      stdin = options[:stdin]
-      stdout = options[:stdout]
-      stderr = options[:stderr]
+      #logger = options[:logger]
+      #stdin = options[:stdin]
+      #stdout = options[:stdout]
+      #stderr = options[:stderr]
 
       Main.push_ios!
 

data/lib/main/usage.rb

@@ -142,27 +142,26 @@ module Main
 
       parameters = arguments + keywords + options + environment
 
-      s =
-        parameters.map do |p|
-          ps = ''
-          ps << Util.columnize("#{ p.synopsis }", :indent => 2, :width => 78)
-          #ps << Util.columnize("* #{ p.synopsis }", :indent => 2, :width => 78)
+      parameters.map do |p|
+        ps = ''
+        ps << Util.columnize("#{ p.synopsis }", :indent => 2, :width => 78)
+        #ps << Util.columnize("* #{ p.synopsis }", :indent => 2, :width => 78)
+        #ps << "\n"
+        if p.description?
+          ps << "\n"
+          ps << Util.columnize("#{ p.description }", :indent => 6, :width => 78)
+          #ps << Util.columnize(p.description, :indent => 6, :width => 78)
           #ps << "\n"
-          if p.description?
+        end
+        #ps << "\n"
+        unless(p.examples.nil? or p.examples.empty?)
+          p.examples.each do |example|
             ps << "\n"
-            ps << Util.columnize("#{ p.description }", :indent => 6, :width => 78)
-            #ps << Util.columnize(p.description, :indent => 6, :width => 78)
-            #ps << "\n"
+            ps << Util.columnize("#{ example }", :indent => 8, :width => 78)
           end
-          #ps << "\n"
-          unless(p.examples.nil? or p.examples.empty?)
-            p.examples.each do |example|
-              ps << "\n"
-              ps << Util.columnize("#{ example }", :indent => 8, :width => 78)
-            end
-          end
-          ps
-        end.join("\n")
+        end
+        ps
+      end.join("\n")
     end
 
     def author_section

data/lib/main/util.rb

@@ -44,7 +44,7 @@ module Main
       def columnize buf, opts = {}
         width = Util.getopt 'width', opts, 80
         indent = Util.getopt 'indent', opts
-        indent = Fixnum === indent ? (' ' * indent) : "#{ indent }"
+        indent = Numeric === indent ? (' ' * indent.to_i) : "#{ indent }"
         column = []
         words = buf.split %r/\s+/o
         row = "#{ indent }"

data/lib/main.rb

@@ -1,7 +1,7 @@
 module Main
 # top level constants
 #
-  Main::VERSION = '6.2.2' unless
+  Main::VERSION = '6.3.0' unless
     defined? Main::VERSION
   def Main.version() Main::VERSION end
 
@@ -11,7 +11,6 @@ module Main
 
   Main::LIBDIR = File.join(File.dirname(File.expand_path(__FILE__)), self.name.downcase, '') unless
     defined? Main::LIBDIR
-  def self.libdir() Main::LIBDIR end
 
   Main::EXIT_SUCCESS = 0 unless defined? Main::EXIT_SUCCESS
   Main::EXIT_FAILURE = 1 unless defined? Main::EXIT_FAILURE
@@ -22,10 +21,10 @@ module Main
 #
   def Main.dependencies
     {
-      'chronic'     => [ 'chronic', '~> 0.6', '>= 0.6.2' ] ,
-      'fattr'       => [ 'fattr', '~> 2.2', '>= 2.2.0' ] ,
-      'arrayfields' => [ 'arrayfields', '~> 4.7', '>= 4.7.4' ] ,
-      'map'         => [ 'map', '~> 6.1', '>= 6.1.0' ] ,
+      'chronic'     => [ 'chronic', '~> 0.10', '>= 0.10.2' ] ,
+      'fattr'       => [ 'fattr', '~> 2.4', '>= 2.4.0' ] ,
+      'arrayfields' => [ 'arrayfields', '~> 4.9', '>= 4.9.2' ] ,
+      'map'         => [ 'map', '~> 6.6', '>= 6.6.0' ] ,
     }
   end
 

data/main.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "main"
-  spec.version = "6.2.2"
+  spec.version = "6.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "main"
   spec.description = "a class factory and dsl for generating command line programs real quick"
@@ -14,7 +14,6 @@ Gem::Specification::new do |spec|
  "README.erb",
  "Rakefile",
  "TODO",
- "a.rb",
  "lib",
  "lib/main",
  "lib/main.rb",
@@ -56,18 +55,17 @@ Gem::Specification::new do |spec|
   spec.test_files = nil
 
   
-    spec.add_dependency(*["chronic", "~> 0.6", ">= 0.6.2"])
+    spec.add_dependency(*["chronic", "~> 0.10", ">= 0.10.2"])
   
-    spec.add_dependency(*["fattr", "~> 2.2", ">= 2.2.0"])
+    spec.add_dependency(*["fattr", "~> 2.4", ">= 2.4.0"])
   
-    spec.add_dependency(*["arrayfields", "~> 4.7", ">= 4.7.4"])
+    spec.add_dependency(*["arrayfields", "~> 4.9", ">= 4.9.2"])
   
-    spec.add_dependency(*["map", "~> 6.1", ">= 6.1.0"])
+    spec.add_dependency(*["map", "~> 6.6", ">= 6.6.0"])
   
 
   spec.extensions.push(*[])
 
-  spec.rubyforge_project = "codeforpeople"
   spec.author = "Ara T. Howard"
   spec.email = "ara.t.howard@gmail.com"
   spec.homepage = "https://github.com/ahoward/main"

data/test/main_test.rb

@@ -117,7 +117,6 @@ class T < Test::Unit::TestCase
 # parameter parsing 
 #
   def test_0080
-    p = nil
     assert_raises(Main::Parameter::NotGiven){
       main(){
         argument 'foo'
@@ -129,7 +128,6 @@ class T < Test::Unit::TestCase
     p = nil
     m = nil
     argv = %w[ 42 ]
-    given = nil
     assert_nothing_raised{
       main(argv.dup){
         argument 'foo'
@@ -144,7 +142,6 @@ class T < Test::Unit::TestCase
   def test_0100
     p = nil
     argv = %w[]
-    given = nil
     assert_nothing_raised{
       main(argv){
         p = argument('foo'){ optional }
@@ -160,7 +157,6 @@ class T < Test::Unit::TestCase
   def test_0101
     p = nil
     argv = %w[]
-    given = nil
     assert_nothing_raised{
       main(argv){
         p = argument('foo'){ required false }
@@ -492,12 +488,12 @@ class T < Test::Unit::TestCase
 #
   def test_0280
     assert_nothing_raised{
-      u = Main::Usage.new
+      Main::Usage.new
     }
   end
   def test_0290
     assert_nothing_raised{
-      u = Main::Usage.default(Main.factory)
+      Main::Usage.default(Main.factory)
     }
   end
   def test_0300
@@ -733,32 +729,29 @@ class T < Test::Unit::TestCase
     assert m.param['zero_or_more'].values == argv
   end 
   def test_0450
-    m = nil
     argv = %w()
     assert_raises(Main::Parameter::NotGiven){
       main(argv.dup) {
         argument('one_or_more'){ arity(-2) }
-        run{ m = self }
+        run{ self }
       }
     }
   end 
   def test_0460
-    m = nil
     argv = %w( a )
     assert_raises(Main::Parameter::Arity){
       main(argv.dup) {
         argument('two_or_more'){ arity(-3) }
-        run{ m = self }
+        run{ self }
       }
     }
   end 
   def test_0470
-    m = nil
     argv = %w( a )
     assert_raises(Main::Parameter::Arity){
       main(argv.dup) {
         argument('two_or_more'){ arity(-4) }
-        run{ m = self }
+        run{ self }
       }
     }
   end 
@@ -830,12 +823,11 @@ class T < Test::Unit::TestCase
 #
   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 }
+        run{ self }
       }
     }
   end 
@@ -897,7 +889,6 @@ class T < Test::Unit::TestCase
   end 
 
   def test_0550
-    name  = 'mode_argument_with_help_parameter_outputs_help'
     p = nil
     argv = %w( foo help )
     assert_nothing_raised{

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: main
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.3.0
 platform: ruby
 authors:
 - Ara T. Howard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ! '>='
+        version: '0.10'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ! '>='
+        version: '0.10'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: fattr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ! '>='
+        version: '2.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ! '>='
+        version: '2.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: arrayfields
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ! '>='
+        version: '4.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.4
+        version: 4.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ! '>='
+        version: '4.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.4
+        version: 4.9.2
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ! '>='
+        version: '6.6'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ! '>='
+        version: '6.6'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.6.0
 description: a class factory and dsl for generating command line programs real quick
 email: ara.t.howard@gmail.com
 executables: []
@@ -100,7 +100,6 @@ files:
 - README.erb
 - Rakefile
 - TODO
-- a.rb
 - lib/main.rb
 - lib/main/cast.rb
 - lib/main/daemon.rb
@@ -133,25 +132,23 @@ homepage: https://github.com/ahoward/main
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: codeforpeople
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: main
 test_files: []
-has_rdoc: 

data/a.rb

@@ -1,28 +0,0 @@
-require_relative './lib/main.rb'
-
-Main{
-  daemonizes!
-
-  def run
-    i = 0
-
-    loop do
-      p argv
-      p i
-      sleep(3 + rand)
-      i += 1
-    end
-  end
-
-
-
-
-
-}
-
-
-__END__
-
-
-a.rb daemon start
-a.rb daemon stop