dynport_tools 0.2.17 → 0.2.18

data/VERSION

@@ -1 +1 @@
-0.2.17
+0.2.18

data/dynport_tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.17"
+  s.version = "0.2.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]

data/lib/dynport_tools/embedded_redis.rb

@@ -6,20 +6,28 @@ require "fileutils"
 class DynportTools::EmbeddedRedis
   include Singleton
   
-  attr_accessor :started, :base_path, :killed
+  attr_accessor :started, :base_path, :killed, :custom_config
   attr_writer :logger
   
   def initialize(options = {})
-    self.base_path = options[:base_path] || "/tmp"
+    self.base_path = options[:base_path] || "/tmp/embedded_redis"
     self.logger = options[:logger] || Logger.new($stderr)
   end
   
   def pid_path
-    "#{base_path}/pids/redis.#{Process.pid}.pid"
+    "#{base_path}/redis.#{Process.pid}.pid"
   end
   
   def socket_path
-    "#{base_path}/sockets/redis.#{Process.pid}.socket"
+    "#{base_path}/redis.#{Process.pid}.socket"
+  end
+  
+  def dbfilename
+    "redis.#{Process.pid}.rdb"
+  end
+  
+  def dbfile_path
+    "#{base_path}/#{dbfilename}"
   end
   
   def pid
@@ -43,7 +51,7 @@ class DynportTools::EmbeddedRedis
   end
   
   def do_start!
-    [socket_path, pid_path].each { |path| FileUtils.mkdir_p(File.dirname(path)) }
+    FileUtils.mkdir_p(base_path)
     system(%(echo "#{config}" | redis-server -))
     sleep 0.1
     self.started = true
@@ -82,17 +90,19 @@ class DynportTools::EmbeddedRedis
       log "killing #{pid}"
       system(%(kill #{pid})) 
       FileUtils.rm_f(socket_path)
+      FileUtils.rm_f(dbfile_path)
       self.killed = true
     end
   end
   
+  def default_config
+    { 
+      :daemonize => "yes", :pidfile => pid_path, :port => 0, :unixsocket => socket_path, :dir => base_path, 
+      :dbfilename  => dbfilename
+    }
+  end
+  
   def config
-    [
-      "daemonize yes",
-      "pidfile #{pid_path}",
-      "port 0",
-      "unixsocket #{socket_path}"
-      
-    ].join("\n")
+    default_config.merge(custom_config || {}).map { |key, value| ["#{key} #{value}"] }.join("\n")
   end
 end

data/spec/dynport_tools/embedded_redis_spec.rb

@@ -13,6 +13,49 @@ describe DynportTools::EmbeddedRedis do
   
   after(:each) do
     DynportTools::EmbeddedRedis.instance.instance_variable_set("@connection", nil)
+    DynportTools::EmbeddedRedis.instance.custom_config = nil
+  end
+  
+  describe "#kill" do
+    before(:each) do
+      er.unstub(:kill)
+      er.stub!(:killed?).and_return false
+      er.stub!(:pid).and_return "123"
+      FileUtils.stub!(:rm_f)
+    end
+    
+    it "kills the proces" do
+      er.should_receive(:system).with("kill 123")
+      er.kill
+    end
+    
+    it "removes the socket file" do
+      er.should_receive(:socket_path).and_return("/path/to/socket.tst")
+      FileUtils.should_receive(:rm_f).with("/path/to/socket.tst")
+      er.kill
+    end
+    
+    it "removes the file path" do
+      er.stub!(:base_path).and_return("/base/path")
+      er.stub!(:dbfilename).and_return("some_name")
+      FileUtils.should_receive(:rm_f).with("/base/path/some_name")
+      er.kill
+    end
+    
+    it "sets killed to true" do
+      er.kill
+      er.killed.should == true
+    end
+    
+    it "does not call system when killed" do
+      er.stub(:killed?).and_return true
+      er.should_not_receive(:system)
+    end
+    
+    it "does not call system when pid is nil" do
+      er.stub(:pid?).and_return nil
+      er.should_not_receive(:system)
+    end
   end
   
   describe "#pid" do
@@ -75,16 +118,28 @@ describe DynportTools::EmbeddedRedis do
     end
   end
   
-  describe "do_start" do
+  describe "#config" do
+    it "returns the default config" do
+      er.stub!(:default_config).and_return(:a => 1, :b => 2)
+      er.config.should == "a 1\nb 2"
+    end
+    
+    it "merges the custom_config when defined" do
+      er.stub!(:default_config).and_return(:a => 1, :b => 2)
+      er.custom_config = { :a => 3 }
+      er.config.should == "a 3\nb 2"
+    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.stub(:base_path).and_return "/custom_base/test"
+      FileUtils.should_receive(:mkdir_p).with("/custom_base/test")
       er.do_start!
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 2
-  - 17
-  version: 0.2.17
+  - 18
+  version: 0.2.18
 platform: ruby
 authors: 
 - Tobias Schwab