subnet_calc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb254774e26a03f73b61199cb800765362710d7
-  data.tar.gz: b534f281a42f5d2119145881ebe9852fe5be0eb6
+  metadata.gz: 7f08208310333a341c9f31757534e9e40986c827
+  data.tar.gz: c7a36481efddf08a866a1ed2697f49f0044dbfd4
 SHA512:
-  metadata.gz: 435ad51490ff9c2b322e609917333c2450b2ac24621c5643ad8b453513192e4f279961b23f15d1b9e6fa2c4ca406e20614cd191ea872b27be076af1d53b9117c
-  data.tar.gz: 71c37c544ed68cf59919a8e41a9fc934d1c5be678f77cf8866e635520d9133575075c95023f72d396f1e34b1b1be8c7521c602257f3ef4ea748278e93a77b476
+  metadata.gz: 71f6d30b105979461de671031e9ded95c93f98db2808571d3f63462908a3c7194502a75d73c5e1769b9ad20dfe08c667401665df464176158573991314194159
+  data.tar.gz: a0bce9a42f943f9e654a25abb4aaad74c1bafc5955dfed872218f477aeea9508eb71e6bd5100ce105376e317035efc2de149439626177212f5956a86ec95cbeb

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-y���>M���V��+�b'C}�|����ò8�-:����/TE�s�?���D�[d�ZkSD�{�
-iqB���'�͹�
-�ܦ�|$�=Q��Y5��q
��t��1nm��F�dZ��x��򁖗J��Ҥ�?��om-�ro��,({/8�@���9�i}��~MYQ���������x�bJ��i@	���;�r0hf�n�+�-��(�����=��3
+c�l�6���/��ں�
+׈��R?-�2R�AE�-/U�>��1�r�ܵ�%�S��ϵ�W�J�t�i�N������A�(��V�S��3tvg�ڕe���[3*$�c:�������W2�p��e?�ټ{|ha������w(��@���
[�.�:'HV�
+"�F<�
m��޷�k��pTK�e�'��G��2��֎

data/lib/subnet_calc.rb

@@ -24,14 +24,14 @@ class SubnetCalc
 
   attr_reader :to_h
 
-  def initialize(inputs={hosts: 254})
+  def initialize(inputs={})
 
     @inputs = inputs
-    default_inputs = {hosts: 254, ip: '192.168.0.0'}.merge(inputs)
+    default_inputs = {hosts: nil, ip: '192.168.0.0', prefix: nil}.merge(inputs)
     
     # Using the input(s) supplied:
 
-    hosts = default_inputs[:hosts]
+    hosts, prefix = %i(hosts prefix).map {|x| default_inputs[x]}
     
 
     @prefixes = 1.upto(32).each_slice(8).to_a
@@ -64,14 +64,33 @@ class SubnetCalc
 
     end
     
-    hosts_per_subnet = octets.map.with_index do |x,i| 
-      x.bits.map.with_index {|y,j| [i, j, y.hosts_per_subnet] }
-    end.flatten(1)
+
+    # ------------------------------------
+
+
+    octet_n, col = 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    
+      
+      hosts_per_subnet.reverse.detect {|x| x.last >  hosts + 1}    
     
+    elsif prefix
 
-    # determine what class of network we are using
+      prefixes = @prefixes.flat_map.with_index do |octet,i|
+        octet.map.with_index {|x,j| [i, j, x]}
+      end
+      
+      prefixes.detect {|x| x.last == prefix}
+    
+    end    
 
-    class_type = hosts <= 254 ? 'c' : 'b'
+    # determine what class of network we are using
+    class_type = (hosts and hosts <= 254 or prefix >= 24) ? 'c' : 'b'
 
     # Identify the network bits and the host bits
 
@@ -80,6 +99,7 @@ class SubnetCalc
     # 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
@@ -90,14 +110,7 @@ class SubnetCalc
       octet.mask = address_bits[i].join.to_i(2)
     end
 
-    # ------------------------------------
-
-
 
-    # find the smallest decimal value to match the 
-    # required number of hosts on a network    
-    
-    octet_n, col = hosts_per_subnet.reverse.detect {|x| x.last >  hosts + 1}    
 
     bit = octets[octet_n].bits[col]
 
@@ -105,7 +118,8 @@ class SubnetCalc
     
     no_of_subnets = (2 ** 8.0) / bit.hosts_per_subnet
 
-    segments = (no_of_subnets >= 1 ? no_of_subnets : 256 / (256 * no_of_subnets)).to_i
+    segments = (no_of_subnets >= 1 ? no_of_subnets : 
+                256 / (256 * no_of_subnets)).to_i
     n =  col
 
     # add the new mask to the octet
@@ -148,7 +162,10 @@ class SubnetCalc
 
     tfo = TableFormatter.new
 
-    tfo.source = @h[:subnets].map.with_index{|x,i| ([i] + x.to_h.values).map(&:to_s) }
+    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
     

metadata

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