Changeset 707

Timestamp:

10/02/07 09:01:35 (1 year ago)

Author:

iv..@gweezlebur.com

Message:

require merb in script/generate

Files:

• trunk/app_generators/merb/templates/script/destroy (modified) (1 diff)
• trunk/app_generators/merb/templates/script/generate (modified) (1 diff)
• trunk/merb_generators/merb_controller/merb_controller_generator.rb (modified) (1 diff)

trunk/app_generators/merb/templates/script/destroy

@@ -7 +7 @@
-  require 'rubygems'
-  require 'rubigen'
+end
+
+require 'merb'
+module Kernel
+  undef dependency if defined?(Kernel.dependency)
-end
-

trunk/app_generators/merb/templates/script/generate

@@ -9 +9 @@
-end
-
+require 'merb'
+module Kernel
+  undef dependency if defined?(Kernel.dependency)
+end
+
-# Make the App's local gems available
-Gem.clear_paths
-File.join(APP_ROOT, "gems")
+APP_ROOT / "gems"
-
-require 'rubigen/scripts/generate'

trunk/merb_generators/merb_controller/merb_controller_generator.rb

@@ -1 @@
-require 'merb'
-module Kernel
-  undef dependency
-end
-
-class MerbControllerGenerator < RubiGen::Base
-