Merge pull request #97 from eric/guard-against-bundler

Provide a simple way to prevent bundler auto-loading

bin/god

@@ -4,7 +4,6 @@ STDOUT.sync = true
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'optparse'
 require 'drb'
 require 'yaml'
@@ -105,6 +104,9 @@ begin
     abort("Invalid log level '#{options[:log_level]}'")
   end
 
+  # Use this flag to actually load all of the god infrastructure
+  $load_god = true
+
   # dispatch
   if !options[:config] && options[:version]
     require 'god'

lib/god.rb

@@ -1,4 +1,8 @@
-$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
+# Bail out before loading anything unless this flag is set.
+#
+# We are doing this to guard against bundler autoloading because there is
+# no value in loading god in most processes.
+if $load_god
 
 # core
 require 'stringio'
@@ -726,7 +730,7 @@ def self.at_exit
   # private
 
   # Match a shortened pattern against a list of String candidates.
-  # The pattern is expanded into a regular expression by 
+  # The pattern is expanded into a regular expression by
   # inserting .* between each character.
   #
   # pattern - The String containing the abbreviation.
@@ -756,3 +760,5 @@ def self.pattern_match(pattern, list)
 at_exit do
   God.at_exit if $run
 end
+
+end

test/helper.rb

@@ -1,4 +1,8 @@
-require 'rubygems'
+$:.unshift File.expand_path('../../lib', __FILE__) # For use/testing when no gem is installed
+
+# Use this flag to actually load all of the god infrastructure
+$load_god = true
+
 require File.join(File.dirname(__FILE__), *%w[.. lib god sys_logger])
 require File.join(File.dirname(__FILE__), *%w[.. lib god])
 God::EventHandler.load