furnish-ip 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+* 0.0.3 (03/25/2013)
+  * Several fixes around the encoding of IP addresses -- fixes Ruby 2.0.0-p0
+    issues.
+  * Furnish::IP#allocate and Furnish::IP#allocated? exist to assist with direct
+    allocations.
+  * Documentation is generated with RDoc 4
+  * Depend on Furnish 0.0.4
 * 0.0.2 (03/20/2013)
   * Migration to and exploitation of furnish 0.0.2
 * 0.0.1 (03/20/2013)

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in furnish-ip.gemspec
 gemspec
+
+gem 'guard-rake', :git => "https://github.com/erikh/guard-rake", :branch => "failure_ok"

data/Rakefile

@@ -10,7 +10,8 @@ end
 
 RDoc::Task.new do |rdoc|
   rdoc.title = "Generic IP allocator for the Furnish provisioning system"
-  rdoc.rdoc_files.include("lib/**/*.rb")
+  rdoc.main = "README.md"
+  rdoc.rdoc_files.include("README.md", "lib/**/*.rb")
   rdoc.rdoc_files -= ["lib/furnish/ip/version.rb"]
   if ENV["RDOC_COVER"]
     rdoc.options << "-C"

data/furnish-ip.gemspec

@@ -17,14 +17,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'furnish', '~> 0.0.2'
+  gem.add_dependency 'furnish', '~> 0.0.4'
   gem.add_dependency 'palsy',   '~> 0.0.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest', '~> 4.5.0'
   gem.add_development_dependency 'guard-minitest'
   gem.add_development_dependency 'guard-rake'
-  gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'rdoc', '~> 4'
   gem.add_development_dependency 'rb-fsevent'
   gem.add_development_dependency 'simplecov'
 end

data/lib/furnish/ip.rb

@@ -46,6 +46,23 @@ module Furnish # :nodoc:
       @groups     = Palsy::Map.new('furnish_ip_groups', name)
     end
 
+    #
+    # Allocates an IP without putting it in a group. Useful for placeholders.
+    #
+    # Makes no attempt to check if something's allocated already.
+    #
+
+    def allocate(ip)
+      allocated.add(ip.encode("UTF-8"))
+    end
+
+    #
+    # Predicate to determine whether or not an IP is already allocated.
+    #
+    def allocated?(ip)
+      allocated.include?(ip.encode("UTF-8"))
+    end
+
     #
     # Determine, based on allocations already made, what the next available
     # un-used IP is. Will raise ArgumentError if #new is not provided with an
@@ -63,7 +80,7 @@ module Furnish # :nodoc:
       net = subnet
 
       subnet_range.count.times do
-        this_ip = net.to_s
+        this_ip = net.to_s.encode("UTF-8")
 
         return this_ip unless allocated.include?(this_ip)
 
@@ -93,8 +110,9 @@ module Furnish # :nodoc:
       group = group_ips(name)
 
       ips.each do |ip|
-        allocated.add(ip)
-        group.add(ip)
+        utf8_ip = ip.encode("UTF-8")
+        allocated.add(utf8_ip)
+        group.add(utf8_ip)
       end
 
       groups[name] = group

data/lib/furnish/ip/version.rb

@@ -1,6 +1,6 @@
 module Furnish
   class IP
     # Version for furnish-ip
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/test_ip_lib.rb

@@ -19,7 +19,7 @@ class TestIPLib < Furnish::TestCase
     assert_equal("127.0.0.0", ip.unused_ip, "picks the next available ip")
     assert_equal("127.0.0.0", ip.unused_ip, "has no side effects -- returns the same IP on the second call")
 
-    ip.allocated.add("127.0.0.0") # add something to get it to choose the next thing.
+    ip.allocate("127.0.0.0") # add something to get it to choose the next thing.
 
     assert_equal("127.0.0.1", ip.unused_ip, "picks the next unavailable ip")
 
@@ -27,6 +27,31 @@ class TestIPLib < Furnish::TestCase
     assert_raises(ArgumentError, "Furnish::IP#unused_ip requires an IPAddr object to work") { ip.unused_ip }
   end
 
+  def test_encoding
+    ip = Furnish::IP.new(IPAddr.new("127.0.0.1/24"))
+
+    %w[ASCII-8BIT UTF-8].each_with_index do |enc, i|
+      ip.allocate("127.0.0.#{i}".encode(enc))
+      assert(ip.allocated?("127.0.0.#{i}".encode(enc)), "127.0.0.#{i} is allocated with a string with encoding #{enc}")
+    end
+
+    ip.allocate("127.0.0.42".encode("ASCII-8BIT"))
+    assert(ip.allocated?("127.0.0.42".encode("UTF-8")), "127.0.0.42 was allocated encoding-agnostic")
+
+    ip.assign_group_ips("foo", "127.0.0.23".encode("ASCII-8BIT"))
+    assert_equal("UTF-8", ip.group_ips("foo").first.encoding.to_s, "encoding always comes back UTF-8")
+  end
+
+  def test_allocated
+    ip = Furnish::IP.new(IPAddr.new("127.0.0.1/24"))
+    ip.allocate("127.0.0.0")
+    assert(ip.allocated?("127.0.0.0"), "127.0.0.0 is allocated")
+
+    ip.assign_group_ips("foo", "127.0.0.1")
+
+    assert(ip.allocated?("127.0.0.1"), "127.0.0.1 is allocated by way of a group")
+  end
+
   def test_cycle_detection
     ip = Furnish::IP.new(IPAddr.new("127.0.0.1/31"))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnish-ip
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: furnish
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: palsy
   requirement: !ruby/object:Gem::Requirement
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement