guard-redis 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632ab4b4b54c4e8b9d3860ce6b6f7c1b52f77283
-  data.tar.gz: da85a2b91081fcc2263a1fa5d4de3eee05df05aa
+  metadata.gz: fae5b604bb544bddec0334ad7491722faeb5f594
+  data.tar.gz: 0eac208b2d898a82e129fa9cad1323021b76036c
 SHA512:
-  metadata.gz: e429cf1236bd4e8859e966174234e3a901f1f734322d338fa0fadb8f45fe1db0dc4b2eeb6c7e8fd920203b3619252866256823f2bf31dea55b808774ed9e4e1c
-  data.tar.gz: d2ad050d41116680d37b1129872858fea48a9145a220385faa52a21ae748bee155f8321193a00a09e6521f673a2996ae4e865c2f9532469abe828b5ff1b313a0
+  metadata.gz: 77e10fae981ebba8c99b81a477224d166ab5bb4b06f2bbc5e779489ce5bed111df3b7007b37a04e6337200470e4cfabd0ba2d18dba59b2bc7f15dc406fbffd3d
+  data.tar.gz: 51ead19490a1e9fe643c79b2c4eed906e35df60221591e7ef316d504018f4fb15655e35d5ddc7b035d5c574a45fae4356df348af25bae41d3ca118a75e3017c2

data/README.md

@@ -38,7 +38,7 @@ It takes several options related to its configuration.
 
 ### List of available options
 ~~~~ruby
-:executable => "/path/to/redis/server/executable"  # Set the custom path to the Redis server executable
+:executable => "/path/to/redis-server/executable"  # Set the custom path to the Redis server executable
 :port => 9999                                      # Set a custom port number the Redis server is running on
 :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
@@ -53,5 +53,14 @@ It takes several options related to its configuration.
                                                    # these options to ensure it does so cleanly before reloading with :reload_on_change.
 ~~~~
 
+### Pidfile location must be writable
+Starting with version 2.0.0, the pidfile location you specify or the *default*
+location (`/tmp/redis.pid`) if you don't specify **must be writable** or
+guard-redis will fail to start.
+
+**If you specify a pidfile location via the configuration and the directory path
+doesn't exist, guard-redis will attempt to create it**. If it cannot write to that
+directory, you will see an error and redis will fail to start.
+
 ## Contributors
 Thanks so much to [all who have contributed](https://github.com/whazzmaster/guard-redis/graphs/contributors)!

data/lib/guard/redis.rb

@@ -3,21 +3,30 @@ require 'guard/compat/plugin'
 module Guard
   class Redis < Plugin
     def start
-      UI.info "Starting Redis on port #{port}..."
-      @pid = nil
-      IO.popen("#{executable} -", 'w+') do |server|
-        @pid = server.pid
-        server.write(config)
-        server.close_write
+      @started = false
+      begin
+        ensure_pidfile_directory
+        UI.info "Starting Redis on port #{port}..."
+        IO.popen("#{executable} -", 'w+') do |server|
+          server.write(config)
+          server.close_write
+        end
+        UI.info "Redis is running with PID #{pid}"
+        @started = last_operation_succeeded?
+      rescue ::Exception => err
+        UI.error "Redis not started due to errors: #{err}"
       end
-      UI.info "Redis is running with PID #{pid}"
-      last_operation_succeeded?
+      @started
     end
 
     def stop
-      shutdown_redis
-      @pid = nil
-      true
+      if redis_started?
+        shutdown_redis
+        true
+      else
+        UI.info "Redis never started. No need to shutdown."
+        true
+      end
     end
 
     def reload
@@ -35,6 +44,10 @@ module Guard
       reload if reload_on_change?
     end
 
+    def redis_started?
+      @started
+    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?
@@ -56,8 +69,20 @@ module Guard
       }
     end
 
+    def ensure_pidfile_directory
+      pidfile_dir = File.dirname(pidfile_path)
+      unless Dir.exist? pidfile_dir
+        UI.info "Creating pidfie directory #{pidfile_dir}"
+        FileUtils.mkdir_p pidfile_dir
+      end
+
+      unless File.writable? pidfile_dir
+        raise "no write access to pidfile directory #{pidfile_dir}"
+      end
+    end
+
     def config
-      result = <<"END"
+      result = <<END
 daemonize yes
 pidfile #{pidfile_path}
 port #{port}
@@ -67,7 +92,18 @@ END
     end
 
     def pid
-      (File.exist?(pidfile_path) && File.read(pidfile_path).to_i) || @pid
+      count = 0
+      loop do
+        if count > 5
+          raise "pidfile was never written to #{pidfile_path}"
+        end
+
+        break if File.exists? pidfile_path
+        UI.info "Waiting for pidfile to appear at #{pidfile_path}..."
+        count += 1
+        sleep 1
+      end
+      File.read(pidfile_path).to_i
     end
 
     def executable

data/lib/guard/redis/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RedisVersion
-    VERSION = '1.0.1'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-redis
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Zachery Moneypenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,16 +56,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Guard gem for Redis