redis-server 0.0.3 → 0.0.4

data/bin/redis

@@ -15,13 +15,7 @@ class RedisController
     @pid_path = options.fetch(:pid_path) { File.join(@db_dir, 'redis.pid') }
     @port = options.fetch(:port, 6379)
 
-    @daemon = DaemonController.new(
-                :identifier => 'Redis server',
-                :start_command => "#{MYSELF} generate-config --daemonize | #{File.join(REDIS_EXEC_ROOT, 'redis-server')} -",
-                :ping_command => lambda { TCPSocket.new('localhost', @port) },
-                :pid_file => @pid_path,
-                :log_file => @log_path
-              )
+
   end
 
   def generate_config(options = {})
@@ -56,21 +50,39 @@ class RedisController
   end
 
   def start
-    @daemon.start
+    daemon.start
   end
 
   def stop
-    @daemon.stop
+    daemon.stop
   end
 
   def run
-    exec "#{MYSELF} generate-config | #{File.join(REDIS_EXEC_ROOT, 'redis-server')} -"
+    exec "#{MYSELF} generate-config | #{bin('redis-server')} -"
   end
 
   def cli
-    exec File.join(REDIS_EXEC_ROOT, 'redis-cli')
+    exec bin('redis-cli')
+  end
+
+  def bin(binary)
+    path = File.join(REDIS_EXEC_ROOT, binary)
+    raise Errno::ENOENT.new(path) unless File.file?(path)
+    path
   end
 
+  private
+  
+  def daemon
+    @daemon ||= DaemonController.new(
+                :identifier => 'Redis server',
+                :start_command => "#{MYSELF} generate-config --daemonize | #{bin('redis-server')} -",
+                :ping_command => lambda { TCPSocket.new('localhost', @port) },
+                :pid_file => @pid_path,
+                :log_file => @log_path
+              )
+  end
+  
 end
 
 $redis_controller = RedisController.new
@@ -108,6 +120,17 @@ class RedisCommand < Clamp::Command
       $redis_controller.cli
     end
   end
+  
+  subcommand 'bin', "Output the path to a redis binary" do
+    parameter "[BINARY]", "binary to find", :default => 'redis-server'
+  
+    def execute
+      puts $redis_controller.bin(binary)
+    rescue Errno::ENOENT
+      STDERR.puts $!
+      exit 1
+    end
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &14797940 !ruby/object:Gem::Requirement
+  requirement: &14842720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *14797940
+  version_requirements: *14842720
 - !ruby/object:Gem::Dependency
   name: daemon_controller
-  requirement: &14797460 !ruby/object:Gem::Requirement
+  requirement: &14841960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *14797460
+  version_requirements: *14841960
 description: ! '                    Gem to install the redis server; makes things
   easy.