subnet_calc 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed194bf35fe325fc2fb62ea861140f63c0f6b5ac
-  data.tar.gz: 48a9537735c184f33cc7f170364c157e0b7bdcbc
+SHA256:
+  metadata.gz: 704ba733fc18df391c8e1c226a80d6b4211afdbb859038be24a8b1b79da15dfd
+  data.tar.gz: bb2c85e9364aa9503a5b8c299967e87f8a384c9dbc03f0ae0330989f82dbc152
 SHA512:
-  metadata.gz: 37e0e8c28058efe0a2e8a7616e05f778d89faf799a4ad459fc14b442622e9c79a6860c864ba29d561dfa9875ad33f9bfa0c1cdf7d3a5fea09c645bf1597e830a
-  data.tar.gz: f12f12f39424d089ca56299099327b01c13cab8725dedaa0b4162f2e77913a98c16ac29f384382ece6db222f9a0477b1e603a6b5432ee69f7eb406672518f1fa
+  metadata.gz: 984d0441e4452864f39246a00b100a5dd4b97ebc941185bcc2ee35620d582fbc51aa9467d7308e49012e3e3a19f9c9c306662067e1da2c2c1474a36972066bed
+  data.tar.gz: c56ac4cb0a20a1623f06d3c40ecccbc31df366c812dbaa10959bf4d5a8b7850a8c8b97886674eb91c47b7d9ba234946e0e0648eb231a3e4d1db1b896969bda2e

data/lib/subnet_calc.rb

@@ -10,7 +10,7 @@ require 'table-formatter'
 
 module Ordinals
 
-  refine Fixnum do
+  refine Integer do
     def ordinal
       self.to_s + ( (10...20).include?(self) ? 'th' : 
                     %w{ th st nd rd th th th th th th }[self % 10] )
@@ -27,7 +27,7 @@ class SubnetCalc
   def initialize(inputs={})
 
     @inputs = inputs
-    default_inputs = {hosts: nil, ip: '192.168.0.0', prefix: nil}.merge(inputs)
+    default_inputs = {hosts: nil, ip: nil, prefix: nil}.merge(inputs)
     
     # Using the input(s) supplied:
 
@@ -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")
@@ -157,7 +156,9 @@ class SubnetCalc
       class_a_subnets(256  ** 2 / segments, bit.decimal)      
     end
 
-    ip = (default_inputs[:ip] + ' ') .split('.')[0..octet_n-1]
+    default_inputs[:ip] ||= ['10.0.0.0', '172.16.0.0','192.166.0.0'][class_n-1]
+    
+    ip = (default_inputs[:ip] + ' ') .split('.')[0..class_n-1]
     
     first_ip = (ip + [subnets.first.first]).join('.')
     last_ip = (ip + [subnets.first.last]).join('.')
@@ -168,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],
@@ -216,7 +216,7 @@ Subnet calculator
 
 Inputs: 
 
-#{Kvx.new(@inputs).to_s.lines.map {|x| ' ' * 2 + x}.join}
+#{indent Kvx.new(@inputs).to_s}
 
 Summary
 -------
@@ -286,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('.')
       }
                 
