noe 1.7.4 → 1.7.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.7.5 / 2012-06-16
+
+  * Raise an error at noe go if a manifest entry is missing.
+  * Allow wlang-dialect to be explicitely set to nil (yaml ~) to prevent wlang for
+    being used on specific entries.
+
 # 1.7.4 / 2012-02-26
 
   * Avoid creating the project folder if 'noe prepare' is going to fail due to unknown

data/lib/noe/go.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 module Noe
   class Main
     #
@@ -296,11 +297,16 @@ module Noe
       class FileInstantiate < DoSomething
         
         def run
-          relocated.open('w') do |out|
-            dialect = entry.wlang_dialect
-            braces = entry.wlang_braces
-            variables.methodize!
-            out << WLang::file_instantiate(entry.realpath.to_s, variables, dialect, braces)
+          source = entry.realpath.to_s
+          target = relocated
+          if dialect = entry.wlang_dialect
+            target.open('w') do |out|
+              braces = entry.wlang_braces
+              variables.methodize!
+              out << WLang::file_instantiate(source, variables, dialect, braces)
+            end
+          else
+            FileUtils.cp(source, target)
           end
         end
         

data/lib/noe/template.rb

@@ -90,11 +90,16 @@ module Noe
     
     # Returns manifest Hash for a given entry
     def manifest_for(entry)
-      manifest = spec['template-info']['manifest'] || {}
-      manifest[entry.path.to_s] || {
+      path = entry.path.to_s
+      manifest = spec['template-info']['manifest']
+      manifest = manifest[path]
+      if manifest.nil? and Path(path).file?
+        raise "Missing manifest for #{entry.path}"
+      end
+      {
         'description'   => "No description for #{entry.path}",
         'safe-override' => false
-      } 
+      }.merge(manifest || {})
     end
     
     # Visit the template
@@ -186,9 +191,11 @@ module Noe
       
       # Returns wlang dialect to use
       def wlang_dialect
-        @wlang_dialect ||= begin
-          default = template.main_wlang_dialect
-          manifest['wlang-dialect'] || self.class.infer_wlang_dialect(relocate, default)
+        told = manifest['wlang-dialect']
+        if told.nil? && manifest.has_key?('wlang-dialect')
+          nil
+        else
+          told || self.class.infer_wlang_dialect(relocate, template.main_wlang_dialect)
         end
       end
       

data/lib/noe/version.rb

@@ -3,7 +3,7 @@ module Noe
 
     MAJOR = 1
     MINOR = 7
-    TINY  = 4
+    TINY  = 5
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/noe.noespec

@@ -1,6 +1,6 @@
 template-info:
-  name: ruby
-  version: 1.7.3
+  name: rubygem.noe
+  version: 1.7.5
   author: Bernard Lambeau <blambeau@gmail.com>
   manifest:
     spec/spec_helper.rb:
@@ -10,7 +10,7 @@ template-info:
 variables:
   lower: noe
   upper: Noe
-  version: 1.7.4
+  version: 1.7.5
   summary: 
     Noe is a simple, general-purpose and extensible skeleton generator from project templates
   description:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noe
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000Z
+date: 2012-06-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70144303386380 !ruby/object:Gem::Requirement
+  requirement: &71969890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70144303386380
+  version_requirements: *71969890
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144303385840 !ruby/object:Gem::Requirement
+  requirement: &71965460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70144303385840
+  version_requirements: *71965460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70144303367700 !ruby/object:Gem::Requirement
+  requirement: &71965140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70144303367700
+  version_requirements: *71965140
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70144303367020 !ruby/object:Gem::Requirement
+  requirement: &71964820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70144303367020
+  version_requirements: *71964820
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &70144303366320 !ruby/object:Gem::Requirement
+  requirement: &71964490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *70144303366320
+  version_requirements: *71964490
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &70144303365540 !ruby/object:Gem::Requirement
+  requirement: &71964200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70144303365540
+  version_requirements: *71964200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70144303364940 !ruby/object:Gem::Requirement
+  requirement: &71963860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70144303364940
+  version_requirements: *71963860
 - !ruby/object:Gem::Dependency
   name: epath
-  requirement: &70144303364260 !ruby/object:Gem::Requirement
+  requirement: &71963540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70144303364260
+  version_requirements: *71963540
 description: Noe is a tool that generates project skeletons from predefined templates.
   A template is designed for a specific product (a ruby library, a static or dynamic
   web site, ...). Noe instantiates templates and helps you maintaining your product
@@ -120,21 +120,21 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- lib/noe/commons.rb
-- lib/noe/config.rb
-- lib/noe/config.yaml
-- lib/noe/default.yaml
-- lib/noe/ext/array.rb
-- lib/noe/ext/hash.rb
-- lib/noe/go.rb
 - lib/noe/help.rb
-- lib/noe/install.rb
-- lib/noe/list.rb
-- lib/noe/loader.rb
-- lib/noe/main.rb
 - lib/noe/prepare.rb
+- lib/noe/go.rb
 - lib/noe/show_spec.rb
+- lib/noe/main.rb
 - lib/noe/template.rb
+- lib/noe/commons.rb
+- lib/noe/list.rb
+- lib/noe/install.rb
+- lib/noe/config.rb
+- lib/noe/loader.rb
+- lib/noe/default.yaml
+- lib/noe/ext/hash.rb
+- lib/noe/ext/array.rb
+- lib/noe/config.yaml
 - lib/noe/version.rb
 - lib/noe.rb
 - LICENCE.md
