subnet_calc 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1faa541b180b1e05028a169b0f6caba522666ff7
-  data.tar.gz: 31b09138c648c9ed7223746b3d66872cbaa30f84
+  metadata.gz: 8a1eddfe72b1f9709ba8dc4bba337acb4e3b5948
+  data.tar.gz: d110a0f4455a9cb344f6b18e03f8606682b59139
 SHA512:
-  metadata.gz: defd091462944103cd5443294504beb6dd9a8c7e82c195c1c477a71fb2db0a41c229d3efe2655969508381557a138edf30e9e6c228bd9458e61bd767916f846a
-  data.tar.gz: ab60d4c82e57372b35e7cc94308557fb26f00fb12adf835b02588b747d307d2e762109026ae3ca974ec948a9e1c7027dca648758caddeb3556dd0db4bcb5cf52
+  metadata.gz: 7b1c0bb55656d10d346dd5b4f18d68a54ab0f7a867c26bb3830a2954cd38b94a7730addca35430085b4999f68a02e4cc6ca24233b79d39bb20e5fe6c10551e08
+  data.tar.gz: b98f890520e115843b3a2f1bcadce7b92d2606594d27b8122106f54de778856ae74b094a09b18aa9ada1f8f360536ee187588e0a7d079432682a7e05c20da2d2

data/lib/subnet_calc.rb

@@ -70,7 +70,7 @@ class SubnetCalc
     # ------------------------------------
 
 
-    octet_n, col, class_type = if hosts then
+    octet_n, bit_n, 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] }
@@ -132,16 +132,15 @@ class SubnetCalc
     end
 
 
-    bit = octets[octet_n].bits[col]
+    bit = octets[octet_n].bits[bit_n]
 
     magic_number, hosts_per_subnet, prefix = bit.decimal, 
         bit.hosts_per_subnet, bit.prefix
     
-    n =  col
 
     # add the new mask to the octet
 
-    octets[octet_n].mask = octets[octet_n].bits.map(&:decimal)[0..n].inject(:+)
+    octets[octet_n].mask = octets[octet_n].bits.map(&:decimal)[0..bit_n].inject(:+)
     subnet_mask = octets.map(&:mask).join('.')
     
     subnet_bits = (subnet_mask.split('.')[class_n]).to_i.to_s(2).count("1")
@@ -170,8 +169,7 @@ class SubnetCalc
       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]},
+      subnet_bitmask: subnet_mask.split('.').map {|x| "%08d" % x.to_i.to_s(2)},
       prefix: prefix,
       subnets: subnets,
       range: "%s-%s" % [first_ip, last_ip],
@@ -288,9 +286,9 @@ EOF
     class_subnets(n, block_size) do |network, first, last, broadcast|
       
       {
-        network: [network, 0].join('.'), 
-        first: [network, 1].join('.'), 
-        last: [broadcast, 254].join('.'), 
+          network: [network,     0].join('.'), 
+            first: [network,     1].join('.'), 
+             last: [broadcast, 254].join('.'), 
         broadcast: [broadcast, 255].join('.')
       }
                 
@@ -303,15 +301,15 @@ EOF
     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('.'), 
+          network: [network,     0,   0].join('.'), 
+            first: [network,     1,   1].join('.'), 
+             last: [broadcast, 255, 254].join('.'), 
         broadcast: [broadcast, 255, 255].join('.')
       }
                 
     end    
     
-  end    
+  end     
   
   def indent(s, i=2)
     s.lines.map{|x| ' ' * i + x}.join

metadata

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

metadata.gz.sig

@@ -1 +1,2 @@
-�oi(>:�'�\��j���>��&O�<��
n0�L��y��vs��t/Ki��u
<�#]������I���j\��i�B;�Xg~��,8���?(����<���L��c�%�|MA��Emc�ٜ�>�-���h ���A����P���lsqw �0:SB(C[*F���H=�lHk��LM��I�J����(��@��ݐ���D��P�S��0ަ�F>�i���K
+��e<�Zך?�����T՗˒3 �Z/ձ���w��:
+����4����ѷ�^T�A������k5�sk6m9�����syyM����ފ�-�8�{߱�(�'߻���3<�l�N�h��)�ў��\8�����~r���P�ay�N"� ul�-�3��J4f�L�]O"#J�<����h+�Bf�!�K�{������e0��f�́y���1.������:ԯ��z-;����	���Kj�[