resque-swapper 0.1 → 0.1.1

data/lib/resque-swapper.rb

@@ -1,4 +1,6 @@
 require 'resque'
 require 'resque-swapper/resque-swapper'
 
-Resque.servers = 'config/resque.yml'
+if File.exists?('config/resque.yml')
+  Resque::Swapper.load('config/resque.yml')
+end

data/lib/resque-swapper/resque-swapper.rb

@@ -1,11 +1,31 @@
 require 'yaml'
 
 module Resque
-  def self.swap server
+  extend self
+
+  module Swapper
+    extend self
+
+    def load(path)
+      @swapper_config = Hash.new
+      if File.exists?(path)
+        @swapper_config = YAML.load_file(path)
+      else
+        puts "Warning: config file doesn't not exists."
+      end
+    end
+
+    def config(server=nil)
+      c = @swapper_config[Resque.info[:environment]]
+      server.nil? ? c : c[server.to_s]
+    end
+  end
+
+  def swap server
     current = Resque.redis
-    
+
     # Create Redis connection.
-    Resque.redis = server_connect(server, @swapper_config[server])
+    Resque.redis = server_connect(server, Swapper.config(server))
     if block_given?
       yield Resque
       Resque.redis = current
@@ -13,32 +33,24 @@ module Resque
     Resque
   end
   
-  def self.servers &block
-    @swapper_config.collect do |server, config|
+  def servers &block
+    Swapper.config.collect do |server, config|
       swap(server, &block)
     end
   end
-  
-  def self.servers= (path)
-    @swapper_redis = Hash.new
-    if File.exists?(path)
-      config = YAML.load_file(path)
-      # Force configuration keys as symbols
-      @swapper_config = Hash[config.collect {|n| [n[0].to_sym, Hash[n[1].collect{|c| [c[0].to_sym, c[1]] }] ] }]
-    else
-      puts "Warning: config file doesn't not exists."
-    end
-  end
-  
-  def self.server(server)
-    server_connect(server, @swapper_config[server])
+
+  def server(server)
+    server_connect(server, Swapper.config(server))
   end
   
   protected
-    def self.server_connect(server, config)
+    def server_connect(server, config)
+      @swapper_redis ||= {}
+
       unless @swapper_redis[server]
-        @swapper_redis[server] = Redis.new(config)
+        # Force configuration keys as symbols
+        @swapper_redis[server] = Redis.new(Hash[config.collect {|n| [n[0].to_sym, n[1] ] }])
       end
       @swapper_redis[server]
     end
-end
+end

data/lib/resque-swapper/tasks.rb

@@ -9,17 +9,15 @@ namespace 'resque' do
     
     file = 'config/resque.yml'
     FileUtils.mkdir_p('config')
-    
-    append_config = <<YML
-#{name}:
-  host: #{host}
-  port: #{port}
 
-YML
-    File.open(file, 'a') do |f|
-      f.write(append_config)
+    server = {'name' => {'host' => host, 'port' => port}}
+
+    configuration = (File.exists?(file)) ? YAML.load_file(file) : {}
+    %w{production development test}.each do |env|
+      configuration[env] = server
     end
-    puts "Write into #{file}: "
-    puts append_config
+    
+    File.open(file, 'w+') {|f| f.write(configuration.to_yaml) }
+    "#{file} was updated."
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: resque-swapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Endel Dreyer
@@ -10,10 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 -03:00
-default_executable: 
-dependencies: []
-
+date: 2012-01-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: resque
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.15.0
+  type: :runtime
+  version_requirements: *id001
 description: "    Swapping tool for Resque server on runtime.\n"
 email: endel.dreyer@gmail.com
 executables: []
@@ -27,7 +36,6 @@ files:
 - lib/resque-swapper/resque-swapper.rb
 - lib/resque-swapper/tasks.rb
 - lib/resque-swapper.rb
-has_rdoc: true
 homepage: http://github.com/endel/resque-swapper
 licenses: []
 
@@ -51,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Swapping tool for Resque server on runtime.