iqeo-hostspec 0.1.0.pre1 → 0.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08702c71ab8703e8556dff864bcfc5af505a898f
-  data.tar.gz: e5934ce4e4a66002865c86c829fdcdbb5019e153
+  metadata.gz: 4b3e2f1c15026a95d95666c9eaee3de460ccf92d
+  data.tar.gz: 263459817766d46b9b32d4bfee19f546134817b0
 SHA512:
-  metadata.gz: c6ef52db6597eacbc79792df006d91b0b905c1296f8778058f8ade392ba53f995743b9dc53175393b8b4b98100aff09a600cd37c14b4c1a56a9e49fde2b59a69
-  data.tar.gz: 33a876331bfc2bafefc004709c7dd45327a902aceea9dacff839fa691b446e77b9f9c3d971c4dee2ca59c6cbeb34f0cf058d525796bae27a2d0f9859c827b5e3
+  metadata.gz: 0be30e4d2da2a60e74561d4a224e8cf85c4f3d5477ede05859aa6a62f58983122d907489920071acd200bd19dfd53bef9ecd3594b576354ac102b61b70436404
+  data.tar.gz: a07aabde5df2381c9d2f4b379a16e8c758c422c773e16d665b3d2af1ff84ef2b85876cd0c54fb55a72d2e87512782d5212847735fd216f4b2bac1c64acc66904

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+ - "2.1.0"
+ - "2.0.0"
+script: bundle exec rspec

data/README.md

@@ -1,5 +1,8 @@
 # Iqeo::Hostspec
 
