noe 1.6.0 → 1.7.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.7.0 / 2012-01-12
+
+  * Added support for wlang-braces in manifest entries to generate wlang 
+    templates without brace collisions.
+  * Most important changes are in default ruby skeleton, see its own CHANGELOG
+
 # 1.6.0 / 2011-12-09
 
   * Most important changes are in default ruby skeleton, see its own CHANGELOG

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     diff-lcs (1.1.3)
     highline (1.6.2)
     quickl (0.4.1)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)

data/lib/noe/go.rb

@@ -298,8 +298,9 @@ module Noe
         def run
           File.open(relocated, 'w') do |out|
             dialect = entry.wlang_dialect
+            braces = entry.wlang_braces
             variables.methodize!
-            out << WLang::file_instantiate(entry.realpath, variables, dialect)
+            out << WLang::file_instantiate(entry.realpath, variables, dialect, braces)
           end
         end
         

data/lib/noe/template.rb

@@ -213,6 +213,11 @@ module Noe
         res ? res : (default || 'wlang/active-text')
       end
       
+      # Returns wlang braces
+      def wlang_braces
+        @wlang_braces ||= (manifest['wlang-braces'] || "braces").to_sym
+      end
+      
       # Is this entry safe to override?
       def safe_override?
         manifest['safe-override']

data/lib/noe/version.rb

@@ -2,7 +2,7 @@ module Noe
   module Version
 
     MAJOR = 1
-    MINOR = 6
+    MINOR = 7
     TINY  = 0
 
     def self.to_s

data/noe.noespec

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

data/templates/ruby/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.7.0 / 2012-01-12
+
+* Use the correct version number when generating CHANGELOG
+* Fix version number of the template itself
+
 # 1.6.0 / 2011-12-09
 
 * Moved to rspec 1.7.0

data/templates/ruby/noespec.yaml

@@ -21,7 +21,7 @@ template-info:
 
   # Don't remove the name and version entries, which are ALWAYS required
   name: "!{template_name}"
-  version: 1.5.1
+  version: 1.7.0
 
   # The following entries are information about the template itself and can safely
   # be removed on your own project.

data/templates/ruby/short.yaml

@@ -1,13 +1,12 @@
-# Noe template for ruby gem libraries (https://github.com/blambeau/noe) - short version
-# Run 'noe show-spec' and 'noe help show-spec' for additional details.
+# Noe template for ruby gem libraries (https://github.com/blambeau/noe) - short 
+# version. Run 'noe show-spec' and 'noe help show-spec' for additional details.
 
 # Don't remove this entry!
 template-info:
   name: "!{template_name}"
-  version: 1.5.1
+  version: 1.7.0
   links:
-    source: https://github.com/blambeau/noe/tree/master/templates/ruby
-    documentation: https://github.com/blambeau/noe/blob/master/templates/ruby/README.md
+    source: https://github.com/blambeau/noe
 
 # Update to match your own configuration.
 variables:
@@ -51,4 +50,4 @@ variables:
     - {name: yard,      version: "~> 0.7.2", groups: [development]}
     - {name: bluecloth, version: "~> 2.2.0", groups: [development]}
     # wlang is required to run 'rake debug_mail'. See tasks/debug_mail.rake
-    - {name: wlang, version: "~> 0.10.2", groups: [development]}
+    - {name: wlang,     version: "~> 0.10.2", groups: [development]}

data/templates/ruby/src/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 1.0.0 / FIX ME
+# !{version} / FIX ME
 
 * Enhancements
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noe
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &79595140 !ruby/object:Gem::Requirement
+  requirement: &80815370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *79595140
+  version_requirements: *80815370
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79594890 !ruby/object:Gem::Requirement
+  requirement: &80807740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *79594890
+  version_requirements: *80807740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &79594650 !ruby/object:Gem::Requirement
+  requirement: &80806020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *79594650
+  version_requirements: *80806020
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &79594400 !ruby/object:Gem::Requirement
+  requirement: &80780630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *79594400
+  version_requirements: *80780630
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &79594150 !ruby/object:Gem::Requirement
+  requirement: &80776130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *79594150
+  version_requirements: *80776130
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &79593920 !ruby/object:Gem::Requirement
+  requirement: &80710970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *79593920
+  version_requirements: *80710970
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &79593660 !ruby/object:Gem::Requirement
+  requirement: &80708960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *79593660
+  version_requirements: *80708960
 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
