free_zipcode_data 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe97e5c2963d4c40da211303f3f3c31ad9b29253c70c3d3f2ff303d92d51c9a
-  data.tar.gz: 38744e59531dcaf6dbc710a8343c7b97f72b3e35f4c48d73f499eacdfee6ea2b
+  metadata.gz: dda92f3d094c519def33805973be1116b84cf060e15bd112defcc1436ef2e0b8
+  data.tar.gz: 772e32aabb48de44e36e63875f5dd481b5760885afab159216f688faa11c1a73
 SHA512:
-  metadata.gz: a65a8d0bfcece72ef8e8a93bb654f0c50436de7d3639f1fefca845f8e3a1082aba1ae0597be269967715eb2ebcc01090a5f714cb7ec10b141c9c041bdde9349a
-  data.tar.gz: 0611b47e763d063e84029de8022fda6f2ffd2bceeb6f2ff8a6f04499a5d8814a700bd8b6b14520a627338947ff5aa171b20703d59a9afc7ab5d673b7949d2588
+  metadata.gz: 33e594c722a53a24946defa4e0aacc1077b142e096b716606b77153e44e15a819956b65cc800442d0cc89b6ce33b5c06206603e71c4500e27d15904599fce5e4
+  data.tar.gz: 9c828694222edca8dcceb667b9bd1bcc7cf9280a9b6581b8522c22dfd5b0bef963853a47d61e8f159c1c7439a85e99a180369093b7f1114b9e699173004f5cc5

data/CHANGELOG

@@ -1,3 +1,9 @@
+*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,13 +1,13 @@
 PATH
   remote: .
   specs:
-    free_zipcode_data (1.0.1)
+    free_zipcode_data (1.0.2)
       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/
@@ -20,6 +20,7 @@ GEM
     json (2.1.0)
     kiba (2.0.0)
     method_source (0.8.2)
+    optimist (3.0.0)
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
@@ -54,7 +55,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-prof (0.17.0)
     ruby-progressbar (1.9.0)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -62,7 +63,6 @@ GEM
     simplecov-html (0.10.2)
     slop (3.6.0)
     sqlite3 (1.3.13)
-    trollop (2.1.2)
     unicode-display_width (1.3.2)
 
 PLATFORMS
@@ -79,4 +79,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/free_zipcode_data.gemspec

@@ -35,9 +35,9 @@ Gem::Specification.new do |spec|
 
   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/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.2'.freeze
 end

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.2
 platform: ruby
 authors:
 - Chris Blackburn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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.
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Free US and world-wide postal codes in SQLite and CSV format