ip2cidr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7560f2aa3dfe648e86b20a86c315844581516640
-  data.tar.gz: c04d1f724bd0dd0cf53eb090376c36994295d3fe
+  metadata.gz: 85ddd250aa46758efa99ad5736cfe690752491aa
+  data.tar.gz: 8c7d0006155aa59defeddc6ef1764cf97d2440f5
 SHA512:
-  metadata.gz: ec43c2211fdb5d43d859eaadb13a274da5e57b9484501bbd33636d81195688cf0280813ea0b35c477d4fe717a5001e90923f8360e435f4e5d9856e2bbd6b1182
-  data.tar.gz: 3288dee934e0b30b0722633f2dce36c5bf844444f0cc08a02f28d3f103415e5c7af9c4aed6bc906dabc62285d1200803096759be0647929b82a6587d159c52ac
+  metadata.gz: 2a86badb7c622ebd495300e1007aecd0c89ec80e4f9414caf5dd9cf7b486a77f403b2ac7efb8d8886dcd1287597a074ef52f321438f31a55408e4c023a2a2f7e
+  data.tar.gz: 7f1aa352abc09c6afe8b09607918a5f34724dc6f803fff9fa6e922f4ad73eb62462acaf9506ea9ed5eea4295af4f6c7c8ad949ea0797992a024e3143a4905d8c

data/bin/ip2cidr

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'ip2cidr'
+puts IPToCIDR.solveCIDR("#{ARGV[0]}", "#{ARGV[1]}")

data/lib/ip2cidr.rb

@@ -1,66 +1,25 @@
-class IPToCIDR
-  # ipstring_to_long 
-  # Convert an ip address in string format to integer.
-  def self.ipstring_to_long(ipstring)
-    ipstring = ipstring.split(".")
-    longip = Array.new(4)
-    for i in 0..3
-      longip[i] = ipstring[i].to_i
-    end
-    #return longip
-    return (longip[0] << 24) + (longip[1] << 16) + 
-           (longip[2] << 8) + longip[3]
-  end
-
-  # long_to_ip_string
-  # Convert an ip address in integer format to string.
-  def self.long_to_ip_string(longip)
-    ipstring = ""
-    ipstring = (longip >> 24).to_s + "." + 
-               ((longip & 0x00FFFFFF)>> 16).to_s + "." + 
-               ((longip & 0x0000FFFF) >> 8).to_s + "." + 
-               (longip & 0x000000FF).to_s
-    return ipstring
-  end
-
-  # iprange_to_cidr
-  # Return a list of cidr addresses given a range of ip 
-  # addresses.
-  def self.iprange_to_cidr(startip, endip)
-    cidr2mask = [0x00000000, 0x80000000, 0xC0000000, 
-                 0xE0000000, 0xF0000000, 0xF8000000, 
-                 0xFC000000, 0xFE000000, 0xFF000000, 
-                 0xFF800000, 0xFFC00000, 0xFFE00000, 
-                 0xFFF00000, 0xFFF80000, 0xFFFC0000, 
-                 0xFFFE0000, 0xFFFF0000, 0xFFFF8000, 
-                 0xFFFFC000, 0xFFFFE000, 0xFFFFF000, 
-                 0xFFFFF800, 0xFFFFFC00, 0xFFFFFE00, 
-                 0xFFFFFF00, 0xFFFFFF80, 0xFFFFFFC0, 
-                 0xFFFFFFE0, 0xFFFFFFF0, 0xFFFFFFF8, 
-                 0xFFFFFFFC, 0xFFFFFFFE, 0xFFFFFFFF]
-    startaddr =  ipstring_to_long(startip)
-    endaddr = ipstring_to_long (endip)
-    cidrlist = Array.new
-
-    while endaddr >= startaddr
-      maxsize = 32
-      while maxsize > 0
-        mask = cidr2mask[maxsize - 1]
-        maskedbase = startaddr & mask
+require "ip2cidr/iphandling"
 
