conker 0.12.2 → 0.13.1

data/conker.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name = 'conker'
   s.authors = ['Sam Stokes', 'Conrad Irwin', 'Lee Mallabone', 'Martin Kleppmann']
   s.email = 'supportive@rapportive.com'
-  s.version = '0.12.2'
+  s.version = '0.13.1'
   s.summary = %q{Conker will conquer your config.}
   s.description = "Configuration library."
   s.homepage = "https://github.com/rapportive/conker"

data/lib/conker.rb

@@ -242,6 +242,20 @@ module Conker
         raise MustBeDefined if value.nil? # there's nothing sensible to default to
         require 'addressable' unless defined? Addressable
         Addressable::URI.parse(value.to_s)
+      when :ip_address
+        raise MustBeDefined if value.nil? # there's nothing sensible to default to
+        require 'ipaddr' unless defined? IPAddr
+        IPAddr.new(value.to_s)
+      when :ip_range
+        raise MustBeDefined if value.nil? # there's nothing sensible to default to
+        require 'ipaddr' unless defined? IPAddr
+
+        # Support <from>..<to> for ranges that cannot be specified with CIDR easily.
+        if value =~ /\A(.*)\.\.(.*)\z/
+          IPAddr.new($1) .. IPAddr.new($2)
+        else
+          IPAddr.new(value.to_s).to_range
+        end
       when :timestamp
         raise MustBeDefined if value.nil? # there's nothing sensible to default to.
         Time.iso8601(value.to_s).utc

data/spec/lib/conker_spec.rb

@@ -1,5 +1,5 @@
 require 'active_support/core_ext/hash/indifferent_access'
-
+$:.unshift File.expand_path("../../lib", __FILE__)
 require 'conker'
 
 describe Conker do
@@ -15,6 +15,35 @@ describe Conker do
     end
   end
 
+  describe 'type: :ip_address' do
+    it 'should parse IP addresses' do
+      Conker.module_eval do
+        setup_config! :development, {"IP_ADDR" => "172.17.16.15"},
+                      IP_ADDR: optional(type: :ip_address, default: nil)
+      end
+      ::IP_ADDR.should == IPAddr.new("172.17.16.15")
+    end
+  end
+
+  describe 'type: :ip_range' do
+    it 'should parse CIDR ranges' do
+      Conker.module_eval do
+        setup_config! :development, {"IP_RANGE" => "172.17.16.0/24"},
+                      IP_RANGE: optional(type: :ip_range, default: nil)
+
+      end
+      ::IP_RANGE.should include IPAddr.new("172.17.16.15")
+    end
+
+    it 'should parse <from>..<to>' do
+      Conker.module_eval do
+        setup_config! :development, {"IP_RANGE" => "172.17.16.116..172.17.16.131"},
+                      IP_RANGE: optional(type: :ip_range, default: nil)
+
+      end
+      ::IP_RANGE.should include IPAddr.new("172.17.16.128")
+    end
+  end
 
   describe 'reading config from a hash' do
     describe 'basic usage' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conker
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Conker will conquer your config.