noe 1.7.3 → 1.7.4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.7.4 / 2012-02-26
+
+  * Avoid creating the project folder if 'noe prepare' is going to fail due to unknown
+    template or layout.
+  * Enhance an error message when unknown template or layout.
+  * Noe uses the epath gem for easy file management. Noe's public API(s) should not be
+    affected at all by this change.
+
 # 1.7.3 / 2012-02-25
 
   * Most important changes are in default ruby skeleton, see its own CHANGELOG

data/Gemfile

@@ -2,21 +2,22 @@ source 'http://rubygems.org'
 
 group :test do
   gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.7.0"
+  gem "rspec", "~> 2.9"
 end
 
 group :release do
   gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.7.0"
+  gem "rspec", "~> 2.9"
 end
 
 group :doc do
   gem "yard", "~> 0.7.2"
-  gem "bluecloth", "~> 2.2.0"
+  gem "bluecloth", "~> 2.2"
 end
 
 group :runtime do
   gem "wlang", "~> 0.10.2"
   gem "quickl", "~> 0.4.1"
-  gem "highline", "~> 1.6.0"
+  gem "highline", "~> 1.6"
+  gem "epath", "~> 0.1.1"
 end

data/Gemfile.lock

@@ -3,29 +3,31 @@ GEM
   specs:
     bluecloth (2.2.0)
     diff-lcs (1.1.3)
-    highline (1.6.2)
-    quickl (0.4.1)
+    epath (0.1.1)
+    highline (1.6.11)
+    quickl (0.4.3)
     rake (0.9.2.2)
-    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.7.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     wlang (0.10.2)
-    yard (0.7.2)
+    yard (0.7.5)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  bluecloth (~> 2.2.0)
-  highline (~> 1.6.0)
+  bluecloth (~> 2.2)
+  epath (~> 0.1.1)
+  highline (~> 1.6)
   quickl (~> 0.4.1)
   rake (~> 0.9.2)
-  rspec (~> 2.7.0)
+  rspec (~> 2.9)
   wlang (~> 0.10.2)
   yard (~> 0.7.2)

data/Rakefile

@@ -1,7 +1,3 @@
-# Dynamically load the gem spec
-$gemspec_file = File.expand_path('../noe.gemspec', __FILE__)
-$gemspec      = Kernel.eval(File.read($gemspec_file))
-
 # We run tests by default
 task :default => :test
 

data/lib/noe.rb

@@ -6,7 +6,6 @@ end # module Noe
 require 'noe/version'
 require 'noe/loader'
 require 'yaml'
-require 'fileutils'
 require 'noe/ext/array'
 require 'noe/ext/hash'
 require 'noe/config'

data/lib/noe/commons.rb

@@ -4,7 +4,7 @@ module Noe
     # Install options
     def self.add_common_options(opt)
       opt.on_tail("--version", "Show version") do
-        raise Quickl::Exit, "#{File.basename($0 || 'noe')} #{Noe::VERSION} (c) 2011, Bernard Lambeau"
+        raise Quickl::Exit, "noe #{Noe::VERSION} (c) 2011, Bernard Lambeau"
       end
       opt.on_tail('--help', "Show detailed help") do 
         raise Quickl::Help
@@ -21,15 +21,15 @@ module Noe
     end
     
     def template(name = config.default)
-      Template.new(File.join(templates_dir, name))
+      Template.new(templates_dir/name)
     end
     
     def find_noespec_file(args)
       # Find spec file
       spec_file = if args.size == 1
-        Quickl.valid_read_file!(args.first)
+        Path(Quickl.valid_read_file!(args.first))
       else
-        spec_files = Dir['*.noespec']
+        spec_files = Path.glob('*.noespec')
         if spec_files.size > 1
           raise Noe::Error, "Ambiguous request, multiple specs: #{spec_files.join(', ')}"
         end

data/lib/noe/config.rb

@@ -2,10 +2,10 @@ module Noe
   class Config
     
     # Path to the default configuration file
-    DEFAULT_CONFIG_FILE = File.expand_path('../default.yaml', __FILE__)
+    DEFAULT_CONFIG_FILE = Path.relative('default.yaml')
     
     # Default configuration hash
