noe 1.5.1 → 1.6.0

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 1.5.1 / FIX ME
+# 1.6.0 / 2011-12-09
+
+  * Most important changes are in default ruby skeleton, see its own CHANGELOG
+  * The project structure moved to ruby.noe 1.6.0 itself
+
+# 1.5.1 / 2011-08-31
 
   * Most important changes are in default ruby skeleton, see its own CHANGELOG
   * Added a --silent option to 'noe prepare' that removes the "what's next" 

data/Gemfile

@@ -2,17 +2,17 @@ source 'http://rubygems.org'
 
 group :test do
   gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.6.0"
+  gem "rspec", "~> 2.7.0"
 end
 
 group :release do
   gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.6.0"
+  gem "rspec", "~> 2.7.0"
 end
 
 group :doc do
   gem "yard", "~> 0.7.2"
-  gem "bluecloth", "~> 2.1.0"
+  gem "bluecloth", "~> 2.2.0"
 end
 
 group :runtime do

data/Gemfile.lock

@@ -1,19 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bluecloth (2.1.0)
-    diff-lcs (1.1.2)
+    bluecloth (2.2.0)
+    diff-lcs (1.1.3)
     highline (1.6.2)
     quickl (0.4.1)
     rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
     wlang (0.10.2)
     yard (0.7.2)
 
@@ -22,10 +22,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bluecloth (~> 2.1.0)
+  bluecloth (~> 2.2.0)
   highline (~> 1.6.0)
   quickl (~> 0.4.1)
   rake (~> 0.9.2)
-  rspec (~> 2.6.0)
+  rspec (~> 2.7.0)
   wlang (~> 0.10.2)
   yard (~> 0.7.2)

data/Rakefile

@@ -19,5 +19,5 @@ task :default => :test
 # See .rake files there for complete documentation.
 #
 Dir["tasks/*.rake"].each do |taskfile|
-  instance_eval File.read(taskfile), taskfile
+  load taskfile
 end

data/lib/noe/version.rb

@@ -2,8 +2,8 @@ module Noe
   module Version
 
     MAJOR = 1
-    MINOR = 5
-    TINY  = 1
+    MINOR = 6
+    TINY  = 0
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/noe.gemspec

@@ -124,9 +124,9 @@ Gem::Specification.new do |s|
   # for each development dependency. These gems are required for developers
   #
   s.add_development_dependency("rake", "~> 0.9.2")
-  s.add_development_dependency("rspec", "~> 2.6.0")
+  s.add_development_dependency("rspec", "~> 2.7.0")
   s.add_development_dependency("yard", "~> 0.7.2")
-  s.add_development_dependency("bluecloth", "~> 2.1.0")
+  s.add_development_dependency("bluecloth", "~> 2.2.0")
   s.add_dependency("wlang", "~> 0.10.2")
   s.add_dependency("quickl", "~> 0.4.1")
   s.add_dependency("highline", "~> 1.6.0")

data/noe.noespec

@@ -1,6 +1,6 @@
 template-info:
   name: ruby
-  version: 1.5.0
+  version: 1.6.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.5.1
+  version: 1.6.0
   summary: 
     Noe is a simple, general-purpose and extensible skeleton generator from project templates
   description:
@@ -28,9 +28,9 @@ variables:
     - http://revision-zero.org/noe
   dependencies: 
     - {name: rake,         version: "~> 0.9.2",  groups: [test, release]}
-    - {name: rspec,        version: "~> 2.6.0",  groups: [test, release]}
+    - {name: rspec,        version: "~> 2.7.0",  groups: [test, release]}
     - {name: yard,         version: "~> 0.7.2",  groups: [doc          ]}
-    - {name: bluecloth,    version: "~> 2.1.0",  groups: [doc          ]}
+    - {name: bluecloth,    version: "~> 2.2.0",  groups: [doc          ]}
     - {name: wlang,        version: "~> 0.10.2", groups: [runtime      ]}
     - {name: quickl,       version: "~> 0.4.1",  groups: [runtime      ]}
     - {name: highline,     version: "~> 1.6.0",  groups: [runtime      ]}

data/tasks/debug_mail.rake

@@ -31,48 +31,45 @@
 #     tasks/debug_mail.txt:
 #       safe-override: false
 #
-begin
-  require 'wlang'
+desc "Debug the release announcement mail"
+task :debug_mail do
+  begin
+    require 'wlang'
+  rescue LoadError
+    abort "wlang is not available. Try 'gem install wlang'"
+  end
   require 'yaml'
 
-  desc "Debug the release announcement mail"
-  task :debug_mail do
-    # Check that a .noespec file exists
-    noespec_file = File.expand_path('../../noe.noespec', __FILE__)
-    unless File.exists?(noespec_file)
-      raise "Unable to find .noespec project file, sorry."
-    end
-
-    # Load it as well as variables and options
-    noespec = YAML::load(File.read(noespec_file))
-    vars = noespec['variables'] || {}
+  # Check that a .noespec file exists
+  noespec_file = File.expand_path('../../noe.noespec', __FILE__)
+  unless File.exists?(noespec_file)
+    raise "Unable to find .noespec project file, sorry."
+  end
 
