geolite2_city 2018.09.05 → 2018.09.11

checksums.yaml

@@ -1,17 +1,7 @@
 ---
-!binary "U0hBMjU2":
-  metadata.gz: !binary |-
-    M2QzNjU2MDAwMzYxMDc2ZTE2ZjUyYjk0NDhjODU0ZDYxYmQyODM4ZWY2NzJl
-    MzFjMWUyNmE4ZWVlNjhlMzY5ZA==
-  data.tar.gz: !binary |-
-    MDFmMGFhYjM5YTRiMTEyMzRhMjI5MTRkOWRmMGRhMzE4ZTJjOWYwOGI4ODlj
-    ZmFmOTYzZjE4OWUxMTdlMjgwMw==
+SHA1:
+  metadata.gz: d64259b8782fd4e1bba8465eab0800dc872fd794
+  data.tar.gz: 78121f9b9c1aad8099c8d3fe42b262fe2aa45697
 SHA512:
-  metadata.gz: !binary |-
-    NDdjYTljZjM1YTdiZDNhYTA0NGEwOTZiMTNlNjc4NDJiNjdjMDFiYWU0NjQ3
-    ZGY0NjIxMDM2ODIzNWRmYjU5NmZkYTU0NDc1NmQwNDI3Mjc3NTFiNTcxNDE1
-    ZjAzZGVmMTdkMDI5ZmM0OWU1Njk4NDAxZDJkMGU2YmE4MzdkN2M=
-  data.tar.gz: !binary |-
-    NGY4ZGI0MDc5MmRlNTU3ODMyNDNlMGQzMDg1ODJhZGVhYTMyMzZhZTk0NWY2
-    MzgxZWVkMTI3NmYzMDIyM2E4ZmI0Mzg4YmU5ZjUyZWRjM2JjNjk2Mjg1YjE5
-    YjE2NDk4ZjQ5NTQ2YjY1MWYwZDM1OWRmNTY3Yzg0YzFlYjkxMjc=
+  metadata.gz: 0b562b815444656a19145ecf7badb9b7ac881658cd61516b3c9319af85c26a966b5356b49ee2d4d921aad4d6583d81f050fdabfa50b2026d116a92e64958901e
+  data.tar.gz: be19d59dc2495f842c7dc039b67aedc9162a4cd6d1d3292d7f9282abd7be01f6043c00b3786d9a0eeaf4276a1ee36c8697562ea039de6e4b7c48095673ff1aec

data/README.md

@@ -56,9 +56,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ### Updating the DB
 
-* Download the latest from <http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz> (linked from <https://dev.maxmind.com/geoip/geoip2/geolite2/>), unpack it and stick its contents in the `db` dir of the gem.
-* Update the version of the gem to match the date in the unpacked folder name.
-* Release the gem.
+* Run `rake db:update` and make a pull request with the result
+* Release the gem
 * Prosper‽
 
 

data/Rakefile

@@ -1,5 +1,10 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "zlib"
+require "fileutils"
+require "rubygems/package"
+require "net/http"
+require "uri"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -7,4 +12,34 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+desc "Update the DB and the Gem version"
+namespace :db do
+  task :update do
+    uri = URI("http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz")
+    tarball = Net::HTTP.get(uri)
+    z = Zlib::GzipReader.new(StringIO.new(tarball))
+    unzipped = StringIO.new(z.read)
+
+    gem_version = nil
+
+    Gem::Package::TarReader.new(unzipped) do |tar|
+      tar.each do |tarfile|
+        if tarfile.directory?
+          _prefix, file_version = tarfile.full_name.split("_", 2)
+          gem_version = [ file_version[0,4], file_version[4,2], file_version[6,2] ].join(".")
+
+          File.write(File.join(__dir__, "db", "VERSION"), gem_version)
+
+          next
+        end
+
+        filename = File.basename(tarfile.full_name)
+        File.binwrite(File.join(__dir__, "db", filename), tarfile.read)
+      end
+    end
+
+    puts "Done! Version: #{gem_version}"
+  end
+end
+
 task :default => :test

data/db/VERSION

@@ -0,0 +1 @@
+2018.09.11

data/geolite2_city.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "maxminddb"
+  spec.add_development_dependency "minitest"
 end

data/lib/geolite2_city/version.rb

@@ -1,3 +1,3 @@
 module Geolite2City
-  VERSION = "2018.09.05"
+  VERSION = File.read(File.join(__dir__, "../../db/VERSION"))
 end

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: geolite2_city
 version: !ruby/object:Gem::Version
-  version: 2018.09.05
+  version: 2018.09.11
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: maxminddb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - henrik@nyh.se
@@ -45,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -57,6 +85,7 @@ files:
 - db/GeoLite2-City.mmdb
 - db/LICENSE.txt
 - db/README.txt
+- db/VERSION
 - geolite2_city.gemspec
 - lib/geolite2_city.rb
 - lib/geolite2_city/version.rb
@@ -70,17 +99,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Includes the free GeoLite2 City database file.