hooray 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802bcd728c96f076a536c4adeb98f0497079758f
-  data.tar.gz: 99422fa325a830dae6ce61597c80c886320bbbfc
+  metadata.gz: 70895187b462c2363960525378f2616fb1d25a11
+  data.tar.gz: 1a5bf065e8f66a315e703c55ac39b25131b33803
 SHA512:
-  metadata.gz: b55f595a75a77f04a92c9cec33abcc01c248b05307ae25851db036c3678add355c5e729ce53a247e872b7b6b454345c287428d8b9133aca78f83cc6d1bc531c5
-  data.tar.gz: 1aea417879176c639d150c9404de92baee5419316ba8dab6aa433d7f55d2d6f547c3d5b443de4886c08d36187ae2d9b0d6630186697e4ded12e0808b9a91b4fb
+  metadata.gz: f76544c3f668672549a984f31b831fa9cf116e23bb9a3e38f419cb3903750fafdf4d698be69dd4dec5a793db800c709625ae706e9c592ac86f4495801293f75f
+  data.tar.gz: 1323add01b3372288b79e7df6fe3cc32f327d46ec0470eca9b24f601e260203f11ae9e5609a8b59a94abc36ea7fee44e3a11d7cfc46c2eb663e1353f88601371

data/lib/hooray/cli.rb

@@ -49,7 +49,7 @@ module Hooray
     LONG
     def watch
       print_table old_seek = Seek.new(options[:network]).nodes
-      pa "Starting watch...", :red
+      pa 'Starting watch...', :red
       loop do
         sleep 5
         new_seek = Seek.new(options[:network]).nodes
@@ -94,7 +94,7 @@ module Hooray
 
     def print_table(nodes)
       tp nodes, :name, :ip, :mac
-      puts "---"
+      puts '---'
       took = (Time.now - @start).round(2)
       pa "#{nodes.count} devices @ #{Time.now} #{took}s", '#777', :bold
     end
@@ -105,7 +105,7 @@ module Hooray
         puts "Do you want to `#{params.first}` to a device?"
         puts "Use #{ARGV.first} #{params.first} <device name>"
       when 2 then
-        command, device = *params
+        command, *device = *params
         system "#{command} "
       else super
       end

data/lib/hooray/port.rb

@@ -1,4 +1,7 @@
 module Hooray
+  #
+  # Socket Port
+  #
   class Port < Struct.new(:number, :protocol, :name)
     def name
       @name || Settings.services[number][protocol]

data/lib/hooray/seek.rb

@@ -48,32 +48,35 @@ module Hooray
       scan
     end
 
+    #
+    # ARP Table reader
+    #
     def arp_table
       return @arp_table if @arp_table
       @arp_table ||= {}
-      `arp -n`.split(/\n/).each do |l|
-        ip, _hw, mac, _flag, iface = l.split(/\s+/)
-        # p "#{ip}  #{mac} #{iface}"
+      `arp -na`.split(/\n/).each do |l|
+        _q, ip, _at, mac, *iface = l.split(/\s+/)
+        next unless mac =~ /:\w{2}:/
+        ip = ip[1..-2] # (ip) -> ip
         @arp_table.merge!(ip => mac) if iface
       end
       @arp_table
     end
 
     class << self
-
-    def my_ips
-      Socket.ip_address_list.select do |ip|
-        ip.ipv4_private? && !ip.ipv4_loopback?
+      def my_ips
+        Socket.ip_address_list.select do |ip|
+          ip.ipv4_private? && !ip.ipv4_loopback?
+        end
       end
-    end
 
-    def my_lan_ip
-      IPAddr.new(my_ips.first.ip_address)
-    end
+      def my_lan_ip
+        IPAddr.new(my_ips.first.ip_address)
+      end
 
-    def local_mask
-      my_lan_ip.mask(NET_MASK)
-    end
+      def local_mask
+        my_lan_ip.mask(NET_MASK)
+      end
     end
   end
 end

data/lib/hooray/settings.rb

@@ -17,6 +17,10 @@ module Hooray
         @all = YAML.load_file(CONFIG_DIR + 'settings.yml')
         @services = YAML.load_file(CONFIG_DIR + 'services.yml')
         @devices  = YAML.load_file(CONFIG_DIR + 'devices.yml')
+        read_mac_prefixes
+      end
+
+      def read_mac_prefixes
         @macs = {}
         File.read(CONFIG_DIR + 'nmap-mac-prefixes').each_line do |line|
           next if line =~ /^\s*#/
@@ -39,7 +43,7 @@ module Hooray
       end
 
       def family(mac)
-        prefix = mac.to_s.gsub(':', '')[0,6].upcase
+        prefix = mac.to_s.gsub(':', '')[0, 6].upcase
         macs[prefix]
       end
 

data/lib/hooray/version.rb

@@ -1,3 +1,4 @@
+# Hooray version
 module Hooray
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hooray
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Marcos Piccinini