removing unused file in lib directory for now and merging the test he…

…lpers
jkgraham · May 6, 2008 · 5b70645 · 5b70645
1 parent 9632e04
commit 5b70645
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 51 deletions.
diff --git a/lib/nifty_generator.rb b/lib/nifty_generator.rb
diff --git a/script/console b/script/console
@@ -5,6 +5,5 @@ irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 libs =  " -r irb/completion"
 # Perhaps use a console_lib to store any extra methods I may want available in the cosole
 # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/nifty_generator.rb'}"
-puts "Loading nifty_generator gem"
+puts "Loading nifty-generators gem"
 exec "#{irb} #{libs} --simple-prompt"
diff --git a/test/test_generator_helper.rb b/test/test_generator_helper.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,6 +1,27 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/nifty_generator'
 
+# Must set before requiring generator libs.
+TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
+PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
+app_root = File.join(TMP_ROOT, PROJECT_NAME)
+if defined?(APP_ROOT)
+  APP_ROOT.replace(app_root)
+else
+  APP_ROOT = app_root
+end
+if defined?(RAILS_ROOT)
+  RAILS_ROOT.replace(app_root)
+else
+  RAILS_ROOT = app_root
+end
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/helpers/generator_test_helper'
 require 'rails_generator'
 
 module NiftyGenerators
@@ -24,7 +45,7 @@ def run_rails_generator(generator, *args)
     end
 
     def generator_sources
-      [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", "rails_generators"))]
+      [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__), "..", "rails_generators"))]
     end
   end
 end
diff --git a/test/test_nifty_generator.rb b/test/test_nifty_generator.rb
diff --git a/test/test_nifty_layout_generator.rb b/test/test_nifty_layout_generator.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
+require File.join(File.dirname(__FILE__), "test_helper.rb")
 
 class TestNiftyLayoutGenerator < Test::Unit::TestCase
   include NiftyGenerators::TestHelper

diff --git a/test/test_nifty_scaffold_generator.rb b/test/test_nifty_scaffold_generator.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
+require File.join(File.dirname(__FILE__), "test_helper.rb")
 
 class TestNiftyScaffoldGenerator < Test::Unit::TestCase
   include NiftyGenerators::TestHelper