+[![Gem Version](https://badge.fury.io/rb/iqeo-hostspec.png)](http://badge.fury.io/rb/iqeo-hostspec)
+[![Build Status](https://travis-ci.org/iqeo/iqeo-hostspec.png?branch=master)](https://travis-ci.org/iqeo/iqeo-hostspec)
+
 TODO: Write a gem description
 
 ## Installation
@@ -20,10 +23,3 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/bin/hostspec

@@ -2,130 +2,5 @@
 
 require 'iqeo/hostspec'
 
-class Runner
-
-  def self.run args, out: $stdout, err: $stderr
-
-    if args.empty?
-      err.puts "Error: No specs given"
-      return 1
-    end
-
-    if args.include?('-h') || args.include?('--help')
-      print_help err
-      return 0
-    end
-
-    if args.include?('-v') || args.include?('--version')
-      print_version err
-      return 0
-    end
-
-    cmd_sw_index = args.index('-c') || args.index('--cmd')
-    if cmd_sw_index
-      specs = args.take(cmd_sw_index)            # specs are before switch
-      cmd   = args.drop(cmd_sw_index+1).join ' ' # command components are after switch, join into string to pass to subshell
-      if cmd.empty?
-        err.puts "Error: No command given"
-        return 2
-      end
-    else 
-      specs = args
-      cmd = nil
-    end
-    
-    results = []
-    specs.each do |spec|
-      spec = spec.strip
-      begin
-        host_spec = Iqeo::Hostspec.new spec
-      rescue Exception => e
-        err.puts "Error: #{e.message}"
-        return 3
-      end
-      if cmd.nil?
-        host_spec.each { |address| out.puts address }
-      else
-        env = {
-          'HOSTSPEC_MASK'    => host_spec.mask,
-          'HOSTSPEC_MASKLEN' => host_spec.mask_length.to_s,
-          'HOSTSPEC_COUNT'   => host_spec.size.to_s
-        }
-        host_spec.each_with_index do |address,index|
-          env['HOSTSPEC_IP']    = address
-          env['HOSTSPEC_INDEX'] = (index+1).to_s
-          # this uses posix 'sh', to use bash user's cmd should be 'bash -c "echo \$HOSTSPEC_IP"' and deal with the weird nested quoting
-          results << system( env, cmd )
-        end
-      end
-    end
-    ( results.empty? || results.all? ) ? 0 : 4
-  end
-
-  def self.print_help io
-    io.puts "Usage: hostspec [ options ] specs... [ [ -c / --cmd ] command ]"
-    io.puts
-    io.puts "Prints all IP addresses for IP host specifications (see Specs:)."
-    io.puts "If specified, a command is executed for each IP address, with related values in environment variables (see Command:)."
-    io.puts
-    io.puts "Specs:"
-    io.puts "  Nmap-style IP host specifications, multiple specs separated by spaces."
-    io.puts "  Single host       : x.x.x.x or hostname"
-    io.puts "  Multiple hosts:"
-    io.puts "  - by mask length  : x.x.x.x/m or hostname/m"
-    io.puts "  - by octet values : x.x.x.a,b,c"
-    io.puts "  - by octet ranges : x.x.x.d-e"
-    io.puts "  Octet values and ranges may be combined or applied to any/multiple octets."
-    io.puts "  Examples:"
-    io.puts "    hostname         : localhost      => 127.0.0.1"
-    io.puts "    hostname w/mask  : localhost/24   => 127.0.0.0 127.0.0.1 ... 127.0.0.254 127.0.0.255"
-    io.puts "    address          : 1.1.1.1        => 1.1.1.1"
-    io.puts "    address w/mask   : 2.2.2.1/24     => 2.2.2.0 2.2.2.1 ... 2.2.2.254 2.2.2.255"
-    io.puts "    address w/values : 3.3.3.10,20,30 => 3.3.3.10 3.3.3.20 3.3.3.30"
-    io.puts "    address w/ranges : 4.4.4.40-50    => 4.4.4.40 4.4.4.41 ... 4.4.4.49 4.4.4.50"
-    io.puts "    address w/combo  : 5.5.5.2,4-6,8  => 5.5.5.2 5.5.5.4 5.5.5.5 5.5.5.6 5.5.5.8"
-    io.puts "    complex          : 6.1-2,3.4-5.6  => 6.1.4.6 6.1.5.6 6.2.4.6 6.2.5.6 6.3.4.6 6.3.5.6"
-    io.puts
-    io.puts "Command:"
-    io.puts "  A command to execute for each IP address may be specified following the command switch ( -c / --cmd )."
-    io.puts "  The command is executed in a separate shell for each IP address."
-    io.puts "  Environment variables are provided with values for each IP address command execution."
-    io.puts "  Quote these variables in the command to prevent substitution by the current shell."
-    io.puts "    $HOSTSPEC_IP      : IP address"
-    io.puts "    $HOSTSPEC_MASK    : Mask (255.255.255.255 if a mask length was not specified)"
-    io.puts "    $HOSTSPEC_MASKLEN : Mask length (32 if a mask length was not specified)"
-    io.puts "    $HOSTSPEC_COUNT   : Count of IP addresses"
-    io.puts "    $HOSTSPEC_INDEX   : Index of IP address (from 1 to Count)"
-    io.puts "  Examples:"
-    io.puts "    Print IP addresses and mask length with index and count:"
-    io.puts "      hostspec 1.1.1.1-3 --cmd echo '$HOSTSPEC_INDEX' of '$HOSTSPECT_COUNT' : '$HOSTSPEC_IP/$HOSTSPEC_MASKLEN'"
-    io.puts "      ..."
-    io.puts "      1 of 3 : 1.1.1.1/24"
-    io.puts "      2 of 3 : 1.1.1.2/24"
-    io.puts "      3 of 3 : 1.1.1.3/24"
-    io.puts "    Collect routing tables of all hosts on a network via ssh:"
-    io.puts "      hostspec 1.1.1.1-254 --cmd 'ssh me@$HOSTSPEC_IP route -n'"
-    io.puts "    Collect default web pages from all servers on a network via curl:"
-    io.puts "      hostspec 1.1.1.1-254 --cmd curl -o '$HOSTSPEC_IP.html' 'http://$HOSTSPEC_IP'"
-    io.puts "    Collect IP configuration info from multiple windows systems (run from a windows system):"
-    io.puts "      hostspec 1.1.1.1-254 --cmd psexec '\\%HOSTSPEC_IP%' ipconfig /all"
-    io.puts "    Collect IP configuration info from multiple windows systems (run from a linux system with kerberos):"
-    io.puts "      hostspec 1.1.1.1-254 --cmd winexe --kerberos yes //$(dig -x '$HOSTSPEC_IP' +short) ipconfig /all"
-    io.puts "    ...or any task that you would have to execute individually on multiple systems."
-    io.puts
-    io.puts "Options:"
-    io.puts "  -h / --help     : Display this helpful information"
-    io.puts "  -v / --version  : Display program version"
-    io.puts
-  end
-
-  def self.print_version io
-    io.puts "hostspec version #{Iqeo::Hostspec::VERSION}"
-  end
-  
-end
-
-if __FILE__ == $0
-  exit Runner.run ARGV
-end
+exit Iqeo::Hostspec::Runner.run ARGV
 

data/lib/iqeo/hostspec/hostspec.rb

@@ -0,0 +1,179 @@
+require 'resolv'
+
+module Iqeo
+  module Hostspec
+
+    class HostspecException < Exception ; end
+
+    class Hostspec
+
+      include Enumerable
+
+      attr_reader :string, :mask, :mask_length, :address_spec, :hostname
+
+      def initialize spec_str
+        @string = spec_str
+        raise HostspecException, 'spec cannot be empty' if spec_str.empty?
+        host_str, mask_str = split_on_slash spec_str
+        raise HostspecException, 'host cannot be empty' if host_str.empty?
+        parse_mask mask_str
+        begin
+          parse_address_spec host_str
+        rescue HostspecException
+          parse_hostname host_str
+        end
+        raise HostspecException, 'complex spec cannot have mask length' if @mask_specified && @address_spec.any? { |octet| octet.size > 1 }
+        mask_address_spec
+      end
+
+      def split_on_slash str
+        case str.count '/'
+        when 0 then [ str.strip, '' ]
+        when 1 then str.strip.split '/'
+        else raise 'bad format, expected 0 or 1 "/"'
+        end
+      end
+
+      def parse_mask str
+        if str.empty?
+          @mask = '255.255.255.255'
+          @mask_length = 32
+          @mask_specified = false
+          return
+        end
+        if match = str.match( /^\d+$/ )
+          @mask_length = match[0].to_i
+          raise "bad mask length (#{@mask_length}), expected between 0 ad 32" unless @mask_length.between? 0,32
+          mask_int = ((2**@mask_length)-1) << (32-@mask_length)
+          @mask = [24,16,8,0].collect { |n| ( mask_int & ( 255 << n ) ) >> n }.join '.'
+          @mask_specified = true
+        else
+          raise "bad format, expected mask length after '/'"
+        end
+      end
+
+      def mask_address_spec
+        @address_spec.each_with_index do |octet,index|
+          high_bit_position = ( index * 8 ) + 1 
+          low_bit_position = ( index + 1 ) * 8
+          @address_spec[index] = case
+                                 when @mask_length >= low_bit_position then octet
+                                 when @mask_length < high_bit_position then [0..255]
+                                 else
+                                   octet_mask_length = @mask_length % 8
+                                   octet_mask = ( ( 2 ** octet_mask_length ) - 1 ) << ( 8 - octet_mask_length )
+                                   octet_mask_inverted = octet_mask ^ 255
+                                   octet_min = octet_mask & octet[0]
+                                   octet_max = octet_min | octet_mask_inverted
+                                   [octet_min..octet_max]
+                                 end
+        end
+      end
+
+      def parse_address_spec str
+        octet_strs = str.split '.'
+        raise HostspecException, 'bad ip, expected 4 octets' unless octet_strs.size == 4    
+        octets = octet_strs.collect { |octet_str| parse_octet octet_str }
+        @address_spec = octets
+      end
+
+      def parse_octet str
+        values = str.split ','
+        values.collect { |value_str| parse_octet_value value_str }
+      end
+
+      def parse_octet_value str
+        # values may be dash denoted ranges, possibilities...
+        #   n   : just a number         :   'n'.split '-' == ['n']       <= same = problem!    'n'.split '-', -1 == [ "n"       ] 
+        #   n-m : range from n to m     : 'n-m'.split '-' == ['n','m']                       'n-m'.split '-', -1 == [ "n" , "m" ]
+        #   n-  : range from n to 255   :  'n-'.split '-' == ['n']       <= same = problem!   'n-'.split '-', -1 == [ "n" , ""  ]
+        #   -m  : range from 0 to m     :  '-m'.split '-' == ['','m']                         '-m'.split '-', -1 == [ ""  , "m" ]
+        #   -   : range from 0 to 255   :   '-'.split '-' == []                                '-'.split '-', -1 == [ ""  , ""  ]
+        numbers = str.split '-', -1 # maximize return fields to distinguish 'n' from '-m'
+        case numbers.size
+        when 1 then
+          check_octet_value numbers[0]
+          numbers[0].to_i
+        when 2 then
+          numbers[0] =   '0' if numbers[0].empty?
+          numbers[1] = '255' if numbers[1].empty?
+          check_octet_value numbers[0]
+          check_octet_value numbers[1]
+          range_start = numbers[0].to_i
+          range_finish = numbers[1].to_i
+          raise HostspecException, "bad ip, reversed range in octet value: #{str}" if range_start > range_finish
+          range_start..range_finish
+        else
+          raise HostspecException, "bad ip, invalid octet value: #{str}"
+        end
+      end
+
+      def check_octet_value str
+        match = str.match /^(25[0-5]|2[0-4]\d|[0-1]\d\d|\d\d|\d)$/
+        raise HostspecException, "bad ip, octet value is not a number in 0-255: #{str}" unless match
+      end
+
+      def parse_hostname str
+        @hostname = str
+        parse_address_spec Resolv.getaddress(str)
+      end
+
+      def recursively_iterate_octets octet_index = 0, address = [], &block
+        @address_spec[octet_index].each do |item|
+          if item.respond_to? :each
+            item.each do |value|
+              address.push value
+              octet_index == 3 ? yield( address.join '.' ) : recursively_iterate_octets( octet_index + 1, address, &block )
+              address.pop
+            end
+          else
+            address.push item
+            octet_index == 3 ? yield( address.join '.' ) : recursively_iterate_octets( octet_index + 1, address, &block )
+            address.pop
+          end
+        end
+      end
+
+      def each_address 
+        if block_given?
+          recursively_iterate_octets do |address_str|
+            yield address_str
+          end
+        else
+          return to_enum( :each_address ) { size }
+        end
+      end
+
+      alias_method :each, :each_address
+
+      def size
+        if @mask_length == 32
+          @address_spec.inject(1) { |oc,o| oc * o.inject(0) { |vc,v| vc + ( v.respond_to?(:each) ? v.size : 1 ) } }
+        else
+          2**(32-@mask_length)
+        end
+      end
+
+      def min
+        first
+      end
+
+      def last
+        address = nil
+        each { |addr| address = addr }
+        address
+      end
+
+      def max
+        last
+      end
+
+      def minmax
+        [first,last]
+      end
+
+    end
+
+  end
+end
+

data/lib/iqeo/hostspec/runner.rb

@@ -0,0 +1,131 @@
+
+module Iqeo
+  module Hostspec
+
+    class Runner
+
+      def self.run args, out: $stdout, err: $stderr
+
+        if args.empty?
+          err.puts "Error: No specs given"
+          return 1
+        end
+
+        if args.include?('-h') || args.include?('--help')
+          print_help err
+          return 0
+        end
+
+        if args.include?('-v') || args.include?('--version')
+          print_version err
+          return 0
+        end
+
+        cmd_sw_index = args.index('-c') || args.index('--cmd')
+        if cmd_sw_index
+          specs = args.take(cmd_sw_index)            # specs are before switch
+          cmd   = args.drop(cmd_sw_index+1).join ' ' # command components are after switch, join into string to pass to subshell
+          if cmd.empty?
+            err.puts "Error: No command given"
+            return 2
+          end
+        else 
+          specs = args
+          cmd = nil
+        end
+
+        results = []
+        specs.each do |spec|
+          spec = spec.strip
+          begin
+            host_spec = Hostspec.new spec
+          rescue Exception => e
+            err.puts "Error: #{e.message}"
+            return 3
+          end
+          if cmd.nil?
+            host_spec.each { |address| out.puts address }
+          else
+            env = {
+              'HOSTSPEC_MASK'    => host_spec.mask,
+              'HOSTSPEC_MASKLEN' => host_spec.mask_length.to_s,
+              'HOSTSPEC_COUNT'   => host_spec.size.to_s
+            }
+            host_spec.each_with_index do |address,index|
+              env['HOSTSPEC_IP']    = address
+              env['HOSTSPEC_INDEX'] = (index+1).to_s
+              # this uses posix 'sh', to use bash user's cmd should be 'bash -c "echo \$HOSTSPEC_IP"' and deal with the weird nested quoting
+              results << system( env, cmd )
+            end
+          end
+        end
+        ( results.empty? || results.all? ) ? 0 : 4
+      end
+
+      def self.print_help io
+        io.puts "Usage: hostspec [ options ] specs... [ [ -c / --cmd ] command ]"
+        io.puts
+        io.puts "Prints all IP addresses for IP host specifications (see Specs:)."
+        io.puts "If specified, a command is executed for each IP address, with related values in environment variables (see Command:)."
+        io.puts
+        io.puts "Specs:"
+        io.puts "  Nmap-style IP host specifications, multiple specs separated by spaces."
+        io.puts "  Single host       : x.x.x.x or hostname"
+        io.puts "  Multiple hosts:"
+        io.puts "  - by mask length  : x.x.x.x/m or hostname/m"
+        io.puts "  - by octet values : x.x.x.a,b,c"
+        io.puts "  - by octet ranges : x.x.x.d-e"
+        io.puts "  Octet values and ranges may be combined or applied to any/multiple octets."
+        io.puts "  Examples:"
+        io.puts "    hostname         : localhost      => 127.0.0.1"
+        io.puts "    hostname w/mask  : localhost/24   => 127.0.0.0 127.0.0.1 ... 127.0.0.254 127.0.0.255"
+        io.puts "    address          : 1.1.1.1        => 1.1.1.1"
+        io.puts "    address w/mask   : 2.2.2.1/24     => 2.2.2.0 2.2.2.1 ... 2.2.2.254 2.2.2.255"
+        io.puts "    address w/values : 3.3.3.10,20,30 => 3.3.3.10 3.3.3.20 3.3.3.30"
+        io.puts "    address w/ranges : 4.4.4.40-50    => 4.4.4.40 4.4.4.41 ... 4.4.4.49 4.4.4.50"
+        io.puts "    address w/combo  : 5.5.5.2,4-6,8  => 5.5.5.2 5.5.5.4 5.5.5.5 5.5.5.6 5.5.5.8"
+        io.puts "    complex          : 6.1-2,3.4-5.6  => 6.1.4.6 6.1.5.6 6.2.4.6 6.2.5.6 6.3.4.6 6.3.5.6"
+        io.puts
+        io.puts "Command:"
+        io.puts "  A command to execute for each IP address may be specified following the command switch ( -c / --cmd )."
+        io.puts "  The command is executed in a separate shell for each IP address."
+        io.puts "  Environment variables are provided with values for each IP address command execution."
+        io.puts "  Quote these variables in the command to prevent substitution by the current shell."
+        io.puts "    $HOSTSPEC_IP      : IP address"
+        io.puts "    $HOSTSPEC_MASK    : Mask (255.255.255.255 if a mask length was not specified)"
+        io.puts "    $HOSTSPEC_MASKLEN : Mask length (32 if a mask length was not specified)"
+        io.puts "    $HOSTSPEC_COUNT   : Count of IP addresses"
+        io.puts "    $HOSTSPEC_INDEX   : Index of IP address (from 1 to Count)"
+        io.puts "  Examples:"
+        io.puts "    Print IP addresses and mask length with index and count:"
+        io.puts "      hostspec 1.1.1.0/30 --cmd echo '$HOSTSPEC_INDEX' of '$HOSTSPECT_COUNT' : '$HOSTSPEC_IP/$HOSTSPEC_MASKLEN'"
+        io.puts "      ..."
+        io.puts "      1 of 4 : 1.1.1.0/255.255.255.252"
+        io.puts "      2 of 4 : 1.1.1.1/255.255.255.252"
+        io.puts "      3 of 4 : 1.1.1.2/255.255.255.252"
+        io.puts "      4 of 4 : 1.1.1.3/255.255.255.252"
+        io.puts "    Collect routing tables of all hosts on a network via ssh:"
+        io.puts "      hostspec 1.1.1.1-254 --cmd 'ssh me@$HOSTSPEC_IP route -n'"
+        io.puts "    Collect default web pages from all servers on a network via curl:"
+        io.puts "      hostspec 1.1.1.1-254 --cmd curl -o '$HOSTSPEC_IP.html' 'http://$HOSTSPEC_IP'"
+        io.puts "    Collect IP configuration info from multiple windows systems (run from a windows system):"
+        io.puts "      hostspec 1.1.1.1-254 --cmd psexec '\\\\%HOSTSPEC_IP%' ipconfig /all"
+        io.puts "    Collect IP configuration info from multiple windows systems (run from a linux system with kerberos):"
+        io.puts "      hostspec 1.1.1.1-254 --cmd winexe --kerberos yes //$(dig -x '$HOSTSPEC_IP' +short) ipconfig /all"
+        io.puts "    ...or any task that you would have to execute individually on multiple systems."
+        io.puts
+        io.puts "Options:"
+        io.puts "  -h / --help     : Display this helpful information"
+        io.puts "  -v / --version  : Display program version"
+        io.puts
+      end
+
+      def self.print_version io
+        io.puts "hostspec version #{Iqeo::Hostspec::VERSION}"
+      end
+
+    end
+
+  end
+end
+

data/lib/iqeo/hostspec/version.rb

@@ -0,0 +1,7 @@
+
+module Iqeo
+  module Hostspec
+    VERSION = '0.1.0.pre2'
+  end
+end
+

data/lib/iqeo/hostspec.rb

@@ -1,180 +1,5 @@
-require 'resolv'
-
-module Iqeo
-
-  class HostspecException < Exception ; end
-
-  class Hostspec
-
-    VERSION = '0.1.0.pre1'
-
-    include Enumerable
-
-    attr_reader :string, :mask, :mask_length, :address_spec, :hostname
-
-    def initialize spec_str
-      @string = spec_str
-      raise HostspecException, 'spec cannot be empty' if spec_str.empty?
-      host_str, mask_str = split_on_slash spec_str
-      raise HostspecException, 'host cannot be empty' if host_str.empty?
-      parse_mask mask_str
-      begin
-        parse_address_spec host_str
-      rescue HostspecException
-        parse_hostname host_str
-      end
-      raise HostspecException, 'complex spec cannot have mask length' if @mask_specified && @address_spec.any? { |octet| octet.size > 1 }
-      mask_address_spec
-    end
-
-    def split_on_slash str
-      case str.count '/'
-      when 0 then [ str.strip, '' ]
-      when 1 then str.strip.split '/'
-      else raise 'bad format, expected 0 or 1 "/"'
-      end
-    end
-
-    def parse_mask str
-      if str.empty?
-        @mask = '255.255.255.255'
-        @mask_length = 32
-        @mask_specified = false
-        return
-      end
-      if match = str.match( /^\d+$/ )
-        @mask_length = match[0].to_i
-        raise "bad mask length (#{@mask_length}), expected between 0 ad 32" unless @mask_length.between? 0,32
-        mask_int = ((2**@mask_length)-1) << (32-@mask_length)
-        @mask = [24,16,8,0].collect { |n| ( mask_int & ( 255 << n ) ) >> n }.join '.'
-        @mask_specified = true
-      else
-        raise "bad format, expected mask length after '/'"
-      end
-    end
-
-    def mask_address_spec
-      @address_spec.each_with_index do |octet,index|
-        high_bit_position = ( index * 8 ) + 1 
-        low_bit_position = ( index + 1 ) * 8
-        @address_spec[index] = case
-        when @mask_length >= low_bit_position then octet
-        when @mask_length < high_bit_position then [0..255]
-        else
-          octet_mask_length = @mask_length % 8
-          octet_mask = ( ( 2 ** octet_mask_length ) - 1 ) << ( 8 - octet_mask_length )
-          octet_mask_inverted = octet_mask ^ 255
-          octet_min = octet_mask & octet[0]
-          octet_max = octet_min | octet_mask_inverted
-          [octet_min..octet_max]
-        end
-      end
-    end
-
-    def parse_address_spec str
-      octet_strs = str.split '.'
-      raise HostspecException, 'bad ip, expected 4 octets' unless octet_strs.size == 4    
-      octets = octet_strs.collect { |octet_str| parse_octet octet_str }
-      @address_spec = octets
-    end
-
-    def parse_octet str
-      values = str.split ','
-      values.collect { |value_str| parse_octet_value value_str }
-    end
-
-    def parse_octet_value str
-      # values may be dash denoted ranges, possibilities...
-      #   n   : just a number         :   'n'.split '-' == ['n']       <= same = problem!    'n'.split '-', -1 == [ "n"       ] 
-      #   n-m : range from n to m     : 'n-m'.split '-' == ['n','m']                       'n-m'.split '-', -1 == [ "n" , "m" ]
-      #   n-  : range from n to 255   :  'n-'.split '-' == ['n']       <= same = problem!   'n-'.split '-', -1 == [ "n" , ""  ]
-      #   -m  : range from 0 to m     :  '-m'.split '-' == ['','m']                         '-m'.split '-', -1 == [ ""  , "m" ]
-      #   -   : range from 0 to 255   :   '-'.split '-' == []                                '-'.split '-', -1 == [ ""  , ""  ]
-      numbers = str.split '-', -1 # maximize return fields to distinguish 'n' from '-m'
-      case numbers.size
-      when 1 then
-        check_octet_value numbers[0]
-        numbers[0].to_i
-      when 2 then
-        numbers[0] =   '0' if numbers[0].empty?
-        numbers[1] = '255' if numbers[1].empty?
-        check_octet_value numbers[0]
-        check_octet_value numbers[1]
-        range_start = numbers[0].to_i
-        range_finish = numbers[1].to_i
-        raise HostspecException, "bad ip, reversed range in octet value: #{str}" if range_start > range_finish
-        range_start..range_finish
-      else
-        raise HostspecException, "bad ip, invalid octet value: #{str}"
-      end
-    end
-
-    def check_octet_value str
-      match = str.match /^(25[0-5]|2[0-4]\d|[0-1]\d\d|\d\d|\d)$/
-      raise HostspecException, "bad ip, octet value is not a number in 0-255: #{str}" unless match
-    end
-
-    def parse_hostname str
-      @hostname = str
-      parse_address_spec Resolv.getaddress(str)
-    end
-
-    def recursively_iterate_octets octet_index = 0, address = [], &block
-      @address_spec[octet_index].each do |item|
-        if item.respond_to? :each
-          item.each do |value|
-            address.push value
-            octet_index == 3 ? yield( address.join '.' ) : recursively_iterate_octets( octet_index + 1, address, &block )
-            address.pop
-          end
-        else
-          address.push item
-          octet_index == 3 ? yield( address.join '.' ) : recursively_iterate_octets( octet_index + 1, address, &block )
-          address.pop
-        end
-      end
-    end
-
-    def each_address 
-      if block_given?
-        recursively_iterate_octets do |address_str|
-          yield address_str
-        end
-      else
-        return to_enum( :each_address ) { size }
-      end
-    end
-  
-    alias_method :each, :each_address
-
-    def size
-      if @mask_length == 32
-        @address_spec.inject(1) { |oc,o| oc * o.inject(0) { |vc,v| vc + ( v.respond_to?(:each) ? v.size : 1 ) } }
-      else
-        2**(32-@mask_length)
-      end
-    end
-
-    def min
-      first
-    end
-
-    def last
-      address = nil
-      each { |addr| address = addr }
-      address
-    end
-
-    def max
-      last
-    end
-
-    def minmax
-      [first,last]
-    end
-
-  end
-
-end
 
+require 'iqeo/hostspec/version'
+require 'iqeo/hostspec/hostspec'
+require 'iqeo/hostspec/runner'
 

data/spec/iqeo/hostspec_spec.rb

@@ -1,21 +1,22 @@
 require 'iqeo/hostspec'
+include Iqeo::Hostspec
 
-describe Iqeo::Hostspec do
+describe Hostspec do
 
   context '.new' do
 
     it 'accepts a single argument only' do
-      expect { Iqeo::Hostspec.new                     }.to     raise_error
-      expect { Iqeo::Hostspec.new "1.1.1.1"           }.to_not raise_error
-      expect { Iqeo::Hostspec.new "1.1.1.1","2.2.2.2" }.to     raise_error
+      expect { Hostspec.new                     }.to     raise_error
+      expect { Hostspec.new "1.1.1.1"           }.to_not raise_error
+      expect { Hostspec.new "1.1.1.1","2.2.2.2" }.to     raise_error
     end
 
     it 'does not require a mask length' do
-      expect { Iqeo::Hostspec.new "3.3.3.3" }.to_not raise_error
+      expect { Hostspec.new "3.3.3.3" }.to_not raise_error
     end
 
     it 'defaults to a host mask when none specified' do
-      hs = Iqeo::Hostspec.new "4.4.4.4"
+      hs = Hostspec.new "4.4.4.4"
       hs.mask.should eq '255.255.255.255'
       hs.mask_length.should eq 32
     end
@@ -50,27 +51,27 @@ describe Iqeo::Hostspec do
     end
 
     it 'is specified numerically after /' do
-      expect { Iqeo::Hostspec.new "5.5.5.5/24"  }.to_not raise_error
-      expect { Iqeo::Hostspec.new "5.5.5.5/"    }.to     raise_error
-      expect { Iqeo::Hostspec.new "5.5.5.5/xyz" }.to     raise_error
+      expect { Hostspec.new "5.5.5.5/24"  }.to_not raise_error
+      expect { Hostspec.new "5.5.5.5/"    }.to     raise_error
+      expect { Hostspec.new "5.5.5.5/xyz" }.to     raise_error
     end
 
     it 'is between 0 and 32' do
       (0..32).each do |masklen|
-        hs = Iqeo::Hostspec.new "1.2.3.4/#{masklen}"
+        hs = Hostspec.new "1.2.3.4/#{masklen}"
         hs.mask_length.should eq masklen
       end
     end
 
     it 'cannot be > 32' do
       [ 33, 100, 1000 ].each do |masklen|
-        expect { Iqeo::Hostspec.new "1.2.3.4/#{masklen}" }.to raise_error
+        expect { Hostspec.new "1.2.3.4/#{masklen}" }.to raise_error
       end
     end
 
     it 'sets mask string' do
       @mask_strings.each_with_index do |str,len|
-        hs = Iqeo::Hostspec.new "1.2.3.4/#{len}"
+        hs = Hostspec.new "1.2.3.4/#{len}"
         hs.mask.should eq str
       end
     end
@@ -84,8 +85,8 @@ describe Iqeo::Hostspec do
     end
 
     it 'cannot be empty' do
-      expect { Iqeo::Hostspec.new ''    }.to raise_error
-      expect { Iqeo::Hostspec.new '/32' }.to raise_error
+      expect { Hostspec.new ''    }.to raise_error
+      expect { Hostspec.new '/32' }.to raise_error
     end
 
     context 'an IP address' do
@@ -93,7 +94,7 @@ describe Iqeo::Hostspec do
       it 'may specify a single host without a mask length' do
         @octets.each_cons(4) do |octets|
           address = octets.join('.')
-          hs = Iqeo::Hostspec.new address
+          hs = Hostspec.new address
           hs.address_spec.collect(&:first).should eq octets
         end 
       end 
@@ -107,7 +108,7 @@ describe Iqeo::Hostspec do
           '1.1.1.1/0'  => [[0..255],[0..255],[0..255],[0..255]]
         }
         slash_specs.each do |spec_str,spec_data|
-          hs = Iqeo::Hostspec.new spec_str
+          hs = Hostspec.new spec_str
           hs.address_spec.should eq spec_data
         end
       end
@@ -248,7 +249,7 @@ describe Iqeo::Hostspec do
           '255.255.255.255/0'  => [[0..255]  ,[0..255],[0..255],[0..255]],
         }
         slash_specs.each do |spec_str,spec_data|
-          hs = Iqeo::Hostspec.new spec_str
+          hs = Hostspec.new spec_str
           hs.address_spec.should eq spec_data
         end
       end
@@ -258,16 +259,16 @@ describe Iqeo::Hostspec do
     context 'a hostname' do
 
       it 'is assumed when not a simple IP spec' do
-        Iqeo::Hostspec.new('localhost').hostname.should eq 'localhost'
+        Hostspec.new('localhost.iqeo.net').hostname.should eq 'localhost.iqeo.net'
       end
 
       it 'is assumed when not a complex IP spec' do
-        expect { hs = Iqeo::Hostspec.new "1.2.3.100-300" }.to raise_error Resolv::ResolvError 
+        expect { hs = Hostspec.new "1.2.3.100-300" }.to raise_error Resolv::ResolvError 
       end
 
       it 'resolves to a host IP address' do
-        hs = Iqeo::Hostspec.new('localhost') 
-        hs.hostname.should eq 'localhost'
+        hs = Hostspec.new('localhost.iqeo.net') 
+        hs.hostname.should eq 'localhost.iqeo.net'
         hs.address_spec.collect(&:first).should eq [127,0,0,1]
         hs.mask.should eq '255.255.255.255'
         hs.mask_length.should eq 32
@@ -275,7 +276,7 @@ describe Iqeo::Hostspec do
 
       it 'may specify address range with a mask length' do
         (0..32).each do |masklen|
-          hs = Iqeo::Hostspec.new("localhost/#{masklen}")
+          hs = Hostspec.new("localhost.iqeo.net/#{masklen}")
           hs.mask_length.should eq masklen
         end
       end
@@ -286,51 +287,51 @@ describe Iqeo::Hostspec do
 
       it 'must not specify a mask length' do
         (0..32).each do |masklen|
-          expect { hs = Iqeo::Hostspec.new "10.20,22,24.30-39.40/#{masklen}" }.to raise_error
+          expect { hs = Hostspec.new "10.20,22,24.30-39.40/#{masklen}" }.to raise_error
         end
       end
       
       it 'may specify octet values with commas' do
-        hs = Iqeo::Hostspec.new '10,11,12.20,21,22.30,31,32.40,41,42'
+        hs = Hostspec.new '10,11,12.20,21,22.30,31,32.40,41,42'
         hs.address_spec.should eq [[10,11,12],[20,21,22],[30,31,32],[40,41,42]]
       end
       
       context 'may specify octet value ranges with dashes' do
 
         it 'in form "n-m"' do
-          hs = Iqeo::Hostspec.new '10-19.20-29.30-39.40-49'
+          hs = Hostspec.new '10-19.20-29.30-39.40-49'
           hs.address_spec.should eq [[10..19],[20..29],[30..39],[40..49]]
         end  
 
         it 'in form "n-"' do
-          hs = Iqeo::Hostspec.new '10-.20-.30-.40-'
+          hs = Hostspec.new '10-.20-.30-.40-'
           hs.address_spec.should eq [[10..255],[20..255],[30..255],[40..255]]
         end  
       
         it 'in form "-m"' do
-          hs = Iqeo::Hostspec.new '-19.-29.-39.-49'
+          hs = Hostspec.new '-19.-29.-39.-49'
           hs.address_spec.should eq [[0..19],[0..29],[0..39],[0..49]]
         end  
         
         it 'in form "-"' do
-          hs = Iqeo::Hostspec.new '-.-.-.-'
+          hs = Hostspec.new '-.-.-.-'
           hs.address_spec.should eq [[0..255],[0..255],[0..255],[0..255]]
         end  
       
       end
 
       it 'may mix octet specifications with dashes and commas' do
-        hs = Iqeo::Hostspec.new '1,10,100,200.13-247.23-.-99'
+        hs = Hostspec.new '1,10,100,200.13-247.23-.-99'
         hs.address_spec.should eq [[1,10,100,200],[13..247],[23..255],[0..99]]
       end
 
       it 'may combine octet specification with dashes and commas' do
-        hs = Iqeo::Hostspec.new '0,1,10,100-200,250,254,255.-50,99,200-.-33,44,55-66,77,88-.-'
+        hs = Hostspec.new '0,1,10,100-200,250,254,255.-50,99,200-.-33,44,55-66,77,88-.-'
         hs.address_spec.should eq [[0,1,10,100..200,250,254,255],[0..50,99,200..255],[0..33,44,55..66,77,88..255],[0..255]]
       end
 
       it 'may not specifiy a reversed range' do
-        expect { hs = Iqeo::Hostspec.new '1.1.1.20-10' }.to raise_error
+        expect { hs = Hostspec.new '1.1.1.20-10' }.to raise_error
       end
     
     end
@@ -374,7 +375,7 @@ describe Iqeo::Hostspec do
       it 'a single address for host address' do
         @octets.each_cons(4) do |octets|
           address = octets.join('.')
-          hs = Iqeo::Hostspec.new address
+          hs = Hostspec.new address
           address_count = 0
           hs.send(method) do |address_str|
             address_str.should eq address
@@ -385,7 +386,7 @@ describe Iqeo::Hostspec do
       end
 
       it 'multiple addresses for a spec with multiple octet values (commas)' do
-        hs = Iqeo::Hostspec.new @multi_spec_with_commas
+        hs = Hostspec.new @multi_spec_with_commas
         address_count = 0
         hs.send(method) do |address_str|
           address_str.should eq @multi_expected_addresses[address_count]
@@ -395,7 +396,7 @@ describe Iqeo::Hostspec do
       end
 
       it 'multiple addresses for a spec with octet ranges (dashes)' do
-        hs = Iqeo::Hostspec.new @multi_spec_with_dashes
+        hs = Hostspec.new @multi_spec_with_dashes
         address_count = 0
         hs.send(method) do |address_str|
           address_str.should eq @multi_expected_addresses[address_count]
@@ -406,7 +407,7 @@ describe Iqeo::Hostspec do
 
       it 'masked addresses for specs with a mask length' do
         @specs_with_slash.each do |address_spec,expected_addresses|
-          hs = Iqeo::Hostspec.new address_spec
+          hs = Hostspec.new address_spec
           address_count = 0
           hs.send(method) do |address_str|
             address_str.should eq expected_addresses[address_count]
@@ -429,59 +430,59 @@ describe Iqeo::Hostspec do
     context 'enumerable' do
       
       it '.each returns an Enumerator' do
-        hs = Iqeo::Hostspec.new '10.20.30.40/24'
+        hs = Hostspec.new '10.20.30.40/24'
         hs.each.class.should eq Enumerator
       end
 
       it 'responds to Enumerable methods' do
-        hs = Iqeo::Hostspec.new '10.20.30.40/24'
+        hs = Hostspec.new '10.20.30.40/24'
         hs.all? { |i| i.start_with? '10' }.should be_true
         hs.any? { |i| i.end_with? '255'  }.should be_true
       end
 
       it 'can calculate size for simple specs' do
         (0..32).each do |masklen|
-          hs = Iqeo::Hostspec.new "10.20.30.40/#{masklen}"
+          hs = Hostspec.new "10.20.30.40/#{masklen}"
           hs.size.should eq 2**(32-masklen)
         end
       end
 
       it 'can calculate size for complex specs' do
-        hs = Iqeo::Hostspec.new @multi_spec_with_commas
+        hs = Hostspec.new @multi_spec_with_commas
         hs.size.should eq @multi_expected_addresses.size
-        hs = Iqeo::Hostspec.new @multi_spec_with_dashes
+        hs = Hostspec.new @multi_spec_with_dashes
         hs.size.should eq @multi_expected_addresses.size
       end
 
       it 'Enumerator can make use of size' do
-        hs = Iqeo::Hostspec.new '1.1.1.1-10'
+        hs = Hostspec.new '1.1.1.1-10'
         hs.size.should eq 10
         enumerator = hs.each
         enumerator.size.should eq 10
       end
 
       it 'has first (from enumerable)' do
-        hs = Iqeo::Hostspec.new '1.1.2-10.20-100'
+        hs = Hostspec.new '1.1.2-10.20-100'
         hs.first.should eq '1.1.2.20'
       end
       
       it 'has last' do
-        hs = Iqeo::Hostspec.new '1.1.2-10.20-100'
+        hs = Hostspec.new '1.1.2-10.20-100'
         hs.last.should eq '1.1.10.100'
       end
 
       it 'has min equals first' do
-        hs = Iqeo::Hostspec.new '1.1.2-10.20-100'
+        hs = Hostspec.new '1.1.2-10.20-100'
         hs.min.should eq '1.1.2.20'
       end
 
       it 'has max equals last' do
-        hs = Iqeo::Hostspec.new '1.1.2-10.20-100'
+        hs = Hostspec.new '1.1.2-10.20-100'
         hs.max.should eq '1.1.10.100'
       end
 
       it 'has minmax' do
-        hs = Iqeo::Hostspec.new '1.1.2-10.20-100'
+        hs = Hostspec.new '1.1.2-10.20-100'
         hs.minmax.should eq ['1.1.2.20','1.1.10.100']
       end
 

data/spec/{hostspec_runner_spec.rb → iqeo/runner_spec.rb}

@@ -1,4 +1,5 @@
 load './bin/hostspec'
+include Iqeo::Hostspec
 
 require 'stringio'
 
@@ -15,13 +16,13 @@ describe Runner do
     Runner.run( ['10.20.30.40'],                out: StringIO.new, err: StringIO.new ).should eq 0
     Runner.run( ['10.20.30.40/24'],             out: StringIO.new, err: StringIO.new ).should eq 0
     Runner.run( ['10,11.20-29.30,31-38,39.40'], out: StringIO.new, err: StringIO.new ).should eq 0
-    Runner.run( ['localhost'],                  out: StringIO.new, err: StringIO.new ).should eq 0
+    Runner.run( ['localhost.iqeo.net'],                  out: StringIO.new, err: StringIO.new ).should eq 0
   end
 
   it 'accepts multiple host specs for arguments with no switches' do
     Runner.run( ['10.20.30.40/24','11.22.33.44'],                out: StringIO.new, err: StringIO.new ).should eq 0
     Runner.run( ['10,11.20-29.30,31-38,39.40','11.22.33.44/28'], out: StringIO.new, err: StringIO.new ).should eq 0
-    Runner.run( ['localhost','1.2.3.4/26','11.22.33.44-55'],     out: StringIO.new, err: StringIO.new ).should eq 0
+    Runner.run( ['localhost.iqeo.net','1.2.3.4/26','11.22.33.44-55'],     out: StringIO.new, err: StringIO.new ).should eq 0
   end
 
   it 'expects valid single host spec or prints error' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iqeo-hostspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre1
+  version: 0.1.0.pre2
 platform: ruby
 authors:
 - Gerard Fowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -41,8 +42,11 @@ files:
 - bin/hostspec
 - iqeo-hostspec.gemspec
 - lib/iqeo/hostspec.rb
-- spec/hostspec_runner_spec.rb
+- lib/iqeo/hostspec/hostspec.rb
+- lib/iqeo/hostspec/runner.rb
+- lib/iqeo/hostspec/version.rb
 - spec/iqeo/hostspec_spec.rb
+- spec/iqeo/runner_spec.rb
 - tmux
 homepage: ''
 licenses:
@@ -69,5 +73,5 @@ signing_key:
 specification_version: 4
 summary: Write a gem summary
 test_files:
-- spec/hostspec_runner_spec.rb
 - spec/iqeo/hostspec_spec.rb
+- spec/iqeo/runner_spec.rb