-    DEFAULT_CONFIG = YAML::load(File.read(DEFAULT_CONFIG_FILE)).merge(
+    DEFAULT_CONFIG = DEFAULT_CONFIG_FILE.load.merge(
       'config_file' => DEFAULT_CONFIG_FILE,
       'version'     => Noe::VERSION)
     
@@ -22,7 +22,7 @@ module Noe
       case arg
       when Hash
         super
-      when String
+      when Path
         __load_from_file(arg)
       when NilClass
         super(DEFAULT_CONFIG)
@@ -34,13 +34,13 @@ module Noe
     # Loads configuration from YAML file
     def self.__load_from_file(file)
       # check loaded file
-      file = File.expand_path(file)
-      unless File.file?(file) and File.readable?(file)
+      file = file.expand
+      unless file.file? and file.readable?
         raise Noe::Error, "Not a file or not readable: #{file}"
       end
 
       # load YAML
-      loaded = YAML::load(File.read(file))
+      loaded = YAML::load(file.read)
       unless loaded.is_a?(Hash)
         raise Noe::Error, "Corrupted or invalid config file: #{file}"
       end
@@ -50,8 +50,8 @@ module Noe
       config = Config.new(config_hash)
       
       # Some sanity check
-      templates_dir = config.templates_dir
-      unless File.directory?(templates_dir) and File.readable?(templates_dir)
+      templates_dir = Path(config.templates_dir)
+      unless templates_dir.dir? and templates_dir.readable?
         raise Noe::Error, "Invalid noe config, not a directory or unreadable: #{templates_dir}"
       end
       
@@ -66,7 +66,7 @@ module Noe
     # Returns folder where templates are located. Always returns an 
     # absolute path.
     def templates_dir
-      @templates_dir ||= File.expand_path(config['templates-dir'], File.dirname(file))
+      @templates_dir ||= Path(config['templates-dir']).expand(file.dir)
     end
     
     # Returns expected noe's version

data/lib/noe/go.rb

@@ -127,8 +127,8 @@ module Noe
       
       # Checks if one is a file and the other a directory or the inverse
       def kind_clash?(entry, relocated)
-        (entry.file? and File.directory?(relocated)) or
-        (entry.directory? and File.file?(relocated))
+        (entry.file? and relocated.directory?) or
+        (entry.directory? and relocated.file?)
       end
       
       def build_one_directory(entry, variables)
@@ -137,7 +137,7 @@ module Noe
         todo = []
         
         skipped = false
-        if File.exists?(relocated) 
+        if relocated.exists?
           # file exists already exists, check what can be done!
           if kind_clash?(entry, relocated)
             if interactive?
@@ -175,7 +175,7 @@ module Noe
         todo = []
         
         skipped = false
-        if File.exists?(relocated)
+        if relocated.exists?
           # name clash, the file exists
           if adds_only?
             # file exists and we are only allowed to add new things
@@ -227,7 +227,7 @@ module Noe
         
         # Load spec now
         spec_file = find_noespec_file(args)
-        spec = YAML::load(File.read(spec_file))
+        spec = YAML::load(spec_file.read)
         template = template(spec['template-info']['name'])
         template.merge_spec(spec)
         variables = template.variables
@@ -272,7 +272,7 @@ module Noe
       class MkDir < DoSomething
 
         def run
-          FileUtils.mkdir relocated
+          relocated.mkdir
         end
         
         def to_s
@@ -284,7 +284,7 @@ module Noe
       class Rm < DoSomething
 
         def run
-          FileUtils.rm_rf relocated
+          relocated.rm_rf
         end
         
         def to_s
@@ -296,11 +296,11 @@ module Noe
       class FileInstantiate < DoSomething
         
         def run
-          File.open(relocated, 'w') do |out|
+          relocated.open('w') do |out|
             dialect = entry.wlang_dialect
             braces = entry.wlang_braces
             variables.methodize!
-            out << WLang::file_instantiate(entry.realpath, variables, dialect, braces)
+            out << WLang::file_instantiate(entry.realpath.to_s, variables, dialect, braces)
           end
         end
         

data/lib/noe/install.rb

@@ -1,4 +1,3 @@
-require 'fileutils'
 module Noe
   class Main
     #
@@ -43,39 +42,37 @@ module Noe
         if args.size > 1
           raise Quickl::InvalidArgument, "Needless arguments: #{args[1..-1].join(' ')}"
         end
-        folder = args.first || ENV['HOME']
+        folder = Path(args.first || Path.home)
         
-        noerc_file = File.join(folder, '.noerc')
-        noe_folder = File.join(folder, '.noe')
+        noerc_file = folder/'.noerc'
+        noe_folder = folder/'.noe'
 
         # generate .noerc
-        if File.exists?(noerc_file) and not(force)
+        if noerc_file.exists? and not(force)
           raise Noe::Error, "#{noerc_file} already exists, use --force to override"
         end
-        File.open(noerc_file, 'w') do |out|
-          def_config = File.join(File.dirname(__FILE__), 'config.yaml')
-          context = { :templates_dir => noe_folder }
+        noerc_file.open('w') do |out|
+          def_config = Path.relative('config.yaml').to_s
+          context = { :templates_dir => noe_folder.to_s }
           out << WLang::file_instantiate(def_config, context, 'wlang/active-string')
         end
         
         # generate .noe folder
-        unless File.exists?(noe_folder)
-          FileUtils.mkdir(noe_folder)
-        end
+        noe_folder.mkdir unless noe_folder.exists?
         
         # copy default templates
-        tdir = File.expand_path('../../../templates', __FILE__)
-        Dir[File.join(tdir, '*')].each do |tpl|
-          target = File.join(noe_folder, File.basename(tpl))
-          if File.exists?(target)
-            if force 
-              FileUtils.rm_rf target
+        tdir = Path.relative '../../templates'
+        tdir.each_child do |tpl|
+          target = noe_folder/tpl.basename
+          if target.exists?
+            if force
+              target.rm_rf
             else
               puts "#{target} already exists, use --force to override"
               next
             end
           end
-          FileUtils.cp_r tpl, noe_folder
+          tpl.cp_r(noe_folder)
         end
         
         # say something!

data/lib/noe/list.rb

@@ -29,7 +29,7 @@ module Noe
           raise Quickl::InvalidArgument, "Needless argument: #{args.join(', ')}"
         end
 
-        tpls = Dir[File.join(templates_dir, '**')].collect{|tpldir| Template.new(tpldir)}
+        tpls = templates_dir.glob('**').map { |tpldir| Template.new(tpldir) }
         columns = [:name, :version, :layouts, :summary]
         data = [ columns ] + tpls.collect{|tpl|
           begin

data/lib/noe/loader.rb

@@ -1,3 +1,4 @@
 require "wlang"
 require "quickl"
 require "highline"
+require "epath"

data/lib/noe/main.rb

@@ -38,8 +38,8 @@ module Noe
 
     # Finds the configuration file and loads automatically
     def find_config_file
-      in_home = File.join(ENV['HOME'], '.noerc')
-      File.file?(in_home) ? in_home : nil
+      in_home = Path.home/'.noerc'
+      in_home if in_home.file?
     end
     
     # Install options
@@ -47,7 +47,7 @@ module Noe
       # Set a specific configuration file to use
       opt.on('--config=FILE',
              'Use a specific config file (defaults to ~/.noerc)') do |f|
-        @config_file = Quickl.valid_read_file!(f)
+        @config_file = Path(Quickl.valid_read_file!(f))
       end
       # Show backtrace on error
       opt.on_tail("--backtrace", 

data/lib/noe/prepare.rb

@@ -1,4 +1,3 @@
-require 'fileutils'
 module Noe
   class Main
     #
@@ -85,13 +84,16 @@ module Noe
       end
       
       def generate_noespec_file(where)
-        if File.exists?(where) and not(force)
+        if where.exists? and not(force)
           raise Noe::Error, "File #{where} already exists, remove it first or set --force."
         else
           tpl = template
-          File.open(where, 'w') do |out|
-            context = {'template_name' => tpl.name}
-            out << WLang::file_instantiate(tpl.spec_layout_file(@layout), context, "wlang/active-text")
+          unless (parent = where.parent).exists?
+            parent.mkdir_p
+          end
+          where.open('w') do |out|
+            context = {'template_name' => tpl.name.to_s}
+            out << WLang::file_instantiate(tpl.spec_layout_file(@layout).to_s, context, "wlang/active-text")
           end 
         end
         where
@@ -101,12 +103,11 @@ module Noe
         pname, where = nil, nil
         case args.size
         when 0
-          pname = File.basename(File.expand_path('.'))
-          where = generate_noespec_file("#{pname}.noespec")
+          pname = Path.getwd.basename
+          where = generate_noespec_file(pname.add_ext(".noespec"))
         when 1
-          pname = args.first
-          FileUtils.mkdir(pname) unless File.exists?(pname)
-          where = generate_noespec_file(File.join(pname, "#{pname}.noespec"))
+          pname = Path(args.first)
+          where = generate_noespec_file(pname/pname.add_ext(".noespec"))
         else
           raise Quickl::Help unless args.size > 1
         end

data/lib/noe/show_spec.rb

@@ -34,7 +34,7 @@ module Noe
       def execute(args)
         raise Quickl::Help if args.size > 1
         spec_file = find_noespec_file(args)
-        spec = YAML::load(File.read(spec_file))
+        spec = YAML::load(spec_file.read)
         template = template(spec['template-info']['name'])
         template.merge_spec(spec)
         puts template.to_yaml

data/lib/noe/template.rb

@@ -16,32 +16,32 @@ module Noe
   
     # Loads the template from its folder
     def __load
-      if File.file?(spec_file) and File.readable?(spec_file)
-        @spec = YAML::load(File.read(spec_file))
+      if spec_file.file? and spec_file.readable?
+        @spec = YAML::load(spec_file.read)
       else
         raise Noe::Error, "Unable to find template: #{spec_file}"
       end
     end
     
     def spec_layout_file(layout = 'noespec')
-      file = File.join(folder, "#{layout}.yaml")
-      if File.exists?(file)
+      file = folder/"#{layout}.yaml"
+      if file.exists?
         file
       else
-        puts "On #{file}"
-        raise Noe::Error, "Unknown specification layout: #{layout}, try 'noe list'"
+        $stderr.puts "Config file: #{file}"
+        raise Noe::Error, "No such file or directory: #{file}, try 'noe list'"
       end
     end
     alias :spec_file :spec_layout_file
     
     # Returns an array with available layout names
     def layouts
-      Dir[File.join(folder, '*.yaml')].collect{|f| File.basename(f, '.yaml')}
+      folder.glob('*.yaml').map { |file| file.base.to_s }
     end
     
     # Merges another spec file inside this template
     def merge_spec_file(file)
-      merge_spec YAML::load(File.read(spec_file))
+      merge_spec YAML::load(spec_file.read)
     end
     
     # Merges template spec with another spec given from a Hash
@@ -51,7 +51,7 @@ module Noe
     
     # Returns template name  
     def name
-      File.basename(folder)
+      folder.basename
     end
     
     # Returns template summary
@@ -80,23 +80,18 @@ module Noe
     
     # Returns path to the sources folder
     def src_folder
-      File.join(folder, "src")
-    end
-    
-    # Ignore some file?
-    def ignore?(file)
-      ['.', '..'].include? File.basename(file)
+      folder/"src"
     end
     
     # Returns an entry for a given relative path
     def entry(*paths)
-      Entry.new(self, paths.join(File::PATH_SEPARATOR))
+      Entry.new(self, paths.join(File::SEPARATOR))
     end
     
     # Returns manifest Hash for a given entry
     def manifest_for(entry)
       manifest = spec['template-info']['manifest'] || {}
-      manifest[entry.path] || {
+      manifest[entry.path.to_s] || {
         'description'   => "No description for #{entry.path}",
         'safe-override' => false
       } 
@@ -110,11 +105,9 @@ module Noe
         entry = Entry.new(self, nil)
       end  
       if entry.directory?
-        Dir.foreach(entry.realpath) do |child|
+        entry.realpath.each_child(false) do |child|
           childentry = entry.child_entry(child)
-          unless ignore?(childentry.realpath)
-            visit(childentry, &block)
-          end
+          visit(childentry, &block)
         end
       end
     end
@@ -139,31 +132,30 @@ module Noe
       # Creates an entry instance
       def initialize(template, path)
         @template = template
-        @path = path
+        @path = Path(path)
       end
       
       # Returns real absolute path of the entry
       def realpath
-        path.nil? ? template.src_folder : File.join(template.src_folder, path)
+        template.src_folder/path
       end
       
       # Returns entry name
       def name
-        File.basename(realpath)
+        realpath.basename
       end
       
       # Relocate the path according to variables
       def relocate(variables = template.variables)
-        path.split(File::PATH_SEPARATOR).
-             collect{|v| rename_one(variables, v)}.
-             join(File::PATH_SEPARATOR)
+        # path must be relative (or the initial / might be lost)
+        Path(*path.each_filename.map { |v| rename_one(variables, v) })
       end
       
       # Returns the target name, according to some variables
       def rename_one(variables, name = self.name)
-        if name =~ /__([a-z]+)__/
+        if name.to_s =~ /__([a-z]+)__/
           if x = variables[$1]
-            name.gsub(/__([a-z]+)__/, x)
+            Path(name.to_s.gsub(/__([a-z]+)__/, x))
           else
             raise Noe::Error, "Missing variable #{$1}"
           end
@@ -174,17 +166,17 @@ module Noe
       
       # Is the entry a file?
       def file?
-        File.file?(realpath)
+        realpath.file?
       end
       
       # Is the entry a directory?
       def directory?
-        File.directory?(realpath)
+        realpath.directory?
       end
       
       # Builds an child entry for a given name
       def child_entry(name)
-        template.entry(path.nil? ? name : File.join(path, name))
+        template.entry(path/name)
       end
       
       # Returns the hash with the manifest for this entry
@@ -202,7 +194,7 @@ module Noe
       
       # Infers the wlang dialect to use for the entry
       def self.infer_wlang_dialect(uri, default = nil)
-        res = case d = WLang::infer_dialect(uri)
+        res = case d = WLang::infer_dialect(uri.to_s)
           when nil
             nil
           when /^wlang/

data/lib/noe/version.rb

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

data/noe.gemspec

@@ -124,12 +124,13 @@ 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.7.0")
+  s.add_development_dependency("rspec", "~> 2.9")
   s.add_development_dependency("yard", "~> 0.7.2")
-  s.add_development_dependency("bluecloth", "~> 2.2.0")
+  s.add_development_dependency("bluecloth", "~> 2.2")
   s.add_dependency("wlang", "~> 0.10.2")
   s.add_dependency("quickl", "~> 0.4.1")
-  s.add_dependency("highline", "~> 1.6.0")
+  s.add_dependency("highline", "~> 1.6")
+  s.add_dependency("epath", "~> 0.1.1")
 
   # The version of ruby required by this gem
   #

data/noe.noespec

@@ -10,7 +10,7 @@ template-info:
 variables:
   lower: noe
   upper: Noe
-  version: 1.7.3
+  version: 1.7.4
   summary: 
     Noe is a simple, general-purpose and extensible skeleton generator from project templates
   description:
@@ -28,12 +28,13 @@ variables:
     - http://revision-zero.org/noe
   dependencies: 
     - {name: rake,         version: "~> 0.9.2",  groups: [test, release]}
-    - {name: rspec,        version: "~> 2.7.0",  groups: [test, release]}
+    - {name: rspec,        version: "~> 2.9",    groups: [test, release]}
     - {name: yard,         version: "~> 0.7.2",  groups: [doc          ]}
-    - {name: bluecloth,    version: "~> 2.2.0",  groups: [doc          ]}
+    - {name: bluecloth,    version: "~> 2.2",    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      ]}
+    - {name: highline,     version: "~> 1.6",    groups: [runtime      ]}
+    - {name: epath,        version: "~> 0.1.1",  groups: [runtime      ]}
   rake_tasks: 
     spec_test: 
       pattern: spec/**/*_spec.rb

data/spec/integration/go/go_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 describe 'noe go' do
   
   let(:go){ Noe::Main::Go.new }

data/spec/integration/spaces_spec.rb

@@ -1,18 +1,18 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 describe 'line endings and trailing spaces' do
   it 'all files should end with a single \n and have no trailing spaces' do
     begin
-      dir = File.expand_path('../../fixtures', __FILE__)
-      project_dir = dir + '/test'
-      Dir.chdir(dir) do
+      dir = Path.relative '../fixtures'
+      project_dir = dir / 'test'
+      dir.chdir do
         Noe::Main.run(%w{prepare --silent test})
       end
-      Dir.chdir(project_dir) do
-        FileUtils.cp dir+'/test.noespec', project_dir
+      project_dir.chdir do
+        (dir/'test.noespec').cp(project_dir)
         Noe::Main.run(['go'])
-        Dir["**/*"].each { |file|
-          if File.file?(file) and File.size(file) > 0
-            contents = File.read(file)
+        Path.glob("**/*") { |file|
+          if file.file? and !file.empty?
+            contents = file.read
             tail = contents[-3..-1]
             contents.each_line.with_index { |line, i|
               line.should match(/(?:^|\S)$/),
@@ -24,7 +24,7 @@ describe 'line endings and trailing spaces' do
         }
       end
     ensure
-      FileUtils.rm_r(project_dir) if File.exist? project_dir
+      project_dir.rm_r if project_dir.exist?
     end
   end
 end

data/spec/{integration/spec_helper.rb → spec_helper.rb}

@@ -1,3 +1,3 @@
-$noe_root = File.expand_path('../../../', __FILE__)
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'noe'
+$noe_root = Path.dir.parent

data/spec/unit/config/new_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Config.new" do
     
@@ -14,7 +14,7 @@ module Noe
     end # without argument
     
     context 'with a hash' do
-      let(:hash){ {'config_file' => File.expand_path("../config1.yaml", __FILE__)} }
+      let(:hash){ {'config_file' => Path.relative("config1.yaml")} }
       subject{ Config.new(hash) }
       
       it 'should create a configuration instance' do
@@ -30,14 +30,14 @@ module Noe
     context 'with an invalid file' do
       
       it 'should raise a Noe::Error' do
-        file = File.expand_path("../unexistsing.yaml", __FILE__)
+        file = Path.relative("unexistsing.yaml")
         lambda{ Config.new(file) }.should raise_error(Noe::Error)
       end
       
     end # with an invalid file
     
     context 'with an valid file' do
-      let(:file){ File.expand_path("../config1.yaml", __FILE__) }
+      let(:file){ Path.relative("config1.yaml") }
       subject{ Config.new(file) }
       
       it 'should create a valid configuration' do

data/spec/unit/config/templates_dir_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Config#templates_dir" do
     
@@ -8,24 +8,24 @@ module Noe
       let(:config){ Config.new }
       
       it "should be Noe's template dir" do
-        subject.should == File.join($noe_root, "templates")
+        subject.should == $noe_root/"templates"
       end
       
     end # on default config
     
     context 'when a relative path is used' do
-      let(:file)  { File.expand_path("../config1.yaml", __FILE__) }
+      let(:file)  { Path.relative("config1.yaml") }
       let(:config){ Config.new(file)                              }
       
       it "should be an absolute path" do
-        subject.should == File.expand_path("../templates", __FILE__)
+        subject.should == Path.relative("templates")
       end
       
     end # relative path
     
     context 'when an absolute path is used' do
-      let(:file) { File.expand_path("../config1.yaml", __FILE__) }
-      let(:tdir) { File.expand_path("../templates", __FILE__)    }
+      let(:file) { Path.relative("config1.yaml") }
+      let(:tdir) { Path.relative("templates")    }
       let(:hash) { { "config_file" => file, "templates-dir" => tdir } }
       let(:config){ Config.new(hash) }
       

data/spec/unit/ext/hash/methodize_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Hash#methodize!" do
     

data/spec/unit/ext/hash/noe_merge_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Hash#noe_merge" do
     

data/spec/unit/noe_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 describe Noe do
   
   it "should have a version number" do

data/spec/unit/template/entry/infer_wlang_dialect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Template::Entry#infer_wlang_dialect" do
     

data/spec/unit/template/entry/relocate_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Template::Entry#relocate" do
     
     let(:template){ 
-      Template.new(File.expand_path('../../../../../templates/ruby', __FILE__)) 
+      Template.new(Path.relative('../../../../templates/ruby'))
     }
     let(:vars){ 
       {"lower" => "project"} 
@@ -14,27 +14,27 @@ module Noe
     
     describe "when nothing has to change" do
       let(:entry){ template.entry('.gitignore') }
-      it{ should == ".gitignore" }
+      it{ should == Path(".gitignore") }
     end
 
     describe "when exactly a replacement" do
       let(:entry){ template.entry("__lower__") }
-      it { should == "project" }
+      it { should == Path("project") }
     end
     
     describe "when a replacement inside something else" do
       let(:entry){ template.entry("__lower___spec.rb") }
-      it { should == "project_spec.rb" }
+      it { should == Path("project_spec.rb") }
     end
     
     describe "when no replace and sub file" do
       let(:entry){ template.entry("lib", "README.md") }
-      it { should == ["lib", "README.md"].join(File::PATH_SEPARATOR)  }
+      it { should == Path("lib/README.md")  }
     end
     
     describe "when no replace and sub file with replacement" do
       let(:entry){ template.entry("lib", "__lower__.rb") }
-      it { should == ["lib", "project.rb"].join(File::PATH_SEPARATOR)  }
+      it { should == Path("lib/project.rb")  }
     end
 
   end 

data/spec/unit/template/entry/rename_one_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 module Noe
   describe "Template::Entry#rename_one" do
     
     let(:template){ 
-      Template.new(File.expand_path('../../../../../templates/ruby', __FILE__)) 
+      Template.new(Path.relative('../../../../templates/ruby'))
     }
     let(:vars){ 
       {"lower" => "project"} 
@@ -14,17 +14,17 @@ module Noe
     
     describe "when nothing has to change" do
       let(:entry){ template.entry("project") }
-      it { should == "project" }
+      it { should == Path("project") }
     end
     
     describe "when exactly a replacement" do
       let(:entry){ template.entry("__lower__") }
-      it { should == "project" }
+      it { should == Path("project") }
     end
     
     describe "when a replacement inside something else" do
       let(:entry){ template.entry("__lower___spec.rb") }
-      it { should == "project_spec.rb" }
+      it { should == Path("project_spec.rb") }
     end
     
   end

data/tasks/gem.rake

@@ -25,13 +25,18 @@
 #
 begin
   require 'rubygems/package_task'
-  Gem::PackageTask.new($gemspec) do |t|
+
+  # Dynamically load the gem spec
+  gemspec_file = File.expand_path('../../noe.gemspec', __FILE__)
+  gemspec      = Kernel.eval(File.read(gemspec_file))
+
+  Gem::PackageTask.new(gemspec) do |t|
 
     # Name of the package
-    t.name = $gemspec.name
+    t.name = gemspec.name
 
     # Version of the package
-    t.version = $gemspec.version
+    t.version = gemspec.version
 
     # Directory used to store the package files
     t.package_dir = "pkg"
@@ -49,7 +54,7 @@ begin
     t.need_zip = false
 
     # List of files to be included in the package.
-    t.package_files = $gemspec.files
+    t.package_files = gemspec.files
 
     # Tar command for gzipped or bzip2ed archives.
     t.tar_command = "tar"

data/templates/ruby/src/Rakefile

@@ -1,7 +1,3 @@
-# Dynamically load the gem spec
-$gemspec_file = File.expand_path('../!{lower}.gemspec', __FILE__)
-$gemspec      = Kernel.eval(File.read($gemspec_file))
-
 # We run tests by default
 task :default => :test
 

data/templates/ruby/src/spec/test___lower__.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 describe !{upper} do
 
   it "should have a version number" do

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

@@ -25,13 +25,18 @@
 #
 begin
   require 'rubygems/package_task'
-  Gem::PackageTask.new($gemspec) do |t|
+
+  # Dynamically load the gem spec
+  gemspec_file = File.expand_path('../../!{lower}.gemspec', __FILE__)
+  gemspec      = Kernel.eval(File.read(gemspec_file))
+
+  Gem::PackageTask.new(gemspec) do |t|
 
     # Name of the package
-    t.name = $gemspec.name
+    t.name = gemspec.name
 
     # Version of the package
-    t.version = $gemspec.version
+    t.version = gemspec.version
 
     # Directory used to store the package files
     t.package_dir = +{rake_tasks.gem.package_dir}
@@ -49,7 +54,7 @@ begin
     t.need_zip = +{rake_tasks.gem.need_zip}
 
     # List of files to be included in the package.
-    t.package_files = $gemspec.files
+    t.package_files = gemspec.files
 
     # Tar command for gzipped or bzip2ed archives.
     t.tar_command = +{rake_tasks.gem.tar_command}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noe
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000Z
+date: 2012-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70417630 !ruby/object:Gem::Requirement
+  requirement: &70144303386380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70417630
+  version_requirements: *70144303386380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70417350 !ruby/object:Gem::Requirement
+  requirement: &70144303385840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70417350
+  version_requirements: *70144303385840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70417050 !ruby/object:Gem::Requirement
+  requirement: &70144303367700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70417050
+  version_requirements: *70144303367700
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70416770 !ruby/object:Gem::Requirement
+  requirement: &70144303367020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70416770
+  version_requirements: *70144303367020
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &70416520 !ruby/object:Gem::Requirement
+  requirement: &70144303366320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *70416520
+  version_requirements: *70144303366320
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &70416220 !ruby/object:Gem::Requirement
+  requirement: &70144303365540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,18 +76,29 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70416220
+  version_requirements: *70144303365540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70415950 !ruby/object:Gem::Requirement
+  requirement: &70144303364940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70415950
+  version_requirements: *70144303364940
+- !ruby/object:Gem::Dependency
+  name: epath
+  requirement: &70144303364260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70144303364260
 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
@@ -109,21 +120,21 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- lib/noe/help.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/config.yaml
 - lib/noe/default.yaml
-- lib/noe/ext/hash.rb
 - lib/noe/ext/array.rb
-- lib/noe/config.yaml
+- 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/show_spec.rb
+- lib/noe/template.rb
 - lib/noe/version.rb
 - lib/noe.rb
 - LICENCE.md
@@ -132,52 +143,51 @@ files:
 - noe.noespec
 - Rakefile
 - README.md
-- spec/integration/spec_helper.rb
-- spec/integration/spaces_spec.rb
-- spec/integration/go/go_spec.rb
+- spec/fixtures/test.noespec
+- spec/fixtures/typitpl/noespec.yaml
+- spec/fixtures/typitpl/src/README.txt
 - 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.rb
-- spec/unit/template/entry/infer_wlang_dialect_spec.rb
+- spec/integration/go/go_spec.rb
+- spec/integration/spaces_spec.rb
+- spec/spec_helper.rb
 - spec/unit/config/config1.yaml
 - spec/unit/config/new_spec.rb
 - spec/unit/config/templates_dir_spec.rb
-- spec/unit/noe_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
+- 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
 - tasks/debug_mail.rake
-- tasks/yard.rake
+- tasks/debug_mail.txt
 - tasks/gem.rake
 - tasks/spec_test.rake
 - tasks/unit_test.rake
-- tasks/debug_mail.txt
-- templates/ruby/noespec.yaml
+- tasks/yard.rake
 - templates/ruby/CHANGELOG.md
+- templates/ruby/noespec.yaml
 - templates/ruby/README.md
-- templates/ruby/src/CHANGELOG.md
-- templates/ruby/src/README.md
-- templates/ruby/src/Manifest.txt
-- templates/ruby/src/Rakefile
+- templates/ruby/short.yaml
 - templates/ruby/src/__lower__.gemspec
-- templates/ruby/src/lib/__lower__.rb
+- templates/ruby/src/CHANGELOG.md
+- templates/ruby/src/Gemfile
 - 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/yard.rake
+- templates/ruby/src/tasks/debug_mail.txt
 - templates/ruby/src/tasks/gem.rake
 - templates/ruby/src/tasks/spec_test.rake
 - templates/ruby/src/tasks/unit_test.rake
-- templates/ruby/src/tasks/debug_mail.txt
-- templates/ruby/src/Gemfile
-- templates/ruby/short.yaml
+- templates/ruby/src/tasks/yard.rake
 - templates/ruby/src/.travis.yml
 - templates/ruby/src/.gitignore
 homepage: http://github.com/blambeau/noe
@@ -202,27 +212,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+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:
-- spec/integration/spec_helper.rb
-- spec/integration/spaces_spec.rb
-- spec/integration/go/go_spec.rb
+- spec/fixtures/test.noespec
+- spec/fixtures/typitpl/noespec.yaml
+- spec/fixtures/typitpl/src/README.txt
 - 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.rb
-- spec/unit/template/entry/infer_wlang_dialect_spec.rb
+- spec/integration/go/go_spec.rb
+- spec/integration/spaces_spec.rb
+- spec/spec_helper.rb
 - spec/unit/config/config1.yaml
 - spec/unit/config/new_spec.rb
 - spec/unit/config/templates_dir_spec.rb
-- spec/unit/noe_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
+- 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

data/spec/unit/spec_helper.rb

@@ -1,3 +0,0 @@
-$noe_root = File.expand_path('../../../', __FILE__)
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'noe'