rubyrep 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.1 2009-03-25
+
+* 3 minor enhancements:
+  * Verified compatibility with active_record 2.3.2 and jruby 1.2.0
+  * Released jruby bunde with the updated activerecord and jruby
+  * Catch ctrl+c and execute graceful shutdown
+
 == 1.0.0 2009-03-07
 
 * 1 major enhancement:

data/lib/rubyrep/replication_runner.rb

@@ -89,7 +89,9 @@ EOS
       @termination_mutex = Mutex.new
       @termination_mutex.lock
       @waiter_thread ||= Thread.new {@termination_mutex.lock; self.termination_requested = true}
-      Signal.trap('TERM') {@termination_mutex.unlock}
+      %w(TERM INT).each do |signal|
+        Signal.trap(signal) {puts "\nCaught '#{signal}': Initiating graceful shutdown"; @termination_mutex.unlock}
+      end
     end
 
     # Prepares the replication

data/lib/rubyrep/version.rb

@@ -2,7 +2,7 @@ module RR #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/replication_runner_spec.rb

@@ -90,20 +90,30 @@ describe ReplicationRunner do
 
     runner.pause_replication
   end
-  
-  it "init_waiter should setup correct TERM signal processing" do
-    runner = ReplicationRunner.new
-    runner.stub!(:session).and_return(Session.new(standard_config))
+
+  it "init_waiter should setup correct signal processing" do
+    org_stdout = $stdout
+    $stdout = StringIO.new
+    begin
+      runner = ReplicationRunner.new
+      runner.stub!(:session).and_return(Session.new(standard_config))
     
-    # simulate sending the TERM signal
-    Signal.should_receive(:trap).with('TERM').and_yield
+      # simulate sending the TERM signal
+      Signal.should_receive(:trap).with('TERM').and_yield
+
+      # also verify that the INT signal is trapped
+      Signal.should_receive(:trap).with('INT')
 
-    runner.init_waiter
+      runner.init_waiter
 
-    # verify the that any pause would have been prematurely finished and
-    # termination signal been set
-    runner.termination_requested.should be_true
-    runner.instance_variable_get(:@waiter_thread).should_not be_alive
+      # verify the that any pause would have been prematurely finished and
+      # termination signal been set
+      runner.termination_requested.should be_true
+      runner.instance_variable_get(:@waiter_thread).should_not be_alive
+      $stdout.string.should =~ /TERM.*shutdown/
+    ensure
+      $stdout = org_stdout
+    end
   end
 
   it "prepare_replication should call ReplicationInitializer#prepare_replication" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyrep
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Arndt Lehmann
@@ -30,7 +30,7 @@ cert_chain:
   NwT26VZnE2nr8g==
   -----END CERTIFICATE-----
 
-date: 2009-03-08 00:00:00 +09:00
+date: 2009-03-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency