main 3.0.3 → 4.0.0

data/README

@@ -457,6 +457,14 @@ DOCS
   API section below
 
 HISTORY
+  4.0.0
+    - avoid duping ios.  new methods Main.push_ios! and Main.pop_ios! are
+    utilized for testing.  this was done to make it simple to wrap
+    daemon/servolux programs around main, althought not strictly required.
+    not the version bump - there is not reason to expect existing main
+    programs to break, but it *is* and interface change which requires a major
+    version bump.
+
   3.0.0
     - major refactor to support modes via module/extend vs. subclassing.
     MIGHT NOT be backward compatible, though no known issues thus far.

data/README.erb

@@ -186,6 +186,14 @@ DOCS
   API section below
 
 HISTORY
+  4.0.0
+    - avoid duping ios.  new methods Main.push_ios! and Main.pop_ios! are
+    utilized for testing.  this was done to make it simple to wrap
+    daemon/servolux programs around main, althought not strictly required.
+    not the version bump - there is not reason to expect existing main
+    programs to break, but it *is* and interface change which requires a major
+    version bump.
+
   3.0.0
     - major refactor to support modes via module/extend vs. subclassing.
     MIGHT NOT be backward compatible, though no known issues thus far.

data/lib/main.rb

@@ -2,7 +2,7 @@ module Main
 #
 # top level constants
 #
-  Main::VERSION = '3.0.3' unless
+  Main::VERSION = '4.0.0' unless
     defined? Main::VERSION
   def self.version() Main::VERSION end
 
@@ -44,4 +44,25 @@ module Main
   require libdir + 'mode'
   require libdir + 'program'
   require libdir + 'factories'
+
+  class << Main
+    def push_ios!
+      @ios ||= []
+      @ios.push({
+        :STDIN => STDIN.dup, :STDOUT => STDOUT.dup, :STDERR => STDERR.dup
+      })
+    end
+
+    def pop_ios!
+      @ios ||= []
+      (@ios.pop||{}).each do |const, dup|
+        dst = eval(const.to_s)
+        begin
+          dst.reopen(dup)
+        rescue
+          ::Object.const_set(const, dup)
+        end
+      end
+    end
+  end
 end

data/lib/main/factories.rb

@@ -8,11 +8,14 @@ module Main
   end
 
   def Main.new(*args, &block)
-    factory(&block).build(*args).new()
+    main_class = factory(&block).build(*args)
+    main_class.new()
   end
 
   def Main.run(*args, &block)
-    new(*args, &block).run()
+    main_class = factory(&block).build(*args)
+    main = main_class.new()
+    main.run()
   end
 end
 
@@ -21,6 +24,5 @@ private
   def Main(*args, &block)
     Main.run(*args, &block)
   end
-
   alias_method 'main', 'Main'
 end

data/lib/main/program/class_methods.rb

@@ -48,24 +48,25 @@ module Main
           opts = (args.shift || {}).to_hash.dup
 
           factory = self
+
           program = Class.new(Program)
-          program.evaluate(&factory)
 
-          program.module_eval do
-            program.factory = factory
-            program.argv = argv
-            program.env = env
-            program.opts = opts
+          program.factory = factory
+          program.argv = argv
+          program.env = env
+          program.opts = opts
 
+          program.module_eval(&factory)
+
+          program.module_eval do
             dynamically_extend_via_commandline_modes!
             program.set_default_options!
-
             define_method(:run, &block) if block
-
             wrap_run!
           end
           program
         end
+
       end
 
       def new()

data/lib/main/program/instance_methods.rb

@@ -41,7 +41,6 @@ module Main
       def before_initialize() :hook end
       def main_initialize()
         setup_finalizers
-        setup_io_restoration
         setup_io_redirection
         setup_logging
       end
@@ -50,13 +49,14 @@ 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
       end
 
       def finalize
+        @finalizers ||= []
         while((f = @finalizers.pop)); f.call; end
       end
 
@@ -76,39 +76,43 @@ module Main
           case log 
             when ::Logger, Logger
               @logger = log
