From 60281af200180d752b8300bdad3c0a869d56347f Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Thu, 26 May 2011 17:57:46 +0200
Subject: Move load_generators from Rails::Application to Rails::Engine

---
 railties/lib/rails/application.rb | 12 ------------
 railties/lib/rails/engine.rb      | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 953233d774..497d4b5ac3 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -105,14 +105,6 @@ module Rails
       self
     end
 
-    def load_generators(app=self)
-      initialize_generators
-      railties.all { |r| r.load_generators(app) }
-      Rails::Generators.configure!(app.config.generators)
-      super
-      self
-    end
-
     def load_console(app=self)
       initialize_console
       railties.all { |r| r.load_console(app) }
@@ -195,10 +187,6 @@ module Rails
       end
     end
 
-    def initialize_generators
-      require "rails/generators"
-    end
-
     def initialize_console
       require "pp"
       require "rails/console/app"
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 383be1802f..b358de89d0 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -330,6 +330,14 @@ module Rails
     autoload :Configuration, "rails/engine/configuration"
     autoload :Railties,      "rails/engine/railties"
 
+    def load_generators(app=self)
+      initialize_generators
+      railties.all { |r| r.load_generators(app) }
+      Rails::Generators.configure!(app.config.generators)
+      super
+      self
+    end
+
     class << self
       attr_accessor :called_from, :isolated
       alias :isolated? :isolated
@@ -567,6 +575,10 @@ module Rails
 
   protected
 
+    def initialize_generators
+      require "rails/generators"
+    end
+
     def routes?
       defined?(@routes)
     end
-- 
cgit v1.2.3


From 835c9cee3ede273030bae5dcf465176d64b287dd Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Thu, 26 May 2011 17:59:00 +0200
Subject: Introducing engine commands

---
 railties/lib/rails/commands/generate.rb            |  7 +++-
 railties/lib/rails/engine/commands.rb              | 37 ++++++++++++++++++++++
 .../rails/plugin_new/templates/script/rails.tt     |  7 ++--
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 railties/lib/rails/engine/commands.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index b6f9a003d1..1f742f8853 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -7,4 +7,9 @@ if ARGV.first.in?([nil, "-h", "--help"])
 end
 
 name = ARGV.shift
-Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => Rails.root
+
+if defined?(ENGINE_ROOT)
+  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => ENGINE_ROOT
+else
+  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => Rails.root
+end
diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
new file mode 100644
index 0000000000..33a7cd5805
--- /dev/null
+++ b/railties/lib/rails/engine/commands.rb
@@ -0,0 +1,37 @@
+require 'active_support/core_ext/object/inclusion'
+
+ARGV << '--help' if ARGV.empty?
+
+aliases = {
+  "g" => "generate"
+}
+
+command = ARGV.shift
+command = aliases[command] || command
+
+case command
+when 'generate'
+  require 'rails/generators'
+
+  require ENGINE_PATH
+  engine = ::Rails::Engine.find(ENGINE_ROOT)
+  engine.load_generators
+
+  require 'rails/commands/generate'
+
+when '--version', '-v'
+  ARGV.unshift '--version'
+  require 'rails/commands/application'
+
+else
+  puts "Error: Command not recognized" unless command.in?(['-h', '--help'])
+  puts <<-EOT
+Usage: rails COMMAND [ARGS]
+
+The common rails commands available for engines are:
+ generate    Generate new code (short-cut alias: "g")
+
+All commands can be run with -h for more information.
+  EOT
+  exit(1)
+end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt b/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
index 65d82abf6d..0d7becad4f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
@@ -1,4 +1,7 @@
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../<%= dummy_path %>/script/rails',  __FILE__)
+ENGINE_ROOT = File.expand_path('../..',  __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine',  __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
-- 
cgit v1.2.3


From 9935c308f14df1eab1e1334dc007bae999dab92f Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Fri, 27 May 2011 08:25:56 +0200
Subject: Fix and test ENGINE_PATH and ENGINE_ROOT

---
 .../lib/rails/generators/rails/plugin_new/templates/script/rails.tt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt b/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
index 0d7becad4f..aa87d1b50c 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
@@ -1,7 +1,7 @@
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..',  __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine',  __FILE__)
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'
-- 
cgit v1.2.3


From b7476767e608a1835dde5acdb43db2b9c55ce3f8 Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Fri, 27 May 2011 08:46:32 +0200
Subject: Move requiring engine out of the switch case

---
 railties/lib/rails/engine/commands.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
