netaddr 1.5.1 → 2.0.3

data/test/mask32_test.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/ruby
+
+require_relative "../lib/netaddr.rb"
+require 'test/unit'
+
+class TestMask32 < Test::Unit::TestCase
+	def test_new
+		m32 = NetAddr::Mask32.new(24)
+		assert_equal("/24", m32.to_s)
+		assert_equal(0xffffff00, m32.mask)
+		
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.new(-1) }
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.new(33) }
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.new("/24") }
+	end
+	
+	def test_parse
+		m32 = NetAddr::Mask32.parse("255.255.255.0")
+		assert_equal("/24", m32.to_s)
+		
+		m32 = NetAddr::Mask32.parse("/24")
+		assert_equal("/24", m32.to_s)
+		
+		assert_raise(NetAddr::ValidationError){ NetAddr::Mask32.parse("255.248.255.0") }
+	end
+	
+	def test_cmp
+		m = NetAddr::Mask32.new(24)
+		m2 = NetAddr::Mask32.new(25)
+		m3 = NetAddr::Mask32.new(23)
+		m4 = NetAddr::Mask32.new(24)
+		assert_equal(1, m.cmp(m2))
+		assert_equal(-1, m.cmp(m3))
+		assert_equal(0, m.cmp(m4))
+	end
+	
+	def test_len
+		m = NetAddr::Mask32.new(24)
+		assert_equal(256, m.len())
+		
+		m = NetAddr::Mask32.new(26)
+		assert_equal(64, m.len())
+		
+		m = NetAddr::Mask32.new(32)
+		assert_equal(1, m.len())
+		
+		m = NetAddr::Mask32.new(0)
+		assert_equal(0, m.len())
+	end
+
+end

data/test/netaddr_test.rb

