hooray 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70895187b462c2363960525378f2616fb1d25a11
-  data.tar.gz: 1a5bf065e8f66a315e703c55ac39b25131b33803
+  metadata.gz: fe7164b3a564dbaca837819687bd21014d190564
+  data.tar.gz: 61f8f487a6570d32013f26895f0015060147abd8
 SHA512:
-  metadata.gz: f76544c3f668672549a984f31b831fa9cf116e23bb9a3e38f419cb3903750fafdf4d698be69dd4dec5a793db800c709625ae706e9c592ac86f4495801293f75f
-  data.tar.gz: 1323add01b3372288b79e7df6fe3cc32f327d46ec0470eca9b24f601e260203f11ae9e5609a8b59a94abc36ea7fee44e3a11d7cfc46c2eb663e1353f88601371
+  metadata.gz: 63de61f3a84464c2b0c3370fc9de0398b09d8927a097ff090b6305ae74ffb46f87f83fc8fc776bff7debf5e0002e01d19143f939f7855a5eb40fcaef7b6bdff6
+  data.tar.gz: 9ac80ce35d020fe3cc43576738e43ae75e7a458311882fea80867273fb386af99a622215a678d61d5aa21430ad2278e2ad072421499073dff3faa5c93e56462f

data/README.md

@@ -24,10 +24,11 @@ LG Electronics              | 192.168.1.79  | cc:fa:XX:XX:XX:XX
 TP-Link                     | 192.168.1.253 | f8:d1:XX:XX:XX:XX
 Siemens Subscriber Networks | 192.168.1.254 | 00:0b:XX:XX:XX:XX
 ---
-8 devices @ 2014-12-11 13:32:04 -0200 2.85s
+8 devices @ 2014-12-11 13:32:04 -0200 2.27s
 ```
 
-Find running services:
+
+## Find running services
 
 ```
 hoo list web
@@ -35,7 +36,11 @@ hoo list web
 ```
 NAME              | IP           | MAC
 ------------------|--------------|------------------
+dsl modem         | 192.168.1.1  | 64:a3:XX:XX:XX:XX
+test server       | 192.168.1.75 | 64:a3:XX:XX:XX:XX
 nofxx desktop     | 192.168.1.77 | 64:a3:XX:XX:XX:XX
+---
+3 devices @ 2014-12-11 19:23:11 -0200 1.10s
 ```
 
 Or simply by ports:
@@ -46,25 +51,45 @@ hoo list 80
 hoo list 6777 udp
 ```
 
-Monitor:
+## Monitor
 
 ```
 hoo watch
 ```
 ```
 New nodes @ 2014-12-11 13:53:06 -0200
-NAME         | IP           | MAC
--------------|--------------|------------------
-iPhone nofxx | 192.168.1.76 | 64:a3:XX:XX:XX:XX
+NAME       | IP           | MAC
+-----------|--------------|------------------
+myphone    | 192.168.1.76 | 64:a3:XX:XX:XX:XX
+```
+
+
+## Use another program
+
 ```
+hoo ssh myphone
+```
+
+Will execute: `ssh <ip of myphone>`
+
+You can use any program, not just ssh.
+
+
+## Use as a lib
 
-Use as a lib:
 ```
 require 'hooray'
 Hooray::Seek.lan(port, protocol).devices
 Hooray::Seek.new(network, port, protocol).devices
 ```
 
+* Nil port means ICMP ping.
+* Protocol always defaults to :tcp.
+* Network defaults to LAN IP 24 bits masked.
+
+Possible protocols: tcp, udp, http, wmi & icmp (requires root).
+
+
 ## Why?
 
 Bind macs or fix IP's is also boring and a per device work.
@@ -89,3 +114,7 @@ services.yml regex list ports to names you recognize.
 
 * Ruby net-ping gem.
 * Nmap`s mac precompiled prefixes.
+
+
+Hooray should work on UNIX based systems.
+Tested in Linux and OS X.