@@ -143,51 +143,51 @@ files:
 - noe.noespec
 - Rakefile
 - README.md
-- spec/fixtures/test.noespec
-- spec/fixtures/typitpl/noespec.yaml
-- spec/fixtures/typitpl/src/README.txt
+- spec/spec_helper.rb
+- spec/integration/spaces_spec.rb
+- spec/integration/go/go_spec.rb
 - spec/integration/go/after_prepare/after_prepare.noespec
 - spec/integration/go/after_prepare/README.md
-- spec/integration/go/go_spec.rb
-- spec/integration/spaces_spec.rb
-- spec/spec_helper.rb
+- spec/unit/template/entry/rename_one_spec.rb
+- spec/unit/template/entry/relocate_spec.rb
+- spec/unit/template/entry/infer_wlang_dialect_spec.rb
 - spec/unit/config/config1.yaml
 - spec/unit/config/new_spec.rb
 - spec/unit/config/templates_dir_spec.rb
-- spec/unit/ext/hash/methodize_spec.rb
-- spec/unit/ext/hash/noe_merge_spec.rb
 - spec/unit/noe_spec.rb
-- spec/unit/template/entry/infer_wlang_dialect_spec.rb
-- spec/unit/template/entry/relocate_spec.rb
-- spec/unit/template/entry/rename_one_spec.rb
+- spec/unit/ext/hash/noe_merge_spec.rb
+- spec/unit/ext/hash/methodize_spec.rb
+- spec/fixtures/typitpl/noespec.yaml
+- spec/fixtures/typitpl/src/README.txt
+- spec/fixtures/test.noespec
 - tasks/debug_mail.rake
-- tasks/debug_mail.txt
+- tasks/yard.rake
 - tasks/gem.rake
 - tasks/spec_test.rake
 - tasks/unit_test.rake
-- tasks/yard.rake
-- templates/ruby/CHANGELOG.md
+- tasks/debug_mail.txt
 - templates/ruby/noespec.yaml
+- templates/ruby/CHANGELOG.md
 - templates/ruby/README.md
-- templates/ruby/short.yaml
-- templates/ruby/src/__lower__.gemspec
 - templates/ruby/src/CHANGELOG.md
-- templates/ruby/src/Gemfile
+- templates/ruby/src/README.md
+- templates/ruby/src/Manifest.txt
+- templates/ruby/src/Rakefile
+- templates/ruby/src/__lower__.gemspec
+- templates/ruby/src/lib/__lower__.rb
 - templates/ruby/src/lib/__lower__/loader.rb
 - templates/ruby/src/lib/__lower__/version.rb
-- templates/ruby/src/lib/__lower__.rb
 - templates/ruby/src/LICENCE.md
-- templates/ruby/src/Manifest.txt
-- templates/ruby/src/Rakefile
-- templates/ruby/src/README.md
 - templates/ruby/src/spec/spec_helper.rb
 - templates/ruby/src/spec/test___lower__.rb
 - templates/ruby/src/tasks/debug_mail.rake
-- templates/ruby/src/tasks/debug_mail.txt
+- templates/ruby/src/tasks/yard.rake
 - templates/ruby/src/tasks/gem.rake
 - templates/ruby/src/tasks/spec_test.rake
 - templates/ruby/src/tasks/unit_test.rake
-- templates/ruby/src/tasks/yard.rake
+- templates/ruby/src/tasks/debug_mail.txt
+- templates/ruby/src/Gemfile
+- templates/ruby/short.yaml
 - templates/ruby/src/.travis.yml
 - templates/ruby/src/.gitignore
 homepage: http://github.com/blambeau/noe
@@ -212,26 +212,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Noe is a simple, general-purpose and extensible skeleton generator from project
   templates
 test_files:
-- spec/fixtures/test.noespec
-- spec/fixtures/typitpl/noespec.yaml
-- spec/fixtures/typitpl/src/README.txt
+- spec/spec_helper.rb
+- spec/integration/spaces_spec.rb
+- spec/integration/go/go_spec.rb
 - spec/integration/go/after_prepare/after_prepare.noespec
 - spec/integration/go/after_prepare/README.md
-- spec/integration/go/go_spec.rb
-- spec/integration/spaces_spec.rb
-- spec/spec_helper.rb
+- spec/unit/template/entry/rename_one_spec.rb
+- spec/unit/template/entry/relocate_spec.rb
+- spec/unit/template/entry/infer_wlang_dialect_spec.rb
 - spec/unit/config/config1.yaml
 - spec/unit/config/new_spec.rb
 - spec/unit/config/templates_dir_spec.rb
-- spec/unit/ext/hash/methodize_spec.rb
-- spec/unit/ext/hash/noe_merge_spec.rb
 - spec/unit/noe_spec.rb
-- spec/unit/template/entry/infer_wlang_dialect_spec.rb
-- spec/unit/template/entry/relocate_spec.rb
-- spec/unit/template/entry/rename_one_spec.rb
+- spec/unit/ext/hash/noe_merge_spec.rb
+- spec/unit/ext/hash/methodize_spec.rb
+- spec/fixtures/typitpl/noespec.yaml
+- spec/fixtures/typitpl/src/README.txt
+- spec/fixtures/test.noespec