subnet_calc 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3541fb5686bd771f912d578a7d12fda7a53cbeaa
-  data.tar.gz: 0a08287455c96a33016ac1e3be4c54c59e80786f
+  metadata.gz: 4bb254774e26a03f73b61199cb800765362710d7
+  data.tar.gz: b534f281a42f5d2119145881ebe9852fe5be0eb6
 SHA512:
-  metadata.gz: 4fc514377befd4ff8fa3c6d8fa97c0ba9b3aab5e5dafae7807b2d8d483e0603ae8d813128ae5011949a54cdac09f1b2844f42e4c87721c371d727238a7079567
-  data.tar.gz: 9ca4eb4802ad73c97fae25fef5d0f0f2637cbc666c5df33e70e1fc15c90eda941dcb43cc0f0e864efc9f575f3128cf2b62baa79347a37e630aa06331232cea5b
+  metadata.gz: 435ad51490ff9c2b322e609917333c2450b2ac24621c5643ad8b453513192e4f279961b23f15d1b9e6fa2c4ca406e20614cd191ea872b27be076af1d53b9117c
+  data.tar.gz: 71c37c544ed68cf59919a8e41a9fc934d1c5be678f77cf8866e635520d9133575075c95023f72d396f1e34b1b1be8c7521c602257f3ef4ea748278e93a77b476

data.tar.gz.sig

@@ -1 +1,2 @@
-(`8�XP]?ز��n�%��F{�*]e�.!}X�@�f�>3 ��~�YG�������D+$����4%�v4f�[��̸O��V
����cĝ�fx�Ҵ]+�R��7���*�`C\��I��X�K�������o:���O��d�R<�T�T&���U_����虒U�}�`����A����=2
+�r�iVk�INI��ˏIt�ύU�9�
+ȱOm��N���b�]Wz�{��ݩ�W�b~�HȰ���R��I鄰���*YE,���Gi]�DS,

data/lib/subnet_calc.rb

@@ -28,6 +28,11 @@ class SubnetCalc
 
     @inputs = inputs
     default_inputs = {hosts: 254, ip: '192.168.0.0'}.merge(inputs)
+    
+    # Using the input(s) supplied:
+
+    hosts = default_inputs[:hosts]
+    
 
     @prefixes = 1.upto(32).each_slice(8).to_a
     
@@ -66,7 +71,7 @@ class SubnetCalc
 
     # determine what class of network we are using
 
-    class_type = 'c'
+    class_type = hosts <= 254 ? 'c' : 'b'
 
     # Identify the network bits and the host bits
 
@@ -87,23 +92,20 @@ class SubnetCalc
 
     # ------------------------------------
 
-    # Using the input(s) supplied:
-
-    hosts = default_inputs[:hosts]
-
 
 
     # 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}    
+    octet_n, col = hosts_per_subnet.reverse.detect {|x| x.last >  hosts + 1}    
 
     bit = octets[octet_n].bits[col]
 
-    magic_number, prefix = bit.hosts_per_subnet, bit.prefix
-    
-    no_of_subnets = (2 ** 8) / bit.hosts_per_subnet
+    magic_number, prefix = bit.hosts_per_subnet, bit.prefix    
     
+    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
     n =  col
 
     # add the new mask to the octet
@@ -111,22 +113,17 @@ class SubnetCalc
     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|
-      
-      i = r.last ? r.last.network + magic_number : 0
-
-      broadcast = i + magic_number - 1
-      first = i + 1
-      last = broadcast - 1
-      r << OpenStruct.new({network: i, first: first, last: last, 
-                           broadcast: broadcast})
+    subnets = case class_type
+    when 'c'
+      class_subnets(segments, magic_number)
+    when 'b'
+      class_b_subnets(256 / segments, bit.decimal)
     end
+
+    ip = (default_inputs[:ip] + ' ') .split('.')[0..octet_n-1]
     
-    ip = (default_inputs[:ip] + ' ') .split('.')
-    ip[class_n] = subnets.first.first
-    first_ip = ip.join('.')
-    ip[class_n] = subnets.first.last
-    last_ip = ip.join('.')
+    first_ip = (ip + [subnets.first.first]).join('.')
+    last_ip = (ip + [subnets.first.last]).join('.')
 
     result = {
       class_type: class_type.upcase,
@@ -138,7 +135,7 @@ class SubnetCalc
       subnets: subnets,
       range: "%s-%s" % [first_ip, last_ip],
       subnet_bits: n+1,
-      max_subnets: no_of_subnets
+      max_subnets: segments
     }
 
     @octet_n = octet_n
@@ -151,9 +148,15 @@ class SubnetCalc
 
     tfo = TableFormatter.new
 
-    tfo.source = @h[:subnets].map{|x| x.to_h.values.map(&:to_s) }
-    tfo.labels = %w(Network 1st last broadcast)
-    subnets_table = tfo.display(markdown: true).to_s
+    tfo.source = @h[:subnets].map.with_index{|x,i| ([i] + x.to_h.values).map(&:to_s) }
+    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
 
@@ -214,6 +217,47 @@ EOF
   
   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 indent(s, i=2)
     s.lines.map{|x| ' ' * i + x}.join
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subnet_calc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -103,5 +103,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A subnet calculator (only tested for a class C network)
+summary: A subnet calculator (only tested for class C and class B networks)
 test_files: []