dfl-factories-and-workers 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+* [10/22/2008] - 0.1.4
+  
+  Prevent rails/init from loading factories.rb, etc. if inside rake db:*
+
 * [10/22/2008] - 0.1.3
 
   FactoryBuilder was using #classify which also calls #singularize... now uses camelize instead.

data/init.rb

@@ -1,6 +1,6 @@
 if defined?(RAILS_ENV) && __FILE__ =~ %r{vendor/plugins} # are we running as a rails plugin?
 
-# Modify the variable below to specify in which environments this plugin should be loaded.
+  # Modify the variable below to specify in which environments this plugin should be loaded.
   load_plugin_in = {
     'test'        => true,
     'development' => true,   # NOTE: often comes in handy in the console
@@ -24,5 +24,3 @@ else  # bootstrap the gem
   # end
 
 end  
-
-

data/rails/init.rb

@@ -2,26 +2,28 @@ require 'fileutils'
 
 config.after_initialize do
 
-  # if script_console_running = defined?(::IRB) && ::IRB.conf[:LOAD_MODULES] && ::IRB.conf[:LOAD_MODULES].include?('console_with_helpers')
-  #   # mixin to Object if we are running in ./script/console
+  unless $*.grep(/db:*/)  # prevent the plugin from loading if we are simply running rake db:migrate, etc.
+    
+    # if script_console_running = defined?(::IRB) && ::IRB.conf[:LOAD_MODULES] && ::IRB.conf[:LOAD_MODULES].include?('console_with_helpers')
+    #   # mixin to Object if we are running in ./script/console
     obj = Object
-  # else # otherwise just mix into Test::Unit to play it safe
-  #   obj = Test::Unit::TestCase
-  # end
+    # else # otherwise just mix into Test::Unit to play it safe
+    #   obj = Test::Unit::TestCase
+    # end
 
-  # mixin plugin
-  obj.send :include, FactoriesAndWorkers::Factory
-  obj.send :include, FactoriesAndWorkers::Worker
-  
-  # load factory and worker definition files if they exist
-  %w(spec/factories.rb spec/factory_workers.rb test/factories.rb test/factory_workers.rb).each do |file|
-    path = File.join(Dir.pwd, file)
-    require path if File.exists?(path)
-  end
+    # mixin plugin
+    obj.send :include, FactoriesAndWorkers::Factory
+    obj.send :include, FactoriesAndWorkers::Worker
 
-  # mixin factory and worker definitions
-  obj.send :include, ::TestFactories if defined?(TestFactories)
-  obj.send :include, ::FactoryWorkers if defined?(FactoryWorkers)
-end
+    # load factory and worker definition files if they exist
+    %w(spec/factories.rb spec/factory_workers.rb test/factories.rb test/factory_workers.rb).each do |file|
+      path = File.join(Dir.pwd, file)
+      require path if File.exists?(path)
+    end
 
+    # mixin factory and worker definitions
+    obj.send :include, ::TestFactories if defined?(TestFactories)
+    obj.send :include, ::FactoryWorkers if defined?(FactoryWorkers)
+  end
 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dfl-factories-and-workers
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nathan Herald