dynport_tools 0.2.15 → 0.2.16

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.16

data/dynport_tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.15"
+  s.version = "0.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "spec/dynport_tools/ascii_table_spec.rb",
     "spec/dynport_tools/deep_merger_spec.rb",
     "spec/dynport_tools/differ_spec.rb",
+    "spec/dynport_tools/embedded_redis_spec.rb",
     "spec/dynport_tools/eta_spec.rb",
     "spec/dynport_tools/have_attributes_spec.rb",
     "spec/dynport_tools/jenkins_spec.rb",

data/lib/dynport_tools/embedded_redis.rb

@@ -1,11 +1,12 @@
 require "redis"
 require "singleton"
 require "logger"
+require "fileutils"
 
 class EmbeddedRedis
   include Singleton
   
-  attr_accessor :started, :base_path
+  attr_accessor :started, :base_path, :killed
   attr_writer :logger
   
   def initialize(options = {})
@@ -22,27 +23,34 @@ class EmbeddedRedis
   end
   
   def pid
-    File.read(pid_path).strip.presence if File.exists?(pid_path)
+    if File.exists?(pid_path)
+      pid = File.read(pid_path).strip
+      pid.length > 0 ? pid : nil
+    end
   end
   
   def running?
-    !!(pid && `ps -p #{pid} | tail -n +2`.present?)
+    !!(pid && IO.popen("ps -p #{pid} | grep redis-server").count > 0)
   end
   
   def start
     if !running?
-      [socket_path, pid_path].each { |path| FileUtils.mkdir_p(File.dirname(path)) }
-      system(%(echo "#{config}" | redis-server -))
-      sleep 0.1
-      self.started = true
-      log "started redis with pid #{pid}"
-      at_exit do
-        kill
-      end
-      connection
+      do_start!
     else
       log "already running with pid #{pid}"
     end
+    connection
+  end
+  
+  def do_start!
+    [socket_path, pid_path].each { |path| FileUtils.mkdir_p(File.dirname(path)) }
+    system(%(echo "#{config}" | redis-server -))
+    sleep 0.1
+    self.started = true
+    log "started redis with pid #{pid}"
+    at_exit do
+      kill
+    end
   end
   
   def started?
@@ -50,7 +58,9 @@ class EmbeddedRedis
   end
   
   def connection
-    start if !started?
+    if !started?
+      start 
+    end
     @connection ||= Redis.new(:path => socket_path)
   end
   
@@ -62,11 +72,17 @@ class EmbeddedRedis
     @logger ||= Logger.new($stdout)
   end
   
+  def killed?
+    !!killed
+  end
+  
   def kill
     log "killing redis"