-        break if maskedbase != startaddr
-
-        maxsize -= 1
-      end
-
-      x = Math.log(endaddr - startaddr + 1) / Math.log(2)
-      maxdiff = 32 - x.floor
-      maxsize = maxdiff if maxsize < maxdiff
-
-      cidrlist.push(long_to_ip_string(startaddr) + "/" + maxsize.to_s)
-      startaddr += 2**(32 - maxsize)
-    end
-
-    return cidrlist
+# The main IPToCIDR driver
+class IPToCIDR
+  # Converts IP Range to IP CIDR blocks
+  # 
+  # Example:
+  #   >> IPToCIDR.solveCIDR("172.254.6.1","192.168.254.254")
+  #   => 192.168.254.0/24
+  # Arguments:
+  #   startip: (String)
+  #   endip:   (String)
+
+  def self.solveCIDR(startip, endip)
+    cidr = IPHandling.new
+
+    # Check if IP Starting Address is valid
+    raise ArgumentError, 'IP Address is not valid' unless startip.split(".").length == 4
+    
+    # Check if Ending IP Address is valid
+    raise ArgumentError, 'IP Address is not valid' unless endip.split(".").length == 4
+    
+    cidr.iprange_to_cidr(startip,endip)
   end
 end

data/lib/ip2cidr/iphandling.rb

@@ -0,0 +1,67 @@
+class IPHandling
+  # ipstring_to_long 
+  # Convert an ip address in string format to integer.
+  def ipstring_to_long(ipstring)
+    ipstring = ipstring.split(".")
+    longip = Array.new(4)
+    for i in 0..3
+      longip[i] = ipstring[i].to_i
+    end
+
+    #return longip
+    return (longip[0] << 24) + (longip[1] << 16) + 
+           (longip[2] << 8) + longip[3]
+  end
+
+  # long_to_ipstring
+  # Convert an ip address in integer format to string.
+  def long_to_ipstring(longip)
+    ipstring = ""
+    ipstring = (longip >> 24).to_s + "." + 
+               ((longip & 0x00FFFFFF)>> 16).to_s + "." + 
+               ((longip & 0x0000FFFF) >> 8).to_s + "." + 
+               (longip & 0x000000FF).to_s
+    return ipstring
+  end
+
+  # iprange_to_cidr
+  # Return a list of cidr addresses given a range of ip 
+  # addresses.
+  def iprange_to_cidr(startip, endip)
+    cidr2mask = [0x00000000, 0x80000000, 0xC0000000, 
+                 0xE0000000, 0xF0000000, 0xF8000000, 
+                 0xFC000000, 0xFE000000, 0xFF000000, 
+                 0xFF800000, 0xFFC00000, 0xFFE00000, 
+                 0xFFF00000, 0xFFF80000, 0xFFFC0000, 
+                 0xFFFE0000, 0xFFFF0000, 0xFFFF8000, 
+                 0xFFFFC000, 0xFFFFE000, 0xFFFFF000, 
+                 0xFFFFF800, 0xFFFFFC00, 0xFFFFFE00, 
+                 0xFFFFFF00, 0xFFFFFF80, 0xFFFFFFC0, 
+                 0xFFFFFFE0, 0xFFFFFFF0, 0xFFFFFFF8, 
+                 0xFFFFFFFC, 0xFFFFFFFE, 0xFFFFFFFF]
+    startaddr =  ipstring_to_long(startip)
+    endaddr = ipstring_to_long (endip)
+    cidrlist = Array.new
+
+    while endaddr >= startaddr
+      maxsize = 32
+      while maxsize > 0
+        mask = cidr2mask[maxsize - 1]
+        maskedbase = startaddr & mask
+
+        break if maskedbase != startaddr
+
+        maxsize -= 1
+      end
+
+      x = Math.log(endaddr - startaddr + 1) / Math.log(2)
+      maxdiff = 32 - x.floor
+      maxsize = maxdiff if maxsize < maxdiff
+
+      cidrlist.push(long_to_ipstring(startaddr) + "/" + maxsize.to_s)
+      startaddr += 2**(32 - maxsize)
+    end
+
+    return cidrlist
+  end
+end

data/test/test_ip2cidr.rb

@@ -1,32 +1,14 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'ip2cidr'
 
