From 120649dc8302122e32fb2e57fe36246f4ecf878e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 15 Dec 2004 14:19:22 +0000
Subject: Moved generate to bin and included it again

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@170 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/Rakefile               |  9 +--------
 railties/bin/generate.rb        | 41 +++++++++++++++++++++++++++++++++++++++++
 railties/generators/generate.rb | 41 -----------------------------------------
 3 files changed, 42 insertions(+), 49 deletions(-)
 create mode 100755 railties/bin/generate.rb
 delete mode 100755 railties/generators/generate.rb

(limited to 'railties')

diff --git a/railties/Rakefile b/railties/Rakefile
index 740c323aea..28d8e20f45 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -21,8 +21,7 @@ TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/testing
 
 LOG_FILES    = %w( apache.log development.log test.log production.log )
 HTML_FILES   = %w( 404.html 500.html index.html )
-SCRIPT_FILES = %w( generate )
-BIN_FILES    = %w( breakpointing envcon )
+BIN_FILES    = %w( generate breakpointing envcon )
 GENERATORS   = %w( controller mailer model scaffold )
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer railties )
@@ -140,12 +139,6 @@ end
 task :copy_generators do
   mkdir_p File.join(PKG_DESTINATION, 'script/generators')
 
-  SCRIPT_FILES.each do |file|
-    dest_file = File.join(PKG_DESTINATION, 'script', file)
-    cp File.join('generators', "#{file}.rb"), dest_file
-    chmod 0755, dest_file
-  end
-
   GENERATORS.each do |dir|
     cp_r File.join('generators', dir), File.join(PKG_DESTINATION, 'script', 'generators', dir)
   end
diff --git a/railties/bin/generate.rb b/railties/bin/generate.rb
new file mode 100755
index 0000000000..8f2f1497d6
--- /dev/null
+++ b/railties/bin/generate.rb
@@ -0,0 +1,41 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../config/environment'
+require 'rails_generator'
+
+unless ARGV.empty?
+  begin
+    name = ARGV.shift
+    Rails::Generator.instance(name, ARGV).generate
+  rescue Rails::Generator::UsageError => e
+    puts e.message
+  end
+else
+  builtin_generators = Rails::Generator.builtin_generators.join(', ')
+  contrib_generators = Rails::Generator.contrib_generators.join(', ')
+
+  $stderr.puts <<end_usage
+  #{$0} generator [args]
+
+  Rails comes with #{builtin_generators} generators.
+    #{$0} controller Login login logout
+    #{$0} model Account
+    #{$0} mailer AccountMailer
+    #{$0} scaffold Account action another_action
+
+end_usage
+
+  unless contrib_generators.empty?
+    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/generators):"
+    $stderr.puts "    #{contrib_generators}"
+    $stderr.puts
+  end
+
+  $stderr.puts <<end_usage
+  More generators are available at http://rubyonrails.org
+    1. Download, for example, auth_controller.zip
+    2. Unzip to directory #{RAILS_ROOT}/generators/auth_controller
+    3. Generate without args for usage information
+         #{$0} auth_controller
+end_usage
+  exit 0
+end
diff --git a/railties/generators/generate.rb b/railties/generators/generate.rb
deleted file mode 100755
index 8f2f1497d6..0000000000
--- a/railties/generators/generate.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
-require 'rails_generator'
-
-unless ARGV.empty?
-  begin
-    name = ARGV.shift
-    Rails::Generator.instance(name, ARGV).generate
-  rescue Rails::Generator::UsageError => e
-    puts e.message
-  end
-else
-  builtin_generators = Rails::Generator.builtin_generators.join(', ')
-  contrib_generators = Rails::Generator.contrib_generators.join(', ')
-
-  $stderr.puts <<end_usage
-  #{$0} generator [args]
-
-  Rails comes with #{builtin_generators} generators.
-    #{$0} controller Login login logout
-    #{$0} model Account
-    #{$0} mailer AccountMailer
-    #{$0} scaffold Account action another_action
-
-end_usage
-
-  unless contrib_generators.empty?
-    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/generators):"
-    $stderr.puts "    #{contrib_generators}"
-    $stderr.puts
-  end
-
-  $stderr.puts <<end_usage
-  More generators are available at http://rubyonrails.org
-    1. Download, for example, auth_controller.zip
-    2. Unzip to directory #{RAILS_ROOT}/generators/auth_controller
-    3. Generate without args for usage information
-         #{$0} auth_controller
-end_usage
-  exit 0
-end
-- 
cgit v1.2.3