-    # Changes are taken from CHANGELOG
-    logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
-    unless logs.size == 1
-      abort "Unable to find a changelog file"
-    end
+  # Load it as well as variables and options
+  noespec = YAML::load(File.read(noespec_file))
+  vars = noespec['variables'] || {}
 
-    # Load interesting changesets
-    changes, end_found = [], 0
-    File.readlines(logs.first).select{|line|
-      if line =~ /^# /
-        break if end_found >= 1
-        end_found += 1
-      end
-      changes << line
-    }
-    vars['changes'] = changes.join
+  # Changes are taken from CHANGELOG
+  logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
+  unless logs.size == 1
+    abort "Unable to find a changelog file"
+  end
 
-    # WLang template
-    template = File.expand_path('../debug_mail.txt', __FILE__)
+  # Load interesting changesets
+  changes, end_found = [], 0
+  File.readlines(logs.first).select{|line|
+    if line =~ /^# /
+      break if end_found >= 1
+      end_found += 1
+    end
+    changes << line
+  }
+  vars['changes'] = changes.join
 
-    # Let's go!
-    $stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
-  end
+  # WLang template
+  template = File.expand_path('../debug_mail.txt', __FILE__)
 
-rescue LoadError
-  task :debug_mail do
-    abort "wlang is not available. Try 'gem install wlang'"
-  end
+  # Let's go!
+  $stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
 end

data/tasks/spec_test.rake

@@ -32,14 +32,6 @@ begin
     # Glob pattern to match files.
     t.pattern = "spec/**/*_spec.rb"
 
-    # By default, if there is a Gemfile, the generated command will include
-    # 'bundle exec'. Set this to true to ignore the presence of a Gemfile,
-    # and not add 'bundle exec' to the command.
-    t.skip_bundler = false
-
-    # Name of Gemfile to use
-    t.gemfile = "Gemfile"
-
     # Whether or not to fail Rake when an error occurs (typically when
     # examples fail).
     t.fail_on_error = true

data/templates/ruby/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.6.0 / 2011-12-09
+
+* Moved to rspec 1.7.0
+
 # 1.5.1 / 2011-08-31
 
 * The whole template has been cleaned so as to have proper line endings and no 

data/templates/ruby/noespec.yaml

@@ -190,10 +190,10 @@ variables:
     # Bundler is required for developers and is used by the Rakefile
     - {name: bundler,   version: "~> 1.0",   groups: [development]}
     # RSpec is required to run 'rake spec'. See tasks/spec.rake
-    - {name: rspec,     version: "~> 2.6.0", groups: [development]}
+    - {name: rspec,     version: "~> 2.7.0", groups: [development]}
     # YARD and BlueCloth are required to run 'rake yard'. See tasks/yard.rake
     - {name: yard,      version: "~> 0.7.2", groups: [development]}
-    - {name: bluecloth, version: "~> 2.1.0", 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]}
 

data/templates/ruby/short.yaml

@@ -46,9 +46,9 @@ variables:
     # Bundler is required for developers and is used by the Rakefile
     - {name: bundler,   version: "~> 1.0",   groups: [development]}
     # RSpec is required to run 'rake spec'. See tasks/spec.rake
-    - {name: rspec,     version: "~> 2.6.0", groups: [development]}
+    - {name: rspec,     version: "~> 2.7.0", groups: [development]}
     # YARD and BlueCloth are required to run 'rake yard'. See tasks/yard.rake
     - {name: yard,      version: "~> 0.7.2", groups: [development]}
-    - {name: bluecloth, version: "~> 2.1.0", 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]}

data/templates/ruby/src/Rakefile

@@ -19,5 +19,5 @@ task :default => :test
 # See .rake files there for complete documentation.
 #
 Dir["tasks/*.rake"].each do |taskfile|
-  instance_eval File.read(taskfile), taskfile
+  load taskfile
 end

data/templates/ruby/src/tasks/debug_mail.rake

@@ -31,48 +31,45 @@
 #     tasks/debug_mail.txt:
 #       safe-override: false
 #
-begin
-  require 'wlang'
+desc "Debug the release announcement mail"
+task :debug_mail do
+  begin
+    require 'wlang'
+  rescue LoadError
+    abort "wlang is not available. Try 'gem install wlang'"
+  end
   require 'yaml'
 
-  desc "Debug the release announcement mail"
-  task :debug_mail do
-    # Check that a .noespec file exists
-    noespec_file = File.expand_path('../../!{lower}.noespec', __FILE__)
-    unless File.exists?(noespec_file)
-      raise "Unable to find .noespec project file, sorry."
-    end
-
-    # Load it as well as variables and options
-    noespec = YAML::load(File.read(noespec_file))
-    vars = noespec['variables'] || {}
+  # Check that a .noespec file exists
+  noespec_file = File.expand_path('../../!{lower}.noespec', __FILE__)
+  unless File.exists?(noespec_file)
+    raise "Unable to find .noespec project file, sorry."
+  end
 
