subnet_calc 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc90d91915916592cdf05424c9aee5f9448f2257
-  data.tar.gz: ed2a21fbea8a6836dbf688698e911ad1edc59484
+  metadata.gz: f58b0336e3cc9963db8a899c1374becd98687b53
+  data.tar.gz: 84c13e31ef5091c48b3301693814390a5996f4f9
 SHA512:
-  metadata.gz: 7e7a93085e84393136d93c27f85a583442e49f564125d479f9ef36bcda69b3280e7dfeefa5cfa3a5bc586825f8fc32053120f4e1d011867c2333db1633025d0d
-  data.tar.gz: a4aaab7e14df16e5a6c30a2a519c1ed343b27984e0240d0b21f8074278e88d360381b014b726e9adb61e185b061945c46309846ba2634152f6dfe659f2d2f511
+  metadata.gz: 94e0125b67f02fff4ca4024ea61a10443456d164ae0cb01c166844a081f1b13e9d4fd933b08c99e6e3e08876c58d31902a36669c51e035952b67cb641519b8ee
+  data.tar.gz: 62e9cf6fa08ef0fb457cf2c8bac143a5d0245302f56f941c2c274421e29aa78be2316780d12faa33f35a4332772c12bd8f1a5163e51e9db14a5a1b924702027e

data.tar.gz.sig

