main 6.1.0 → 6.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmVhZWRjMmM1NGY2MmU2YzAxOGJmZDMwOTFlMjc2NzMzNWJkNmJlZA==
+    N2EwNDVmM2IwNTc2NDQ3ZGI0ODFhZjhhOWExYjVlODJmNzQwZGY4NQ==
   data.tar.gz: !binary |-
-    Y2IzNDNiMWI0MTRmMDA4YmQ3YjRiYzg2Y2Q2ZDYwZDYyNjVjOGY1NA==
+    NjM1NzA0Yzc0MzJhOTlmZTAwMGVmMmU1NWU3NjY2NDQ2NGI2Mzg2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGM0OTdlMThiNDMwZmEwOGZjMmVlZWYxNTA2ZjcwYWVmZjhjNzdkOTNiMTAw
-    OWM1ZmNlZThmYjYyOTEzZjhkODU5OTAzNDZmYTk3MjQ5ZmRkZjQ4MTYyNDU0
-    YTIzOGZhNzU4NWRhNjIwNDRhODhlOTkyMjFjYzZlMWUyOGY2MWM=
+    ZWExOGE1ODRjNDc3MDVhZmI2ZDQwZGMzMmM5Y2IwMmZkYTFhZTBkNTdhNTdk
+    YzY3ZGE5NmNkMjZiZDk2MDc4ZGY1OTZhMGU0YTFhNjk3Mzg4NjQ0OTAwZGMy
+    ZTcyNzQ5YzdmNTY3ZjE0YmVmNjBiZDJkZTNhMmY3NjhmZTBlMTE=
   data.tar.gz: !binary |-
-    ODU2MDQ0NWExNTZhMTBhY2EwNDI2ZDBhMTM5YTg5NmFiMzFiYWM3MGJjYzBl
-    ODgxNDgwODkxNWU5YmMxN2IzMmY1ZDQxOWEwNmZmMDMzMjIyNDlmYjYxMjgy
-    MDIxMTUyMGMxMDlkNGI1ZDU2YjAxN2EwOWY1MWM2MzI5MjE1ZjY=
+    OTdhYjlhYzc0YTg4NTRiNGNhM2ZhOTBkNWI4NGI0YWZkZjM1MWIzZTNjZjNl
+    NDQ5YzMyMmVkMzVmMTBjMzJlZjYyY2I2NGE4ODIyMzFiZjg0MmMwNzcxOTAy
+    NzY2MDk0ZDNmMDdhNzVkN2RkMzkwNDFlNzIxZjRjMGM4YTVmNTU=

data/lib/main.rb

@@ -1,7 +1,7 @@
 module Main
 # top level constants
 #
-  Main::VERSION = '6.1.0' unless
+  Main::VERSION = '6.2.0' unless
     defined? Main::VERSION
   def Main.version() Main::VERSION end
 
@@ -25,7 +25,7 @@ module Main
       'chronic'     => [ 'chronic'     , '>= 0.6.2' ] ,
       'fattr'       => [ 'fattr'       , '>= 2.2.0' ] ,
       'arrayfields' => [ 'arrayfields' , '>= 4.7.4' ] ,
-      'map'         => [ 'map'         , '>= 5.1.0' ] ,
+      'map'         => [ 'map'         , '>= 6.1.0' ] ,
     }
   end
 

data/lib/main/program/class_methods.rb

@@ -269,29 +269,66 @@ module Main
         define_method(:run, &block) if block
       end
 
+      def main_env(*args, &block)
+        @main_env ||= main_env! 
+
+        if args.empty?
+          @main_env
+        else
+          key = main_env_key_for(args.first)
+          @main_env[key]
+        end
+      end
+
+      def main_env_key_for(key)
+        key.to_s.strip.downcase.sub(/^main_/, '')
+      end
+
+      def main_env!
+        @main_env = Map.new
+
+        @main_env[:state]          = env['STATE']
+        @main_env[:state_dirname]  = env['STATE_DIRNAME']
+        @main_env[:state_basename] = env['STATE_BASENAME']
+
+        env.each do |key, val|
+          next unless key.to_s =~ /^\s*MAIN_/i
+          k = main_env_key_for(key)
+          @main_env[k] = val
+        end
+
+        @main_env
+      end
+
       def state_dirname(*args)
         @state_dirname = File.join(*args) unless args.empty? 