-    # Changes are taken from CHANGELOG
-    logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
-    unless logs.size == 1
-      abort "Unable to find a changelog file"
-    end
+  # Load it as well as variables and options
+  noespec = YAML::load(File.read(noespec_file))
+  vars = noespec['variables'] || {}
 
-    # Load interesting changesets
-    changes, end_found = [], 0
-    File.readlines(logs.first).select{|line|
-      if line =~ !{rake_tasks.debug_mail.rx_changelog_sections}
-        break if end_found >= +{rake_tasks.debug_mail.nb_changelog_sections}
-        end_found += 1
-      end
-      changes << line
-    }
-    vars['changes'] = changes.join
+  # Changes are taken from CHANGELOG
+  logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
+  unless logs.size == 1
+    abort "Unable to find a changelog file"
+  end
 
-    # WLang template
-    template = File.expand_path('../debug_mail.txt', __FILE__)
+  # Load interesting changesets
+  changes, end_found = [], 0
+  File.readlines(logs.first).select{|line|
+    if line =~ !{rake_tasks.debug_mail.rx_changelog_sections}
+      break if end_found >= +{rake_tasks.debug_mail.nb_changelog_sections}
+      end_found += 1
+    end
+    changes << line
+  }
+  vars['changes'] = changes.join
 
-    # Let's go!
-    $stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
-  end
+  # WLang template
+  template = File.expand_path('../debug_mail.txt', __FILE__)
 
-rescue LoadError
-  task :debug_mail do
-    abort "wlang is not available. Try 'gem install wlang'"
-  end
+  # Let's go!
+  $stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
 end

data/templates/ruby/src/tasks/spec_test.rake

@@ -32,14 +32,6 @@ begin
     # Glob pattern to match files.
     t.pattern = +{rake_tasks.spec_test.pattern}
 
-    # By default, if there is a Gemfile, the generated command will include
-    # 'bundle exec'. Set this to true to ignore the presence of a Gemfile,
-    # and not add 'bundle exec' to the command.
-    t.skip_bundler = +{rake_tasks.spec_test.skip_bundler}
-
-    # Name of Gemfile to use
-    t.gemfile = +{rake_tasks.spec_test.gemfile}
-
     # Whether or not to fail Rake when an error occurs (typically when
     # examples fail).
     t.fail_on_error = +{rake_tasks.spec_test.fail_on_error}

metadata

@@ -1,146 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: noe
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 1
-  version: 1.5.1
 platform: ruby
-authors: 
+authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-12-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &79595140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  version_requirements: *id001
-  name: rake
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *79595140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &79594890 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
-  version_requirements: *id002
-  name: rspec
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *79594890
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &79594650 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.7.2
-  version_requirements: *id003
-  name: yard
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *79594650
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &79594400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  version_requirements: *id004
-  name: bluecloth
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 2.2.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *79594400
+- !ruby/object:Gem::Dependency
+  name: wlang
+  requirement: &79594150 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.10.2
-  version_requirements: *id005
-  name: wlang
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *79594150
+- !ruby/object:Gem::Dependency
+  name: quickl
+  requirement: &79593920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.4.1
-  version_requirements: *id006
-  name: quickl
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *79593920
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &79593660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
-  version_requirements: *id007
-  name: highline
-  prerelease: false
   type: :runtime
-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 via meta-information provided by a .noespec yaml file. In contrast to other tools, Noe is not specific to certain kinds of products. Even if Noe comes bundled with a default template to develop gem libraries, writing your own template is possible and even simple!
-email: 
+  prerelease: false
+  version_requirements: *79593660
+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
+  via meta-information provided by a .noespec yaml file. In contrast to other tools,
+  Noe is not specific to certain kinds of products. Even if Noe comes bundled with
+  a default template to develop gem libraries, writing your own template is possible
+  and even simple!
+email:
 - blambeau@gmail.com
-executables: 
+executables:
 - noe
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 - LICENCE.md
-files: 
+files:
 - .gemtest
 - bin/noe
 - CHANGELOG.md
@@ -245,46 +209,35 @@ files:
 - templates/ruby/src/.gitignore
 homepage: http://github.com/blambeau/noe
 licenses: []
-
-post_install_message: |
-  Noe successfully installed!
-  
-  What's next?
-    - 'noe help install' for configuration and default templates
-    - 'noe prepare --template=ruby hello_world'
-  
-  Thank you for using Noe, enjoy!
-
+post_install_message: ! "Noe successfully installed!\n\nWhat's next?\n  - 'noe help
+  install' for configuration and default templates\n  - 'noe prepare --template=ruby
+  hello_world'\n\nThank you for using Noe, enjoy!\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -670464717
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Noe is a simple, general-purpose and extensible skeleton generator from project templates
-test_files: 
+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