main 4.7.1 → 4.7.2

data/Rakefile

@@ -3,9 +3,6 @@ This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
 This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
-task :license do
-  open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
-end
 
 task :default do
   puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
@@ -90,7 +87,7 @@ task :gemspec do
   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")
+  test_files  = test(?e, "test/#{ lib }.rb") ? "test/#{ lib }.rb" : nil
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
 
@@ -103,38 +100,51 @@ task :gemspec do
   end
   extensions = [extensions].flatten.compact
 
+# TODO
+  if This.dependencies.nil?
+    dependencies = []
+  else
+    case This.dependencies
+      when Hash
+        dependencies = This.dependencies.values
+      when Array
+        dependencies = This.dependencies
+    end
+  end
+
   template = 
     if test(?e, 'gemspec.erb')
       Template{ IO.read('gemspec.erb') }
     else
       Template {
         <<-__
-          ## #{ lib }.gemspec
+          ## <%= lib %>.gemspec
           #
 
           Gem::Specification::new do |spec|
-            spec.name = #{ lib.inspect }
-            spec.version = #{ version.inspect }
+            spec.name = <%= lib.inspect %>
+            spec.version = <%= version.inspect %>
             spec.platform = Gem::Platform::RUBY
-            spec.summary = #{ lib.inspect }
-            spec.description = #{ description.inspect }
+            spec.summary = <%= lib.inspect %>
+            spec.description = <%= description.inspect %>
 
-            spec.files =\n#{ files.sort.pretty_inspect }
-            spec.executables = #{ executables.inspect }
+            spec.files =\n<%= files.sort.pretty_inspect %>
+            spec.executables = <%= executables.inspect %>
             
             spec.require_path = "lib"
 
-            spec.test_files = #{ test_files.inspect }
+            spec.test_files = <%= test_files.inspect %>
 
-          ### spec.add_dependency 'lib', '>= version'
-          #### spec.add_dependency 'map'
+            <% dependencies.each do |lib_version| %>
+              spec.add_dependency(*<%= Array(lib_version).flatten.inspect %>)
+            <% end %>
 
-            spec.extensions.push(*#{ extensions.inspect })
+            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 }
+            spec.rubyforge_project = <%= This.rubyforge_project.inspect %>
+            spec.author = <%= This.author.inspect %>
+            spec.email = <%= This.email.inspect %>
+            spec.homepage = <%= This.homepage.inspect %>
           end
         __
       }
@@ -270,6 +280,12 @@ BEGIN {
   end
   This.version = version
 
+# see if dependencies are export by the module
+#
+  if This.object.respond_to?(:dependencies)
+    This.dependencies = This.object.dependencies
+  end
+
 # we need to know the name of the lib an it's version
 #
   abort('no lib') unless This.lib

data/lib/main.rb

@@ -1,8 +1,7 @@
 module Main
-#
 # top level constants
 #
-  Main::VERSION = '4.7.1' unless
+  Main::VERSION = '4.7.2' unless
     defined? Main::VERSION
   def self.version() Main::VERSION end
 
@@ -14,7 +13,41 @@ module Main
   Main::EXIT_FAILURE = 1 unless defined? Main::EXIT_FAILURE
   Main::EXIT_WARN = 42 unless defined? Main::EXIT_WARN
   Main::EXIT_WARNING = 42 unless defined? Main::EXIT_WARNING
+
+## deps
 #
+  def Main.dependencies
+    {
+      'chronic'     => [ 'chronic'     , '~> 0.6.2' ] , 
+      'fattr'       => [ 'fattr'       , '~> 2.2.0' ] , 
+      'arrayfields' => [ 'arrayfields' , '~> 4.7.4' ] , 
+      'map'         => [ 'map'         , '~> 4.3.0' ]
+    }
+  end
+
+  def Main.libdir(*args, &block)
+    @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'')
+    args.empty? ? @libdir : File.join(@libdir, *args)
+  ensure
+    if block
+      begin
+        $LOAD_PATH.unshift(@libdir)
+        block.call()
+      ensure
+        $LOAD_PATH.shift()
+      end
+    end
+  end
+
+  def Main.load(*libs)
+    libs = libs.join(' ').scan(/[^\s+]+/)
+    Main.libdir{ libs.each{|lib| Kernel.load(lib) } }
+  end
+end
+ 
+
+
+
 # built-in
 #
   require 'logger'
@@ -23,7 +56,7 @@ module Main
   require 'uri'
   require 'time'
   require 'date'
-#
+ 
 # use gems to pick up dependancies
 #
   begin
@@ -32,27 +65,25 @@ module Main
     42
   end
 
-  begin
-    require 'chronic'
-  rescue LoadError
-    42
+  if defined?(gem)
+    Main.dependencies.each do |lib, dependency|
+      gem(*dependency)
+      require(lib)
+    end
   end
-
-  require 'fattr'
-  require 'arrayfields'
-  require 'map'
-#
+ 
 # main's own libs
 #
-  require libdir + 'stdext'
-  require libdir + 'softspoken'
-  require libdir + 'util'
-  require libdir + 'logger'
-  require libdir + 'usage'
-  require libdir + 'cast'
-  require libdir + 'parameter'
-  require libdir + 'getoptlong'
-  require libdir + 'mode'
-  require libdir + 'program'
-  require libdir + 'factories'
-end
+  Main.load %w[
+    stdext.rb
+    softspoken.rb
+    util.rb
+    logger.rb
+    usage.rb
+    cast.rb
+    parameter.rb
+    getoptlong.rb
+    mode.rb
+    program.rb
+    factories.rb
+  ]

data/main.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "main"
-  spec.version = "4.7.1"
+  spec.version = "4.7.2"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "main"
   spec.description = "description: main kicks the ass"
@@ -54,8 +54,15 @@ Gem::Specification::new do |spec|
 
   spec.test_files = nil
 
-### spec.add_dependency 'lib', '>= version'
-#### spec.add_dependency 'map'
+  
+    spec.add_dependency(*["chronic", "~> 0.6.2"])
+  
+    spec.add_dependency(*["fattr", "~> 2.2.0"])
+  
+    spec.add_dependency(*["arrayfields", "~> 4.7.4"])
+  
+    spec.add_dependency(*["map", "~> 4.3.0"])
+  
 
   spec.extensions.push(*[])
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  hash: 33
   prerelease: 
-  segments: 
-  - 4
-  - 7
-  - 1
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,10 +10,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -06:00
-default_executable: 
-dependencies: []
-
+date: 2011-08-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fattr
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: arrayfields
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.7.4
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: map
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.3.0
+  type: :runtime
+  version_requirements: *id004
 description: "description: main kicks the ass"
 email: ara.t.howard@gmail.com
 executables: []
@@ -61,7 +98,6 @@ files:
 - samples/h.rb
 - samples/j.rb
 - test/main_test.rb
-has_rdoc: true
 homepage: https://github.com/ahoward/main
 licenses: []
 
@@ -75,23 +111,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: main