@@ -301,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.0
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTEwNjE1MjYxMFoXDTE3MTEwNjE1MjYxMFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAPVqVqTGhTW3Ph6mzF3tBResSXXhxAkyJbw4BcVRgk8dvqJwNpAgtlt/BB9B
-  KJmuAYo1cviZ8XIXCrbSEjXSLNF9acv2YSYZdmGdwNLtGQVKt+N9DLbFIGRMh2L2
-  4/he6hxypRKDS9gONQ4YXUVZdCawA3++wslin+BREK8Ujy6ULTkRvQJZF2J6J8ex
-  a5oGJsQuDyO52rz2m7nm+LPPGTuuv8wIjyuYL/fn/nw4FY0XfW9mOmLHFfEo/9HZ
-  7SEsrpA4u2Izxiz/ngnICUipJznXe2fF2KX9vYpnHpfV2jeeN6IoZX8Jg5pyoZBz
-  5bQISgWwJfpJjhsOCGy3ju631/UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU1lNDXV4p/8OlTXMCiS+R28ekARgwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAj62jBmu0
-  ttOHIlwiLlINXEEIfnLPAMX85eeepU+FFrC+LfAxRLZ/Z+jBMDiNaNC4696jdZnW
-  14Bc0EuI6ZSshPPQHlkZ9vCVvS5IbymMkhsGSdzBCn7U3RhbItc8eaZii6F0uuZX
-  ytJiqiVwujezDxT2QYyI94xbWfU6f9tBNX7blfXysexghcEDm0BxtrEOk4ssykt8
-  PyPsXxOL9+WA/tVhAFUQeAogZNF5ZFOO1t0EWxTthM5H79lzF7qtthPO2nsRGeNn
-  oAH9dWawpFIItSVexeVF4ycrINDboVQH/q93Udr9ZLbwux6Dp2bpsAxyXAdIw+Um
-  ZWJvjR10ewlMyQ==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMTI2MTQwNTE0WhcN
+  MjMwMTI2MTQwNTE0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDSBn5G
+  eGCaHiHmEVrH91cyjGr36ViyVwpYwfBZmio9+0t4pr52m+9oHP2sEM0h26lOpViS
+  cEfxQwlPlKKpgli/w/295kaWpCvsCcy6D8e2FG/+l065XQJrRQLcxwQC2xU3ZITE
+  Hhs86mHrnFYEzp7YWfJh8M6oX0rbYMCY7Mms/D5AhOWMk0h8aIJ15LjGAt04KJ3L
+  C1tkGgDHunlZX7Qq8lUUSWgzmBVr8ZyK1w5gm1XIxd/on3DKPeAmPH7KN4O3jOql
+  WTidLyB8RRaXvCzVyMQFuqaaTjUifz25TYirAW4OojT0F4Ns3UfiQeAtND1oMuEZ
+  SbN/S6jXQUzcmPQ+gZZdJTXb57uH41MvPdSiUdQG4ffq//SWl2WRZG8Z5nqBhiL9
+  Ou4auTk/rZAPthy6pEiXJ+YysPsJRSir2lCSxkbUEAcPNaSzcZ52W1D9/qaWVCmc
+  1V9m+2ykNJ8VrFDhCLVCSZFFVDBT1AlQM9Dekg6cS3mWnuAf92Kjg0c1tPUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQULNuL6xf7
+  AS5e9WbqKzpvmILIWCEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAmczOo8IIS5BJC2SS6fxhxaln1Ws4QofL08hkCGyP
+  9ZbuhqQhcFuB2EQRS8mQDDdHwyWfOalfGWbhPediwgq2tnWzUFRQ6PXSmoUieOYE
+  NLsVVnMNbxeDautTXFAW1lvBWkd8CWRehhOqFiZHJb4s1QH15CFZKPNRloqSjlZQ
+  uw4dVxUH1tKCsisyl6a0XZpeamGIgWCAK9Xf8PZ6ORvZVL/kaGuZ/6p1DDacSFNE
+  uysHzUZIgbUALxG5sDsjn2kI3euWGRpLIzZlaDf3HcQek9vQ63FJoWzI5VoBi1Hb
+  /z4Jjtx+hvz/sJfVX2bRYZZBfUy7k8jfUIr2qHVjGAwXXeRdihW+TYwUjzUnfH3r
+  z03A25tBmUnyj8bCggtTOJLr1NyoGU2UUyNymVmH+KV5nxyd7AaaFJgUdeJlArwC
+  Xvl3mk0+I701FZKkOutz4RhfV+0riwGfBE+vMHNLeZBgGbk1+zwzbeDuEbfOE16i
+  yGY4SKyxeL2j6jkB02U8c2FF
   -----END CERTIFICATE-----
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kvx
@@ -39,42 +43,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: table-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: 
-email: james@r0bertson.co.uk
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -100,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A subnet calculator (only tested for class C and class B networks)