index 33a7cd5805..b77fef8ffd 100644
--- a/railties/lib/rails/engine/commands.rb
+++ b/railties/lib/rails/engine/commands.rb
@@ -9,14 +9,13 @@ aliases = {
 command = ARGV.shift
 command = aliases[command] || command
 
+require ENGINE_PATH
+engine = ::Rails::Engine.find(ENGINE_ROOT)
+
 case command
 when 'generate'
   require 'rails/generators'
-
-  require ENGINE_PATH
-  engine = ::Rails::Engine.find(ENGINE_ROOT)
   engine.load_generators
-
   require 'rails/commands/generate'
 
 when '--version', '-v'
-- 
cgit v1.2.3


From 5f00592466bd91107ecdfd055140cb2b36e29f50 Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Fri, 27 May 2011 13:25:35 +0200
Subject: Refactor identifying generator's destination root

---
 railties/lib/rails/commands/generate.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index 1f742f8853..1fb2d98834 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -8,8 +8,5 @@ end
 
 name = ARGV.shift
 
-if defined?(ENGINE_ROOT)
-  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => ENGINE_ROOT
-else
-  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => Rails.root
-end
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => root
-- 
cgit v1.2.3


From e38d3752c377b400aea1d0b854bebf3734664cd7 Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Fri, 27 May 2011 13:44:10 +0200
Subject: Generate script/rails only if --full is given

---
 railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 00f90f9498..184fe19c06 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -126,6 +126,8 @@ task :default => :test
     end
 
     def script(force = false)
+      return unless full?
+
       directory "script", :force => force do |content|
         "#{shebang}\n" + content
       end
-- 
cgit v1.2.3


From 0ac5c03f169b3e3055040e84ca088df134c2bfbb Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Fri, 27 May 2011 13:50:42 +0200
Subject: Add destroy to engine's commands

---
 railties/lib/rails/engine/commands.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
index b77fef8ffd..59b7c4d67f 100644
--- a/railties/lib/rails/engine/commands.rb
+++ b/railties/lib/rails/engine/commands.rb
@@ -13,10 +13,10 @@ require ENGINE_PATH
 engine = ::Rails::Engine.find(ENGINE_ROOT)
 
 case command
-when 'generate'
+when 'generate', 'destroy'
   require 'rails/generators'
   engine.load_generators
-  require 'rails/commands/generate'
+  require "rails/commands/#{command}"
 
 when '--version', '-v'
   ARGV.unshift '--version'
@@ -29,6 +29,7 @@ Usage: rails COMMAND [ARGS]
 
 The common rails commands available for engines are:
  generate    Generate new code (short-cut alias: "g")
+ destroy     Undo code generated with "generate"
 
 All commands can be run with -h for more information.
   EOT
-- 
cgit v1.2.3


From fd59a3a1d7d81f6a9b54e2f958b78d929f6db9fc Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Fri, 27 May 2011 13:56:39 +0200
Subject: We moved engine commands to rails/engine/commands

---
 railties/lib/rails/commands.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 39627a3094..bf6644c782 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -23,11 +23,7 @@ when 'generate', 'destroy', 'plugin'
     require APP_PATH
     Rails.application.require_environment!
 
-    if defined?(ENGINE_PATH) && engine = Rails::Engine.find(ENGINE_PATH)
-      Rails.application.load_generators(engine)
-    else
-      Rails.application.load_generators
-    end
+    Rails.application.load_generators
 
     require "rails/commands/#{command}"
   end
-- 
cgit v1.2.3


From f18283194bfb43fc020be37d6fa7cd3149fa8b5e Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Tue, 7 Jun 2011 11:21:38 +0200
Subject: Use namespace if it's a mountable engine

---
 railties/lib/rails/engine/commands.rb       |  1 +
 railties/lib/rails/generators.rb            | 10 ++++++++++
 railties/lib/rails/generators/named_base.rb |  4 +---
 railties/lib/rails/railtie.rb               |  5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
index 59b7c4d67f..3b0920e213 100644
--- a/railties/lib/rails/engine/commands.rb
+++ b/railties/lib/rails/engine/commands.rb
@@ -15,6 +15,7 @@ engine = ::Rails::Engine.find(ENGINE_ROOT)
 case command
 when 'generate', 'destroy'
   require 'rails/generators'
+  Rails::Generators.namespace = engine.railtie_namespace
   engine.load_generators
   require "rails/commands/#{command}"
 
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 09e505a75b..508d5359ba 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -90,6 +90,16 @@ module Rails
       @options ||= DEFAULT_OPTIONS.dup
     end
 
+    def self.namespace
+      @namespace ||= if defined?(Rails) && Rails.application
+         Rails.application.class.parents.detect { |n| n.respond_to?(:_railtie) }
+      end
+    end
+
+    def self.namespace=(namespace)
+      @namespace ||= namespace
+    end
+
     # Hold configured generators fallbacks. If a plugin developer wants a
     # generator group to fallback to another group in case of missing generators,
     # they can add a fallback.
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 7e7f8d2d08..c6c0392f43 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -63,9 +63,7 @@ module Rails
         end
 
         def namespace
-          @namespace ||= if defined?(Rails) && Rails.application
-            Rails.application.class.parents.detect { |n| n.respond_to?(:_railtie) }
-          end
+          Rails::Generators.namespace
         end
 
         def namespaced?
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 65c567d72f..5f50943626 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -1,6 +1,7 @@
 require 'rails/initializable'
 require 'rails/configuration'
 require 'active_support/inflector'
+require 'active_support/core_ext/module/introspection'
 
 module Rails
   # Railtie is the core of the Rails framework and provides several hooks to extend
@@ -192,5 +193,9 @@ module Rails
     def load_generators(app)
       self.class.generators.each { |block| block.call(app) }
     end
+
+    def railtie_namespace
+      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:_railtie) }
+    end
   end
 end
-- 
cgit v1.2.3


From 8ea90ffdb8a08438e72054518f8f0b54c628b3ea Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Tue, 7 Jun 2011 11:36:11 +0200
Subject: Use mattr_accessor :namespace

---
 railties/lib/rails/generators.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 508d5359ba..355b05ce0b 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -20,6 +20,8 @@ module Rails
     autoload :ResourceHelpers, 'rails/generators/resource_helpers'
     autoload :TestCase,        'rails/generators/test_case'
 
+    mattr_accessor :namespace
+
     DEFAULT_ALIASES = {
       :rails => {
         :actions => '-a',
@@ -90,16 +92,6 @@ module Rails
       @options ||= DEFAULT_OPTIONS.dup
     end
 
-    def self.namespace
-      @namespace ||= if defined?(Rails) && Rails.application
-         Rails.application.class.parents.detect { |n| n.respond_to?(:_railtie) }
-      end
-    end
-
-    def self.namespace=(namespace)
-      @namespace ||= namespace
-    end
-
     # Hold configured generators fallbacks. If a plugin developer wants a
     # generator group to fallback to another group in case of missing generators,
     # they can add a fallback.
-- 
cgit v1.2.3