-    if pid
+    if !killed? && pid
+      log "killing #{pid}"
       system(%(kill #{pid})) 
       FileUtils.rm_f(socket_path)
+      self.killed = true
     end
   end
   

data/lib/dynport_tools.rb

@@ -8,4 +8,4 @@ require "cgi"
 require "term/ansicolor"
 require "diff/lcs"
 
-%w(deep_merger differ jenkins redis_dumper xml_file have_attributes redis_q eta ascii_table).map { |m| require "dynport_tools/#{m}" }
+%w(deep_merger differ jenkins redis_dumper xml_file have_attributes redis_q eta ascii_table embedded_redis).map { |m| require "dynport_tools/#{m}" }

data/spec/dynport_tools/embedded_redis_spec.rb

@@ -0,0 +1,136 @@
+require 'spec_helper'
+
+describe EmbeddedRedis do
+  let(:er) { EmbeddedRedis.instance }
+  
+  before(:each) do
+    er.logger = Logger.new("/dev/null")
+    er.stub(:system)
+    er.stub!(:sleep)
+    er.stub!(:kill)
+    FileUtils.stub!(:mkdir_p)
+  end
+  
+  after(:each) do
+    EmbeddedRedis.instance.instance_variable_set("@connection", nil)
+  end
+  
+  describe "#pid" do
+    it "returns nil when file not found" do
+      pid_path = root.join("tmp/some_weird_pid_path.pid")
+      er.stub!(:pid_path).and_return pid_path
+      er.pid.should be_nil
+    end
+    
+    it "returns nil when blank" do
+      pid_path = root.join("tmp/redis_test.pid")
+      File.open(pid_path, "w") { |f| f.puts "  " }
+      er.stub!(:pid_path).and_return pid_path
+      er.pid.should be_nil
+    end
+    
+    it "returns the correct pid when present" do
+      pid_path = root.join("tmp/redis_test.pid")
+      File.open(pid_path, "w") { |f| f.puts "123" }
+      er.stub!(:pid_path).and_return pid_path
+      er.pid.should == "123"
+    end
+  end
+  
+  describe "#running?" do
+    it "returns false when pid is nil" do
+      er.should_receive(:pid).and_return nil
+      er.running?.should be_false
+    end
+    
+    it "returns false when not in pid list" do
+      er.stub!(:pid).and_return "1212"
+      IO.should_receive(:popen).with("ps -p 1212 | grep redis-server").and_return([])
+      er.running?.should be_false
+    end
+    
+    it "returns true lines > 0" do
+      er.stub!(:pid).and_return "1212"
+      IO.stub(:popen).with("ps -p 1212 | grep redis-server").and_return(["line"])
+      er.running?.should be_true
+    end
+  end
+  
+  describe "#start" do
+    before(:each) do
+      er.stub!(:do_start!)
+      er.stub!(:connection).and_return double("connection")
+    end
+    
+    it "calls do_start when running? is false" do
+      er.should_receive(:running?).and_return false
+      er.should_receive(:do_start!).and_return true
+      er.start
+    end
+    
+    it "does not call do_start! of running" do
+      er.should_receive(:running?).and_return true
+      er.should_not_receive(:do_start!).and_return true
+      er.start
+    end
+  end
+  
+  describe "do_start" do
+    it "sets started to true" do
+      er.do_start!
+      er.started.should be_true
+    end
+    
+    it "creates dir of pid and socket paths" do
+      er.stub(:base_path).and_return "/custom_base"
+      FileUtils.should_receive(:mkdir_p).with("/custom_base/pids")
+      FileUtils.should_receive(:mkdir_p).with("/custom_base/sockets")
+      er.do_start!
+    end
+    
+    it "starts redis" do
+      er.stub(:config).and_return "some config"
+      er.should_receive(:system).with(/echo "some config" \| redis-server -/)
+      er.do_start!
+    end
+    
+    it "registers an on_exit hook" do
+      er.should_receive(:at_exit)
+      er.do_start!
+    end
+  end
+  
+  describe "#started?" do
+    it "returns true when started is true" do
+      er.started = true
+      er.started?.should == true
+    end
+    
+    it "returns false when started is nil" do
+      er.started = nil
+      er.started?.should == false
+    end
+  end
+  
+  describe "#connection" do
+    it "calls start when not started" do
+      er.should_receive(:started?).and_return false
+      er.should_receive(:start)
+      er.connection
+    end
+    
+    it "does not call start when already started" do
+      er.should_receive(:started?).and_return true
+      er.should_not_receive(:start)
+      er.connection
+    end
+    
+    it "creates a new redis connection" do
+      er.instance_variable_set("@connection", nil)
+      er.stub(:socket_path).and_return("/some/socket/path")
+      er.stub(:started?).and_return true
+      redis = er.connection
+      redis.should be_kind_of(Redis)
+    end
+  end
+end

data/spec/dynport_tools/redis_q_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DynportTools::RedisQ do
   let(:key) { "test/redis_queue" }
-  let(:redis) { Redis.new(:path => root.join("tmp/redis.socket")) }
+  let(:redis) { EmbeddedRedis.instance.connection }
   let(:queue) do 
     q = DynportTools::RedisQ.new(key)
     q.redis = redis

data/spec/spec_helper.rb

@@ -21,31 +21,8 @@ RSpec.configure do |config|
   end
 end
 
+EmbeddedRedis.instance.logger = Logger.new("/dev/null")
+
 def root
   Pathname.new(File.expand_path("../../", __FILE__))
-end
-
-def redis_pidfile
-  root.join("tmp/redis.pid")
-end
-
-def redis_socket
-  root.join("tmp/redis.socket")
-end
-
-redis_config = [
-  "port 0",
-  "unixsocket #{redis_socket}",
-  "pidfile #{redis_pidfile}",
-  "daemonize yes"
-].join("\n")
-
-FileUtils.mkdir_p(File.dirname(redis_pidfile))
-
-system("echo '#{redis_config}' | redis-server -")
-
-at_exit do
-  pid = File.read(redis_pidfile).strip
-  system("kill #{pid}")
-  FileUtils.rm_f(redis_socket)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -261,6 +261,7 @@ files:
 - spec/dynport_tools/ascii_table_spec.rb
 - spec/dynport_tools/deep_merger_spec.rb
 - spec/dynport_tools/differ_spec.rb
+- spec/dynport_tools/embedded_redis_spec.rb
 - spec/dynport_tools/eta_spec.rb
 - spec/dynport_tools/have_attributes_spec.rb
 - spec/dynport_tools/jenkins_spec.rb