deadpool 0.1.2 → 0.1.4

data/lib/deadpool/generator.rb

@@ -147,7 +147,8 @@ exec #{ruby_path} #{deadpool_admin_path} --foreground #{config_params}
     # mkdir path/lib/deadpool/failover_protocol
     #       path/lib/deadpool/failover_protocol
     def generate_configuration(options)
-      path = config_path
+      config_path = options[:config_path]
+      path        = config_path
       FileUtils.mkdir_p(File.join(path, 'config/pools'))
       FileUtils.mkdir_p(File.join(path, 'lib/deadpool/monitor'))
       FileUtils.mkdir_p(File.join(path, 'lib/deadpool/failover_protocol'))
@@ -204,7 +205,7 @@ failover_protocol_configs:
 # admin_port: 5507
 
       EOF
-      if File.exists? enironment_config_path
+      if File.exists? environment_config_path
         puts "#{environment_config_path} already exists.  Here's what we would have copied there."
         puts environment_conf
       else

data/lib/deadpool/helper.rb

@@ -20,11 +20,15 @@ module Deadpool
     end
 
     def self.configure(options)
-      default_config = YAML.load(File.read(File.join(File.dirname(__FILE__), '../../config/default_environment.yml')))
-      user_config    = YAML.load(File.read(File.join(options[:config_path], 'config/environment.yml')))
-      config         = Deadpool::Helper.symbolize_keys default_config.merge(user_config).merge(options)
+      default_config          = YAML.load(File.read(File.join(File.dirname(__FILE__), '../../config/default_environment.yml')))
+      environment_config_path = File.join(options[:config_path], 'config/environment.yml')
 
-      return config
+      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
+      end
     end
 
     def self.setup_logger(config)
@@ -33,6 +37,14 @@ module Deadpool
       
       return logger
     end
+    
+    def self.camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+      if first_letter_in_uppercase
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      else
+        lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..1]
+      end
+    end
 
   end
 

data/lib/deadpool/server.rb

@@ -40,6 +40,17 @@ module Deadpool
         schedule_system_check
       }
     end
+    
+    def load_plugins
+      failover_plugin_dir = File.join @options[:config_path], 'lib', 'deadpool', 'failover_protocol'
+      monitor_plugin_dir = File.join @options[:config_path], 'lib', 'deadpool', 'monitor'
+
+      [failover_plugin_dir, monitor_plugin_dir].each do |plugin_dir|
+        Dir[plugin_dir + '/*.rb'].each do |filename|
+          require filename
+        end
+      end
+    end
 
     def load_handlers
       @handlers = {}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deadpool
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Kirt Fitzpatrick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -08:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   version_requirements: *id002
-description: "    Plugin architecture and chainable failover protocols.\n    Nagios reporting baked in.\n    Can use VIPs but doesn't need 'em.\n    Can monitor and failover multiple services within the same instance.\n"
+description: "    Non VIP based failover service for MySQL and others in the cloud.\n    Nagios monitoring built in.\n    Designed to let you add custom monitoring and failover plugins.\n"
 email: kirt.fitzpatrick@akqa.com
 executables: 
 - deadpool_admin
@@ -120,6 +120,6 @@ rubyforge_project:
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Failover Service for MySQL, Redis, whatever.
+summary: Non VIP based failover service for MySQL and others in the cloud.
 test_files: []