@@ -110,38 +110,23 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- lib/noe/main.rbc
-- lib/noe/show_spec.rbc
 - lib/noe/help.rb
 - lib/noe/prepare.rb
-- lib/noe/template.rbc
-- lib/noe/prepare.rbc
 - lib/noe/go.rb
 - lib/noe/show_spec.rb
 - lib/noe/main.rb
-- lib/noe/list.rbc
 - lib/noe/template.rb
-- lib/noe/go.rbc
 - lib/noe/commons.rb
 - lib/noe/list.rb
-- lib/noe/version.rbc
-- lib/noe/config.rbc
-- lib/noe/help.rbc
 - lib/noe/install.rb
 - lib/noe/config.rb
-- lib/noe/commons.rbc
 - lib/noe/loader.rb
 - lib/noe/default.yaml
 - lib/noe/ext/hash.rb
 - lib/noe/ext/array.rb
-- lib/noe/ext/hash.rbc
-- lib/noe/ext/array.rbc
 - lib/noe/config.yaml
-- lib/noe/install.rbc
-- lib/noe/loader.rbc
 - lib/noe/version.rb
 - lib/noe.rb
-- lib/noe.rbc
 - LICENCE.md
 - Manifest.txt
 - noe.gemspec
@@ -149,31 +134,19 @@ files:
 - Rakefile
 - README.md
 - spec/integration/spec_helper.rb
-- spec/integration/spaces_spec.rbc
-- spec/integration/spec_helper.rbc
 - spec/integration/spaces_spec.rb
 - spec/integration/go/go_spec.rb
-- spec/integration/go/go_spec.rbc
 - spec/integration/go/after_prepare/after_prepare.noespec
 - spec/integration/go/after_prepare/README.md
 - spec/unit/spec_helper.rb
 - spec/unit/template/entry/rename_one_spec.rb
-- spec/unit/template/entry/relocate_spec.rbc
 - spec/unit/template/entry/relocate_spec.rb
 - spec/unit/template/entry/infer_wlang_dialect_spec.rb
-- spec/unit/template/entry/rename_one_spec.rbc
-- spec/unit/template/entry/infer_wlang_dialect_spec.rbc
-- spec/unit/config/new_spec.rbc
 - spec/unit/config/config1.yaml
 - spec/unit/config/new_spec.rb
 - spec/unit/config/templates_dir_spec.rb
-- spec/unit/config/templates_dir_spec.rbc
-- spec/unit/spec_helper.rbc
-- spec/unit/noe_spec.rbc
 - spec/unit/noe_spec.rb
 - spec/unit/ext/hash/noe_merge_spec.rb
-- spec/unit/ext/hash/methodize_spec.rbc
-- spec/unit/ext/hash/noe_merge_spec.rbc
 - spec/unit/ext/hash/methodize_spec.rb
 - spec/fixtures/typitpl/noespec.yaml
 - spec/fixtures/typitpl/src/README.txt
@@ -223,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -670464717
+      hash: -416885011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,38 +205,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/integration/spec_helper.rb
-- spec/integration/spaces_spec.rbc
-- spec/integration/spec_helper.rbc
 - spec/integration/spaces_spec.rb
 - spec/integration/go/go_spec.rb
-- spec/integration/go/go_spec.rbc
 - spec/integration/go/after_prepare/after_prepare.noespec
 - spec/integration/go/after_prepare/README.md
 - spec/unit/spec_helper.rb
 - spec/unit/template/entry/rename_one_spec.rb
