falsework 0.2.8 → 1.3.0

data/lib/falsework/templates/{naive/bin/%%@project%%.erb → ruby-naive/bin/%%@project%%}

@@ -3,10 +3,10 @@
 
 require_relative '../lib/<%= @project %>/trestle.rb'
 
-include <%= @project.capitalize %>
+include <%= @camelcase %>
 
 $conf = Hash.new
-u = Trestle.new($conf)
+$t = Trestle.new($conf)
 
 $conf[:banner] = "Usage: #{File.basename($0)} [options] hren'"
 $conf[:foobar] = ''
@@ -14,12 +14,12 @@ $conf[:foobar] = ''
 
 # --[ main ]------------------------------------------------------------
 
-u.config_parse(['foobar']) {|src|
-  o = u.cl_parse(src) # create an OptionParser object
+$t.config_parse(['foobar']) {|src|
+  o = $t.cl_parse(src) # create an OptionParser object
   o.on('--foobar STR', 'An example of the option --foobar') {|i|
     $conf[:foobar] = i
   }
-  u.cl_parse(src, o) # run cl parser
+  $t.cl_parse(src, o) # run cl parser
 }
 
 # print our env

data/lib/falsework/templates/{naive/doc/#util.rdoc.erb → ruby-naive/doc/#doc.rdoc}

@@ -1,16 +1,16 @@
 =Name
 
-<%= what %>--[TODO: write a summary here.]
+<%= target %>--[TODO: write a summary here.]
 
 
 ==Synopsis
 
- <%= what %> [options]
+ <%= target %> [options]
 
 
 ==Description
 
-The <%= what %> utility [TODO: write a description here.]
+The <%= target %> utility [TODO: write a description here.]
 
 The options are as follows:
 
@@ -31,7 +31,7 @@ The options are as follows:
 
 ==Configuration
 
-<%= what %> looks for its configuration at 3 places at start up.
+<%= target %> looks for its configuration at 3 places at start up.
 
 1. At <tt><%= @project.upcase %>_CONF</tt> env variable.
    (Its format is exactly similar to CL options.)
@@ -51,5 +51,5 @@ gemdir`/gems/<%= @project %>-x.y.z/etc/</tt> directory for samples.
 
 ==Examples
 
- % <%= what %> --config-dirs
- % <%= what %> -V
+ % <%= target %> --config-dirs
+ % <%= target %> -V

data/lib/falsework/templates/ruby-naive/doc/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) <%= DateTime.now.year %> <%= @gecos %>.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/falsework/templates/{naive/README.rdoc.erb → ruby-naive/doc/README.rdoc}

@@ -1,6 +1,6 @@
 =Name
 
-<%= @project %>-- [TODO: write a summary here.]
+<%= @classy %>--[TODO: write a summary here.]
 
 
 ==Synopsis
@@ -51,6 +51,6 @@ gemdir`/gems/<%= @project %>-x.y.z/etc/</tt> directory for samples.
 
 ==Examples
 
- % ri <%= @project.capitalize %>
+ % ri <%= @camelcase %>
  % <%= @project %> --config-dirs
  % <%= @project %> -V

data/lib/falsework/templates/{naive/lib/%%@project%%/meta.rb.erb → ruby-naive/lib/%%@project%%/meta.rb}

@@ -1,5 +1,6 @@
-module <%= @project.capitalize %>
-  module Meta
+# :include: ../../README.rdoc
+module <%= @camelcase %>
+  module Meta # :nodoc:
     NAME = '<%= @project %>'
     VERSION = '0.0.1'
     AUTHOR = '<%= @gecos %>'

data/lib/falsework/templates/{naive/lib/%%@project%%/trestle.rb.erb → ruby-naive/lib/%%@project%%/trestle.rb}

@@ -7,9 +7,8 @@ require 'open4'
 
 require_relative 'meta'
 
-# :include: ../../README.rdoc
-module <%= @project.capitalize %>
-
+module <%= @camelcase %>
+  # A common routines from <%= @project %> with love.
   class Trestle
 
     # Execute _cmd_ and return a list [exit_status, stderr,
@@ -25,9 +24,9 @@ module <%= @project.capitalize %>
 
     # Return a directory with program libraries.
     def self.gem_libdir
-      t = ["#{File.dirname(File.realpath($0))}/../lib/#{<%= @project.capitalize %>::Meta::NAME}",
-           "#{Gem.dir}/gems/#{<%= @project.capitalize %>::Meta::NAME}-#{<%= @project.capitalize %>::Meta::VERSION}/lib/#{<%= @project.capitalize %>::Meta::NAME}",
-           "lib/#{<%= @project.capitalize %>::Meta::NAME}"]
+      t = ["#{File.dirname(File.realpath($0))}/../lib/#{<%= @camelcase %>::Meta::NAME}",
+           "#{Gem.dir}/gems/#{<%= @camelcase %>::Meta::NAME}-#{<%= @camelcase %>::Meta::VERSION}/lib/#{<%= @camelcase %>::Meta::NAME}",
+           "lib/#{<%= @camelcase %>::Meta::NAME}"]
       t.each {|i| return i if File.readable?(i) }
       fail "all paths are invalid: #{t}"
     end
@@ -127,9 +126,9 @@ module <%= @project.capitalize %>
 #        puts "\n2 run"
         r = config_flat_load(rvars)
       rescue
-        Trestle.errx(1, "cannot load config: #{$!}")
+        Trestle.errx(1, "cannot load config: #{Trestle.get_backtrace}")
       end
-      veputs(1, "Loaded config: #{r}")
+      veputs(1, "OK") if r
       cb.call(block_given?, ARGV)
     end
 
@@ -141,7 +140,8 @@ module <%= @project.capitalize %>
     # Return a loaded filename or nil on error.
     def config_flat_load(rvars)
       p = ->(f) {
-        if File.readable?(f)
+        veputs(1, "Loading #{f}... " + NNL_MARK)
+        if File.file?(f)
           begin
             myconf = YAML.load_file(f)
           rescue
@@ -153,11 +153,13 @@ module <%= @project.capitalize %>
           @conf.merge!(myconf)
           return @conf[:config]
         end
+        
+        veputs(1, "FAILED")
         return nil
       }
 
       if @conf[:config].index('/')
-        return p.call(@config[:config])
+        return p.call(@conf[:config])
       else
         @conf[:config_dirs].each {|dir|
           return dir+'/'+@conf[:config] if p.call(dir + '/' + @conf[:config])
@@ -192,9 +194,15 @@ module <%= @project.capitalize %>
           @conf[:config] = i
         }
         o.on('--config-dirs', 'Show possible config locations.') {
-          @conf[:config_dirs].each { |j|
-            f = j + '/' + @conf[:config]
-            puts((File.readable?(f) ? '* ' : '  ') + f)
+          mark = false
+          @conf[:config_dirs].each { |idx|
+            f = idx + '/' + @conf[:config]
+            if File.readable?(f) && !mark
+              puts "* " + f
+              mark = true
+            else
+              puts "  " + f
+            end
           }
           exit 0
         }
@@ -219,4 +227,4 @@ module <%= @project.capitalize %>
   end # trestle
 end
 
-# Don't remove this: falsework/0.2.8/naive/2011-08-05T17:12:36+03:00
+# Don't remove this: falsework/1.3.0/ruby-naive/2012-01-27T02:39:48+02:00

data/lib/falsework/templates/{naive/test/helper_trestle.rb.erb → ruby-naive/test/helper_trestle.rb}

@@ -5,7 +5,7 @@ require 'fileutils'
 include FileUtils
 
 require_relative '../lib/<%= @project %>/trestle'
-include <%= @project.capitalize %>
+include <%= @camelcase %>
 
 require 'minitest/autorun'
 
@@ -31,4 +31,4 @@ def cmd(c)
   File.absolute_path('../bin/' + c)
 end
 
-# Don't remove this: falsework/0.2.8/naive/2011-08-05T17:12:36+03:00
+# Don't remove this: falsework/1.3.0/ruby-naive/2012-01-27T02:39:48+02:00

data/lib/falsework/templates/{naive/test/rake_git.rb.erb → ruby-naive/test/rake_git.rb}

@@ -33,4 +33,4 @@ end
 
 pp git_ls('.') if __FILE__ == $0
 
-# Don't remove this: falsework/0.2.8/naive/2011-08-05T17:12:36+03:00
+# Don't remove this: falsework/1.3.0/ruby-naive/2012-01-27T02:39:48+02:00

data/lib/falsework/templates/{naive/test/test_%%@project%%.rb.erb → ruby-naive/test/test_%%@project%%.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class Test<%= @project.capitalize %>_<%= rand 2**32 %> < MiniTest::Unit::TestCase
+class Test<%= @camelcase %>_<%= rand 2**32 %> < MiniTest::Unit::TestCase
   def setup
     # this runs every time before test_*
     @cmd = cmd('<%= @project %>') # get path to the exe & cd to tests directory

data/lib/falsework/trestle.rb

@@ -7,9 +7,8 @@ require 'open4'
 
 require_relative 'meta'
 
-# :include: ../../README.rdoc
 module Falsework
-
+  # A common routines from falsework with love.
   class Trestle
 
     # Execute _cmd_ and return a list [exit_status, stderr,
@@ -127,9 +126,9 @@ module Falsework
 #        puts "\n2 run"
         r = config_flat_load(rvars)
       rescue
-        Trestle.errx(1, "cannot load config: #{$!}")
+        Trestle.errx(1, "cannot load config: #{Trestle.get_backtrace}")
       end
-      veputs(1, "Loaded config: #{r}")
+      veputs(1, "OK") if r
       cb.call(block_given?, ARGV)
     end
 
@@ -141,7 +140,8 @@ module Falsework
     # Return a loaded filename or nil on error.
     def config_flat_load(rvars)
       p = ->(f) {
-        if File.readable?(f)
+        veputs(1, "Loading #{f}... " + NNL_MARK)
+        if File.file?(f)
           begin
             myconf = YAML.load_file(f)
           rescue
@@ -153,11 +153,13 @@ module Falsework
           @conf.merge!(myconf)
           return @conf[:config]
         end
+        
+        veputs(1, "FAILED")
         return nil
       }
 
       if @conf[:config].index('/')
-        return p.call(@config[:config])
+        return p.call(@conf[:config])
       else
         @conf[:config_dirs].each {|dir|
           return dir+'/'+@conf[:config] if p.call(dir + '/' + @conf[:config])
@@ -192,9 +194,15 @@ module Falsework
           @conf[:config] = i
         }
         o.on('--config-dirs', 'Show possible config locations.') {
-          @conf[:config_dirs].each { |j|
-            f = j + '/' + @conf[:config]
-            puts((File.readable?(f) ? '* ' : '  ') + f)
+          mark = false
+          @conf[:config_dirs].each { |idx|
+            f = idx + '/' + @conf[:config]
+            if File.readable?(f) && !mark
+              puts "* " + f
+              mark = true
+            else
+              puts "  " + f
+            end
           }
           exit 0
         }

data/test/rake_erb_templates.rb

@@ -31,7 +31,7 @@ def erb_skeletons(local_prj, template)
 #        puts line
         if line =~ /^..? :erb:/
           t = i.sub(/^.+?\//, '')
-          r[target + '/' + t.sub(/#{local_prj}/, '%%@project%%') + '.erb'] = t
+          r[target + '/' + t.sub(/#{local_prj}/, '%%@project%%')] = t
           break
         end
         n += 1
@@ -45,11 +45,11 @@ end
 def erb_make(local_prj, template, target, tmplt)
   raw = File.read(tmplt)
   raw.gsub!(/#{local_prj}/, '<%= @project %>')
-  raw.gsub!(/#{local_prj.capitalize}/, '<%= @project.capitalize %>')
+  raw.gsub!(/#{Mould.name_camelcase(local_prj)}/, '<%= @camelcase %>')
 
   mark = <<-EOF
 
-# Don't remove this: <%= #{local_prj.capitalize}::Meta::NAME %>/<%= #{local_prj.capitalize}::Meta::VERSION %>/#{template}/<%= DateTime.now %>
+# Don't remove this: <%= #{Mould.name_camelcase(local_prj)}::Meta::NAME %>/<%= #{local_prj.capitalize}::Meta::VERSION %>/#{template}/<%= DateTime.now %>
   EOF
   File.open(target, 'w+') {
     |fp| fp.puts raw + ERB.new(mark).result(binding)
@@ -57,4 +57,4 @@ def erb_make(local_prj, template, target, tmplt)
 end
 
 
-pp erb_skeletons(Falsework::Meta::NAME, 'naive') if __FILE__ == $0
+pp erb_skeletons(Falsework::Meta::NAME, 'ruby-naive') if __FILE__ == $0

data/test/templates/config-01.yaml

@@ -0,0 +1,2 @@
+---
+:tdir: ['templates']

data/test/test_cl.rb

@@ -0,0 +1,29 @@
+require_relative 'helper'
+require_relative '../lib/falsework/mould'
+
+class TestFalsework_3867654745 < MiniTest::Unit::TestCase
+  def setup
+    # this runs every time before test_*
+    @cmd = cmd('falsework') # get path to the exe & cd to tests directory
+  end
+
+  def test_listdirs
+    assert_equal 2, Mould.class_variable_get(:@@template_dirs).size
+    out, err = capture_io { Mould.template_dirs_add ["DOESN'T EXISI"] }
+    assert_equal 2, Mould.class_variable_get(:@@template_dirs).size
+    Mould.template_dirs_add [Dir.pwd]
+    assert_equal 3, Mould.class_variable_get(:@@template_dirs).size
+    
+    assert_equal true, Mould.templates.key?("templates")
+  end
+
+  def test_new_dir_from_config
+    r = Trestle.cmd_run "#{@cmd} --config /NO_SUCH_FILE.yaml listdirs"
+    assert_equal(0, r[0])
+    assert_equal(2, r[2].split("\n").size)
+    
+    r = Trestle.cmd_run "#{@cmd} --config templates/config-01.yaml listdirs"
+    assert_equal(0, r[0])
+    assert_equal(3, r[2].split("\n").size)
+  end
+end

data/test/test_exe.rb

@@ -9,7 +9,7 @@ class TestFalsework < MiniTest::Unit::TestCase
   def test_project_list
     r = Trestle.cmd_run "#{@cmd} list"
     assert_equal(0, r[0])
-    assert_match(/naive\n/, r[2])
+    assert_match(/ruby-naive/, r[2])
   end
 
   # very silly analogue of "sed -i'' -E 's/foo/bar/g' file"
@@ -18,7 +18,7 @@ class TestFalsework < MiniTest::Unit::TestCase
     File.open(file, 'w+') {|fp| fp.printf(o) }
   end
   
-  def test_project_new
+  def test_project_ruby_naive
     rm_rf 'templates/foo'
     r = Trestle.cmd_run "#{@cmd} new templates/foo -v"
 #    pp r
@@ -57,40 +57,71 @@ class TestFalsework < MiniTest::Unit::TestCase
                    i.match(/\.\.?$/) || i.match(/\.git[^i]/)
                  })
 
-    # add files
-    origdir = pwd
-    cd 'templates/foo'
+    Dir.chdir('templates/foo') {
+      # add files
+      r = Trestle.cmd_run "#{@cmd} exe qqq"
+      assert_equal(0, r[0])
+      assert_equal(true, File.executable?('bin/qqq'))
+      assert_equal(true, File.exist?('doc/qqq.rdoc'))
 
-    r = Trestle.cmd_run "#{@cmd} exe qqq"
-    assert_equal(0, r[0])
-    assert_equal(true, File.executable?('bin/qqq'))
-    assert_equal(true, File.exist?('doc/qqq.rdoc'))
-
-    r = Trestle.cmd_run "#{@cmd} test qqq"
-    assert_equal(0, r[0])
-    assert_equal(true, File.exist?('test/test_qqq.rb'))
+      r = Trestle.cmd_run "#{@cmd} test qqq"
+      assert_equal(0, r[0])
+      assert_equal(true, File.exist?('test/test_qqq.rb'))
 
-    # upgrade
-    r = Trestle.cmd_run "#{@cmd} upgrade -b"
-    assert_equal(0, r[0])
-    rm ['test/helper_trestle.rb', 'test/rake_git.rb']
-    r = Trestle.cmd_run "#{@cmd} upgrade -b"
-    assert_equal(0, r[0])
-    sed 'test/helper_trestle.rb',
-    /^(# Don't.+falsework\/)\d+\.\d+\.\d+(\/.+)$/, '\1999.999.999\2'
-    r = Trestle.cmd_run "#{@cmd} upgrade -b"
-    assert_equal(1, r[0])
-    assert_match(/file .+ is from .+ falsework: 999.999.999/, r[1])
-    mv('test', 'ttt')
-    r = Trestle.cmd_run "#{@cmd} upgrade -b"
-    assert_equal(0, r[0])
-    
-    cd origdir
+      # upgrade
+      r = Trestle.cmd_run "#{@cmd} upgrade -b"
+      assert_equal(0, r[0])
+      rm ['test/helper_trestle.rb', 'test/rake_git.rb']
+      r = Trestle.cmd_run "#{@cmd} upgrade -b"
+      assert_equal(0, r[0])
+      sed 'test/helper_trestle.rb',
+      /^(# Don't.+falsework\/)\d+\.\d+\.\d+(\/.+)$/, '\1999.999.999\2'
+      r = Trestle.cmd_run "#{@cmd} upgrade -b"
+      assert_equal(1, r[0])
+      assert_match(/file .+ is from .+ falsework: 999.999.999/, r[1])
+      mv('test', 'ttt')
+      r = Trestle.cmd_run "#{@cmd} upgrade -b"
+      assert_equal(0, r[0])
+    }
   end
 
   def test_project_invalid_name
     r = Trestle.cmd_run "#{@cmd} new 123"
     assert_equal(1, r[0])
-    assert_match(/project name cannot start with a digit/, r[1])
+    assert_match(/invalid project name/, r[1])
+  end
+
+  def test_project_c_glib
+    rm_rf 'templates/c_glib'
+    r = Trestle.cmd_run "#{@cmd} new templates/c-glib -t c-glib --no-git"
+    assert_equal(0, r[0])
+
+    Dir.chdir('templates/c_glib') {
+      r = Trestle.cmd_run "#{@cmd} -t c-glib exe q-q-q"
+      assert_equal(0, r[0])
+      assert_equal(true, File.exist?('src/q_q_q.h'))
+      assert_equal(true, File.exist?('src/q_q_q.c'))
+      assert_equal(true, File.exist?('doc/q_q_q.1.asciidoc'))
+
+      r = Trestle.cmd_run "#{@cmd} -t c-glib test q-q-q"
+      assert_equal(0, r[0])
+      assert_equal(true, File.exist?('test/test_q_q_q.c'))
+      
+      Dir.chdir('src') {
+        r = Trestle.cmd_run "gmake"
+        assert_equal 0, r[0]
+        assert_equal true, File.executable?('c_glib')
+        assert_equal(true, File.exist?('q_q_q.o'))
+      }
+      Dir.chdir('test') {
+        r = Trestle.cmd_run "gmake"
+        assert_equal 0, r[0]
+        assert_equal true, File.executable?('test_utils')
+        assert_equal true, File.executable?('test_q_q_q')
+
+        r = Trestle.cmd_run "gmake test"
+        assert_equal 0, r[0]
+      }
+    }
   end
 end