@@ -0,0 +1,127 @@
+#!/usr/bin/ruby
+
+require_relative "../lib/netaddr.rb"
+require 'test/unit'
+
+class TestNetAddr < Test::Unit::TestCase
+
+	def test_ipv4_prefix_len
+		assert_equal(32,NetAddr.ipv4_prefix_len(1))
+		assert_equal(27,NetAddr.ipv4_prefix_len(30))
+		assert_equal(24,NetAddr.ipv4_prefix_len(254))
+		assert_equal(16,NetAddr.ipv4_prefix_len(0xfffe))
+		assert_equal(8,NetAddr.ipv4_prefix_len(0xfffffe))
+		assert_equal(0,NetAddr.ipv4_prefix_len(0xffffffff))
+	end
+	
+	def test_sort_IPv4
+		ips = []
+		["10.0.0.0","1.1.1.1","0.0.0.0","10.1.10.1"].each do |net|
+			ips.push(NetAddr::IPv4.parse(net))
+		end
+		sorted = NetAddr.sort_IPv4(ips)
+		expect = [ips[2],ips[1],ips[0],ips[3]]
+		assert_equal(expect, sorted)
+	end
+	
+	def test_sort_IPv4Net
+		nets = []
+		["10.0.0.0/24", "1.0.0.0/24", "10.0.0.0/8", "192.168.1.0/26", "8.8.8.8/32"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		sorted = NetAddr.sort_IPv4Net(nets)
+		expect = [nets[1],nets[4],nets[0],nets[2],nets[3]]
+		assert_equal(expect, sorted)
+	end
+	
+	def test_summ_IPv4Net
+		nets = []
+		["10.0.0.0/29", "10.0.0.8/30", "10.0.0.12/30", "10.0.0.16/28", "10.0.0.32/27", "10.0.0.64/26", "10.0.0.128/25"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["10.0.0.0/24"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["10.0.0.0/24", "1.0.0.0/8", "3.4.5.6/32", "3.4.5.8/31", "0.0.0.0/0"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["0.0.0.0/0"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["10.0.1.0/25", "10.0.1.0/26", "10.0.0.16/28", "10.0.0.32/27", "10.0.0.128/26", "10.0.0.192/26", "10.0.0.32/27"].each do |net|
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["10.0.0.16/28", "10.0.0.32/27", "10.0.0.128/25", "10.0.1.0/25"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+	end
+	
+	def test_sort_IPv6
+		ips = []
+		["1::", "3::", "2::", "::", "::1"].each do |net|
+			ips.push(NetAddr::IPv6.parse(net))
+		end
+		sorted = NetAddr.sort_IPv6(ips)
+		expect = [ips[3],ips[4],ips[0],ips[2],ips[1]]
+		assert_equal(expect, sorted)
+	end
+	
+	def test_sort_IPv6Net
+		nets = []
+		["1::/64", "2::/64", "1::/16", "::", "::1"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		sorted = NetAddr.sort_IPv6Net(nets)
+		expect = [nets[3],nets[4],nets[0],nets[2],nets[1]] # ::/128 ::1/128 1::/64 1::/16 2::/64
+		assert_equal(expect, sorted)
+	end
+	
+	def test_summ_IPv6Net
+		nets = []
+		["ff00::/13", "ff08::/14", "ff0c::/14", "ff10::/12", "ff20::/11", "ff40::/10", "ff80::/9"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["ff00::/8"]
+		i = 0
+		NetAddr.summ_IPv6Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["2::/32", "::1", "fec0::/16", "1::/16", "::/0"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["::/0"]
+		i = 0
+		NetAddr.summ_IPv6Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+		
+		nets = []
+		["ff80::/9", "ff10::/12", "ff80::/10", "ff20::/12", "fff0::/16", "fff1::/16", "ff80::/10"].each do |net|
+			nets.push(NetAddr::IPv6Net.parse(net))
+		end
+		expect = ["ff10::/12", "ff20::/12", "ff80::/9", "fff0::/15"]
+		i = 0
+		NetAddr.summ_IPv6Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
+	end
+
+end

data/test/run_all.rb

@@ -0,0 +1,10 @@
+require_relative "examples.rb"
+require_relative "netaddr_test.rb"
+require_relative "eui48_test.rb"
+require_relative "eui64_test.rb"
+require_relative "ipv4_test.rb"
+require_relative "ipv4net_test.rb"
+require_relative "ipv6_test.rb"
+require_relative "ipv6net_test.rb"
+require_relative "mask32_test.rb"
+require_relative "mask128_test.rb"

metadata

@@ -1,42 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: netaddr
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Dustin Spinhirne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
-- Errors
-- changelog
-- license
+- README.md
+- LICENSE
 files:
-- Errors
-- README
-- changelog
-- lib/cidr.rb
-- lib/cidr_shortcuts.rb
-- lib/eui.rb
-- lib/ip_math.rb
-- lib/methods.rb
+- LICENSE
+- README.md
+- lib/eui48.rb
+- lib/eui64.rb
+- lib/ipv4.rb
+- lib/ipv4net.rb
+- lib/ipv6.rb
+- lib/ipv6net.rb
+- lib/mask128.rb
+- lib/mask32.rb
 - lib/netaddr.rb
-- lib/tree.rb
-- lib/validation_shortcuts.rb
-- license
-- test/cidr_test.rb
-- test/eui_test.rb
-- test/methods_test.rb
-- test/tree_test.rb
-homepage: 
+- lib/util.rb
+- test/eui48_test.rb
+- test/eui64_test.rb
+- test/examples.rb
+- test/ipv4_test.rb
+- test/ipv4net_test.rb
+- test/ipv6_test.rb
+- test/ipv6net_test.rb
+- test/mask128_test.rb
+- test/mask32_test.rb
+- test/netaddr_test.rb
+- test/run_all.rb
+homepage: https://github.com/dspinhirne/netaddr-rb
 licenses:
 - Apache-2.0
 metadata: {}
@@ -56,8 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
-summary: A package for manipulating network addresses.
+summary: A Ruby library for performing calculations on IPv4 and IPv6 subnets.
 test_files: []

data/Errors

@@ -1,7 +0,0 @@
-=Error Classes
-
- +-Exception
-   +-StandardError
-     +-BoundaryError => CIDR or EUI is out of bounds for a valid address
-     +-ValidationError => CIDR or EUI failed validation checks
-     +-VersionError => CIDR or EUI is of improper version for requested operation

data/README

@@ -1,17 +0,0 @@
-=Introduction
-
-NetAddr arose through my need as a network engineer for a 
-back-end module that could easily handle such advanced tasks 
-as automating the subnetting/supernetting
-of IP space, performing calculations on IP CIDR blocks, and other
-various items. At that time there were no modules that could
-do any of the things that I needed, so I set out to create my own. 
-Since it has proven to be fairly useful to me, I have decided to share the
-code with the Ruby community. 
- 
-I have added things that I find immediately useful for me. I am
-open to suggestions if there is something that I could add to make
-your life easier. 
- 
-Dustin Spinhirne
-

data/changelog

@@ -1,58 +0,0 @@
-==Version
-====1.5.1
-
-===Changes
-* fixed bug with NetAddr#merge (credit to Daniel Boughton)
-
-
-==Version
-====1.5.0
-
-===Changes
-* fixed bug with EUI48#to_eui64 (credit to Erik Kline)
-* fixed bug with u/l bit toggle on EUI#link_local (credit to Erik Kline)
-* added EUI#to_ipv6
-* added NetAddr#supernets
-
-
-==Version
-====1.4.0
-
-===Changes
-* Added additional options to NetAddr#sort
-
-
-==Version
-====1.3.0
-
-===New Features
-* added CIDR#[]
-* added CIDR#succ (CIDR objects may now be used as args for the standard Ruby Range class)
-* added CIDR#allocate_rfc3531
-* added CIDR#to_i
-* added CIDRv6.unique_local
-* added EUI48#to_eui64
-* added EUI#to_i
-* added EUI#to_s
-
-===Changes
-* deprecated 'packed' methods
-
-
-==Version
-====1.2.0
-
-===Changes
-* CIDRv4#new and CIDRv6#new methods have been changed for the sake of speed improvements.
-  Please use the CIDR#create method instead.
-* changes to CIDR#wildcard_mask
-* bug fix with validate_eui method
-* bug fix with validate_ip_addr
-* bug fix and *vast* simplification of NetAddr.merge
-
-
-===New Features
-* speed improvements
-* added CIDR#set_wildcard_mask
-* added <=>, >, <, == methods to CIDR
-* NetAddr.merge now reports which CIDR addresses were used to create new summary addresses