harbour 0.0.1 → 0.0.2

data/TODO

@@ -1,3 +1,5 @@
 Add timeout to pid, since the port may be open but no pid from lsof. Doing this will also allow the sleep(2) to be removed from start_server! in specs.
 add a self.all_ports which lists all open ports, maybe returning Port objects.
 raise exceptions instead of returning nil
+add commands for linux, it should allow other OS's to be added as well.
+Work out if there is a better way to test

data/lib/harbour.rb

@@ -4,6 +4,8 @@ module Harbour
   class Port
     attr_reader :port
 
+    class PortFailedToClose < StandardError; end
+
     def initialize(port)
       @port = port
     end
@@ -12,30 +14,40 @@ module Harbour
       command "nc -z localhost #{port}"
     end
 
+    def closed?
+      !open?
+    end
+
     def pid
       return nil unless open?
-      `lsof -P | grep ':#{port}' | grep 'LISTEN' | awk '{print $2}'`
+      `lsof -P | grep ':#{port}' | grep 'LISTEN' | awk '{print $2}'`.to_i
     end
 
     def term!(options = {})
       return nil unless open?
-      command "kill #{pid}"
-      ensure_open(options[:timeout] || 10)
+      Process.kill('TERM', pid)
+      ensure_closed!(options[:timeout] || 10)
+    rescue PortFailedToClose
+      raise unless options[:try_kill] == true
+      kill!(options)
     end
 
     def kill!(options = {})
       return nil unless open?
-      command "kill -9 #{pid}"
-      ensure_open(options[:timeout] || 10)
+      Process.kill('KILL', pid)
+      ensure_closed!(options[:timeout] || 10)
     end
 
     private
 
-    def ensure_open(within = 10)
+    def ensure_closed!(within = 10, step = 1)
+      _elasped = within
       within.times do
-        break if open?
-        sleep(1)
+        break if closed?
+        sleep(step)
+        _elasped =- step
       end
+      raise PortFailedToClose, "Port #{port} did not close within #{within} seconds" if _elasped < 1
     end
 
     def command(_command)

data/lib/harbour/version.rb

@@ -1,3 +1,3 @@
 module Harbour
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/port_spec.rb

@@ -9,7 +9,7 @@ describe Harbour::Port do
 
   it '#open? returns true if port is open' do
     with_server(port) do
-      Harbour::Port.new(3000).open?.should be_true
+      Harbour::Port.new(port).open?.should be_true
     end
   end
 
@@ -19,16 +19,34 @@ describe Harbour::Port do
     end
   end
 
-  it '#term! terminates process listening on port' do
-    with_server(port) do
-      Harbour::Port.new(3000).term!
-      port_open?(port).should be_false
+  describe '#term!' do
+    pending 'terminates process listening on port' do
+      # Webrick does not die on TERM
+      with_server(port) do
+        Harbour::Port.new(port).term!
+        port_open?(port).should be_false
+      end
+    end
+
+    it 'raises if port fails to close' do
+      # this is fragile, Webrick does not die on TERM, but may do in the future
+      with_server(port) do
+        expect { Harbour::Port.new(port).term! }.to raise_error(Harbour::Port::PortFailedToClose)
+      end
+    end
+
+    it 'trys to kill process if term fails' do
+      # this is fragile, Webrick does not die on TERM, but may do in the future
+      with_server(port) do
+        Harbour::Port.new(port, :try_kill => true).term!
+        port_open?(port).should be_false
+      end
     end
   end
 
   it '#kill! terminates process listening on port' do
     with_server(port) do
-      Harbour::Port.new(3000).kill!
+      Harbour::Port.new(port).kill!
       port_open?(port).should be_false
     end
   end

data/spec/spec_helper.rb

@@ -4,27 +4,27 @@ require 'harbour'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-  config.order = 'random'
+  # config.run_all_when_everything_filtered = true
+  # config.filter_run :focus
+  # config.order = 'random'
 end
 
-def with_server(port = '8000', &block)
+def with_server(port = 8000, &block)
   start_server!(port)
   yield
   stop_server!(port)
 end
 
 def start_server!(port)
-  return if system "nc -z localhost #{port}"
+  return if system "nc -z localhost #{port} > /dev/null"
   server_root = File.join(File.dirname(__FILE__), 'server')
-  system "cd #{server_root} && rackup -d -p #{port} &"
-  sleep(2)
+  system "cd #{server_root} && rackup -D -s webrick -p #{port}"
+  sleep(1)
 end
 
 def stop_server!(port)
-  pid = `lsof -P | grep ':#{port}' | grep 'LISTEN' | awk '{print $2}'`
-  system "kill -9 #{pid}"
+  pid = `lsof -P | grep ':#{port}' | grep 'LISTEN' | awk '{print $2}'`.to_i
+  Process.kill('KILL', pid)
 end
 
 def port_open?(port)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbour
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2161129300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2161129300
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2161127440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2161127440
 description: Query and terminate processes listening on ports
 email:
 - kris.leech@interkonect.com
@@ -83,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Query and terminate processes listening on ports