genki-ns 0.0.3 → 0.1.0

data/lib/ns.rb

@@ -3,9 +3,7 @@ require 'singleton'
 require 'socket'
 
 class Ns
-  VERSION = "0.0.3"
-  Listener = Struct.new(:proto, :recvq, :sendq, :laddr, :raddr, :state, :prog)
-  @@all = false
+  VERSION = "0.1.0"
 
   include Singleton
 
@@ -14,43 +12,25 @@ class Ns
       action = :list
       opt = OptionParser.new
       opt.on('-k', 'kill'){action = :kill}
-      opt.on('-a', 'all'){@@all = true}
       opt.order!(ARGV)
       instance.send action, ARGV
     end
   end
 
   def list(ports)
-    @listeners.each do |l|
-      unless ports.empty?
-        next unless l.laddr.match(/[^\:]\:(?:#{ports.join('|')})\b/)
-      end
-      next if !@@all && (l.prog.nil? || l.prog == '-')
-      next if l.laddr.split(':').size > 2
-      puts "%18s  %18s  %s" % [l.laddr, l.raddr, l.prog]
-    end
+    system 'lsof', *ports.map{|i| "-i:#{i}"}
   end
 
   def kill(ports)
     puts "ports required" or exit if ports.empty?
-    @listeners.each do |l|
-      unless ports.empty?
-        next unless l.laddr.match(/[^\:]\:(?:#{ports.join('|')})\b/)
+    lines = `lsof#{ports.map{|i| " -i:#{i}"}}`.split("\n")[1..-1]
+    lines.each do |line|
+      pid = line.split(/\s+/)[1]
+      if system "kill -#{@signal || '9'} #{pid}"
+        puts "#{pid} killed."
+      else
+        puts "#{pid} not killed."
       end
-      next if l.laddr.split(':').size > 2
-      next if l.prog.nil?
-      pid, progname = l.prog.split('/', 2)
-      system "kill -9 #{pid}"
-      puts "%s(%s) killed" % [progname, pid]
-    end
-  end
-
-private
-  def initialize
-    @listeners = []
-    lines = `netstat -n -l -p 2>/dev/null`.split("\n")[1..-1]
-    lines.grep(/^(tcp|udp)/).each do |line|
-      @listeners << Listener.new(*line.split(/\s+/))
-    end
+    end unless lines.nil?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-ns
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-12 00:00:00 -07:00
+date: 2009-02-18 00:00:00 -08:00
 default_executable: ns
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redgreen
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -35,8 +36,8 @@ files:
 - ChangeLog
 - Rakefile
 - bin/ns
-- test/test_helper.rb
 - test/ns_test.rb
+- test/test_helper.rb
 - lib/ns.rb
 has_rdoc: true
 homepage: http://ns.rubyforge.org