0
@@ -1,12 +1,12 @@
0
-module <%= name %>
0
+module <%= @name %>
0
 
0
   module Configurations
0
 
0
     class Development
0
 
0
-      database :host => 'localhost', :adapter => 'sqlite', :database => '<%= name.downcase %>'
0
+      database :host => 'localhost', :adapter => 'sqlite', :database => '<%= @name.downcase %>'
0
 
0
-      reloadable [ <%= name %> ]
0
+      reloadable [ <%= @name %> ]
0
 
0
       log :level => :debug
0
 

0
@@ -1,4 +1,4 @@
0
-module <%= name %>
0
+module <%= @name %>
0
 
0
   module Configurations
0
 

0
@@ -1,10 +1,10 @@
0
-module <%= name %>
0
+module <%= @name %>
0
 
0
   module Configurations
0
 
0
     class Production < Default
0
 
0
-      database :host => 'localhost', :adapter => 'mysql', :database => '<%= name.downcase %>',
0
+      database :host => 'localhost', :adapter => 'mysql', :database => '<%= @name.downcase %>',
0
         :user => 'root', :password => ''
0
 
0
       reloadable []

0
@@ -1,3 +1,3 @@
0
-module <%= name %>
0
+module <%= @name %>
0
   include Waves::Foundations::Default
0
 end

0
@@ -18,7 +18,7 @@ end
0
 
0
 
0
 require 'rubygems'
0
-require 'erubis'
0
+require 'genitor'
0
 require 'extensions/all'
0
 begin
0
   require 'utilities/string'
0
@@ -32,32 +32,24 @@ include FileUtils
0
 # are we calling this script from within the waves framework source?
0
 script_path = File.expand_path(__FILE__)
0
 WAVES_SRC = File.dirname(File.dirname(script_path))
0
-IN_WAVES_SRC = Dir.pwd.match(WAVES_SRC) ? true : false
0
-
0
 
0
 puts "** Creating new Waves application ..."
0
+
0
+# Determine path to template
0
 template = begin
0
   File.join File.dirname(File.readlink(__FILE__)), '..', 'app'
0
 rescue Exception
0
   File.join( File.dirname(__FILE__),'..','app')
0
 end
0
-mkdir(app_path)
0
-cp_r Dir["#{template}/*"], app_path
0
 
0
-# get rid of placeholder files left over from gem install
0
-Dir["#{app_path}/**/EMPTY"].each { |path| rm path }
0
-# Dir["#{app_path}/**/EMPTY"].each { |path| system "rm #{path}" }
0
-
0
-# next, process all template files ...
0
-Dir["#{app_path}/**/*.erb"].each do |path|
0
-  unless path =~ %r{^#{app_path}/(schema/migrations/templates|templates)}
0
-    name = app_name.camel_case
0
-    File.write( path.gsub(/\.erb$/,''),
0
-      Erubis::Eruby.new( File.read( path ) ).result( binding ) )
0
-    rm path
0
-  end
0
+generator = Genitor.new("waves:app") do |gen|
0
+  gen.source = template
0
+  gen.target = app_path
0
+  gen.template_assigns = {:name => app_name}
0
 end
0
 
0
+Rake::Task["waves:app"].invoke
0
+
0
 unless RUBY_PLATFORM =~ /mswin32/
0
   # make the scripts executable
0
   system "chmod ug+x #{app_path}/bin/waves-*"

0
@@ -3,7 +3,7 @@
0
 require File.join(File.dirname(__FILE__) , "helpers")
0
 
0
 
0
-describe "startup.rb in a generated app, without requiring rubygems" do
0
+describe "startup.rb in a generated app" do
0
   before do
0
     clobber_test_app(AppPath)
0
     generate_test_app(AppPath)
0
@@ -12,27 +12,19 @@ describe "startup.rb in a generated app, without requiring rubygems" do
0
   after do
0
     clobber_test_app(AppPath)
0
   end
0
+  
0
+  it "should make the scripts executable" do
0
+    File.executable?(File.join(AppPath, "bin", "waves-console")).should.be.true
0
+  end
0
 
0
-  it "should fail to find waves framework" do
0
+  it "should fail to find waves framework, if gem is not available" do
0
     Dir.chdir(AppPath) do
0
       stdin, stdout, stderr = Open3.popen3("ruby startup.rb")
0
       stderr.gets.should =~ %r{no such file to load -- waves \(LoadError\)}
0
     end
0
   end
0
 
0
-end
0
-
0
-describe "startup.rb in an app, without gems, but with WAVES defined" do
0
-  before do
0
-    clobber_test_app(AppPath)
0
-    generate_test_app(AppPath)
0
-  end
0
-
0
-  after do
0
-    clobber_test_app(AppPath)
0
-  end
0
-
0
-  it "should find and use waves framework source" do
0
+  it "should find and use waves framework source when WAVES is defined" do
0
     set_framework_path(AppPath)
0
     Dir.chdir(AppPath) do
0
       stdin, stdout, stderr = Open3.popen3("ruby startup.rb")