ipscanner 0.1.2 → 0.1.3

data/lib/ipscanner.rb

@@ -7,19 +7,22 @@ require 'net/ping'
 class IPScanner
 
   def initialize(ip_base='192.168.1.')
+    @ip_base = ip_base
     @a = []
-    (1..254).each{|i| Thread.new {ip = ip_base + i.to_s; a << i if Net::Ping::TCP.new(ip, 'http').ping?}}
+    threads = (1..254).map{|i| Thread.new {ip = ip_base + i.to_s; @a << i if Net::Ping::TCP.new(ip, 'http').ping?}}
+    threads.join
   end
   
   def self.run(ip_base='192.168.1.')
     a = []
-    (1..254).each{|i| Thread.new {ip = ip_base + i.to_s; a << i if Net::Ping::TCP.new(ip, 'http').ping?}}
+    threads = (1..254).map{|i| Thread.new {ip = ip_base + i.to_s; a << i if Net::Ping::TCP.new(ip, 'http').ping?}}
+    threads.join
     a.sort.map{|x| ip_base + x.to_s}
   end
 
   def self.scan(ip_base='192.168.1.') self.run  end
     
   def to_a()
-    @a.sort.map{|x| ip_base + x.to_s}        
+    @a.sort.map{|x| @ip_base + x.to_s}        
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: ipscanner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +01:00
+date: 2011-04-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency