ipaddr_range_set 0.10.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ec00c0b3c751451810209932ce2bed617eff7a32
+  data.tar.gz: 23d123fe53c6a1b4cf20a49d1677120e3a7d2b54
+SHA512:
+  metadata.gz: eaaa198ba4f8279dd5e7fc695a897dc0133f95081f38f71a9a9cb55105498ab638ee691e0068277d65a0ea73b26172047503106a7317715eefb624b925256fa0
+  data.tar.gz: ae0e7544efef39c72de76941a42f3fda1c92c86ab468aed2c98ca9fdff98d34894916f654e437d009fb1caefd37ffcc57f1a29a7e28d79d6f291df621056b627

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/README.md

@@ -1,5 +1,8 @@
 ipaddr_range_set
 ================
+[![Build Status](https://travis-ci.org/jrochkind/ipaddr_range_set.png)](https://travis-ci.org/jrochkind/ipaddr_range_set)
+
+
 
 convenience class to create a set of possibly discontiguous IP address range
 segments, and check if an IP address is in the set. ruby 1.9.3+ only. 
@@ -93,4 +96,4 @@ is done (should it be? I have no idea, don't really understand ipv6 use cases).
 ## thanks
 
 to whoever wrote IPAddr in ruby stdlib, nice to have it, this is just a
-convenience wrapper over it, really. 
+convenience wrapper over it, really. 

data/lib/ipaddr_range_set.rb

@@ -3,6 +3,11 @@ require "ipaddr_range_set/version"
 require 'ipaddr'
 
 class IPAddrRangeSet
+  # In ruby 2.0, they introduced IPAddr::InvalidAddressError, before
+  # that it was just ArgumentError. Let's throw it if we've got it
+  # to be consistent. 
+  ArgErrorClass = (defined? IPAddr::InvalidAddressError) ? IPAddr::InvalidAddressError : ArgumentError
+
   
   # Zero or more segment arguments, which can be input in a variety of
   # of formats. 
@@ -52,7 +57,7 @@ class IPAddrRangeSet
         octets = segment.split('.')
                 
         if (octets.rindex {|o| o =~ /\d+/}) > octets.rindex("*")
-          raise ArgumentError.new("Invalid splat range, all *s have to come before all concrete octets")
+          raise ArgErrorClass.new("Invalid splat range, all *s have to come before all concrete octets")
         end
                 
         splats = 0
@@ -85,7 +90,7 @@ class IPAddrRangeSet
     segments.each do |segment|
       # important to use cover? and not include? on Ranges, to avoid
       # terribly inefficient check. But if segment is an IPAddr, you want include?
-      if segment.respond_to?(:cover)
+      if segment.respond_to?(:cover?)
         return true if segment.cover? ip_addr
       else
         return true if segment.include? ip_addr

data/lib/ipaddr_range_set/version.rb

@@ -1,3 +1,3 @@
 module IpaddrRangeSet
-  VERSION = "0.10.0"
+  VERSION = "1.0.0"
 end

data/test/test_ip_addr_range_set.rb

@@ -75,15 +75,19 @@ class TestIpAddrRange < Test::Unit::TestCase
   end
   
   def test_bad_input
-    assert_raise(ArgumentError) {  IPAddrRangeSet.new("foo")}
+    # ruby 2.0  IPAddr::InvalidAddressError is a subclass of ArgumentError,
+    # but minitest assert_raise insists on exact kind
+    exception_class = (defined? IPAddr::InvalidAddressError) ? IPAddr::InvalidAddressError : ArgumentError
+
+    assert_raise(exception_class) {  IPAddrRangeSet.new("foo")}
     
-    assert_raise(ArgumentError) {  IPAddrRangeSet.new("124.*")}
+    assert_raise(exception_class) {  IPAddrRangeSet.new("124.*")}
     
     # splats have to be at end  
-    assert_raise(ArgumentError) {  IPAddrRangeSet.new("124.*.1.1")}
+    assert_raise(exception_class) {  IPAddrRangeSet.new("124.*.1.1")}
     
     # Not a valid ipv4, make sure we catch it on ranges
-    assert_raise(ArgumentError) {  IPAddrRangeSet.new("124.999.1.1".."125.0.0.1") }
+    assert_raise(exception_class) {  IPAddrRangeSet.new("124.999.1.1".."125.0.0.1") }
   end
   
   def test_multi_arg

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipaddr_range_set
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -18,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -27,29 +27,27 @@ files:
 - test/test_ip_addr_range_set.rb
 homepage: https://github.com/jrochkind/ipaddr_range_set
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: convenience class to create a set of possibly discontiguous IP address range
   segments, and check if an IP address is in the set.
 test_files:
 - test/test_ip_addr_range_set.rb
-has_rdoc: