netaddr 1.5.0 → 1.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 00af2a0dd3e72c9af45cbf4da1400b712c2786aa
+  data.tar.gz: 00e17047afb4b70c8380d14e41135385db9c3c24
+SHA512:
+  metadata.gz: 4356fd2da890c8f0611e6f616f9d35d6b7874727eeed1d09382c679d904ad0b8e9798f97ac2a41bbfe850f91b141816edd360f66183c11e4ca65b7a3dfc70745
+  data.tar.gz: 614319998cb885b53f98c3d5ad650184e1e9830a442fa39b3df78cbdf0b2871ee920ff0e39d0f31c345e2b81a7208efb2a0e7d52a983bca90af7fc9e50f762ef

data/changelog

@@ -1,3 +1,10 @@
+==Version
+====1.5.1
+
+===Changes
+* fixed bug with NetAddr#merge (credit to Daniel Boughton)
+
+
 ==Version
 ====1.5.0
 

data/lib/cidr_shortcuts.rb

@@ -322,7 +322,7 @@ def cidr_summarize(subnet_list)
         until (index >= summarized_list.length)
             subnet = summarized_list[index]
             if (subnet &&  cidr_compare(supernet,subnet) == 1 )
-                subnet_list[index] = nil
+                unique_list.delete(subnet.desc)
             end
             index += 1
         end

data/license

@@ -0,0 +1,13 @@
+Copyright Dustin L. Spinhirne
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/{tests → test}/methods_test.rb

@@ -83,6 +83,9 @@ class TestMethods < Test::Unit::TestCase
         assert_equal('10.0.0.0/24', merged[0].desc)
         assert_equal('10.0.0.240/28', merged[0].tag[:Subnets][5].desc)
         assert(merged[0].tag[:Subnets][5].tag[:test])
+
+        assert_equal(['10.0.0.0/8','192.168.0.0/24'], NetAddr.merge(['10.0.0.0/8', '10.0.0.0/12', '10.0.0.0/24','192.168.0.0/24','192.168.0.64/26']) )
+
     end
 
     def test_minimum_size

metadata

@@ -1,68 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: netaddr
-version: !ruby/object:Gem::Version 
-  version: 1.5.0
+version: !ruby/object:Gem::Version
+  version: 1.5.1
 platform: ruby
-authors: 
+authors:
 - Dustin Spinhirne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-11-07 00:00:00 -06:00
-default_executable: 
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: 
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - Errors
 - changelog
-files: 
-- lib/cidr_shortcuts.rb
+- license
+files:
+- Errors
+- README
+- changelog
 - lib/cidr.rb
-- lib/ip_math.rb
-- lib/validation_shortcuts.rb
+- lib/cidr_shortcuts.rb
 - lib/eui.rb
-- lib/netaddr.rb
+- lib/ip_math.rb
 - lib/methods.rb
+- lib/netaddr.rb
 - lib/tree.rb
-- README
-- Errors
-- changelog
-has_rdoc: true
+- lib/validation_shortcuts.rb
+- license
+- test/cidr_test.rb
+- test/eui_test.rb
+- test/methods_test.rb
+- test/tree_test.rb
 homepage: 
+licenses:
+- Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: A package for manipulating network addresses.
-test_files: 
-- tests/tree_test.rb
-- tests/methods_test.rb
-- tests/cidr_test.rb
-- tests/eui_test.rb
+test_files: []