data/bin/hoo

@@ -4,6 +4,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'hooray'
 
 puts
-puts '                             Hooray!'
+puts '                                                    Hooray!'
 
 Hooray::CLI.start(ARGV)

data/lib/hooray/cli.rb

@@ -105,8 +105,10 @@ 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
-        system "#{command} "
+        command, name = params
+        device = Hooray::Seek.new.devices.find { |d| d.name == name }
+        return puts("Could not find '#{name}'") unless device
+        system "#{command} #{device.ip}"
       else super
       end
     end

data/lib/hooray/node.rb

@@ -7,20 +7,20 @@ module Hooray
       @ip = params[:ip]
       @mac = params[:mac]
       @mac ||= Mac.addr if @ip == Seek.my_lan_ip
-      set_name
+      @name = params[:name] || find_name
     end
 
-    def set_name
+    def find_name
       return unless mac
-      if [Mac.addr].flatten.include?(mac)
-        @name = Socket.gethostname
+      if [Mac.addr].flatten.include?(mac) # Hack until macaddr get fix
+        Socket.gethostname
       else
-        @name = Settings.device(mac) || Settings.family(mac)
+        Settings.device(mac) || Settings.manufacturer(mac)
       end
     end
 
     def to_ip
-      Addrinfo.ip(ip)
+      IPAddr.new(ip)
     end
 
     def <=>(other)

data/lib/hooray/seek.rb

@@ -10,17 +10,32 @@ module Hooray
 
     def initialize(network = nil, *params)
       @network = network || Seek.local_mask
-      unless 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
-      end
+      set_query(params)
+      set_nodes
+    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
+    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))
-      end
+      end.reject { |n| n.mac.nil? } # remove those without mac
     end
-    alias_method :devices, :nodes
 
     def ping_class
       return Net::Ping::External unless @protocol

data/lib/hooray/settings.rb

@@ -4,10 +4,10 @@ module Hooray
     CONFIG_DIR = ENV['HOME'] + '/.hooray/'
 
     class << self
-      attr_accessor :all, :services, :devices, :macs
+      attr_accessor :all
 
       def no_config_folder
-        puts "No config folder, run `#{$PROGRAM_NAME} init`"
+        pa "No config folder, run `#{$PROGRAM_NAME} init`", :red
         puts
         exit 1
       end
@@ -37,15 +37,27 @@ module Hooray
         out
       end
 
+      def devices
+        @devices ||= {}
+      end
+
       def device(mac)
-        devices ||= {}
         devices[mac.to_sym] || devices[mac.to_s]
       end
 
-      def family(mac)
+      def services
+        @services ||= {}
+      end
+
+      def manufacturers
+        @macs || {}
+      end
+
+      def manufacturer(mac)
         prefix = mac.to_s.gsub(':', '')[0, 6].upcase
-        macs[prefix]
+        manufacturers[prefix]
       end
+      alias_method :family, :manufacturer
 
       def all
         @all ||= {}

data/lib/hooray/version.rb

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

data/spec/hooray/node_spec.rb

@@ -1,16 +1,22 @@
 require 'spec_helper'
 
-describe 'Nodek' do
+describe 'Node' do
 
   it 'should have ip' do
+    expect(Node.new(ip: '10.1.1.1').ip).to eq('10.1.1.1')
+  end
+
+  it 'should have a #to_ip' do
+    expect(Node.new(ip: '10.1.1.1').to_ip).to be_a(IPAddr)
   end
 
-  it 'should have mac address' do
 
+  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
 
   it 'should have name' do
-
+    expect(Node.new(name: 'my iphone').name).to eq('my iphone')
   end
 
   it 'should have ports' do

data/spec/spec_helper.rb

@@ -9,6 +9,9 @@ end
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'hooray'
+include Hooray
+
 if ENV['CI']
   require 'coveralls'
   Coveralls.wear!

metadata

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