falsework 3.0.0 → 3.1.0

data/bin/falsework

@@ -207,8 +207,12 @@ def addFiles mode, files
   CliUtils.errx EX_USAGE, 'missing argument(s)' if files.size == 0
   
   r = true
-  m = Mould.new(File.basename(Dir.pwd), $conf[:template],
-                $conf[:user], $conf[:email], $conf[:gecos])
+  begin
+    m = Mould.new(File.basename(Dir.pwd), $conf[:template],
+                  $conf[:user], $conf[:email], $conf[:gecos])
+  rescue
+    CliUtils.errx EX_SOFTWARE, $!
+  end
   
   files.each {|i|
     created = m.add(mode, i) rescue CliUtils.errx(1, $!)
@@ -283,6 +287,9 @@ $conf[:upgrader] = {}
 $conf[:upgrader][:batch] = false
 $conf[:upgrader][:save] = false
 
+# try to load a note file to set current template
+$conf[:template] = Upgrader.noteLoad['template']['name'] rescue nil
+
 $conf.load {|o|
   o.on('--user STR', 'Github user.') {|i| $conf[:user] = i }
   o.on('--gecos STR', 'A gecos-like string.') {|i| $conf[:gecos] = i }

data/doc/NEWS.rdoc

@@ -1,3 +1,15 @@
+=== 3.1.0
+
+Thu May 24 23:20:04 EEST 2012
+
+* Fix a long standing issue with redundant '-t' CLO after a project was
+  generated.
+
+* Fix empty value of template version in .falsework file.
+
+* Tell user if she doesn't have '#config.yaml' file in her template if
+  she is trying to add files to a project afterwards.
+
 === 3.0.0
 
 Sun Apr 29 12:22:27 EEST 2012

data/lib/falsework/meta.rb

@@ -2,7 +2,7 @@
 module Falsework
   module Meta # :nodoc:
     NAME = 'falsework'
-    VERSION = '3.0.0'
+    VERSION = '3.1.0'
     AUTHOR = 'Alexander Gromnitsky'
     EMAIL = 'alexander.gromnitsky@gmail.com'
     HOMEPAGE = 'http://github.com/gromnitsky/' + NAME

data/lib/falsework/mould.rb

@@ -101,7 +101,8 @@ module Falsework
                      'src' => nil,
                      'dir' => 'test/test_%s.rb',
                      'mode_int' => nil
-                   }]
+                   }],
+        'version' => '1.0.0'
       }
       configParse
       
@@ -251,7 +252,6 @@ module Falsework
         begin
           myconf = YAML.load_file file
           myconf[:file] = file
-          myconf['version'] = '1.0.0' unless myconf['version']
           r = true
         rescue
           CliUtils.warnx "cannot parse #{file}: #{$!}"
@@ -292,7 +292,11 @@ module Falsework
       created = []
 
       unless @conf[mode] && @conf[mode][0]['src']
-        CliUtils.warnx "hash '#{mode}' is empty in #{@conf[:file]}"
+        if @conf[:file]
+          CliUtils.warnx "hash '#{mode}' is empty in #{@conf[:file]}"
+        else
+          CliUtils.warnx "template '#{@template}' doesn't have '#{TEMPLATE_CONFIG}' file"
+        end
         return []
       end
 

data/test/test_cli.rb

@@ -113,7 +113,7 @@ class TestCommandLine < MiniTest::Unit::TestCase
     assert_equal(0, r[0])
 
     Dir.chdir('templates/c_glib') {
-      r = CliUtils.exec "#{@cmd} -t c-glib exe q-q-q"
+      r = CliUtils.exec "#{@cmd} 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'))

data/test/test_mould.rb

@@ -17,7 +17,15 @@ class TestMould < MiniTest::Unit::TestCase
       # no template config file
       m = Mould.new 'foo', nil
       refute m.conf[:upgrade]
+      assert_equal '1.0.0', m.conf['version']
 
+      # config with just a version
+      File.open('t/ruby-cli/'+Mould::TEMPLATE_CONFIG, 'w+') {|fp|
+        fp.puts Hash['version' => '3.2.1'].to_yaml
+      }
+      m = Mould.new 'foo', nil
+      assert_equal '3.2.1', m.conf['version']
+      
       # invalid template config file
       File.open('t/ruby-cli/'+Mould::TEMPLATE_CONFIG, 'w+') {|fp|
         fp.puts 'garbage'
@@ -32,6 +40,19 @@ class TestMould < MiniTest::Unit::TestCase
     assert_equal 'lib/%%@project%%/cliconfig.rb', m.conf['upgrade']['files'].first
   end
 
+  def test_invalidAdd
+    ClearFakeFS do
+      FileUtils.mkdir_p 't/ruby-cli'
+      Mould.template_dirs.unshift Pathname.new('t')
+
+      m = Mould.new 'foo', nil
+      out, err = capture_io { m.add 'doc', 'breaking-news' }
+      assert_match /template .+ doesn\'t have .+ file/, err
+      
+      Mould.template_dirs.shift
+    end
+  end
+
   def test_name_project
     assert_equal '', Mould.name_project('')
     assert_equal '', Mould.name_project(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falsework
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A primitive scaffold generator for writing CLI programs in Ruby.