hooray 0.0.9 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe7164b3a564dbaca837819687bd21014d190564
-  data.tar.gz: 61f8f487a6570d32013f26895f0015060147abd8
+  metadata.gz: 26b25f88e85a64e4c69b0f9329a054dc35bf0c35
+  data.tar.gz: 3c57622a6c1f3aa1258d910f9c8c36f187c0dbad
 SHA512:
-  metadata.gz: 63de61f3a84464c2b0c3370fc9de0398b09d8927a097ff090b6305ae74ffb46f87f83fc8fc776bff7debf5e0002e01d19143f939f7855a5eb40fcaef7b6bdff6
-  data.tar.gz: 9ac80ce35d020fe3cc43576738e43ae75e7a458311882fea80867273fb386af99a622215a678d61d5aa21430ad2278e2ad072421499073dff3faa5c93e56462f
+  metadata.gz: 3cf3772c8c087e120bfcefbc06a6a081d1040a932b941f6a5c95127045ccb9f051064afd6d85269ea65f8d2f394306399d8d65922eb75186fb29bec52d1332b0
+  data.tar.gz: 584abd5fe3d7c4ae8a017f0abb241f87123003346335f6bef794fde4cd775062ca1674d4653484a8a603894f7290c4078c7e4ea24216560aa1325b0bc1df0681

data/README.md

@@ -49,6 +49,7 @@ Or simply by ports:
 ```
 hoo list 80
 hoo list 6777 udp
+hoo list 3000 4000 5000
 ```
 
 ## Monitor

data/lib/hooray.rb

@@ -9,6 +9,7 @@ require 'paint/pa'
 require 'table_print'
 
 require 'hooray/settings'
+require 'hooray/local'
 require 'hooray/node'
 require 'hooray/port'
 require 'hooray/seek'

data/lib/hooray/cli.rb

@@ -37,8 +37,12 @@ module Hooray
 
     LONG
     def list(*filter)
-      pa "Listing devices * #{filter}", :red
-      print_table Seek.new(options[:network], *filter).nodes
+      if (nodes = Seek.new(options[:network], *filter).nodes).empty?
+        pa "No results for filter #{filter.join(' ')}", :red
+      else
+        print_table(nodes)
+      end
+      puts
     end
 
     desc 'watch FILTER', 'watch in realtime  FILTER'
@@ -93,10 +97,16 @@ module Hooray
     end
 
     def print_table(nodes)
-      tp nodes, :name, :ip, :mac
+      return if nodes.empty?
+      if nodes.first.ports.empty?
+        tp nodes, :name, :ip, :mac
+      else
+        tp nodes, :name, :ip, :mac, :ports
+      end
       puts '---'
       took = (Time.now - @start).round(2)
-      pa "#{nodes.count} devices @ #{Time.now} #{took}s", '#777', :bold
+      count_plural = nodes.size > 1 ? 's' : ''
+      pa "#{nodes.count} device#{count_plural} @ #{Time.now} #{took}s", '#777', :bold
     end
 
     def method_missing(*params)

data/lib/hooray/local.rb