-        @state_dirname ||= ENV['STATE_DIRNAME']
+        @state_dirname ||= main_env('STATE_DIRNAME')
         @state_dirname ||= Util.home
         @state_dirname
       end
 
       def state_basename(*args)
         @state_basename = File.join(*args) unless args.empty? 
-        @state_basename ||= ENV['STATE_BASENAME']
+        @state_basename ||= main_env('STATE_BASENAME')
         @state_basename ||= ".#{ name }"
         @state_basename
       end
 
       def state_path(*state_path, &block)
-        @state_path = File.join(state_dirname, state_basename) unless defined?(@state_path)
-
-        @state_path = state_path.join('/') unless state_path.empty?
+        unless defined?(@state_path)
+          if main_env('STATE')
+            @state_path = File.expand_path(main_env('STATE'))
+            @state_dirname = File.dirname(@state_path)
+            @state_basename = File.basename(@state_path)
+          else
+            @state_path = File.join(state_dirname, state_basename)
+          end
+        end
 
         if block
           require 'fileutils' unless defined?(FileUtils)
           FileUtils.mkdir_p(@state_path) unless test(?d, @state_path)
-          Dir.chdir(&block)
+          Dir.chdir(@state_path, &block)
         else
           @state_path
         end

data/lib/main/program/instance_methods.rb

@@ -277,6 +277,10 @@ module Main
         fcall(self, '__instance_eval_block', *argv, &block)
       end
 
+      def main_env(*args, &block)
+        self.class.main_env(*args, &block)
+      end
+
       def state_path(&block)
         self.class.state_path(&block)
       end

data/main.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "main"
-  spec.version = "6.1.0"
+  spec.version = "6.2.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "main"
   spec.description = "a class factory and dsl for generating command line programs real quick"
@@ -63,7 +63,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["arrayfields", ">= 4.7.4"])
   
-    spec.add_dependency(*["map", ">= 5.1.0"])
+    spec.add_dependency(*["map", ">= 6.1.0"])
   
 
   spec.extensions.push(*[])

data/test/main_test.rb

@@ -433,6 +433,7 @@ class T < Test::Unit::TestCase
     assert bar.value == 2 
     assert foobar.value == 'foobar' 
   end
+
   def test_0270
     foo = nil
     assert_nothing_raised{
@@ -949,6 +950,57 @@ class T < Test::Unit::TestCase
     }
     assert a == ["--", "--bar"]
   end
+
+# main_env
+#
+  def test_0900
+    %w[ STATE STATE_DIRNAME STATE_BASENAME ].each do |key|
+      value = nil
+      assert_nothing_raised{
+        main([], key => '42'){
+          define_method('run'){ 
+            k = key.downcase
+            value = main_env[k]
+          }
+        }
+      }
+      assert value == '42'
+    end
+  end
+  def test_0910
+    %w[ MAIN_STATE MAIN_STATE_DIRNAME MAIN_STATE_BASENAME ].each do |key|
+      value = nil
+      assert_nothing_raised{
+        main([], key => '42'){
+          define_method('run'){ 
+            k = key.downcase.sub('main_', '')
+            value = main_env[k]
+          }
+        }
+      }
+      assert value == '42'
+    end
+  end
+  def test_0920
+    %w[ STATE MAIN_STATE ].each do |key|
+      dir = File.expand_path(".main-test-#{ Process.pid }-#{ (rand*1000000000000).to_i }")
+      FileUtils.mkdir_p(dir)
+      begin
+        values = [] 
+        assert_nothing_raised{
+          main([], key => dir){
+            define_method('run'){ 
+              values.push state_path
+              state_path{ values.push File.expand_path(Dir.pwd) }
+            }
+          }
+        }
+        assert values == [dir, dir]
+      ensure
+        FileUtils.rm_rf(dir)
+      end
+    end
+  end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: main
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.1.0
 description: a class factory and dsl for generating command line programs real quick
 email: ara.t.howard@gmail.com
 executables: []
@@ -131,3 +131,4 @@ signing_key:
 specification_version: 4
 summary: main
 test_files: []
+has_rdoc: