subnet_calc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e521e99a577d3c78b49a8400f3b38133150d4d
-  data.tar.gz: 0c006f2519c6aa9916020d326b481fa019031c30
+  metadata.gz: 6765bee68b5f48ecbac6fdbb859652cd6146b9d7
+  data.tar.gz: '049853d600678fc06a67c0035f98ff8883d80891'
 SHA512:
-  metadata.gz: c355f531b300e7a96dfa0e1f21ef771de13a69714a2a81836766aa4ec4419a810eb02112134d9e897ed505a7ec5a3f88ac7dfa13c77d3713da25f42a54b3803c
-  data.tar.gz: 3f275b0feb9baaa4bc2548d19ae8e3fd101f801a75b58ef0798bfa220d3cf111e29b6c8515a9aeb61cc8837fdaa30b35d6bd54009659f56892f0670873d00fe1
+  metadata.gz: f9ee059a44c6de04445fcb49e64568649995b3d4d4dde08e004269423d69acda1539bf7d7085868bc75969e73f9b4bba86f9f6dda0f17d82ba6bcd84125dde41
+  data.tar.gz: f50ca74be7b2637c3244e264e45b0067f575748b57961388ddd79fea802c88d026838d742629366511fff444d5389506227de9bf9619911421725661041ca222

data/lib/subnet_calc.rb

@@ -30,22 +30,39 @@ class SubnetCalc
     default_inputs = {hosts: 254, ip: '192.168.0.0'}.merge(inputs)
 
     @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 do |octet|
+    octets = @prefixes.map.with_index do |octet, j|
 
       a = octet.map.with_index do |prefix, i|
-        OpenStruct.new prefix: prefix, decimal: 2 ** (octet.length - 1 - 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
+    
+    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)
+    
 
     # determine what class of network we are using
 
@@ -74,19 +91,24 @@ class SubnetCalc
 
     hosts = default_inputs[:hosts]
 
+
+
     # find the smallest decimal value to match the 
-    # required number of hosts on a network
+    # required number of hosts on a network    
+    
+    octet_n, col = hosts_per_subnet.reverse.detect {|x| x.last >  hosts}    
 
-    col = octets[class_n].bits.reverse.detect {|x| x.decimal >  hosts }
+    bit = octets[octet_n].bits[col]
 
-    magic_number, prefix = col.decimal, col.prefix
-    n = octets[class_n].bits.map(&:decimal).index(magic_number)
-    no_of_subnets = 2 ** (n+1)
+    magic_number, prefix = bit.hosts_per_subnet, bit.prefix
+    no_of_subnets = (2 ** 8) / bit.decimal
 
+    
+    n =  col
 
     # add the new mask to the octet
 
-    octets[class_n].mask = octets[class_n].bits.map(&:decimal)[0..n].inject(:+)
+    octets[octet_n].mask = octets[octet_n].bits.map(&:decimal)[0..n].inject(:+)
     subnet_mask = octets.map(&:mask).join('.')
 
     subnets = no_of_subnets.times.inject([]) do |r,n|
@@ -119,7 +141,7 @@ class SubnetCalc
       max_subnets: no_of_subnets
     }
 
-    @class_n = class_n
+    @octet_n = octet_n
     @h = result
   end
 
@@ -137,12 +159,11 @@ class SubnetCalc
 
     tfo2 = TableFormatter.new
 
-    prefixes = @prefixes[@class_n].map {|x| '/' + x.to_s}
-    tfo2.source = [@h[:subnet_bitmask][@class_n].chars, prefixes]
+    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
 
 
@@ -172,7 +193,7 @@ Summary
 Breakdown
 ---------
 
-#{(@class_n + 1).ordinal} octet:
+#{(@octet_n + 1).ordinal} octet:
 
 #{indent octet_table}
 
@@ -191,9 +212,9 @@ EOF
     @h
   end
   
-  private
+  private  
   
   def indent(s, i=2)
     s.lines.map{|x| ' ' * i + x}.join
   end
-end
+end

data.tar.gz.sig

@@ -1 +1 @@
-1�Kz�ݧ��a��	o���3
+��Jў`��;V"Fz��=T����?ʖu���d����{_��'��f�Ӽ���խ`^�w��	V�[��Ra4n����A��g���É�]�ϋ��i�<H��d�߹"�&Zb�Pą���^d�A{���J��fV�f���|^�|���]6�ob����ݕ���-̊���tg�`��$��0���b��o��w���`�xϮ�A���m`&A�EIO��K������!Q�$d_�W���4!�`jT���G��q�91Я�

metadata

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