ipcat 2.0.21 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 128607107ec0662a3fa669eb945725fc0561466c031954c4f1e5383ebf151dce
-  data.tar.gz: 5227424a89485a5a5609bd59644921eba35a8865b4ffd4b4a3b360fba87b7fe6
+  metadata.gz: d3240f08c9b89182e5a0eefd5118ec465cbcdec12f30e6a27f60ee3087401be5
+  data.tar.gz: 48c2314773d06ec67d8e5cca4a801a4de99ade8d6d7089b6622c7cc921ed047a
 SHA512:
-  metadata.gz: 1b9d07d76fd125bcb6cde416e2b177ffe875f872fc8617912200c1aa8e1157a6fd10d533cc5909597d04a482c0c6eb30b61c64a7f4a17c483e1fe15322334536
-  data.tar.gz: 0c60a4e6823615569cadf8868a445777140d4c8ddc26eee4a08b002e2d29468704cf94c8501d293482305830488dd572787205cdcfae19ed4ad8a2c7b2827b6f
+  metadata.gz: 3dc28f74b6488a7cd6aabab399363151855ac03ebe65f5dece83dc92b6a8eb8e324e15e7af818686ce7237e68e71d7d7581c94a961708f2b9fad59b11987ee57
+  data.tar.gz: 8192c6b5cc928fc9e1cfc05a3362b796114a4e95b2097096674bc5040afd9faaf0dd4948602bafa7c6e6c9323c5b2be62ba7d55217026b673f6183e0157e0499

data/README.md

@@ -1,9 +1,9 @@
 # ipcat-ruby
 
