free_zipcode_data 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe97e5c2963d4c40da211303f3f3c31ad9b29253c70c3d3f2ff303d92d51c9a
-  data.tar.gz: 38744e59531dcaf6dbc710a8343c7b97f72b3e35f4c48d73f499eacdfee6ea2b
+  metadata.gz: 689bda27853626d8130fd3d8bc525d481b3965b2b15f788d315a73569361d0f2
+  data.tar.gz: a84dce617a5db3ae60a0980edf8fec801bab405ce16dca6d28b22bd25c8e8722
 SHA512:
-  metadata.gz: a65a8d0bfcece72ef8e8a93bb654f0c50436de7d3639f1fefca845f8e3a1082aba1ae0597be269967715eb2ebcc01090a5f714cb7ec10b141c9c041bdde9349a
-  data.tar.gz: 0611b47e763d063e84029de8022fda6f2ffd2bceeb6f2ff8a6f04499a5d8814a700bd8b6b14520a627338947ff5aa171b20703d59a9afc7ab5d673b7949d2588
+  metadata.gz: cd80e10fb64b872e1deeb21b6419727ccb7f0553d4da4d4fa81430635e788c308c1f3f3baf780d142f39c41ee749bdd25e5e3165c50fc59fa7fbc96c96f93362
+  data.tar.gz: a20ec9167f0267fc52268e6bcd3a0679de2b00745ad5efc0670774493a05de8358def3e8318037d7ac711da8e62e290dd0defee24caf457e00d8abcb7ff18bbb

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7
 
   # Include gemspec and Rakefile
   Include:
@@ -19,8 +19,13 @@ AllCops:
     - 'stubs/**/*'
     - 'spec/support/shared_contexts/*'
 
+  NewCops: enable
+
+########################################
+# Style Cops
+
 # Checks formatting of special comments
-CommentAnnotation:
+Style/CommentAnnotation:
   Keywords:
     - TODO
     - FIXME
@@ -28,27 +33,15 @@ CommentAnnotation:
     - HACK
     - REVIEW
 
-########################################
-# Style Cops
-
 Style/ClassVars:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 
-Style/FileName:
-  Enabled: false
-
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
 Style/RegexpLiteral:
   Enabled: false
 
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
 Style/RaiseArgs:
   Enabled: false
 
@@ -61,18 +54,18 @@ Style/PerlBackrefs:
 ########################################
 # Lint Cops
 
-Lint/Eval:
+Lint/SuppressedException:
   Enabled: false
 
-Lint/HandleExceptions:
+########################################
+# Security Cops
+
+Security/Eval:
   Enabled: false
 
 ########################################
 # Metrics Cops
 
-Metrics/LineLength:
-  Max: 110
-
 Metrics/MethodLength:
   CountComments: false # count full line comments?
   Max: 30
@@ -83,6 +76,17 @@ Metrics/ClassLength:
 Metrics/AbcSize:
   Enabled: false
 
-# rubocop:disable Metrics/AbcSize
-# rubocop:disable Metrics/MethodLength
-# rubocop:disable Metrics/BlockLength
+########################################
+# Metrics Cops
+
+Naming/FileName:
+  Enabled: false
+
+########################################
+# Layout Cops
+
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 110

data/.ruby-version

@@ -0,0 +1 @@
+2.7.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+*1.0.3* (August 25, 2024)
+
+* Version bump for rexml CVE
+
+*1.0.2* (January 11, 2019)
+
+* Upgraded RubyZip gem version to address the reported vulnerability
+* Upgrade from Trollop (now deprecated) to Optimist
+* Fix issue #12 (No such file or directory @ rb_sysopen - country_lookup_table.yml) - thanks @srghma
+
 *1.0.1* (April 23, 2018)
 
 * Made it a gem with a command line executable bin/free_zipcode_data

data/Gemfile.lock

@@ -1,82 +1,87 @@
 PATH
   remote: .
   specs:
-    free_zipcode_data (1.0.1)
+    free_zipcode_data (1.0.3)
       colored (~> 1.2)
       kiba (~> 2.0)
+      optimist (~> 3.0)
       ruby-progressbar (~> 1.9)
-      rubyzip (~> 1.2)
+      rubyzip (>= 1.2.2)
       sqlite3 (~> 1.3)
