dante 0.1.4 → 0.1.5

data/lib/dante/runner.rb

@@ -103,8 +103,9 @@ module Dante
         interrupt
         exit
       }
+
       trap("TERM"){
-        interrupt
+        log "Trying to stop #{@name}..."
         exit
       }
 
@@ -128,12 +129,12 @@ module Dante
     end
 
     def interrupt
-      # begin
+      if options[:debug]
         raise Interrupt
-        sleep(1)
-      # rescue Interrupt
-      #  log "Interrupt received; stopping #{@name}"
-      # end
+        sleep 1
+      else
+        log "Interrupt received; stopping #{@name}"
+      end
     end
 
     # Returns true if process is not running
@@ -211,7 +212,7 @@ module Dante
         begin
           pid = IO.read(f).chomp.to_i
           FileUtils.rm f
-          Process.kill('INT', pid)
+          Process.kill('TERM', pid)
           log "Stopped PID: #{pid} at #{f}"
         rescue => e
           log "Failed to stop! #{k}: #{e}"
@@ -223,17 +224,25 @@ module Dante
     # If log_path is nil, redirect to /dev/null to quiet output
     def redirect_output!
       if log_path = options[:log_path]
+        # if the log directory doesn't exist, create it
+        FileUtils.mkdir_p File.dirname(options[:log_path]), :mode => 0755
+        # touch the log file to create it
         FileUtils.touch log_path
-        STDOUT.reopen(log_path, 'a')
-        STDERR.reopen STDOUT
+        # Set permissions on the log file
         File.chmod(0644, log_path)
-        STDOUT.sync = true
+        # Reopen $stdout (NOT +STDOUT+) to start writing to the log file
+        $stdout.reopen(log_path, 'a')
+        # Redirect $stderr to $stdout
+        $stderr.reopen $stdout
+        $stdout.sync = true
       else # redirect to /dev/null
-        STDIN.reopen "/dev/null"
-        STDOUT.reopen "/dev/null", "a"
-        STDERR.reopen STDOUT
+        # We're not bothering to sync if we're dumping to /dev/null
+        # because /dev/null doesn't care about buffered output
+        $stdin.reopen '/dev/null'
+        $stdout.reopen '/dev/null', 'a'
+        $stderr.reopen $stdout
       end
-      log_path = options[:log_path] ? options[:log_path] : "/dev/null"
+      log_path = options[:log_path] ? options[:log_path] : '/dev/null'
     end
 
     # Runs until the block condition is met or the timeout_seconds is exceeded
@@ -248,7 +257,7 @@ module Dante
     end
 
     def log(message)
-      puts message if options[:debug]
+      puts message
     end
 
   end

data/lib/dante/version.rb

@@ -1,3 +1,3 @@
 module Dante
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/runner_test.rb

@@ -33,6 +33,7 @@ describe "dante runner" do
       Process.kill "INT", @pid
       sleep(1) # Wait to complete
       @output = File.read(@process.tmp_path)
+
       assert_match /Started on 8080!!/, @output
       assert_match /Interrupt!!/, @output
       assert_match /Closing!!/, @output
@@ -43,9 +44,10 @@ describe "dante runner" do
       Process.kill "TERM", @pid
       sleep(1) # Wait to complete
       @output = File.read(@process.tmp_path)
+
       assert_match /Started on 8080!!/, @output
-      assert_match /Interrupt!!/, @output
       assert_match /Closing!!/, @output
+      refute_match /Interrupt!!/, @output
     end
   end # daemonize
 
@@ -54,7 +56,7 @@ describe "dante runner" do
       @logfile = '/tmp/dante-logging.log'
       FileUtils.rm(@logfile) if File.exist?(@logfile)
       @process = TestingProcess.new('c')
-      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8081, :log_path => @logfile, :debug => false }
+      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8081, :log_path => @logfile }
       @runner = Dante::Runner.new('test-process-2', @run_options) { |opts|
         @process.run_c!(opts[:port]) }
       @runner.execute
@@ -66,12 +68,38 @@ describe "dante runner" do
       Process.kill "INT", @pid
       sleep(1) # Wait to complete
       @output = File.read(@logfile)
+
       assert_match /Started on 8081!!/, @output
       assert_match /Interrupt!!/, @output
       assert_match /Closing!!/, @output
     end
   end
 
+  describe "with daemonize flag and logging flag enabled, and debug flag disabled" do
+    before do
+      @logfile = '/tmp/dante-logging.log'
+      FileUtils.rm(@logfile) if File.exist?(@logfile)
+      @process = TestingProcess.new('c')
+      @run_options = { :daemonize => true, :pid_path => "/tmp/dante.pid", :port => 8081, :log_path => @logfile, :debug => false }
+      @runner = Dante::Runner.new('test-process-2', @run_options) { |opts|
+        @process.run_c!(opts[:port]) }
+      @runner.execute
+      sleep(1)
+    end
+
+    it "can properly handles log to file and aborts on INT" do
+      refute_equal 0, @pid = `cat /tmp/dante.pid`.to_i
+      Process.kill "INT", @pid
+      sleep(1) # Wait to complete
+      @output = File.read(@logfile)
+
+      assert_match /Started on 8081!!/, @output
+      assert_match /Interrupt received/, @output
+      assert_match /Closing!!/, @output
+    end
+  end
+
+
   describe "with execute accepting block" do
     before do
       @process = TestingProcess.new('b')
@@ -86,6 +114,7 @@ describe "dante runner" do
       Process.kill "INT", @pid
       sleep(1) # Wait to complete
       @output = File.read(@process.tmp_path)
+
       assert_match /Started on 8080!!/, @output
       assert_match /Interrupt!!/, @output
       assert_match /Closing!!/, @output

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dante
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-21 00:00:00 Z
+date: 2012-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake