0
@@ -1,10 +1,15 @@
0
 #!/usr/bin/env ruby
0
+require 'rubygems'
0
+require 'choice'
0
+require 'genitor'
0
 
0
-# rudimentary argument checks
0
-if ARGV.length != 1 || ARGV[0] == '--help'
0
-  $stderr.puts "Usage: waves {app_name}"
0
-  $stderr.puts "app_name may contain only letters, numbers, and underscores."
0
-  exit 1
0
+Choice.options do
0
+  banner 'Usage:  waves path/to/app [-h]'
0
+  option :help  do
0
+    long '--help'
0
+    desc 'Show this message'
0
+  end
0
+  
0
 end
0
 
0
 app_path = ARGV[0]
0
@@ -16,43 +21,18 @@ if app_name =~ /[^\w\d_]/
0
 TEXT
0
 end
0
 
0
-
0
-require 'rubygems'
0
-require 'genitor'
0
-require 'extensions/all'
0
-begin
0
-  require 'utilities/string'
0
-rescue LoadError
0
-  require File.join(File.dirname(__FILE__), '..', 'lib', 'utilities', 'string')
0
-end
0
-
0
-require 'fileutils'
0
-include FileUtils
0
-
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
-
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
+template = File.join( File.dirname(__FILE__),'..','app')
0
 
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
+  gen.executables = %w{ bin/waves-console  bin/waves-server}
0
 end
0
 
0
-Rake::Task["waves:app"].invoke
0
+puts "** Creating new Waves application ..."
0
 
0
-unless RUBY_PLATFORM =~ /mswin32/
0
-  # make the scripts executable
0
-  system "chmod ug+x #{app_path}/bin/waves-*"
0
-end
0
+Rake::Task["waves:app"].invoke
0
 
0
 puts "** Application created!"
0
+

0
@@ -2,16 +2,10 @@
0
 
0
 require File.join(File.dirname(__FILE__) , "helpers")
0
 
0
+clobber_test_app(AppPath)
0
+generate_test_app(AppPath)
0
 
0
 describe "startup.rb in a generated app" 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 make the scripts executable" do
0
     File.executable?(File.join(AppPath, "bin", "waves-console")).should.be.true
0
@@ -32,3 +26,5 @@ describe "startup.rb in a generated app" do
0
     end
0
   end
0
 end
0
+
0
+clobber_test_app(AppPath)