-      trollop (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    coderay (1.1.2)
+    ast (2.4.2)
+    coderay (1.1.3)
     colored (1.2)
-    diff-lcs (1.3)
-    docile (1.3.0)
-    json (2.1.0)
-    kiba (2.0.0)
-    method_source (0.8.2)
-    parallel (1.12.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
-    pry (0.10.4)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    kiba (2.5.0)
+    method_source (0.9.2)
+    optimist (3.0.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
+      method_source (~> 0.9.0)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
     rainbow (3.0.0)
-    rake (12.2.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.3.6)
+      strscan
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.55.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.22.3)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-prof (0.17.0)
-    ruby-progressbar (1.9.0)
-    rubyzip (1.2.1)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    ruby-prof (0.18.0)
+    ruby-progressbar (1.11.0)
+    rubyzip (2.3.2)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.6.0)
-    sqlite3 (1.3.13)
-    trollop (2.1.2)
-    unicode-display_width (1.3.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.4.2)
+    strscan (3.1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler
   free_zipcode_data!
   pry-nav (~> 0.2)
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.7)
-  rubocop (~> 0.55)
+  rubocop
   ruby-prof (~> 0.17)
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/bin/free_zipcode_data

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'bundler/setup'

data/free_zipcode_data.gemspec

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
-# coding: utf-8
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'free_zipcode_data/version'
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
   spec.name          = 'free_zipcode_data'
   spec.version       = FreeZipcodeData::VERSION
   spec.authors       = ['Chris Blackburn', 'Chris McKnight']
@@ -19,25 +18,23 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/midwire/free_zipcode_data'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = Gem::Requirement.new(">= #{Bundler.root.join('.ruby-version').read.strip}")
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry-nav', '~> 0.2'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.55'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'ruby-prof', '~> 0.17'
   spec.add_development_dependency 'simplecov', '~> 0.16'
 
   spec.add_runtime_dependency 'colored', '~> 1.2'
   spec.add_runtime_dependency 'kiba', '~> 2.0'
+  spec.add_runtime_dependency 'optimist', '~> 3.0'
   spec.add_runtime_dependency 'ruby-progressbar', '~> 1.9'
-  spec.add_runtime_dependency 'rubyzip', '~> 1.2'
+  spec.add_runtime_dependency 'rubyzip', '>= 1.2.2'
   spec.add_runtime_dependency 'sqlite3', '~> 1.3'
-  spec.add_runtime_dependency 'trollop', '~> 2.1'
 end
-# rubocop:enable Metrics/BlockLength

data/lib/free_zipcode_data/county_table.rb

@@ -25,6 +25,7 @@ module FreeZipcodeData
 
     def write(row)
       return nil unless row[:county]
+
       state_id = get_state_id(row[:short_state], row[:state])
       return nil unless state_id
 

data/lib/free_zipcode_data/data_source.rb

@@ -18,17 +18,16 @@ module FreeZipcodeData
 
     def download
       return nil if !options.clobber && File.exist?(zipfile_path)
+
       FileUtils.mkdir_p(options.work_dir)
       @logger.info("Downloading: #{zipfile} from GeoNames...")
-      open(zipfile_path, 'wb') do |file|
-        file << open("#{BASE_URL}/#{zipfile}").read
+      File.open(zipfile_path, 'wb') do |file|
+        file << URI.parse("#{BASE_URL}/#{zipfile}").open(&:read)
       end
     end
 
     def datafile
-      @datafile ||= begin
-        datafile_with_headers
-      end
+      @datafile ||= datafile_with_headers
     end
 
     private
@@ -51,6 +50,7 @@ module FreeZipcodeData
         Zip::File.open(zipfile_path) do |zip|
           zip.each do |entry|
             next if entry.name =~ /readme/i
+
             country_file = File.join(options.work_dir, entry.name)
             if File.exist?(country_file)
               if options[:clobber]

data/lib/free_zipcode_data/db_table.rb

@@ -24,7 +24,11 @@ module FreeZipcodeData
     private
 
     def country_lookup_table
-      @country_lookup_table ||= YAML.load_file('country_lookup_table.yml')
+      @country_lookup_table ||=
+        begin
+          path = File.expand_path('../../country_lookup_table.yml', __dir__)
+          YAML.load_file(path)
+        end
     end
 
     def select_first(sql)

data/lib/free_zipcode_data/runner.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'colored'
-require 'trollop'
+require 'optimist'
 require 'kiba'
 
 require_relative '../etl/free_zipcode_data_job'
@@ -35,7 +35,9 @@ module FreeZipcodeData
 
       db_file = File.join(options.work_dir, 'free_zipcode_data.sqlite3')
       database = SqliteRam.new(db_file)
-      configure_meta(database.conn, datasource.datafile)
+
+      line_count = datasource_line_count(datasource.datafile)
+      configure_meta(database.conn, line_count)
 
       %i[country state county zipcode].each { |t| initialize_table(t, database) }
 
@@ -50,7 +52,7 @@ module FreeZipcodeData
       end
 
       elapsed = Time.at(Time.now - start_time).utc.strftime('%H:%M:%S')
-      logger.info("Processed #{datasource_line_count} zipcodes in [#{elapsed}].".yellow)
+      logger.info("Processed #{line_count} zipcodes in [#{elapsed}].".yellow)
     end
 
     private
@@ -67,14 +69,12 @@ module FreeZipcodeData
     end
 
     def datasource_line_count(filename)
-      @datasource_line_count ||= begin
-        count = File.foreach(filename).inject(0) { |c, _line| c + 1 }
-        logger.verbose("Processing #{count} zipcodes in '#{filename}'...")
-        count
-      end
+      count = File.foreach(filename).inject(0) { |c, _line| c + 1 }
+      logger.verbose("Processing #{count} zipcodes in '#{filename}'...")
+      count
     end
 
-    def configure_meta(database, datasource)
+    def configure_meta(database, line_count)
       schema = <<-SQL
         create table meta (
           id integer not null primary key,
@@ -86,7 +86,7 @@ module FreeZipcodeData
 
       sql = <<-SQL
         INSERT INTO meta (name, value)
-        VALUES ('line_count', #{datasource_line_count(datasource)})
+        VALUES ('line_count', #{line_count})
       SQL
       database.execute(sql)
     end
@@ -104,7 +104,7 @@ module FreeZipcodeData
     # rubocop:disable Metrics/BlockLength
     # rubocop:disable Metrics/MethodLength
     def collect_args
-      Trollop.options do
+      Optimist.options do
         opt(
           :work_dir,
           'REQUIRED: Specify your work/build directory, where the SQLite and .csv files will be built',

data/lib/free_zipcode_data/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FreeZipcodeData
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/lib/free_zipcode_data.rb

@@ -2,6 +2,7 @@
 
 require 'readline'
 
+require 'bundler/setup'
 require 'free_zipcode_data/version'
 
 module FreeZipcodeData
@@ -16,6 +17,7 @@ module FreeZipcodeData
   #:nocov:
   def self.config_file(filename = '.free_zipcode_data.yml')
     return root.join('spec', 'fixtures', filename) if current_environment == 'test'
+
     home = ENV.fetch('HOME')
     file = ENV.fetch('FZD_CONFIG_FILE', File.join(home, '.free_zipcode_data.yml'))
     FileUtils.touch(file)

data/lib/tasks/version.rake

@@ -65,9 +65,10 @@ namespace :version do
   end
 
   def module_name
-    if PROJECT_NAME =~ /-/
+    case PROJECT_NAME
+    when /-/
       PROJECT_NAME.split('-').map(&:capitalize).join('::')
-    elsif PROJECT_NAME =~ /_/
+    when /_/
       PROJECT_NAME.split('_').map(&:capitalize).join
     else
       PROJECT_NAME.capitalize
@@ -100,8 +101,9 @@ namespace :version do
   def update_readme_version_strings
     version_string = read_version.join('.')
     readme = open('README.md').read
-    regex = /^\*\*Version: [0-9\.]+\*\*$/i
+    regex = /^\*\*Version: [0-9.]+\*\*$/i
     return nil unless readme =~ regex
+
     File.open('README.md', 'w') do |f|
       f.write(readme.gsub(regex, "**Version: #{version_string}**"))
     end
@@ -109,6 +111,7 @@ namespace :version do
 
   def changelog
     return @changelog_path if @changelog_path
+
     @changelog_path = File.join(PROJECT_ROOT, 'CHANGELOG')
     FileUtils.touch(@changelog_path)
     @changelog_path
@@ -158,9 +161,11 @@ namespace :version do
 
   def check_branch_and_warn
     return true unless current_branch == 'master'
+
     puts(branch_warning_message)
     while (line = $stdin.gets.chomp)
       return true if line =~ /[yY]/
+
       puts 'Aborting version bump.'
       return false
     end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ ENV['APP_ENV'] = 'test'
 
 require 'pry'
 
-Dir[root.join('spec/support/**/*.rb')].each { |f| require f }
+Dir[Pathname.new(File.dirname(__FILE__)).parent.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: free_zipcode_data
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Chris Blackburn
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2024-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +71,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -138,61 +138,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ruby-progressbar
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
 description: |
   Free US and world-wide postal codes in SQLite and CSV format.
   Automated zipcode/postal code aggregation and processing for any needs.
@@ -207,6 +207,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -245,7 +246,8 @@ files:
 homepage: https://github.com/midwire/free_zipcode_data
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -254,17 +256,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Free US and world-wide postal codes in SQLite and CSV format
-test_files:
-- spec/spec_helper.rb
+test_files: []