From 3ea1b81b67d3c2c0e33d7bde8dad7d28e2f607f1 Mon Sep 17 00:00:00 2001 From: Joe Wilson Date: Tue, 12 Mar 2024 11:28:36 -0700 Subject: [PATCH 1/3] Remove rale/ipcat submodule --- .gitmodules | 3 --- .gitsubmodules/rale/ipcat | 1 - 2 files changed, 4 deletions(-) delete mode 160000 .gitsubmodules/rale/ipcat diff --git a/.gitmodules b/.gitmodules index 4340cc5..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule ".gitsubmodules/rale/ipcat"] - path = .gitsubmodules/rale/ipcat - url = https://github.com/rale/ipcat.git diff --git a/.gitsubmodules/rale/ipcat b/.gitsubmodules/rale/ipcat deleted file mode 160000 index 67494a7..0000000 --- a/.gitsubmodules/rale/ipcat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67494a7fef0b2b11dea33b3e32ecfbd354cdb3c5 From 5743bbb8db96568d8fe631eaf82ebcd9262a6c3b Mon Sep 17 00:00:00 2001 From: Joe Wilson Date: Tue, 12 Mar 2024 11:30:49 -0700 Subject: [PATCH 2/3] Add growlfm/ipcat submodule --- .gitmodules | 3 +++ .gitsubmodules/growlfm/ipcat | 1 + 2 files changed, 4 insertions(+) create mode 160000 .gitsubmodules/growlfm/ipcat diff --git a/.gitmodules b/.gitmodules index e69de29..6a29933 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".gitsubmodules/growlfm/ipcat"] + path = .gitsubmodules/growlfm/ipcat + url = https://github.com/growlfm/ipcat diff --git a/.gitsubmodules/growlfm/ipcat b/.gitsubmodules/growlfm/ipcat new file mode 160000 index 0000000..d1d8641 --- /dev/null +++ b/.gitsubmodules/growlfm/ipcat @@ -0,0 +1 @@ +Subproject commit d1d8641a7bf130a58a2ed1db4361b323cd432e2e From ec1517b5387a9955abd73ac2a5dfb94a14ed10d7 Mon Sep 17 00:00:00 2001 From: Joe Wilson Date: Tue, 12 Mar 2024 11:32:48 -0700 Subject: [PATCH 3/3] rale ~> growlfm --- README.md | 2 +- Rakefile | 2 +- ipcat-ruby.gemspec | 2 +- lib/ipcat.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6eb74a4..b45c7b7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ipcat-ruby -A ruby port of the [ipcat](https://github.com/rale/ipcat) library to classify IP addresses from known datacenters +A ruby port of the [ipcat](https://github.com/growlfm/ipcat) library to classify IP addresses from known datacenters [![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) diff --git a/Rakefile b/Rakefile index 606ab85..da66296 100644 --- a/Rakefile +++ b/Rakefile @@ -101,7 +101,7 @@ end ## # Generate data/datacenters binary -file 'data/datacenters' => '.gitsubmodules/rale/ipcat/datacenters.csv' do |f| +file 'data/datacenters' => '.gitsubmodules/growlfm/ipcat/datacenters.csv' do |f| IPCat.load_csv!(path = f.prereqs.first) File.open(f.name, 'w') { |f| f << Marshal.dump(IPCat.ranges) } end diff --git a/ipcat-ruby.gemspec b/ipcat-ruby.gemspec index a698087..de15a39 100644 --- a/ipcat-ruby.gemspec +++ b/ipcat-ruby.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |s| s.licenses = ['MIT'] s.authors = ['Aaron Suggs'] - s.description = 'A ruby port of the ipcat library: https://github.com/rale/ipcat/' + s.description = 'A ruby port of the ipcat library: https://github.com/growlfm/ipcat/' s.email = 'aaron@ktheory.com' s.files = Dir.glob('{bin,lib,data}/**/*') + %w[Rakefile README.md] diff --git a/lib/ipcat.rb b/lib/ipcat.rb index e72cb7c..1a97ff9 100644 --- a/lib/ipcat.rb +++ b/lib/ipcat.rb @@ -2,7 +2,7 @@ ## # IPCat -# Ruby lib for https://github.com/rale/ipcat/ +# Ruby lib for https://github.com/growlfm/ipcat/ require 'ipaddr' require 'ipcat/iprange' @@ -27,7 +27,7 @@ def reset_ranges!(new_ranges = []) @ranges = new_ranges end - def load_csv!(path = 'https://raw.githubusercontent.com/rale/ipcat/master/datacenters.csv') + def load_csv!(path = 'https://raw.githubusercontent.com/growlfm/ipcat/master/datacenters.csv') reset_ranges! require 'open-uri'