sponges 0.7.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8220619bcda7dec95d17c485c795515c819e3293
-  data.tar.gz: eac07f3396446fab4436e97d277cce5fbae5fb63
+  metadata.gz: 7bc1020da5a609d654d69a21d51fc0b77d05ea5c
+  data.tar.gz: bf1a641c5e4a66379fd9e0bcf58cf067a951c129
 SHA512:
-  metadata.gz: 11b08867fbc334aac7e747a02b71393c51aa04cff8e28a16538e4216b9d2ff2078356fd551aa50feba982e76758b95c243b6e549a43e3a858235ad95ba42f1b2
-  data.tar.gz: 4eff5b0558fdd00185ca29b0ff7992b098b22d31c4ce12d6afe512543a5ab0ccf665389a8b1279a4667cbce1b2a70c94eae1be9f9cbf9dd6df83baa9f2b32df4
+  metadata.gz: 60249ea5adc99e00704121e52eec82ba4edb4f4275467e89f9f0f6cc3bf5c395ade5991b22704f84996e4ef0e5d5eec66285060dfc7dc265c53817fedaf1bf14
+  data.tar.gz: fee8bbcee7199bfde7a19d7d4a068ef083c42c921b8856b75dae539eff44f921a0221685e8d99e49c63f077e54570dfbda575be54cb9709d50f04b148de09d09

data/README.md

@@ -71,7 +71,6 @@ end
 
 Sponges.configure do |config|
   config.logger            = MyCustomLogger.new   # optionnal
-  config.redis             = Redis.new            # optionnal
   config.size              = 3                    # optionnal, default to cpu's size
   config.daemonize         = true                 # optionnal, default to false
   config.port              = 5032                 # optionnal, default to 5032
@@ -200,30 +199,6 @@ example of response:
 }
 ```
 
-## Stores
-
-sponges can store pids in memory or in redis. Memory is the default store. The
-`list` command is not available with the memory store.
-
-To select the redis store, you need to add `nest` to your application's
-Gemfile, and do the following.
-
-``` ruby
-gem "nest"
-```
-
-``` ruby
-Sponges.configure do |config|
-  config.store         = :redis
-end
-```
-
-## Roadmap
-
-### Version 1.0
-
- * Removal of Redis store
-
 ## [Changelog](CHANGELOG.md)
 
 ## Acknowledgements

data/lib/sponges.rb

@@ -16,8 +16,6 @@ require_relative 'sponges/runner'
 require_relative 'sponges/commander'
 require_relative 'sponges/cli'
 require_relative 'sponges/store'
-require_relative 'sponges/store/memory'
-require_relative 'sponges/store/redis'
 
 module Sponges
   STOP_SIGNALS = [:INT, :QUIT, :TERM]

data/lib/sponges/cli.rb

@@ -54,38 +54,6 @@ module Sponges
       Sponges::Commander.new(Sponges::Configuration.worker_name, options).
         decrement
     end
-
-    desc "Show running processes"
-    def list
-      if Sponges::Configuration.store == :memory
-        puts "Command not available with the memory store"
-        exit
-      end
-      Sponges.logger.warn "Redis's store will be removed in version 1.0!"
-      redis = Nest.new('sponges')
-      puts %q{
- ___ _ __   ___  _ __   __ _  ___  ___
-/ __| '_ \ / _ \| '_ \ / _` |/ _ \/ __|
-\__ \ |_) | (_) | | | | (_| |  __/\__ \
-|___/ .__/ \___/|_| |_|\__, |\___||___/
-    | |                 __/ |
-    |_|                |___/
-}.gsub(/^\n/, '') + "\n"
-      puts "Workers:"
-      Array(redis[:hostnames].smembers).each do |hostname|
-        puts hostname.rjust(6)
-        Array(redis[hostname][:workers].smembers).each do |worker|
-          puts worker.rjust(6)
-          puts "supervisor".rjust(15)
-          puts redis[hostname][:worker][worker][:supervisor].get.rjust(12)
-          puts "children".rjust(13)
-          Array(redis[hostname][:worker][worker][:pids].smembers).each do |pid|
-            puts pid.rjust(12)
-          end
-        end
-      end
-      puts "\n"
-    end
   end
 
 end

