main 6.2.2 → 6.2.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWI1M2RiNjdkN2U2MjdlODRiYmJkYTI0NmFmMTU3MmQzZDJhM2JjMQ==
-  data.tar.gz: !binary |-
-    NzQ0ZDRkYzc1MDVlMjAwMGRkYzUxNGU0Y2I1MmRhNzJjYzlkNjY1NQ==
+SHA256:
+  metadata.gz: 812f2f08f43b6fe2bd462ccbe6e7bf61b1aa32918e0c7e32c8df3a5b712755a4
+  data.tar.gz: 7f4f1c339134823e8e0c05c162128bdca697f596b5de84ac0cfee9d1857d3aec
 SHA512:
-  metadata.gz: !binary |-
-    N2Q2MzAxY2JlNDUxNDczMGE0M2Y4MmJjYjAxMGQzYzllYTkxOTRjNmNmOGZl
-    YzhlMDRkZTMyY2EwZTcwN2Q4YmU1NmQ1MGRlZTU3MGUxNDkwMDc4MTM5M2Ix
-    ZTg3OTdjMWE0YmZmYzA3YjlkNzI5ZWJmNTRhYTNhZWYwMTkyYzY=
-  data.tar.gz: !binary |-
-    OTVjZjcwODE3ODIyODk5Yzk4NzQxYTc4Zjk4MTVhNTY3MjFlMTVjMzA2MTBi
-    MzE2YzI3NzRkM2IyN2ZkNGIzNzE2NjI2OWUzZmQ4ZDY2MzdkODBiYWMwZTcx
-    ZTU5YmE2ZGM0MzI1YTgyNzNiMGMyMzBlZTNjNjQ5ZmEzMTZiNjk=
+  metadata.gz: 9ece9cb6324614bb8dad6dd6d068ee213dc3cd0a6ab843e6e9d1c42b5ac0fc31731d30a74367ecf438aff8caff7ebdddb1851e93849bac437da9948da2718a9d
+  data.tar.gz: 86149dd72cefee37a167642925a2aeb9e16770bde7109b285aedbd747aba4a4dff782928c239a1fd696b4882574ecb0e0c394bb4cc3496d6172a7e2c56fa010c

data/lib/main.rb

@@ -1,7 +1,7 @@
 module Main
 # top level constants
 #
-  Main::VERSION = '6.2.2' unless
+  Main::VERSION = '6.2.3' 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

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

@@ -107,7 +107,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 +184,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 +366,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/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/main.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "main"
-  spec.version = "6.2.2"
+  spec.version = "6.2.3"
   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",

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.2.3
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2019-08-16 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'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: fattr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: arrayfields
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.4
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 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
@@ -139,19 +138,17 @@ 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
+rubygems_version: 3.0.3
 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