-A ruby port of the [ipcat](https://github.com/client9/ipcat) library to classify IP addresses from known datacenters
+A ruby port of the [ipcat](https://github.com/rale/ipcat) library to classify IP addresses from known datacenters
 
-[![Build Status](https://travis-ci.org/kickstarter/ipcat-ruby.svg?branch=master)](https://travis-ci.org/kickstarter/ipcat-ruby)
-[![Code Climate](https://img.shields.io/codeclimate/github/kickstarter/ipcat-ruby.svg?style=flat)](https://codeclimate.com/github/kickstarter/ipcat-ruby)
+[![gem](https://img.shields.io/gem/v/ipcat?color=crimson&logo=rubygems&logoColor=eee&style=flat)](https://rubygems.org/gems/ipcat)
+[![minitest](https://github.com/kickstarter/ipcat-ruby/actions/workflows/minitest.yml/badge.svg)](https://github.com/kickstarter/ipcat-ruby/actions/workflows/minitest.yml)
 
 ## Installation
 

data/Rakefile

@@ -11,15 +11,10 @@ Rake::TestTask.new do |t|
   t.pattern = 'spec/*_spec.rb'
 end
 
-task default: :test
-
-desc 'Regenerate data/datacenters'
-task :generate_dataset do
-  $LOAD_PATH.unshift './lib'
-  require 'ipcat'
-  IPCat.load_csv!
-  File.open('data/datacenters', 'w') { |f| f << Marshal.dump(IPCat.ranges) }
-end
+task :default => :test
+
+# Ensure tests pass before building gem
+task :build => :test
 
 desc 'Run benchmark'
 task :bench do
@@ -32,3 +27,81 @@ task :bench do
     end
   end
 end
+
+namespace :data do
+  desc 'Automated task to open PR on dataset changes'
+  task :autorev => %i[data/datacenters lib/ipcat/version.rb CHANGELOG.md], :order_only => :update do |t|
+    files = t.prereqs.join(' ')
+    sh %{git diff --quiet data/datacenters} do |ok|
+      unless ok
+        # Get PR ready…
+        main_branch = ENV['GIT_MAIN_BRANCH'] || 'main'
+        remote      = ENV['GIT_REMOTE']      || 'origin'
+        new_branch  = "auto/update-dataset-#{Time.now.utc.to_i}"
+        title       = "[autorev] ipcat v#{IPCat::VERSION}"
+        body        = "Update datacenters file and bump patch version."
+
+        # Checkout new branch, commit rev'd files, push and open PR
+        sh %{git checkout -b #{new_branch}}
+        sh %{git add #{files}}
+        sh %{git commit -m "#{title}\n\n#{body}"}
+        sh %{git push #{remote} #{new_branch}}
+        sh %{gh pr create -B #{main_branch} -b #{body.inspect} -H #{new_branch} -t #{title.inspect}}
+      else
+        puts "data/datacenters is up-to-date."
+      end
+    end
+  end
+
+  desc 'Regenerate data/datacenters'
+  task :generate => %i[update data/datacenters]
+
+  desc 'Update git submodules'
+  task :update do
+    sh %{git submodule update}
+  end
+end
+
+##
+# Add CHANGELOG.md entry
+file 'CHANGELOG.md' => 'lib/ipcat/version.rb' do |f|
+  # Inject changelog entry
+  changelog = [
+    "## v#{IPCat::VERSION} - #{Time.now.strftime('%d %B %Y')}\n",
+    "\n",
+    "- Update datacenters\n",
+    "\n",
+  ]
+  body = File.read(f.name).lines.insert(4, *changelog).join
+
+  # Write to disk
+  File.open(f.name, 'w') { |f| f.write(body) }
+end
+
+##
+# Bump IPCat::VERSION
+file 'lib/ipcat/version.rb' => 'data/datacenters' do |f|
+  # Get current version numbers
+  major, minor, patch = IPCat::VERSION.split(/\./)
+  this_v = "#{major}.#{minor}.#{patch}"
+  next_v = "#{major}.#{minor}.#{patch.to_i + 1}"
+
+  # Bump patch number
+  search  = /VERSION = '#{this_v}'/
+  replace = "VERSION = '#{next_v}'"
+  body    = File.read(f.name).sub(search, replace)
+
+  # Write to disk
+  File.open(f.name, 'w') { |v| v.write(body) }
+
+  # Update IPCat::VERSION silently
+  IPCat.send :remove_const, :VERSION
+  IPCat.const_set :VERSION, next_v
+end
+
+##
+# Generate data/datacenters binary
+file 'data/datacenters' => '.gitsubmodules/rale/ipcat/datacenters.csv' do |f|
+  IPCat.load_csv!(path = f.prereqs.first)
+  File.open(f.name, 'w') { |f| f << Marshal.dump(IPCat.ranges) }
+end

data/lib/ipcat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class IPCat
-  VERSION = '2.0.21'
+  VERSION = '2.0.23'
 end

data/lib/ipcat.rb

@@ -2,7 +2,7 @@
 
 ##
 # IPCat
-# Ruby lib for https://github.com/client9/ipcat/
+# Ruby lib for https://github.com/rale/ipcat/
 
 require 'ipaddr'
 require 'ipcat/iprange'
@@ -27,7 +27,7 @@ class IPCat
       @ranges = new_ranges
     end
 
-    def load_csv!(path = 'https://raw.github.com/client9/ipcat/master/datacenters.csv')
+    def load_csv!(path = 'https://raw.githubusercontent.com/rale/ipcat/master/datacenters.csv')
       reset_ranges!
 
       require 'open-uri'

data/spec/ipcat_iprange_spec.rb

@@ -14,14 +14,14 @@ describe 'IPCat::IPRange' do
 
   describe '#initialize' do
     it 'should fail if last < first' do
-      -> { IPCat::IPRange.new(2, 1) }.must_raise ArgumentError
+      expect { IPCat::IPRange.new(2, 1) }.must_raise ArgumentError
     end
   end
 
   describe '#<=> for integers' do
-    it('should match first')   { (range <=> range.first).must_equal 0 }
-    it('should match last')    { (range <=> range.last).must_equal 0 }
-    it('should match first-1') { (range <=> range.first - 1).must_equal 1 }
-    it('should match last+1')  { (range <=> range.last + 1).must_equal(-1) }
+    it('should match first')   { expect(range <=> range.first).must_equal 0 }
+    it('should match last')    { expect(range <=> range.last).must_equal 0 }
+    it('should match first-1') { expect(range <=> range.first - 1).must_equal 1 }
+    it('should match last+1')  { expect(range <=> range.last + 1).must_equal(-1) }
   end
 end

data/spec/ipcat_spec.rb

@@ -11,14 +11,14 @@ describe 'IPCat' do
   end
 
   describe '#ranges' do
-    it('has a range') { IPCat.ranges.size.must_equal 1 }
+    it('has a range') { expect(IPCat.ranges.size).must_equal 1 }
   end
 
   describe '#datacenter?' do
-    it('should match 1.2.3.0') { IPCat.datacenter?('1.2.3.0').must_be_instance_of IPCat::IPRange }
-    it('should match 1.2.3.1') { IPCat.datacenter?('1.2.3.1').must_be_instance_of IPCat::IPRange }
-    it('should match 1.2.3.1') { IPCat.datacenter?('1.2.3.1').must_be_instance_of IPCat::IPRange }
-    it('should not match 1.1.1.1') { IPCat.datacenter?('1.1.1.1').must_be_nil }
-    it('should not match 2.2.2.2') { IPCat.datacenter?('2.2.2.2').must_be_nil }
+    it('should match 1.2.3.0') { expect(IPCat.datacenter?('1.2.3.0')).must_be_instance_of IPCat::IPRange }
+    it('should match 1.2.3.1') { expect(IPCat.datacenter?('1.2.3.1')).must_be_instance_of IPCat::IPRange }
+    it('should match 1.2.3.1') { expect(IPCat.datacenter?('1.2.3.1')).must_be_instance_of IPCat::IPRange }
+    it('should not match 1.1.1.1') { expect(IPCat.datacenter?('1.1.1.1')).must_be_nil }
+    it('should not match 2.2.2.2') { expect(IPCat.datacenter?('2.2.2.2')).must_be_nil }
   end
 end

metadata

@@ -1,44 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: ipcat
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.23
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 'A ruby port of the ipcat library: https://github.com/client9/ipcat/'
+        version: '13.0'
+description: 'A ruby port of the ipcat library: https://github.com/rale/ipcat/'
 email: aaron@ktheory.com
 executables: []
 extensions: []
@@ -74,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.8
 signing_key: 
 specification_version: 4
 summary: dataset for categorizing IP addresses in ruby