log_sense 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d269dedfbb6ec6eae3a77491cc5ec7ca6241f388f2658964541cdd3983b8298
-  data.tar.gz: 6f24d23c8d06430b3605aad90522e08818cd18fd6c71c5fe90823cdc9483c81e
+  metadata.gz: 0a915af429fe2492f17bc767c86767e38d37a674af6206fb3b2c0a76e4cad620
+  data.tar.gz: bf4cc3a1e438b752c9c99fee5f91c85abd38de95dac947c2382e2f9825b51467
 SHA512:
-  metadata.gz: a63f715b281101a6f61029da3e2bcf5db4d47a537af562507b0184d6c6755eed436afed729c31cc95255bf064cbe9f487917c96d78199bbee25e6d4189469951
-  data.tar.gz: 77c62a24c3c81067dd0288ad606b732e0f112d0d1710b326be9e894aa72a93db4cb0a188c93b54ada728c2eeb0cf7378fb7033e13982c9a0932414c8455d2703
+  metadata.gz: 5612ef5474aa397132527588d289d9d1eba4f8954b92553e32fd5b856f2bd5441ba09d89d1bf12a0f220c602dcd2e73de2d6e360b6177b162d57adc2726442c9
+  data.tar.gz: c3b546cc177a3364b1b513f4274c1521aa1669bb17b142eb453ba73251f1e3458e7b9d1703b692ef275a474821ce7375e387155f63e3e7d5d7c9c42e1c50a150

data/CHANGELOG.org

@@ -2,6 +2,10 @@
 #+AUTHOR: Adolfo Villafiorita
 #+STARTUP: showall
 
+* 1.6.1
+
+- Country DB now stores country name.
+
 * 1.6.0
 
 - [User] New output format =ufw= generates directives to blacklist IPs

data/Rakefile

@@ -10,17 +10,37 @@ require_relative './lib/log_sense/ip_locator.rb'
 
 desc "Convert Geolocation DB to sqlite"
 task :dbip, [:filename] do |tasks, args|
-  filename = args[:filename]
+  filename_or_yyyy_mm = args[:filename]
+
+  filename = if /\d{4}-\d{2}/.match(filename_or_yyyy_mm)
+               "ip_locations/dbip-country-lite-#{filename_or_yyyy_mm}.csv"
+             else
+               filename_or_yyyy_mm
+             end
+
+  # if the filename has a .gz extension or a gzipped version of the file 
+  # exists, gunzip it
+  if File.extname(filename) == ".gz" || File.exist?("#{filename}.gz")
+    system "gunzip #{filename}.gz"
+  end
 
   if !File.exist? filename
-    puts "Error. Could not find: #{filename}"
-    puts
-    puts 'I see the following files:'
-    puts Dir.glob("ip_locations/dbip-country-lite*").map { |x| "- #{x}\n" }
-    puts
-    puts "1. Download (if necessary) a more recent version from: https://db-ip.com/db/download/ip-to-country-lite"
-    puts "2. Save downloaded file to ip_locations/"
-    puts "3. Relaunch with YYYY-MM"
+    puts <<-EOS
+Error. Could not find: #{filename}
+
+I see the following files:
+
+#{Dir.glob("ip_locations/dbip-country-lite*").map { |x| "- #{x}" }.join("\n")}
+
+1. Download (if necessary) a more recent version from: https://db-ip.com/db/download/ip-to-country-lite
+2. Save downloaded file to ip_locations/
+3. Relaunch with YYYY-MM (will build: dbip-country-lite-YYYY-MM.csv)
+   or with filename.
+
+Remark. If the filename has the extension .gz or if the
+filename does not exist, but a file with the same name and .gz extension
+exists, it is gunzipped first
+    EOS
 
     exit
   else

data/lib/log_sense/ip_locator.rb

@@ -16,18 +16,26 @@ module LogSense
         from_ip_n INTEGER,
         from_ip TEXT,
         to_ip TEXT,
-        country_code TEXT
+        country TEXT
       )"
 
       ins = db.prepare "INSERT INTO ip_location(
-                               from_ip_n, from_ip, to_ip, country_code)
+                               from_ip_n, from_ip, to_ip, country)
                                values (?, ?, ?, ?)"
       CSV.foreach(db_location) do |row|
         # skip ip v6 addresses
         next if row[0].include?(":")
 
         ip = IPAddr.new row[0]
-        ins.execute(ip.to_i, row[0], row[1], row[2])
+        country_code = row[2]
+
+        begin
+          country = IsoCountryCodes.find(country_code).name
+        rescue IsoCountryCodes::UnknownCodeError
+          country = country_code
+        end
+        
+        ins.execute(ip.to_i, row[0], row[1], country)
       end
 
       # persist to file
@@ -55,12 +63,9 @@ module LogSense
       begin
         ip_n = IPAddr.new(ip).to_i
         result_set = query.execute ip_n
-        country_code = result_set.map { |x| x[3] }[0]
-        IsoCountryCodes.find(country_code).name
+        result_set.map { |x| x[3] }[0]
       rescue IPAddr::InvalidAddressError
         "INVALID IP"
-      rescue IsoCountryCodes::UnknownCodeError
-        country_code
       end
     end
 

data/lib/log_sense/version.rb

@@ -1,3 +1,3 @@
 module LogSense
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_sense
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Generate analytics for Apache and Rails log file.