guard-redis 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c9e97b9b31760dbdb3a1b76a47d4fe6a30bcb6fa
+  data.tar.gz: 8fa5b34132dbdc6b84360c3cdd8e0ff4c404a1ef
+SHA512:
+  metadata.gz: 3827eed1ebf25253db43d8abc3336d2a943732f9bf2dfc07ffb24e4d817e99dba82b4466cd57a20d31b9f7239a355322ce239173b16e0cbae42777bb090bbdf1
+  data.tar.gz: 59d9d85069adbcd036d9d6ee0fbfcef8065359058f2997e38e051c526f3c2d0171f6fce7bb2d9c92f3829f2f0a43ced1fedd7056e3eb119ea37f68694d16d6be

data/README.md

@@ -33,8 +33,16 @@ It takes several options related to its configuration.
 :pidfile => "/var/pid/redis.pid"                   # Set a custom path the where the pidfile is written
 :reload_on_change => false                         # Reload Redis if any of the specified files change. Note that you
                                                    # must specify this option in addition to passing a block to Guard.
+:capture_logging => true                           # Enables logging to :logfile
+:logfile => "log/redis_#{port}.log"                # Set a custom path where logs from Redis are written
+                                                   # Since by default the output from Redis goes to the ether, these options
+                                                   # let you redirect logging to a file to assist with debugging crashes
+:shutdown_retries => 3                             # Set a number of times to retry
+:shutdown_wait => 5                                # Set a number of seconds to wait between retries
+                                                   # Sometimes Redis takes more than a moment to shut down and you can use
+                                                   # these options to ensure it does so cleanly before reloading with :reload_on_change.
 ~~~~
 
-## Contributers
+## Contributors
 
 https://github.com/whazzmaster/guard-redis/graphs/contributors

data/lib/guard/redis.rb

@@ -16,12 +16,9 @@ module Guard
     end
 
     def stop
-      if pid
-        UI.info "Sending TERM signal to Redis (#{pid})"
-        Process.kill("TERM", pid)
-        @pid = nil
-        true
-      end
+      shutdown_redis
+      @pid = nil
+      true
     end
 
     def reload
@@ -39,6 +36,21 @@ module Guard
       reload if reload_on_change?
     end
 
+    def shutdown_redis
+      return UI.info "No instance of Redis to stop." unless pid
+      return UI.info "Redis (#{pid}) was already stopped." unless process_running?
+      UI.info "Sending TERM signal to Redis (#{pid})..."
+      Process.kill("TERM", pid)
+
+      return if shutdown_retries == 0
+      shutdown_retries.times do
+        return UI.info "Redis stopped." unless process_running?
+        UI.info "Redis is still shutting down. Retrying in #{ shutdown_wait } second(s)..."
+        sleep shutdown_wait
+      end
+      UI.error "Redis didn't shut down after #{ shutdown_retries * shutdown_wait } second(s)."
+    end
+
     def pidfile_path
       options.fetch(:pidfile) {
         File.expand_path('/tmp/redis.pid', File.dirname(__FILE__))
@@ -46,11 +58,13 @@ module Guard
     end
 
     def config
-      <<"END"
+      result = <<"END"
 daemonize yes
 pidfile #{pidfile_path}
 port #{port}
 END
+      result << "logfile #{logfile}" if capture_logging?
+      result
     end
 
     def pid
@@ -65,6 +79,20 @@ END
       options.fetch(:port) { 6379 }
     end
 
+    def logfile
+      options.fetch(:logfile) {
+        if capture_logging? then "log/redis_#{port}.log" else 'stdout' end
+      }
+    end
+
+    def shutdown_retries
+      options.fetch(:shutdown_retries) { 0 }
+    end
+
+    def shutdown_wait
+      options.fetch(:shutdown_wait) { 0 }
+    end
+
     def last_operation_succeeded?
       $?.success?
     end
@@ -72,5 +100,18 @@ END
     def reload_on_change?
       options.fetch(:reload_on_change) { false }
     end
+
+    def process_running?
+      begin
+        Process.getpgid pid
+        true
+      rescue Errno::ESRCH
+        false
+      end
+    end
+
+    def capture_logging?
+      options.fetch(:capture_logging) { false }
+    end
   end
 end

data/lib/guard/redis/templates/Guardfile

@@ -1,4 +1,4 @@
-# Possible options are :port, :executable, :pidfile, and :reload_on_change
+# Possible options are :port, :executable, :pidfile, :reload_on_change, :capture_logging, :logfile, :shutdown_retries, :shutdown_wait
 
 # Default implementation - starts Redis on standard port and stops on exit
 guard 'redis'
@@ -9,3 +9,9 @@ guard 'redis'
 # guard 'redis', :executable => 'redis-server', :pidfile => 'tmp/pids/redis.pid', :port => 6379, :reload_on_change => true do
 #   watch(/^(app|lib|config)\/.*\.rb$/)
 # end
+
+# Same as above - also enable Redis logging and 3 shutdown retries spaced 5 seconds apart
+#
+# guard 'redis', :executable => 'redis-server', :pidfile => 'tmp/pids/redis.pid', :port => 6379, :reload_on_change => true, :capture_logging => true, :logfile => 'log/redis.log', :shutdown_retries => 3, :shutdown_wait => 5 do
+#   watch(/^(app|lib|config)\/.*\.rb$/)
+# end

data/lib/guard/redis/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RedisVersion
-    VERSION = "0.2.2"
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: guard-redis
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Zachery Moneypenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,17 +69,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Guard::Redis automatically starts and restarts your local redis server.
@@ -105,26 +94,25 @@ files:
 - README.md
 homepage: http://rubygems.org/gems/guard-redis
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guard gem for Redis
 test_files: []