-- spec/unit/template/entry/relocate_spec.rbc
 - spec/unit/template/entry/relocate_spec.rb
 - spec/unit/template/entry/infer_wlang_dialect_spec.rb
-- spec/unit/template/entry/rename_one_spec.rbc
-- spec/unit/template/entry/infer_wlang_dialect_spec.rbc
-- spec/unit/config/new_spec.rbc
 - spec/unit/config/config1.yaml
 - spec/unit/config/new_spec.rb
 - spec/unit/config/templates_dir_spec.rb
-- spec/unit/config/templates_dir_spec.rbc
-- spec/unit/spec_helper.rbc
-- spec/unit/noe_spec.rbc
 - spec/unit/noe_spec.rb
 - spec/unit/ext/hash/noe_merge_spec.rb
-- spec/unit/ext/hash/methodize_spec.rbc
-- spec/unit/ext/hash/noe_merge_spec.rbc
 - spec/unit/ext/hash/methodize_spec.rb
 - spec/fixtures/typitpl/noespec.yaml
 - spec/fixtures/typitpl/src/README.txt

data/lib/noe.rbc

@@ -1,393 +0,0 @@
-!RBIX
-11817445442317083511
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-172
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-15
-5
-7
-5
-64
-47
-49
-6
-1
-15
-5
-7
-7
-64
-47
-49
-6
-1
-15
-5
-7
-8
-64
-47
-49
-6
-1
-15
-5
-7
-9
-64
-47
-49
-6
-1
-15
-5
-7
-10
-64
-47
-49
-6
-1
-15
-5
-7
-11
-64
-47
-49
-6
-1
-15
-5
-7
-12
-64
-47
-49
-6
-1
-15
-5
-7
-13
-64
-47
-49
-6
-1
-15
-5
-7
-14
-64
-47
-49
-6
-1
-15
-5
-7
-15
-64
-47
-49
-6
-1
-15
-5
-7
-16
-64
-47
-49
-6
-1
-15
-5
-7
-17
-64
-47
-49
-6
-1
-15
-5
-7
-18
-64
-47
-49
-6
-1
-15
-5
-7
-19
-64
-47
-49
-6
-1
-15
-5
-7
-20
-64
-47
-49
-6
-1
-15
-5
-7
-21
-64
-47
-49
-6
-1
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-22
-x
-3
-Noe
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-3
-Noe
-i
-15
-5
-66
-99
-7
-0
-45
-1
-2
-65
-49
-3
-3
-15
-1
-11
-I
-4
-I
-0
-I
-0
-I
-0
-n
-p
-4
-x
-5
-Error
-x
-13
-StandardError
-n
-x
-10
-open_class
-p
-3
-I
-2
-I
-3
-I
-f
-x
-40
-/home/blambeau/work/devel/noe/lib/noe.rb
-p
-0
-x
-13
-attach_method
-s
-11
-noe/version
-x
-7
-require
-s
-10
-noe/loader
-s
-4
-yaml
-s
-9
-fileutils
-s
-13
-noe/ext/array
-s
-12
-noe/ext/hash
-s
-10
-noe/config
-s
-12
-noe/template
-s
-8
-noe/main
-s
-11
-noe/commons
-s
-11
-noe/install
-s
-8
-noe/help
-s
-8
-noe/list
-s
-11
-noe/prepare
-s
-6
-noe/go
-s
-13
-noe/show_spec
-p
-35
-I
-0
-I
-1
-I
-1a
-I
-6
-I
-23
-I
-7
-I
-2c
-I
-8
-I
-35
-I
-9
-I
-3e
-I
-a
-I
-47
-I
-b
-I
-50
-I
-c
-I
-59
-I
-d
-I
-62
-I
-f
-I
-6b
-I
-10
-I
-74
-I
-11
-I
-7d
-I
-12
-I
-86
-I
-13
-I
-8f
-I
-14
-I
-98
-I
-15
-I
-a1
-I
-16
-I
-ac
-x
-40
-/home/blambeau/work/devel/noe/lib/noe.rb
-p
-0