data/lib/sponges/configuration.rb

@@ -4,9 +4,8 @@ module Sponges
   #
   class Configuration
     class << self
-      ACCESSOR = [:worker_name, :worker, :logger, :redis, :size,
-        :daemonize, :after_fork, :timeout, :gracefully, :store,
-        :port
+      ACCESSOR = [:worker_name, :worker, :logger, :size, :daemonize,
+                  :after_fork, :timeout, :gracefully, :store, :port
       ]
       attr_accessor *ACCESSOR
 
@@ -15,9 +14,8 @@ module Sponges
       end
 
       def configuration
-        ACCESSOR.inject({}) do |conf, method|
+        ACCESSOR.each_with_object({}) do |conf, method|
           conf[method] = send(method)
-          conf
         end
       end
 
@@ -29,27 +27,10 @@ module Sponges
         Hook._on_chld = block
       end
 
-      def store
-        @store || :memory
-      end
-
       def port
         @port || 5032
       end
 
-      def redis
-        @redis ||= Redis.new.tap { warn_redis }
-      end
-
-      def redis=(redis)
-        warn_redis
-        @redis = redis
-      end
-
-      def warn_redis
-        Sponges.logger.warn "Redis's store will be removed in version 1.0!"
-      end
-
     end
   end
 

data/lib/sponges/runner.rb

@@ -14,7 +14,6 @@ module Sponges
         Sponges.logger.error "Runner #{@name} already started."
         exit
       end
-      store.register_hostname Socket.gethostname
     end
 
     def start
@@ -33,12 +32,12 @@ module Sponges
 
     def trap_signals
       Sponges::SIGNALS.each do |signal|
-        trap(signal) {|signal| kill_supervisor(signal) }
+        trap(signal) {|signal| kill_supervisor }
       end
     end
 
-    def kill_supervisor(signal)
-      Process.kill signal, @supervisor
+    def kill_supervisor
+      Process.kill :QUIT, @supervisor
     end
 
     def default_options

data/lib/sponges/store.rb

@@ -1,15 +1,56 @@
 # encoding: utf-8
 module Sponges
   class Store
-    class << self
-      def new(name)
-        case Sponges::Configuration.store
-        when :memory
-          Sponges::Store::Memory.new(name)
-        when :redis
-          Sponges::Store::Redis.new(name)
-        end
-      end
+    extend Forwardable
+
+    attr_writer :supervisor_pid
+    attr_reader :pids, :name
+
+    def initialize(name)
+      @pids, @name = [], name
+    end
+
+    def_delegator :@pids, :<<, :add_children
+    def_delegator :@pids, :delete, :delete_children
+
+    def supervisor_pid
+      return @supervisor_pid if @supervisor_pid
+      s = find_supervisor
+      @supervisor_pid = s.pid if s
+    end
+
+    def children_pids
+      @pids.any? ? @pids : find_childs.map(&:pid)
+    end
+
+    def running?
+      !!find_supervisor
+    end
+
+    def register(supervisor_pid)
+      @supervisor_pid = supervisor_pid
+    end
+
+    def clear(name)
+      pids.clear
+    end
+
+    private
+
+    def supervisor_name
+      "#{name}_supervisor"
+    end
+
+    def childs_name
+      "#{name}_child"
+    end
+
+    def find_supervisor
+      Sys::ProcTable.ps.select {|f| f.cmdline == supervisor_name }.first
+    end
+
+    def find_childs
+      Sys::ProcTable.ps.select {|f| f.cmdline =~ /^#{childs_name}/ }
     end
   end
 end

data/lib/sponges/supervisor.rb

@@ -9,7 +9,6 @@ module Sponges
     def initialize(name, options, store, block)
       @name, @options, @store, @block = name, options, store, block
       $PROGRAM_NAME = "#{@name}_supervisor"
-      store.on_fork
       store.register Process.pid
       @children_seen = 0
       @handler = Handler.new self

data/lib/sponges/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sponges
-  VERSION = "0.7.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sponges
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.0
 platform: ruby
 authors:
 - chatgris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -73,8 +73,6 @@ files:
 - lib/sponges/response.rb
 - lib/sponges/runner.rb
 - lib/sponges/store.rb
-- lib/sponges/store/memory.rb
-- lib/sponges/store/redis.rb
 - lib/sponges/supervisor.rb
 - lib/sponges/version.rb
 homepage: http://af83.github.com/sponges
@@ -96,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Turn any ruby object to a daemon controlling an army of sponges.

data/lib/sponges/store/memory.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-module Sponges
-  class Store
-    class Memory
-      extend Forwardable
-
-      attr_writer :supervisor_pid
-      attr_reader :pids, :name
-
-      def initialize(name)
-        @pids, @name = [], name
-      end
-
-      def_delegator :@pids, :<<, :add_children
-      def_delegator :@pids, :delete, :delete_children
-
-      def supervisor_pid
-        return @supervisor_pid if @supervisor_pid
-        s = find_supervisor
-        @supervisor_pid = s.pid if s
-      end
-
-      def children_pids
-        @pids.any? ? @pids : find_childs.map(&:pid)
-      end
-
-      def running?
-        !!find_supervisor
-      end
-
-      def register(supervisor_pid)
-        @supervisor_pid = supervisor_pid
-      end
-
-      def register_hostname(hostname)
-      end
-
-      def on_fork
-      end
-
-      def clear(name)
-        pids.clear
-      end
-
-      private
-
-      def supervisor_name
-        "#{name}_supervisor"
-      end
-
-      def childs_name
-        "#{name}_child"
-      end
-
-      def find_supervisor
-        Sys::ProcTable.ps.select {|f| f.cmdline == supervisor_name }.first
-      end
-
-      def find_childs
-        Sys::ProcTable.ps.select {|f| f.cmdline =~ /^#{childs_name}/ }
-      end
-    end
-  end
-end

data/lib/sponges/store/redis.rb

@@ -1,75 +0,0 @@
-# encoding: utf-8
-module Sponges
-  class Store
-    class Redis
-      attr_reader :redis, :hostname_store, :name
-      private     :redis, :hostname_store
-
-      def initialize(name)
-        @name = name
-        @redis ||= Nest.new('sponges', Configuration.redis)
-        @hostname_store = @redis[Socket.gethostname]
-      end
-
-      def supervisor_pid
-        hostname_store[:worker][name][:supervisor].get
-      end
-
-      def children_pids
-        Array(hostname_store[:worker][name][:pids].smembers)
-      end
-
-      def running?
-        if pid = hostname_store[:worker][name][:supervisor].get
-          begin
-            Process.kill 0, pid.to_i
-            true
-          rescue Errno::ESRCH => e
-            hostname_store[:worker][name][:supervisor].del
-            false
-          end
-        else
-          false
-        end
-      end
-
-      def register_hostname(hostname)
-        redis[:hostnames].sadd hostname
-      end
-
-      def register(supervisor_pid)
-        hostname_store[:workers].sadd name
-        hostname_store[:worker][name][:supervisor].set supervisor_pid
-      end
-
-      def add_children(pid)
-        hostname_store[:worker][name][:pids].sadd pid
-      end
-
-      def delete_children(pid)
-        hostname_store[:worker][name][:pids].srem pid
-      end
-
-      def clear(name)
-        hostname_store[:worker][name][:supervisor].del
-        hostname_store[:workers].srem name
-        hostname_store[:worker][name][:pids].del
-      end
-
-      def on_fork
-        Sponges::Configuration.redis.client.reconnect
-      end
-
-      private
-
-      def find_supervisor
-        Sys::ProcTable.ps.select {|f| f.cmdline == supervisor_name }.first
-      end
-
-      def find_childs
-        Sys::ProcTable.ps.select {|f| f.cmdline =~ /^#{childs_name}/ }
-      end
-    end
-  end
-end
-