gn_crossmap 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f923dfdab693728fe296afcf09fa275ce870ad
-  data.tar.gz: da0ac647957f8c28c438af7954b1e35473bcfc28
+  metadata.gz: 78484e72d25b7f4edd4dc339756a2e0c0a855fe2
+  data.tar.gz: fae27bcaa9907f0eda181167d2a6f5d96f07b1f2
 SHA512:
-  metadata.gz: 37e8d0183db3322a0bf627c336737a6dc42ae4471c4f52554ea761cfcdcc71210c6d0a793c948623a647cfbc97f7d782538049f4a62bdb97de6bded8ac2998ff
-  data.tar.gz: db2ccccf36fd9bfe04f77e3d75eca76286d82b4cc3f8e79d78fb54c443b6f991f2a235ba396a7bc4c41ec997a15aaec283eb676e577ac52358cb39017154d7d3
+  metadata.gz: 90166a2363931f124f22493c0e754f2f761bf225956ed8f9d0531f9b0f31a4f71e91fab42e040d573da470562b48e8594db3bb195c205517bb8421a911334698
+  data.tar.gz: eea5797f9c160d8fe3eaf11c84f21f0842a3eb97f98e35496dc8b738ffe93376e3b8d3f8296fb3f0f1868b3d4fc7c0bae3e00ed3ad1da4ae133d24fcd7142c01

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ``gn_crossmap`` CHANGELOG
 
+## 4.0.2
+
+* @dimus - Add resolution span_time to stats
+
 ## 4.0.1
 
 * @dimus - Clean up resolution stats

data/gn_crossmap.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "coveralls", "~> 0.8"
   gem.add_development_dependency "rake", "~> 12.0"
   gem.add_development_dependency "rspec", "~> 3.2"
-  gem.add_development_dependency "rubocop", "~> 0.49"
+  gem.add_development_dependency "rubocop", "~> 0.50"
 end
 
 # rubocop:enable Metrics/BlockLength:

data/lib/gn_crossmap/reader.rb

@@ -75,7 +75,7 @@ module GnCrossmap
 
     def process_headers(row)
       @original_fields = headers(row)
-      row = produce_alt_headers(row) if @alt_headers && !@alt_headers.empty?
+      row = produce_alt_headers(row) unless @alt_headers&.empty?
       row
     end
 
@@ -104,7 +104,7 @@ module GnCrossmap
 
     def taxon_id_header(hdrs)
       hdrs.each do |h|
-        return [h] if h && h.match?(/taxonid\s*$/i)
+        return [h] if h&.match?(/taxonid\s*$/i)
       end
       []
     end

data/lib/gn_crossmap/resolver.rb

@@ -119,6 +119,7 @@ module GnCrossmap
       s[:resolution][:completed_records] +=
         job_stats.stats[:resolution][:completed_records]
       @stats.update_eta(current_speed)
+      s[:resolution][:time_span] = Time.now - s[:resolution][:start_time]
       s[:matches][7] += job_stats.stats[:matches][7]
     end
 

data/lib/gn_crossmap/resolver_job.rb

@@ -54,7 +54,7 @@ module GnCrossmap
     end
 
     def update_stats(batch_start)
-      @stats.stats[:current_speed] = @batch_data.size / (Time.now - batch_start)
+      @stats.stats[:current_speed] = @names_size / (Time.now - batch_start)
       @stats.stats[:resolution][:completed_records] = @names_size
     end
   end

data/lib/gn_crossmap/stats.rb

@@ -30,7 +30,7 @@ module GnCrossmap
     private
 
     def eta_struct
-      { start_time: nil, completed_records: 0,
+      { start_time: nil, completed_records: 0, time_span: 0,
         speed: nil, eta: nil, stop_time: nil }
     end
 

data/lib/gn_crossmap/version.rb

@@ -2,7 +2,7 @@
 
 # Namespace module for crossmapping checklists to GN sources
 module GnCrossmap
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gn_crossmap
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: biodiversity
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.50'
 description: Gem uses a checklist in a comma-separated format as an input, and returns
   back a new comma-separated list crossmapping the scientific names to one of the
   data sources from http://resolver.globalnames.org