@@ -1,2 +1,4 @@
-��I�3�\��O�D�	�SM�����;�i�d�����5$����sƜ�
-?�nw.?���]�;z�y����
_��Q?���߿�)6uZ��ݒ��"N�
@R��1	����ݶ��C�N;r�I/����?�X�v�*mq�����b�&���?g릾`<�����T,cq�����<�����|[�0���gx���"�DZO�H�s��4A�S�U��܂���R��΂��z9-�w�p�a[�6�Y�gz9��_p�Bf�
+Ľ%�XD��0�?�=lj�jΖ�4��ܹ��S-�m����G�6=�5�k��`
+�{�
+;���eb�U
+2n妺k]$��P���V@�(r>�*{�iٜQ-��s��+q.C��?1<��ܦ�W��K�hL2���/����Y������jUײVtcںy�U�� 3j�B�A��� }���-Q

data/lib/subnet_calc.rb

@@ -137,331 +137,16 @@ class SubnetCalc
     magic_number, hosts_per_subnet, prefix = bit.decimal, 
         bit.hosts_per_subnet, bit.prefix
     
-    no_of_subnets = (2 ** 8.0) / bit.hosts_per_subnet
-
-    segments = (no_of_subnets >= 1 ? no_of_subnets : (1 / no_of_subnets)).to_i
     n =  col
 
     # add the new mask to the octet
 
     octets[octet_n].mask = octets[octet_n].bits.map(&:decimal)[0..n].inject(:+)
     subnet_mask = octets.map(&:mask).join('.')
-
-    subnets = case class_type
-    when 'c'
-      class_subnets(segments, hosts_per_subnet)
-    when 'b'
-      class_b_subnets(256 / segments, bit.decimal)
-    when 'a'
-      class_a_subnets(256  ** 2 / segments, bit.decimal)      
-    end
-
-    ip = (default_inputs[:ip] + ' ') .split('.')[0..octet_n-1]
     
-    first_ip = (ip + [subnets.first.first]).join('.')
-    last_ip = (ip + [subnets.first.last]).join('.')
-
     subnet_bits = (subnet_mask.split('.')[class_n]).to_i.to_s(2).count("1")
     
-    result = {
-      class_type: class_type.upcase,
-      magic_number: magic_number,
-      hosts: hosts_per_subnet - 2,
-      subnet_mask: subnet_mask,
-      subnet_bitmask: subnet_mask.split('.').map \
-                                  {|x| ('0' * 7 + x.to_i.to_s(2))[-8..-1]},
-      prefix: prefix,
-      subnets: subnets,
-      range: "%s-%s" % [first_ip, last_ip],
-      subnet_bits:  subnet_bits,
-      max_subnets: 2 ** (subnet_bits)
-    }
-
-    @octet_n = octet_n
-    @h = result
-  end
-
-
-  def to_s()
-
-    tfo = TableFormatter.new
-
-    tfo.source = @h[:subnets].map.with_index do |x,i|
-      ([i+1] + x.to_h.values).map(&:to_s)
-    end
-    
-    tfo.labels = %w(index Network 1st last broadcast)
-    full_subnets_table = tfo.display(markdown: true).to_s
-    
-    subnets_table = if full_subnets_table.lines.length > 14 then
-      (full_subnets_table.lines[0..13] + ["\n    ...  "]).join
-    else
-      full_subnets_table
-    end
-
-    # octet broken down
-
-    tfo2 = TableFormatter.new
-
-    prefixes = @prefixes[@octet_n].map {|x| '/' + x.to_s}
-    tfo2.source = [@h[:subnet_bitmask][@octet_n].chars, prefixes]
-    tfo2.labels = 8.times.map {|n| (2 ** n).to_s }.reverse
-    octet_table = tfo2.display(markdown: true).to_s
-
-<<EOF
-
-
-Subnet calculator
-=================
-
-Inputs: 
-
-#{Kvx.new(@inputs).to_s.lines.map {|x| ' ' * 2 + x}.join}
-
-Summary
--------
-
-* Network class: #{@h[:class_type]}
-* magic number: #{@h[:magic_number]}
-* hosts per subnet: #{@h[:hosts]}
-* subnet mask: #{@h[:subnet_mask]}
-* subnet bitmask: #{@h[:subnet_bitmask].join('.')}
-* prefix bit-length: #{@h[:prefix]}
-* range: #{@h[:range]}
-
-* subnet_bits: #{@h[:subnet_bits]}
-* maximum subnets: #{@h[:max_subnets]}
-
-
-
-Breakdown
----------
-
-#{(@octet_n + 1).ordinal} octet:
-
-#{indent octet_table}
-
-### Subnets
-
-
-#{indent subnets_table}
-
------------------------------------------------
-
-EOF
-
-  end
-
-  def to_h()
-    @h
-  end
-  
-  private  
-  
-  def class_subnets(n, block_size)
-    
-    i = 0
-    
-    subnets = n.times.inject([]) do |r,n|
-      
-      broadcast = i + block_size - 1
-      first = i + 1
-      last = broadcast - 1
-        
-      h = if block_given? then
-        yield(i,first,last,broadcast)
-      else
-        { network: i, first: first, last: last, broadcast: broadcast }
-      end
-      i += block_size      
-      
-      r << OpenStruct.new(h)
-      
-    end    
-    
-  end    
-  
-  def class_b_subnets(n, block_size)
-    
-    class_subnets(n, block_size) do |network, first, last, broadcast|
-      
-      {
-        network: [network, 0].join('.'), 
-        first: [network, 1].join('.'), 
-        last: [broadcast, 254].join('.'), 
-        broadcast: [broadcast, 255].join('.')
-      }
-                
-    end    
-    
-  end  
-
-  def class_a_subnets(n, block_size)
-    
-    class_subnets(n, block_size) do |network, first, last, broadcast|
-      
-      {
-        network: [network, 0, 0].join('.'), 
-        first: [network, 1, 1].join('.'), 
-        last: [broadcast, 255, 254].join('.'), 
-        broadcast: [broadcast, 255, 255].join('.')
-      }
-                
-    end    
-    
-  end    
-  
-  def indent(s, i=2)
-    s.lines.map{|x| ' ' * i + x}.join
-  end
-end#!/usr/bin/env ruby
-
-# file: subnet_calc.rb
-
-
-require 'kvx'
-require 'ostruct'
-require 'table-formatter'
-
-
-module Ordinals
-
-  refine Fixnum do
-    def ordinal
-      self.to_s + ( (10...20).include?(self) ? 'th' : 
-                    %w{ th st nd rd th th th th th th }[self % 10] )
-    end
-  end
-end
-
-class SubnetCalc
-
-  using Ordinals
-
-  attr_reader :to_h, :octets
-
-  def initialize(inputs={})
-
-    @inputs = inputs
-    default_inputs = {hosts: nil, ip: '192.168.0.0', prefix: nil}.merge(inputs)
-    
-    # Using the input(s) supplied:
-
-    hosts, prefix = %i(hosts prefix).map {|x| default_inputs[x]}
-    
-
-    @prefixes = 1.upto(32).each_slice(8).to_a
-    
-=begin
-    #=> [
-         [1, 2, 3, 4, 5, 6, 7, 8], [9, 10, 11, 12, 13, 14, 15, 16], 
-         [17, 18, 19, 20, 21, 22, 23, 24], [25, 26, 27, 28, 29, 30, 31, 32]
-        ]
-=end
-    
-
-    octets = @prefixes.map.with_index do |octet, j|
-
-      a = octet.map.with_index do |prefix, i|
-        
-        decimal = 2 ** (octet.length - 1 - i )
-
-        h = {
-              prefix: prefix,
-              decimal: decimal,
-              hosts_per_subnet: (2 ** 8) ** (@prefixes.length - 1 - j) * decimal
-            }
-
-        OpenStruct.new h
-        
-      end
-
-      OpenStruct.new mask: nil, bits: a
-
-    end
-    
-    @octets = octets
-    
-
-    # ------------------------------------
-
-
-    octet_n, col, class_type = if hosts then
-      
-      hosts_per_subnet = octets.flat_map.with_index do |octet,i| 
-        octet.bits.map.with_index {|y,j| [i, j, y.hosts_per_subnet] }
-      end
-        
-      # find the smallest decimal value to match the 
-      # required number of hosts on a network    
-      
-      *r, _ = hosts_per_subnet.reverse.detect {|x| x.last >  hosts + 1}    
-      
-      network = case hosts
-      when 1..254
-        'c'
-      when 255..65534
-        'b'
-      else
-        'a'
-      end
-      
-      (r + [network])
-    
-    elsif prefix
-
-      prefixes = @prefixes.flat_map.with_index do |octet,i|
-        octet.map.with_index {|x,j| [i, j, x]}
-      end
-      
-      *r, _ = prefixes.detect {|x| x.last == prefix}
-      
-      network = case prefix
-      when 24..32
-        'c'
-      when 16..23
-        'b'
-      else
-        'a'
-      end
-      
-      (r + [network])
-    end    
-
-
-    # Identify the network bits and the host bits
-
-    classes = ('a'..'d')
-
-    # identify the initial network bits for a class *a,b or c*
-
-    class_n = (classes.to_a.index(class_type) + 1)
-
-    network_bits = class_n.times.map {|x| Array.new(8, 1)}
-    host_bits = (classes.to_a.length - class_n).times.map {|x| Array.new(8, 0)}
-    address_bits = network_bits + host_bits
-
-    # add the mask to each octet
-
-    octets.each.with_index do |octet, i|
-      octet.mask = address_bits[i].join.to_i(2)
-    end
-
-
-    bit = octets[octet_n].bits[col]
-
-    magic_number, hosts_per_subnet, prefix = bit.decimal, 
-        bit.hosts_per_subnet, bit.prefix
-    
-    no_of_subnets = (2 ** 8.0) / bit.hosts_per_subnet
-
-    segments = (no_of_subnets >= 1 ? no_of_subnets : (1 / no_of_subnets)).to_i
-    n =  col
-
-    # add the new mask to the octet
-
-    octets[octet_n].mask = octets[octet_n].bits.map(&:decimal)[0..n].inject(:+)
-    subnet_mask = octets.map(&:mask).join('.')
+    no_of_subnets = segments = 2 ** (subnet_bits)    
 
     subnets = case class_type
     when 'c'
@@ -477,7 +162,7 @@ class SubnetCalc
     first_ip = (ip + [subnets.first.first]).join('.')
     last_ip = (ip + [subnets.first.last]).join('.')
 
-    subnet_bits = (subnet_mask.split('.')[class_n]).to_i.to_s(2).count("1")
+
     
     result = {
       class_type: class_type.upcase,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subnet_calc
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - James Robertson