-            when IO, StringIO
-              @logger = Logger.new log 
-              @logger.level = logger_level 
             else
               @logger = Logger.new(*log)
-              @logger.level = logger_level 
+              @logger.level = logger_level
           end
         end
         @logger
       end
 
       def setup_io_restoration
+      return
+        @finalizers ||= []
         [STDIN, STDOUT, STDERR].each do |io|
-          dup = io.dup and @finalizers.push lambda{ io.reopen dup rescue nil }
+          dup = io.dup
+          @finalizers.push(
+            lambda do
+              io.reopen(dup)
+            end
+          )
         end
       end
-
+      
       undef_method 'stdin='
       def stdin= io
         unless(defined?(@stdin) and (@stdin == io))
           @stdin =
-            if io.respond_to? 'read'
+            if io.respond_to?('read')
               io
             else
-              fd = open io.to_s, 'r+'
-              @finalizers.push lambda{ fd.close }
+              fd = open(io.to_s, 'r+')
+              @finalizers.push(lambda{ fd.close })
               fd
             end
           begin
-            STDIN.reopen @stdin
+            STDIN.reopen(@stdin)
           rescue
             $stdin = @stdin
-            ::Object.const_set 'STDIN', @stdin
+            ::Object.const_set('STDIN', @stdin)
           end
         end
       end
@@ -117,14 +121,19 @@ module Main
       def stdout= io
         unless(defined?(@stdout) and (@stdout == io))
           @stdout =
-            if io.respond_to? 'write'
+            if io.respond_to?('write')
               io
             else
-              fd = open io.to_s, 'w+'
-              @finalizers.push lambda{ fd.close }
+              fd = open(io.to_s, 'w+')
+              @finalizers.push(lambda{ fd.close })
               fd
             end
-          STDOUT.reopen @stdout rescue($stdout = @stdout)
+          begin
+            STDOUT.reopen(@stdout)
+          rescue
+            $stdout = @stdout
+            ::Object.const_set('STDOUT', @stdout)
+          end
         end
       end
 
@@ -132,14 +141,19 @@ module Main
       def stderr= io
         unless(defined?(@stderr) and (@stderr == io))
           @stderr =
-            if io.respond_to? 'write'
+            if io.respond_to?('write')
               io
             else
-              fd = open io.to_s, 'w+'
-              @finalizers.push lambda{ fd.close }
+              fd = open(io.to_s, 'w+')
+              @finalizers.push(lambda{ fd.close })
               fd
             end
-          STDERR.reopen @stderr rescue($stderr = @stderr)
+          begin
+            STDERR.reopen(@stderr)
+          rescue
+            $stderr = @stderr
+            ::Object.const_set('STDERR', @stderr)
+          end
         end
       end
       

data/main.gemspec

@@ -4,7 +4,7 @@
 Gem::Specification::new do |spec|
   spec.name = "main"
   spec.description = 'a class factory and dsl for generating command line programs real quick'
-  spec.version = "3.0.3"
+  spec.version = "4.0.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "main"
 

data/test/main.rb

@@ -30,6 +30,8 @@ class T < Test::Unit::TestCase
     ENV.clear
     env.each{|k,v| ENV[k.to_s]=v.to_s}
 
+    Main.push_ios!
+
     test = self
 
     factory = Main.factory(&block)
@@ -58,6 +60,8 @@ class T < Test::Unit::TestCase
 
     test.status ||= main.exit_status
 
+    Main.pop_ios!
+
     main
   end
 
@@ -599,8 +603,8 @@ class T < Test::Unit::TestCase
         end
       }
     }
-    assert test(?e, sout.path)
-    assert IO.read(sout.path) == "42\n" 
+    assert test(?e, sout.path), 'sout exists'
+    assert IO.read(sout.path) == "42\n", 'sout has correct output'
   end
   def test_0370
     m = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  version: 3.0.3
+  version: 4.0.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -06:00
+date: 2009-10-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency