ip-ranges 0.1.1 → 0.1.2

data/Gemfile

@@ -1,4 +1,13 @@
-source :rubygems
+source "https://rubygems.org"
+
 gem "netaddr"
-gem "rdoc"
-gem "rspec"
+
+group :development, :test do
+  gem "rdoc"
+  gem "rdoc-data"
+  gem "rake"
+  gem "gem-this"
+  gem "gemcutter"
+  gem "rspec"
+  gem "ruby-debug"
+end

data/Gemfile.lock

@@ -1,9 +1,18 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    columnize (0.8.9)
     diff-lcs (1.1.3)
+    gem-this (0.3.7)
+    gemcutter (0.7.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     netaddr (1.5.0)
+    rake (10.3.2)
+    rbx-require-relative (0.0.9)
     rdoc (3.9.4)
+    rdoc-data (3.12)
+      rdoc (> 2.5, < 4.0)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -12,11 +21,21 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  gem-this
+  gemcutter
   netaddr
+  rake
   rdoc
+  rdoc-data
   rspec
+  ruby-debug

data/Rakefile

@@ -12,6 +12,21 @@ task :spec do
   system "bundle exec rspec spec/*_spec.rb spec/**/*_spec.rb"
 end
 
+
+
+require "rubygems"
+require "rubygems/package_task"
+require "rdoc/task"
+
+require "rspec"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(--format documentation --colour)
+end
+
+
+task :default => ["spec"]
+
 # This builds the actual gem. For details of what all these options
 # mean, and other ones you can add, check the documentation here:
 #
@@ -21,18 +36,17 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "ip-ranges"
-  s.version           = "0.1.1"
-  s.summary           = "Manage ranges of IP numbers determining equivalence, containment and overlaps"
+  s.version           = "0.1.2"
+  s.summary           = "Compare and manipulate ranges of IP numbers"
   s.author            = "David Salgado"
   s.email             = "david@digitalronin.com"
-  s.homepage          = "http://roninonrails.wordpress.com/2011/09/10/ip-ranges-gem/"
+  s.homepage          = "https://digitalronin.github.io/2011/09/10/ip-ranges-gem/"
 
   s.has_rdoc          = true
-  s.description       = "Compare multiple IP ranges for overlaps, equivalence and containment"
-  # s.extra_rdoc_files  = %w(README)
-  s.rdoc_options      = %w(-x pkg)
+  s.extra_rdoc_files  = %w(README.markdown)
+  s.rdoc_options      = %w(--main README.markdown)
 
-  # Add any extra files to include in the gem (like your README)
+  # Add any extra files to include in the gem
   s.files             = %w(Gemfile Gemfile.lock Rakefile README.markdown) + Dir.glob("{spec,lib}/**/*")
   s.require_paths     = ["lib"]
 
@@ -42,7 +56,7 @@ spec = Gem::Specification.new do |s|
 
   # If your tests use any gems, include them here
   s.add_development_dependency("rspec")
-  s.add_development_dependency("rdoc")
+  s.add_development_dependency("ruby-debug")
 end
 
 # This task actually builds the gem. We also regenerate a static
@@ -50,7 +64,7 @@ end
 # be automatically building a gem for this project. If you're not
 # using GitHub, edit as appropriate.
 #
-# To publish your gem online, install the 'gemcutter' gem; Read more 
+# To publish your gem online, install the 'gemcutter' gem; Read more
 # about that here: http://gemcutter.org/pages/gem_docs
 Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
@@ -71,8 +85,8 @@ task :package => :gemspec
 
 # Generate documentation
 RDoc::Task.new do |rd|
-  
-  rd.rdoc_files.include("lib/**/*.rb")
+  rd.main = "README.markdown"
+  rd.rdoc_files.include("README.markdown", "lib/**/*.rb")
   rd.rdoc_dir = "rdoc"
 end
 
@@ -80,3 +94,24 @@ desc 'Clear out RDoc and generated packages'
 task :clean => [:clobber_rdoc, :clobber_package] do
   rm "#{spec.name}.gemspec"
 end
+
+desc 'Tag the repository in git with gem version number'
+task :tag => [:gemspec, :package] do
+  if `git diff --cached`.empty?
+    if `git tag`.split("\n").include?("v#{spec.version}")
+      raise "Version #{spec.version} has already been released"
+    end
+    `git add #{File.expand_path("../#{spec.name}.gemspec", __FILE__)}`
+    `git commit -m "Released version #{spec.version}"`
+    `git tag v#{spec.version}`
+    `git push --tags`
+    `git push`
+  else
+    raise "Unstaged changes still waiting to be committed"
+  end
+end
+
+desc "Tag and publish the gem to rubygems.org"
+task :publish => :tag do
+  `gem push pkg/#{spec.name}-#{spec.version}.gem`
+end

data/lib/ip-ranges/range.rb

@@ -51,6 +51,21 @@ module IpRanges
       end
     end
 
+    # Arguments
+    # * An +Ip+ object
+    # Extend the range if the pushed IP is the next, contiguous ip in the range. Otherwise return false and do nothing.
+    def push(ip)
+      if empty?
+        @first = ip
+        true
+      elsif ip.to_s == @last.dup.increment
+        @last = ip
+        true
+      else
+        false
+      end
+    end
+
     # Returns the last Ip object in this range.
     def last
       @last
@@ -103,6 +118,10 @@ module IpRanges
 
     private
 
+    def empty?
+      @first.nil? && @last.nil?
+    end
+
     def throttle
       @counter += 1
       if @counter % BATCHSIZE == 0

data/spec/ip-ranges/range_spec.rb

@@ -4,6 +4,83 @@ describe IpRanges::Range do
   before do
   end
 
+  context "pushing" do
+    let(:ip1) { IpRanges::Ip.new(:number => '1.1.1.1') }
+    let(:ip2) { IpRanges::Ip.new(:number => '1.1.1.2') }
+    let(:ip3) { IpRanges::Ip.new(:number => '1.1.1.3') }
+    let(:ip4) { IpRanges::Ip.new(:number => '1.1.1.4') }
+
+    context "empty range" do
+      let(:empty) { described_class.new(:range => '') }
+
+      it "pushes" do
+        res = empty.push(ip1)
+        res.should be_true
+      end
+
+      it "sets first ip" do
+        empty.push(ip1)
+        empty.first.should eq(ip1)
+      end
+    end
+
+    context "range with start" do
+      let(:r1) { described_class.new(:range => ip1.to_s) }
+
+      context "pushing next ip" do
+        it "pushes" do
+          res = r1.push(ip2)
+          res.should be_true
+        end
+
+        it "sets last ip" do
+          r1.push(ip2)
+          r1.last.should eq(ip2)
+        end
+      end
+
+      context "pushing non-contiguous ip" do
+        it "doesn't push" do
+          res = r1.push(ip3)
+          res.should be_false
+        end
+
+        it "doesn't set last ip" do
+          r1.push(ip3)
+          r1.last.should eq(r1.first)
+        end
+      end
+    end
+
+    context "range with start and end" do
+      let(:range) { described_class.new(:range => [ip1.to_s, ip2.to_s].join('..')) }
+
+      context "pushing next ip" do
+        it "pushes" do
+          res = range.push(ip3)
+          res.should be_true
+        end
+
+        it "sets last ip" do
+          range.push(ip3)
+          range.last.should eq(ip3)
+        end
+      end
+
+      context "pushing non-contiguous ip" do
+        it "doesn't push" do
+          res = range.push(ip4)
+          res.should be_false
+        end
+
+        it "doesn't set last ip" do
+          range.push(ip4)
+          range.last.should eq(ip2)
+        end
+      end
+    end
+  end
+
   context "checking for overlaps" do
 
     it "knows when range a contains range b" do

data/spec/spec_helper.rb

@@ -1 +1,4 @@
+require 'ruby-debug'
+Debugger.start
+
 require 'lib/ip-ranges'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ip-ranges
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Salgado
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2014-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: netaddr
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +30,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: netaddr
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
+  requirement: *id002
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,16 +58,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
-description: Compare multiple IP ranges for overlaps, equivalence and containment
+  requirement: *id003
+  prerelease: false
+  name: ruby-debug
+description: 
 email: david@digitalronin.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
 files: 
 - Gemfile
 - Gemfile.lock
@@ -81,13 +81,13 @@ files:
 - lib/ip-ranges/ip.rb
 - lib/ip-ranges/range.rb
 - lib/ip-ranges.rb
-homepage: http://roninonrails.wordpress.com/2011/09/10/ip-ranges-gem/
+homepage: https://digitalronin.github.io/2011/09/10/ip-ranges-gem/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- -x
-- pkg
+- --main
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -111,9 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Manage ranges of IP numbers determining equivalence, containment and overlaps
+summary: Compare and manipulate ranges of IP numbers
 test_files: []