ipscan 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f0852ab8dc39016f37d4e781441b5c74e27d98
-  data.tar.gz: 25e3f199daaa1504e888e49ba78c5479c02c2382
+  metadata.gz: ded3eeb5f622d5c832c0057c2b386ccf9dbf6748
+  data.tar.gz: 6eb25877d599e51dad8110304661205e7eaf6919
 SHA512:
-  metadata.gz: 985db2876f5d07380465e5b2403e0d8dcc6a9613dbe54507748b9e3bbada9ddf0e878fe69b6927436e07bb101165b0271f27a061e0df2dd1c9cc3549c6af2ca1
-  data.tar.gz: b8bdef4f08be552a0a601da6867a1eafb8a9152243448c6c8ca3cf2d75cc1a2dde6bbf3ef4df9fb042f5d1d2d7aec6eb29ca3fdd21ed565eae139a5b73255625
+  metadata.gz: 014485d8093c799e81948f2df012ab6ad87dc115e117f9fb069204b41a337c41af1cb426e5abd4c35cac0bc2e0832ed63dd245d2ad71f177b7d0d27beea83fbc
+  data.tar.gz: 52530e90db616217612f8000dae7acd8f4cb14476079d6fc7a017fac1221ca759edea07d902f0b2c79e1db50b80b03ce70674fdb563903bca6b1f883f223fafb

data/lib/ipscan.rb

@@ -5,22 +5,29 @@ require 'net/ping'
 require 'socket'
 require 'ruby-progressbar'
 
-# http://shokai.org/blog/archives/7723
-# http://docs.ruby-ipscang.org/ja/1.9.3/method/Socket/s/gethostbyname.html
-
 module IPScan
 
   def self.arp(ip)
+    data = {}
+    arp_line = `arp #{ip}`.split("\n").last
+    arp_hash = arp_line.split(" ")
     case RbConfig::CONFIG['host_os']
     when /linux/i
-      line = `arp #{ip}`.split("\n").last.split(" ")
-      return {name: line[0],  mac: line[2]}
+      data = {name: arp_hash[0],  mac: arp_hash[2]}
     when /bsd|osx|mach|darwin/i
-      line = `arp #{ip}`.split("\n").last.split(" ")
-      return {name: line[0],  mac: line[3]}
+      data = {name: arp_hash[0],  mac: arp_hash[3]}
     else
       raise "host_os=#{RbConfig::CONFIG['host_os']} are not supported"
     end
+
+    if data[:name]== "?"
+      data[:name] = "<unknown>"
+    end
+
+    if arp_line.index("no entry")
+      data[:mac]  = "<no entry>     "
+    end
+    data
   end
 
   def self.get_range_addresses(network_addr, start_host, last_host)
@@ -49,11 +56,11 @@ module IPScan
     nbtinfo
   end
 
-  def self.scan(renge)
-    unless renge.index("-")
-      renge = renge + "-254"
+  def self.scan(range)
+    unless range.index("-")
+      range = range + "-254"
     end
-    scan_result  = renge.scan(/(.*)-(.*)/)[0]
+    scan_result  = range.scan(/(.*)-(.*)/)[0]
     network_addr = scan_result[0].split(".")[0..2].join(".")
     start_host   = scan_result[0].split(".")[3].to_i
     last_host    = scan_result[1].to_i
@@ -74,20 +81,6 @@ module IPScan
       data.merge!(arp(addr))
       pinger = Net::Ping::External.new(addr)
       if pinger.ping?
-        arp_line = `arp #{addr}`
-        arp_hash = arp_line.split(" ")
-        if arp_hash[0] == "?"
-          data[:name] = "<unknown>"
-        else
-          data[:name] = arp_hash[0]
-        end
-
-        if arp_line.index("no entry")
-          data[:mac]  = "<no entry>     "
-        else
-          data[:mac]  = arp_hash[3]
-        end
-
         if netbios_info[addr]
           data[:netbios_name] = netbios_info[addr][:netbios_name]
         else

data/lib/ipscan/cli.rb

@@ -8,7 +8,5 @@ module IPScan
     def range(range)
       IPScan.scan(range)
     end
-
-    default_task :scan
   end
 end

data/lib/ipscan/version.rb

@@ -1,3 +1,3 @@
 module IPScan
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipscan
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - k-yamada