daemon-kit 0.1.7.11 → 0.1.7.12

data/History.txt

@@ -1,4 +1,8 @@
-== 0.2 (WIP)
+== 0.1.7.12 2009-12-04
+
+* Bug fix, don't load environment files twice [grockit]
+
+== 0.1.7.11 2009-11-30
 
 * Renamed 'daemon_kit' executable to 'daemon-kit'
 * Fixed some broken links in README.rdoc

data/daemon-kit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemon-kit}
-  s.version = "0.1.7.11"
+  s.version = "0.1.7.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kenneth.kalmer@gmail.com"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-04}
   s.default_executable = %q{daemon-kit}
   s.description = %q{daemon-kit aims to simplify creating Ruby daemons by providing a sound application skeleton (through a generator), task specific generators (jabber bot, etc) and robust environment management code.}
   s.email = %q{kenneth.kalmer@gmail.com}

data/lib/daemon_kit.rb

@@ -18,7 +18,7 @@ $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.7.11'
+  VERSION = '0.1.7.12'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'

data/lib/daemon_kit/initializer.rb

@@ -137,8 +137,9 @@ module DaemonKit
     end
 
     def load_environment
-      return if @environment_loaded
-      @environment_loaded = true
+      # Needs to be global to prevent loading the files twice
+      return if $_daemon_environment_loaded
+      $_daemon_environment_loaded = true
 
       config = configuration
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: daemon-kit
 version: !ruby/object:Gem::Version 
-  version: 0.1.7.11
+  version: 0.1.7.12
 platform: ruby
 authors: 
 - kenneth.kalmer@gmail.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 +02:00
+date: 2009-12-04 00:00:00 +02:00
 default_executable: daemon-kit
 dependencies: 
 - !ruby/object:Gem::Dependency