ngauthier-active-listener 0.3.2 → 0.3.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 3
-:patch: 2
 :major: 0
+:minor: 3
+:patch: 3

data/lib/active-listener.rb

@@ -39,6 +39,11 @@ class ActiveListener
       "#{rake_root}",
     ].join(" ")
     `#{command}`
+    10.times do
+      return true if self.running(opts)
+      sleep(0.1)
+    end
+    return self.running(opts)
   end
 
   # Stop an #ActiveListener by specifying a pid file
@@ -46,7 +51,32 @@ class ActiveListener
   #  ActiveListener.stop(:pid_file => File.join(RAILS_ROOT, 'log', 'active-listener.pid'))
   def self.stop(opts = {})
     pid_file = opts[:pid_file]
-    `start-stop-daemon --stop --oknodo --pidfile #{File.expand_path(pid_file)}`
+    10.times do
+      `start-stop-daemon --stop --oknodo --pidfile #{File.expand_path(pid_file)}`
+      break if !self.running(opts)
+      sleep(0.2)
+    end
+    return !self.running(opts)
+  end
+
+  # Check if an #ActiveListener is running
+  #
+  #  ActiveListener.running(:pid => 12345)
+  # or
+  #  ActiveListener.running(:pid_file => 'active-listener.pid')
+  def self.running(opts = {})
+    unless opts[:pid] or opts[:pid_file]
+      raise "Must pass in pid or pid_file"
+    end
+    if opts[:pid_file]
+      raise "File does not exist" unless File.exists?(opts[:pid_file])
+      f = File.new(opts[:pid_file], 'r')
+      pid = f.read.to_i
+      f.close
+    else
+      pid = opts[:pid].to_i
+    end
+    return `ps -p #{pid.to_s} -o pid=`.size > 0
   end
 
   # Create an #ActiveListener in the foreground. This is useful for a non-rails project.
@@ -192,6 +222,8 @@ class ActiveListener
     if port
       self.port = port
       spawn_listener_thread
+    else
+      # puts "no port in [#{config_file}]:\n#{yml.inspect}"
     end
   end
 
@@ -220,7 +252,7 @@ class ActiveListener
 
   # Listen on a port for triggers (not implemented)
   def spawn_listener_thread
-    # puts "Hey a port! #{port}"
+    puts "Hey a port! #{port}"
   end
 
 end

data/test/active_listener-events.yml

@@ -2,4 +2,5 @@
   tasks:
   - task: test:touch_file
     trigger: MY_TRIGGER
+
   port: 20150

data/test/active_listener_test.rb

@@ -91,20 +91,20 @@ class ActiveListenerTest < Test::Unit::TestCase
   context "An autostarted listener" do
 
     setup do
+      @sample_file = File.join(File.dirname(__FILE__),'sample.txt')
+      FileUtils.rm_f @sample_file
       assert ActiveListener.autostart(
         :config => File.join(File.dirname(__FILE__), 'active_listener.yml'),
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid'),
         :log_file => File.join(File.dirname(__FILE__), 'active_listener.log'),
         :rake_root => File.join(File.dirname(__FILE__), '..')
       )
-      @sample_file = File.join(File.dirname(__FILE__),'sample.txt')
     end
 
     teardown do
-      ActiveListener.stop(
+      assert ActiveListener.stop(
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid')
       )
-      sleep(1)
       FileUtils.rm_f(File.join(File.dirname(__FILE__),'sample.txt'))
     end
 
@@ -113,7 +113,7 @@ class ActiveListenerTest < Test::Unit::TestCase
       assert File.exists?(@sample_file)
       FileUtils.rm_f(@sample_file)
       assert !File.exists?(@sample_file)
-      sleep(1)
+      sleep(2)
       assert File.exists?(@sample_file)
     end
 
@@ -121,7 +121,7 @@ class ActiveListenerTest < Test::Unit::TestCase
       pf = File.new(File.join(File.dirname(__FILE__), 'active_listener.pid'))
       pid = pf.read
       pf.close
-      assert(pid_running(pid))
+      assert(ActiveListener.running(:pid => pid))
       ActiveListener.autostart(
         :config => File.join(File.dirname(__FILE__), 'active_listener.yml'),
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid'),
@@ -132,19 +132,19 @@ class ActiveListenerTest < Test::Unit::TestCase
       new_pid = pf.read
       pf.close
       assert_equal pid, new_pid
-      assert(pid_running(pid))
+      assert(ActiveListener.running(:pid => pid))
     end
 
     should "be able to be stopped and a new one can be run" do
       pf = File.new(File.join(File.dirname(__FILE__), 'active_listener.pid'))
       pid = pf.read
       pf.close
-      assert(pid_running(pid))
-      ActiveListener.stop(
+      assert ActiveListener.running(:pid => pid)
+      assert ActiveListener.stop(
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid')
       )
-      sleep(1)
-      assert(!pid_running(pid))
+      sleep(0.2)
+      assert(!ActiveListener.running(:pid => pid))
       ActiveListener.autostart(
         :config => File.join(File.dirname(__FILE__), 'active_listener.yml'),
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid'),
@@ -155,8 +155,8 @@ class ActiveListenerTest < Test::Unit::TestCase
       new_pid = pf.read
       pf.close
       assert_not_equal pid, new_pid
-      assert(pid_running(new_pid))
-      assert(!pid_running(pid))
+      assert ActiveListener.running(:pid => new_pid)
+      assert !ActiveListener.running(:pid => pid)
     end
   end
 
@@ -186,10 +186,9 @@ class ActiveListenerTest < Test::Unit::TestCase
 
   context "An auto-started event based listener" do
     setup do
-      ActiveListener.stop(
+      assert ActiveListener.stop(
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid')
       )
-      sleep(0.5)
       ActiveListener.autostart(
         :config => File.join(File.dirname(__FILE__), 'active_listener-events.yml'),
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid'),
@@ -200,10 +199,9 @@ class ActiveListenerTest < Test::Unit::TestCase
     end
 
     teardown do
-      ActiveListener.stop(
+      assert ActiveListener.stop(
         :pid_file => File.join(File.dirname(__FILE__), 'active_listener.pid')
       )
-      sleep(1)
       FileUtils.rm_f(File.join(File.dirname(__FILE__),'sample.txt'))
     end
 
@@ -213,10 +211,4 @@ class ActiveListenerTest < Test::Unit::TestCase
       #assert File.exists?(@sample_file)
     end
   end
-
-  private
-
-  def pid_running(pid)
-    `ps -p #{pid.to_i.to_s} -o pid=`.size > 0
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ngauthier-active-listener
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Nick Gauthier