god 0.13.0 → 0.13.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.13.1 / 2012-09-18
+  * Minor Changes
+    * Prevent auto-loading from bundler by requiring $load_god to require (#97)
+
 == 0.13.0 / 2012-09-17
   * Minor Changes
     * Reduce verbosity of non-failing conditions (#111)

data/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'

data/god.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'god'
-  s.version = '0.13.0'
-  s.date = '2012-09-17'
+  s.version = '0.13.1'
+  s.date = '2012-09-18'
 
   s.summary = "Process monitoring framework."
   s.description = "An easy to configure, easy to extend monitoring framework written in Ruby."

data/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'
@@ -151,7 +155,7 @@ end
 
 module God
   # The String version number for this package.
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 
   # The Integer number of lines of backlog to keep for the logger.
   LOG_BUFFER_SIZE_DEFAULT = 100
@@ -726,7 +730,7 @@ module God
   # 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 @@ end
 at_exit do
   God.at_exit if $run
 end
+
+end

data/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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 13
-  - 0
-  version: 0.13.0
+  - 1
+  version: 0.13.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -17,191 +16,167 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-17 00:00:00 -07:00
+date: 2012-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 6
         version: "1.6"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: json
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
         version: "0.9"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: rake
+  requirement: *id002
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 3
         - 10
         version: "3.10"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: twitter
+  name: rdoc
+  requirement: *id003
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: prowly
+  name: twitter
+  requirement: *id004
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 3
         version: "0.3"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: xmpp4r
+  name: prowly
+  requirement: *id005
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 5
         version: "0.5"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: dike
+  name: xmpp4r
+  requirement: *id006
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: snapshot
+  name: dike
+  requirement: *id007
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  name: snapshot
+  requirement: *id008
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
         version: "0.9"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: daemons
+  name: rcov
+  requirement: *id009
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mocha
+  name: daemons
+  requirement: *id010
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 10
         version: "0.10"
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: gollum
+  name: mocha
+  requirement: *id011
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 3
         - 1
         version: 1.3.1
-  type: :development
-  version_requirements: *id012
+  name: gollum
+  requirement: *id012
+  prerelease: false
 description: An easy to configure, easy to extend monitoring framework written in Ruby.
 email: god-rb@googlegroups.com
 executables: 
@@ -349,27 +324,23 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: god
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Process monitoring framework.