Remove asset from range

lib/nexpose/site.rb

@@ -203,9 +203,50 @@ def add_ip(ip)
     #
     # @param [String] ip IP address of an asset.
     def remove_ip(ip)
-      @assets = assets.reject { |asset| asset == IPRange.new(ip) }
+      ip = IPRange.new(ip)
+      @assets.each do |asset_range|
+        next if asset_range.is_a?(Nexpose::HostName)
+        if asset_range.include?(ip)
+          asset = split_ip_range(asset_range, ip)
+          @assets.delete(asset_range)
+          @assets.push(asset)
+          @assets.flatten!
+        end
+      end
+    end
+
+
+    def split_ip_range(ip_range, split_ip)
+      split_ip = IPAddr.new(split_ip.from)
+      start_ip, end_ip = IPAddr.new(ip_range.from), IPAddr.new(ip_range.to)
+      all_ip_range = (start_ip..end_ip)
+
+      case split_ip
+      when all_ip_range.min
+        new_start = IPAddr.new(start_ip.to_i + 1, start_ip.family).to_s
+        asset = Nexpose::IPRange.new(new_start, ip_range.to)
+      when all_ip_range.max
+        new_end = IPAddr.new(end_ip.to_i - 1, end_ip.family).to_s
+        asset = Nexpose::IPRange.new(ip_range.from, new_end)
+      else
+        asset = ip_range_split_calc(start_ip, end_ip, split_ip)
+      end
+      return asset
+    end
+
+
+    def ip_range_split_calc(start_ip, end_ip, split_ip)
+      low_split  = IPAddr.new(split_ip.to_i - 1, start_ip.family).to_s
+      high_split = IPAddr.new(split_ip.to_i + 1, end_ip.family).to_s
+
+      low_range  = Nexpose::IPRange.new(start_ip.to_s, low_split)
+      high_range = Nexpose::IPRange.new(high_split, end_ip.to_s)
+
+      return [ low_range, high_range ]
     end
 
+
+
     # Adds assets to this site by IP address range.
     #
     # @param [String] from Beginning IP address of a range.
@@ -725,17 +766,10 @@ def eql?(other)
 
     def include?(single_ip)
       return false unless single_ip.respond_to? :from
-      from = IPAddr.new(@from)
-      to = @to.nil? ? from : IPAddr.new(@to)
-      other = IPAddr.new(single_ip)
-
-      if other < from
-        false
-      elsif to < other
-        false
-      else
-        true
-      end
+      from = IPAddr.new(@from).to_i
+      to = @to.nil? ? from : IPAddr.new(@to).to_i
+      other = IPAddr.new(single_ip.from).to_i
+      (from..to).include?(other)
     end
 
     def hash

nexpose.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rubocop', '~> 0.29.0')
   s.add_development_dependency('webmock', '~> 1.20.4')
   s.add_development_dependency('vcr', '~> 2.9.3')
+  s.add_development_dependency('pry')
+  s.add_development_dependency('pry-byebug')
 end