-class IPToCIDRTest < Test::Unit::TestCase
-  def test_ipstring_to_long
-    assert_equal 0xc0a80001, IPToCIDR.ipstring_to_long("192.168.0.1").to_s(16)
-    assert_equal 0xffffffff, IPToCIDR.ipstring_to_long("255.255.255.255").to_s(16)
-    assert_equal 0x00000000, IPToCIDR.ipstring_to_long("0.0.0.0").to_s(16)
-    assert_equal 0xfefefefe, IPToCIDR.ipstring_to_long("254.254.254.254").to_s(16)
-    assert_equal 0x18ff0701, IPToCIDR.ipstring_to_long("24.255.7.1").to_s(16)
-    assert_equal 0xc23f0f60, IPToCIDR.ipstring_to_long("194.63.15.96").to_s(16)
-    assert_equal 0x2ef653ca, IPToCIDR.ipstring_to_long("46.246.83.202").to_s(16)
-  end
-
-  def test_long_to_ip_string
-    assert_equal "192.168.0.1",     IPToCIDR.long_to_ip_string(0xc0a80001)
-    assert_equal "255.255.255.255", IPToCIDR.long_to_ip_string(0xffffffff)
-    assert_equal "0.0.0.0",         IPToCIDR.long_to_ip_string(0x00000000)
-    assert_equal "254.254.254.254", IPToCIDR.long_to_ip_string(0xfefefefe)
-    assert_equal "24.255.7.1",      IPToCIDR.long_to_ip_string(0x18ff0701)
-    assert_equal "194.63.15.96",    IPToCIDR.long_to_ip_string(0xc23f0f60)
-    assert_equal "46.246.83.202",   IPToCIDR.long_to_ip_string(0x2ef653ca)
-	end
+class IPToCIDRTest < Minitest::Test
 
-  def test_iprange_to_cidr
+  def test_solveCIDR
+    test1 = ["192.168.0.0/29"]
     test2 = ["192.168.0.0/13", "192.176.0.0/12", "192.192.0.0/10", "193.0.0.0/8", "194.0.0.0/7", 
              "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4", "224.0.0.0/4", "240.0.0.0/5", "248.0.0.0/6", 
              "252.0.0.0/7", "254.0.0.0/8", "255.0.0.0/9", "255.128.0.0/11", "255.160.0.0/13", "255.168.0.0/29"]
-    
+    test3 = ["192.168.0.1/32"]
     test4 = ["0.168.0.1/32", "0.168.0.2/31", "0.168.0.4/30", "0.168.0.8/29", "0.168.0.16/28",
              "0.168.0.32/27", "0.168.0.64/26", "0.168.0.128/25", "0.168.1.0/24", 
              "0.168.2.0/23", "0.168.4.0/22", "0.168.8.0/21", "0.168.16.0/20", 
@@ -36,9 +18,9 @@ class IPToCIDRTest < Test::Unit::TestCase
              "32.0.0.0/3", "64.0.0.0/2", "128.0.0.0/2", "192.0.0.0/3", "224.0.0.0/4", 
              "240.0.0.0/5", "248.0.0.0/6", "252.0.0.0/7", "254.0.0.0/24"]
 
-    assert_equal "192.168.0.0/29",  IPToCIDR.iprange_to_cidr("192.168.0.0", "192.168.0.7")
-    assert_equal test2,             IPToCIDR.iprange_to_cidr("192.168.0.0", "255.168.0.7")
-    assert_equal "192.168.0.1/32",  IPToCIDR.iprange_to_cidr("192.168.0.1", "192.168.0.1")
-    assert_equal test4,             IPToCIDR.iprange_to_cidr("0.168.0.1",   "254.0.0.255")
+    assert_equal test1,  IPToCIDR.solveCIDR("192.168.0.0", "192.168.0.7")
+    assert_equal test2,  IPToCIDR.solveCIDR("192.168.0.0", "255.168.0.7")
+    assert_equal test3,  IPToCIDR.solveCIDR("192.168.0.1", "192.168.0.1")
+    assert_equal test4,  IPToCIDR.solveCIDR("0.168.0.1",   "254.0.0.255")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ip2cidr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carlo Niño A. Bitoon
@@ -17,11 +17,14 @@ email:
 - carloninobitoon@yahoo.com
 - kirkmadraga@outlook.com
 - jp_suelto@yahoo.com
-executables: []
+executables:
+- ip2cidr
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/ip2cidr
 - lib/ip2cidr.rb
+- lib/ip2cidr/iphandling.rb
 - test/test_ip2cidr.rb
 homepage: http://rubygems.org/gems/iptocidr
 licenses: