main 4.4.0 → 4.6.0

data/README.erb

@@ -188,6 +188,9 @@ DOCS
   API section below
 
 HISTORY
+  4.5.0
+    - use map.rb for config objects
+
   4.4.0
     - app storage under a dotdir. for example
 

data/Rakefile

@@ -80,6 +80,7 @@ task :gemspec do
             spec.test_files = #{ test_files.inspect }
             spec.add_dependency 'fattr', '>= 2.1.0'
             spec.add_dependency 'arrayfields', '>= 4.7.4'
+            spec.add_dependency 'map', '>= 2.0.0'
 
             spec.extensions.push(*#{ extensions.inspect })
 
@@ -92,8 +93,9 @@ task :gemspec do
       }
     end
 
-  open("#{ lib }.gemspec", "w"){|fd| fd.puts template}
-  This.gemspec = "#{ lib }.gemspec"
+  Fu.mkdir_p(This.pkgdir)
+  This.gemspec = File.join(This.pkgdir, "gemspec.rb")
+  open("#{ This.gemspec }", "w"){|fd| fd.puts(template)}
 end
 
 task :gem => [:clean, :gemspec] do
@@ -103,7 +105,7 @@ task :gem => [:clean, :gemspec] do
   `#{ cmd }`
   after = Dir['*.gem']
   gem = ((after - before).first || after.first) or abort('no gem!')
-  Fu.mv gem, This.pkgdir
+  Fu.mv(gem, This.pkgdir)
   This.gem = File.basename(gem)
 end
 

data/TODO

@@ -1,4 +1,9 @@
 todo:
+  - support run once/singleton pattern via flock/lockfile
+  - config generation support
+
+
+  - support for logging/logs too!
   - examples of new features
   - use map.rb
 

data/lib/main.rb

@@ -2,7 +2,7 @@ module Main
 #
 # top level constants
 #
-  Main::VERSION = '4.4.0' unless
+  Main::VERSION = '4.6.0' unless
     defined? Main::VERSION
   def self.version() Main::VERSION end
 
@@ -40,6 +40,7 @@ module Main
 
   require 'fattr'
   require 'arrayfields'
+  require 'map'
 #
 # main's own libs
 #

data/lib/main/cast.rb

@@ -103,29 +103,39 @@ module Main
     end
 
     cast :list do |*objs|
-      [*objs].flatten.join(',').split(/,/)
+      [*objs].flatten.join(',').split(/[\n,]/).map{|item| item.strip}.delete_if{|item| item.strip.empty?}
     end
 
-  # add list_of_xxx methods
+# add list_of_xxx methods
+#
     List.dup.each do |type|
       next if type.to_s =~ %r/list/ 
-      m = "list_of_#{ type }"
-      define_method m do |*objs|
-        list(*objs).map{|obj| send type, obj}
+      %W" list_of_#{ type } list_of_#{ type }s ".each do |m|
+        define_method m do |*objs|
+          list(*objs).map{|obj| send type, obj}
+        end
+        export m 
+        List << m
       end
-      export m 
-      List << m
     end
 
-  # add list_of_xxx_from_file
+# add list_of_xxx_from_file
+#
     List.dup.each do |type|
       next if type.to_s =~ %r/list/ 
-      m = "list_of_#{ type }"
-      define_method m do |*objs|
-        list(*objs).map{|obj| send type, obj}
+      %W" list_of_#{ type }_from_file list_of_#{ type }s_from_file ".each do |m|
+        define_method m do |*args|
+          buf = nil
+          if args.size == 1 and args.first.respond_to?(:read)
+            buf = args.first.read
+          else
+            open(*args){|io| buf = io.read}
+          end
+          send(m.sub(/_from_file/, ''), buf)
+        end
+        export m
+        List << m
       end
-      export m 
-      List << m
     end
 
     def self.[] sym

data/lib/main/program/class_methods.rb

@@ -302,7 +302,7 @@ module Main
         unless defined?(@config)
           require 'yaml' unless defined?(YAML)
           if test(?s, config_path)
-            @config = YAML.load(IO.read(config_path))
+            @config = Map.for(YAML.load(IO.read(config_path)))
           else
             config = args.last.is_a?(Hash) ? args.last : {}
             lines = config.to_yaml.split(/\n/)
@@ -314,7 +314,7 @@ module Main
             end
             editor = ENV['EDITOR'] || ENV['EDIT'] || 'vi'
             system("#{ editor.inspect } #{ config_path }")
-            @config = YAML.load(IO.read(config_path))
+            @config = Map.for(YAML.load(IO.read(config_path)))
           end
         end
         @config

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: main
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
+  hash: 39
+  prerelease: 
   segments: 
   - 4
-  - 4
+  - 6
   - 0
-  version: 4.4.0
+  version: 4.6.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 -07:00
+date: 2011-06-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,22 @@ dependencies:
         version: 4.7.4
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: map
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  version_requirements: *id003
 description: a class factory and dsl for generating command line programs real quick
 email: ara.t.howard@gmail.com
 executables: []
@@ -59,7 +75,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- a.rb
 - lib/main/cast.rb
 - lib/main/dsl.rb
 - lib/main/factories.rb
@@ -77,7 +92,6 @@ files:
 - lib/main/util.rb
 - lib/main.rb
 - LICENSE
-- main.gemspec
 - Rakefile
 - README
 - README.erb
@@ -122,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: main

data/a.rb

@@ -1,33 +0,0 @@
-require 'main'
-
-Main {
-
-  name :foobar
-
-  db {
-    create_table(:foo) do
-      primary_key :id
-      String :name
-      Float :price
-    end unless table_exists?(:foo)
-  }
-
-  config(
-    :email => 'your.addy@gmail.com',
-    :password => 'yourPa$$word'
-  )
-
-  io
-
-
-  def run
-    #p input.path
-    #p output.path
-    p params.map{|param| param.name}
-    output.puts(:foobar)
-  end
-
-  mode :foo do
-    params[:input].ignore!
-  end
-}

data/main.gemspec

@@ -1,29 +0,0 @@
-## main.gemspec
-#
-
-Gem::Specification::new do |spec|
-  spec.name = "main"
-  spec.description = 'a class factory and dsl for generating command line programs real quick'
-  spec.version = "4.4.0"
-  spec.platform = Gem::Platform::RUBY
-  spec.summary = "main"
-
-  spec.files = ["a.rb", "lib", "lib/main", "lib/main/cast.rb", "lib/main/dsl.rb", "lib/main/factories.rb", "lib/main/getoptlong.rb", "lib/main/logger.rb", "lib/main/mode.rb", "lib/main/parameter.rb", "lib/main/program", "lib/main/program/class_methods.rb", "lib/main/program/instance_methods.rb", "lib/main/program.rb", "lib/main/softspoken.rb", "lib/main/stdext.rb", "lib/main/test.rb", "lib/main/usage.rb", "lib/main/util.rb", "lib/main.rb", "LICENSE", "main.gemspec", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "samples/h.rb", "samples/j.rb", "test", "test/main.rb", "TODO"]
-  spec.executables = []
-  
-  
-  spec.require_path = "lib"
-  
-
-  spec.has_rdoc = true
-  spec.test_files = "test/main.rb"
-  spec.add_dependency 'fattr', '>= 2.1.0'
-  spec.add_dependency 'arrayfields', '>= 4.7.4'
-
-  spec.extensions.push(*[])
-
-  spec.rubyforge_project = "codeforpeople"
-  spec.author = "Ara T. Howard"
-  spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://github.com/ahoward/main/tree/master"
-end