@@ -0,0 +1,37 @@
+module Hooray
+  #
+  # Information from the machine
+  #
+  class Local
+    class << self
+      #
+      # ARP Table reader
+      #
+      def arp_table
+        return @arp_table if @arp_table
+        @arp_table ||= {}
+        `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
+
+      def ips
+        Socket.ip_address_list.select do |ip|
+          ip.ipv4_private? && !ip.ipv4_loopback?
+        end
+      end
+
+      def lan_ip
+        IPAddr.new(ips.first.ip_address)
+      end
+
+      def mask(bits = 24)
+        lan_ip.mask(bits)
+      end
+    end
+  end
+end

data/lib/hooray/node.rb

@@ -4,10 +4,17 @@ module Hooray
     attr_accessor :host, :name, :nick, :mac, :ip, :ports
 
     def initialize(params = {})
-      @ip = params[:ip]
+      self.ip = params[:ip]
       @mac = params[:mac]
-      @mac ||= Mac.addr if @ip == Seek.my_lan_ip
+      @mac ||= Mac.addr if @ip == Hooray::Local.lan_ip
       @name = params[:name] || find_name
+      return unless params[:ports]
+      @ports = params[:ports].reject(&:nil?).map { |n| Hooray::Port.new(n) }
+    end
+
+    def ip=(param)
+      return unless param
+      @ip = param.is_a?(IPAddr) ? param : IPAddr.new(param)
     end
 
     def find_name
@@ -19,8 +26,8 @@ module Hooray
       end
     end
 
-    def to_ip
-      IPAddr.new(ip)
+    def ports
+      @ports.sort.map(&:number).join(', ')
     end
 
     def <=>(other)

data/lib/hooray/port.rb

@@ -6,5 +6,13 @@ module Hooray
     def name
       @name || Settings.services[number][protocol]
     end
+
+    def <=>(other)
+      number <=> other.number
+    end
+
+    def to_s
+      "#{number}/#{protocol}"
+    end
   end
 end

data/lib/hooray/seek.rb

@@ -3,95 +3,78 @@ module Hooray
   # Main runner
   #
   class Seek
-    attr_accessor :network, :opts, :nodes
+    attr_accessor :network, :ports, :opts
 
     NET_MASK = 24
     TIMEOUT  = 1
 
     def initialize(network = nil, *params)
-      @network = network || Seek.local_mask
-      set_query(params)
-      set_nodes
+      @scan = {}
+      @bots = []
+      config_network network
+      config_filters params
     end
-    alias_method :devices, :nodes
 
-    #
-    # Form need params based on user input
-    #
-    def set_query(params)
-      return if params.empty?
-      ports, words = params.flatten.partition { |s| s =~ /\d+/ }
-      @ports = ports.map(&:to_i).first # TODO
-      @protocol = words.select { |w| w =~ /udp|tcp/ }.join
+    def config_network(param)
+      if param && !param.empty?
+        @network = IPAddr.new(param)
+      else
+        @network = Hooray::Local.mask
+      end
     end
 
+    def config_filters(params)
+      return if params.empty?
+      numbers, @words = params.flatten.partition { |s| s =~ /\d+/ }
+      @ports = numbers.map(&:to_i)
+    end
     #
     # Map results to @nodes << Node.new()
     #
     # BUG: sometimes ping returns true
     # When you run list consecutively. Pretty weird!
     # So we need to remove those without mac
-    def set_nodes
-      @nodes = ping.sort.map do |n|
-        Node.new(ip: n, mac: arp_table[n.to_s]) # , name: find_name(n))
+    def nodes
+      return @nodes if @nodes
+      @nodes = sweep.map do |k, v|
+        Node.new(ip: k, mac: Hooray::Local.arp_table[k.to_s], ports: v)
       end.reject { |n| n.mac.nil? } # remove those without mac
     end
+    alias_method :devices, :nodes
 
     def ping_class
-      return Net::Ping::External unless @protocol
-      @protocol =~ /udp/ ? Net::Ping::UDP : Net::Ping::TCP
+      return Net::Ping::External unless ports
+      if @words && @words.join =~ /tcp|udp|http|wmi/
+        Net::Ping.const_get(@words.join.upcase)
+      else
+        Net::Ping::TCP
+        # elsif (serv = Settings.service(@words.join))
+        # @ports = serv.values
+      end
     end
 
-    #
-    # fast -> -sn -PA
-    #
-    def ping
-      scan = []
-      bots = []
-      # pa "Starting #{Settings.list} on '#{network}' #{@ports} #{@protocol}"
-      @network.to_range.each do |ip|
-        # next if ip == my_lan_ip
-        bots << Thread.new do
-          if ping_class.new(ip.to_s, @ports, TIMEOUT).ping?
-            scan << ip
+    def scan_bot(ip)
+      (ports || [nil]).each do |port|
+        @bots << Thread.new do
+          if ping_class.new(ip.to_s, port, TIMEOUT).ping?
+            @scan[ip] << port
             print '.'
           end
         end
       end
-      bots.each(&:join)
-      puts
-      scan
     end
 
     #
-    # ARP Table reader
+    # fast -> -sn -PA
     #
-    def arp_table
-      return @arp_table if @arp_table
-      @arp_table ||= {}
-      `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?
-        end
-      end
-
-      def my_lan_ip
-        IPAddr.new(my_ips.first.ip_address)
-      end
-
-      def local_mask
-        my_lan_ip.mask(NET_MASK)
+    def sweep
+      network.to_range.each do |ip|
+        @scan[ip] = []
+        scan_bot(ip)
       end
+      @bots.each(&:join)
+      puts
+      @scan.reject! { |_k, v| v.empty? }
     end
   end
 end

data/lib/hooray/version.rb

@@ -1,4 +1,4 @@
 # Hooray version
 module Hooray
-  VERSION = '0.0.9'
+  VERSION = '0.1.5'
 end

data/spec/hooray/node_spec.rb

@@ -7,10 +7,9 @@ describe 'Node' do
   end
 
   it 'should have a #to_ip' do
-    expect(Node.new(ip: '10.1.1.1').to_ip).to be_a(IPAddr)
+    expect(Node.new(ip: '10.1.1.1').ip).to be_a(IPAddr)
   end
 
-
   it 'should have mac address' do
     expect(Node.new(mac: 'aa:cc:dd:ee:ff:gg').mac).to eq('aa:cc:dd:ee:ff:gg')
   end
@@ -20,11 +19,9 @@ describe 'Node' do
   end
 
   it 'should have ports' do
-
   end
 
   it 'should have hoops' do
-
   end
 
 end

data/spec/hooray/seek_spec.rb

@@ -1,16 +1,32 @@
 require 'spec_helper'
 
 describe 'Seek' do
-
   it 'should detect local ip' do
   end
 
   it 'should search local network' do
-
   end
 
   it 'should find nodes' do
-
   end
 
+  describe 'Query' do
+
+    it 'should default to ICMP without port' do
+      expect(Seek.new('').ping_class).to eq(Net::Ping::External)
+    end
+
+    it 'should accept ports as integers' do
+      expect(Seek.new('', '80').ports).to eq([80])
+    end
+
+    it 'should defaults to tcp for ports as integers' do
+      expect(Seek.new('', '80').ping_class).to eq(Net::Ping::TCP)
+    end
+
+    it 'should accept protocol with port' do
+      expect(Seek.new('', '80', 'udp').ping_class).to eq(Net::Ping::UDP)
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooray
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.5
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -92,9 +92,9 @@ files:
 - bin/hoo
 - lib/hooray.rb
 - lib/hooray/cli.rb
+- lib/hooray/local.rb
 - lib/hooray/node.rb
 - lib/hooray/port.rb
-- lib/hooray/scan.rb
 - lib/hooray/seek.rb
 - lib/hooray/settings.rb
 - lib/hooray/settings/devices.yml

data/lib/hooray/scan.rb

@@ -1,19 +0,0 @@
-module Hooray
-  #
-  # Main runner
-  #
-  class Scan < Struct.new(:target, :ports, :opts)
-    def run
-      scan = []
-      bots = []
-      pa "Starting #{Settings.list}  on '#{target}' #{ports}"
-      [ports].flatten.each do |port|
-        bots << Thread.new do
-          scan << ip if Net::Ping::TCP.new(ip.to_s, port, 1).ping?
-        end
-      end
-      bots.each(&:join)
-      scan
-    end
-  end
-end