deadpool 0.1.4 → 0.1.5

data/lib/deadpool/generator.rb

@@ -205,10 +205,11 @@ failover_protocol_configs:
 # admin_port: 5507
 
       EOF
-      if File.exists? environment_config_path
-        puts "#{environment_config_path} already exists.  Here's what we would have copied there."
-        puts environment_conf
-      else
+      # if File.exists? environment_config_path
+      #   puts "#{environment_config_path} already exists.  Here's what we would have copied there."
+      #   puts environment_conf
+      # else
+      unless File.exists? environment_config_path
         File.open environment_config_path, 'w' do |file|
           file.write environment_conf
         end

data/lib/deadpool/helper.rb

@@ -25,10 +25,13 @@ module Deadpool
 
       if File.exists? environment_config_path
         user_config = YAML.load(File.read(File.join(options[:config_path], 'config/environment.yml')))
-        return Deadpool::Helper.symbolize_keys default_config.merge(user_config).merge(options)
-      else
-        return default_config
+
+        if user_config
+          return Deadpool::Helper.symbolize_keys default_config.merge(user_config).merge(options)
+        end
       end
+
+      return default_config
     end
 
     def self.setup_logger(config)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deadpool
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Kirt Fitzpatrick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency