hooray 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b25f88e85a64e4c69b0f9329a054dc35bf0c35
-  data.tar.gz: 3c57622a6c1f3aa1258d910f9c8c36f187c0dbad
+  metadata.gz: 2b6ba8e1a0e98fdcef75ae3803ecc84d430a14e7
+  data.tar.gz: 9191775fb0feb7c4137f8ddea30d3442cb387bcf
 SHA512:
-  metadata.gz: 3cf3772c8c087e120bfcefbc06a6a081d1040a932b941f6a5c95127045ccb9f051064afd6d85269ea65f8d2f394306399d8d65922eb75186fb29bec52d1332b0
-  data.tar.gz: 584abd5fe3d7c4ae8a017f0abb241f87123003346335f6bef794fde4cd775062ca1674d4653484a8a603894f7290c4078c7e4ea24216560aa1325b0bc1df0681
+  metadata.gz: af30c78db97d13f77c137eb3a7e38c2129f36ea8f52f6c353406b2d60d247552e3ff35b1f0c8fc4210c036ff692d83716ddfd6f84e37f53bf9deadc44acb3eac
+  data.tar.gz: 21f46636f41389ab80335963bb262fb588858bcca24ce0b6bba3e80d7d86c9150e3e59a9fddf387cfaf076d7c97f26674c55fc118e18fd6eec940487dfe48434

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+coverage
+rdoc
+pkg
+.bundle
+Gemfile.lock
+*.gem
+*.log

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - rbx-2
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/Gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'pry'
+gem 'coveralls'
+gem 'rake'
+gem 'rspec', '>= 3'
+gem 'rubocop'
+gem 'guard'
+gem 'guard-rspec'
+gem 'guard-rubocop'
+
+gem 'coveralls', require: false if ENV['CI']

data/Guardfile

@@ -0,0 +1,22 @@
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+
+# guard :rubocop do
+guard :rubocop, all_on_start: false, keep_failed: false, cli: ['-D'] do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(/^generators\/(.+)\.rb$/) { |_m| 'spec/schemaless/worker_spec' }
+
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2007-2008 Andreas Neuhaus <zargony@zargony.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/hooray.gemspec

@@ -0,0 +1,29 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'hooray/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'hooray'
+  s.version     = Hooray::VERSION
+
+  s.authors     = ['Marcos Piccinini']
+  s.homepage    = 'http://github.com/nofxx/hooray'
+  s.email       = 'x@nofxx.com'
+  s.description = 'Find all those devices connected in LAN'
+  s.summary     = 'Find devices connected in LAN'
+  s.license     = 'MIT'
+
+  s.executables = ['hoo']
+  s.default_executable = 'hoo'
+
+  s.files = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'thor'
+  s.add_dependency 'paint'
+  s.add_dependency 'macaddr'
+  s.add_dependency 'net-ping'
+  s.add_dependency 'table_print'
+end

data/lib/hooray/cli.rb

@@ -2,7 +2,7 @@ require 'thor'
 
 module Hooray
   # Nice cli
-  class CLI < Thor
+  class CLI < Thor # rubocop:disable Metrics/ClassLength
     class_option :verbose, type: :boolean, aliases: :v
     class_option :network, type: :string, aliases: :n
 
@@ -37,13 +37,19 @@ module Hooray
 
     LONG
     def list(*filter)
-      if (nodes = Seek.new(options[:network], *filter).nodes).empty?
+      puts sweep = Seek.new(options[:network], *filter)
+      if sweep.nodes.empty?
         pa "No results for filter #{filter.join(' ')}", :red
       else
-        print_table(nodes)
+        print_table(sweep.nodes)
       end
       puts
     end
+    # no_commands do
+    #   alias_method :lsit, :list
+    #   alias_method :lits, :list
+    #   alias_method :all, :list
+    # end
 
     desc 'watch FILTER', 'watch in realtime  FILTER'
     long_desc <<-LONG
@@ -98,15 +104,21 @@ module Hooray
 
     def print_table(nodes)
       return if nodes.empty?
+      puts
       if nodes.first.ports.empty?
         tp nodes, :name, :ip, :mac
       else
         tp nodes, :name, :ip, :mac, :ports
       end
       puts '---'
+      summary(nodes)
+    end
+
+    def summary(nodes)
       took = (Time.now - @start).round(2)
-      count_plural = nodes.size > 1 ? 's' : ''
-      pa "#{nodes.count} device#{count_plural} @ #{Time.now} #{took}s", '#777', :bold
+      message = "#{nodes.count} device"
+      message += 's' if  nodes.size > 1
+      pa "#{message} @ #{Time.now} #{took}s", '#777', :bold
     end
 
     def method_missing(*params)

data/lib/hooray/seek.rb

@@ -7,6 +7,7 @@ module Hooray
 
     NET_MASK = 24
     TIMEOUT  = 1
+    RANGE_REGEX = /\.{2,3}/
 
     def initialize(network = nil, *params)
       @scan = {}
@@ -15,44 +16,44 @@ module Hooray
       config_filters params
     end
 
-    def config_network(param)
-      if param && !param.empty?
-        @network = IPAddr.new(param)
-      else
-        @network = Hooray::Local.mask
-      end
+    def config_network(str)
+      @network = str && !str.empty? ? IPAddr.new(str) : Hooray::Local.mask
     end
 
     def config_filters(params)
       return if params.empty?
-      numbers, @words = params.flatten.partition { |s| s =~ /\d+/ }
-      @ports = numbers.map(&:to_i)
+      # Map services 'foo' -> 3000 udp
+      params.map! { |o| Settings.service(o) || o }
+      # Map Ranges 1..3 -> [1,2,3]
+      params.map! do |o|
+        next o unless o =~ RANGE_REGEX
+        Range.new(*o.split(RANGE_REGEX)).to_a
+      end
+      numbers, words = params.flatten.partition { |s| s.to_s =~ /\d+/ }
+      @ports, @protocol = numbers.map(&:to_i), words.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 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 # .reject { |n| n.mac.nil? } # remove those without mac
     end
     alias_method :devices, :nodes
 
+    #
+    # Decide how to ping
     def ping_class
       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
+      return Net::Ping::TCP unless @protocol =~ /tcp|udp|http|wmi/
+      Net::Ping.const_get(@protocol.upcase)
     end
 
+    #
+    # Creates a bot per port on IP
     def scan_bot(ip)
       (ports || [nil]).each do |port|
         @bots << Thread.new do
@@ -73,8 +74,11 @@ module Hooray
         scan_bot(ip)
       end
       @bots.each(&:join)
-      puts
       @scan.reject! { |_k, v| v.empty? }
     end
+
+    def to_s
+      "Seek #{network} #{ports}"
+    end
   end
 end

data/lib/hooray/settings.rb

@@ -37,14 +37,18 @@ module Hooray
         out
       end
 
-      def devices
-        @devices ||= {}
-      end
-
       def device(mac)
         devices[mac.to_sym] || devices[mac.to_s]
       end
 
+      def service(name)
+        services[name.to_sym] || services[name.to_s]
+      end
+
+      def devices
+        @devices ||= {}
+      end
+
       def services
         @services ||= {}
       end

data/lib/hooray/settings/devices.yml

@@ -3,7 +3,7 @@
 # :MAC:             |   NAME   | Don't forget the :double: colons on :mac:
 # :01:02:03:04:05:06: Nice host
 #
-# Regexes ok, don't forget :double: colons!
+# Partial (brand codes) ok, don't forget :double: colons!
 #
 # :01:02:03: Some big brand of mobiles
 #

data/lib/hooray/settings/services.yml

@@ -1,11 +1,7 @@
 # Services List
 #
-# protocol:
-#   port: name
+# name: PORT <tcp>
 #
-tcp:
-  3000: Rails Dev
-  27017..27030: Mongos
-
-udp:
-  777: Jackpot Machines
+rails: 3000
+mongos: 27017..27027
+jackpot: 777 udp

data/lib/hooray/version.rb

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

data/spec/hooray/node_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'Node' do
-
   it 'should have ip' do
     expect(Node.new(ip: '10.1.1.1').ip).to eq('10.1.1.1')
   end
@@ -18,10 +17,13 @@ describe 'Node' do
     expect(Node.new(name: 'my iphone').name).to eq('my iphone')
   end
 
-  it 'should have ports' do
+  it 'should have ports as string' do
+    expect(Node.new(ports: [22]).ports).to eq('22')
   end
 
-  it 'should have hoops' do
+  it 'should have compare methods' do
+    node1 = Node.new(ip: '10.1.1.1')
+    node2 = Node.new(ip: '10.1.1.1')
+    expect([node1] - [node2]).to be_empty
   end
-
 end

data/spec/hooray/seek_spec.rb

@@ -11,7 +11,6 @@ describe 'Seek' do
   end
 
   describe 'Query' do
-
     it 'should default to ICMP without port' do
       expect(Seek.new('').ping_class).to eq(Net::Ping::External)
     end
@@ -27,6 +26,5 @@ describe 'Seek' do
     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.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,9 +87,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- Guardfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - bin/hoo
+- hooray.gemspec
 - lib/hooray.rb
 - lib/hooray/cli.rb
 - lib/hooray/local.rb
@@ -129,5 +136,8 @@ rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Find devices connected in LAN
-test_files: []
+test_files:
+- spec/hooray/node_spec.rb
+- spec/hooray/seek_spec.rb
+- spec/spec_helper.rb
 has_rdoc: