Merge pull request #38 from Shopify/fix-count-rows-in-file-for-ruby-26

Fix count_rows_in_file for ruby 2.6.3
Shopify · Jul 24, 2019 · 1cadfd0 · 1cadfd0
2 parents 99159f2 + 1c4b185
commit 1cadfd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/job-iteration/csv_enumerator.rb b/lib/job-iteration/csv_enumerator.rb
@@ -49,12 +49,16 @@ def batches(batch_size:, cursor:)
     private
 
     def count_rows_in_file
+      # TODO: Remove rescue for NoMethodError when Ruby 2.6 is no longer supported.
       begin
         filepath = @csv.path
       rescue NoMethodError
         return
       end
 
+      # Behaviour of CSV#path changed in Ruby 2.6.3 (returns nil instead of raising NoMethodError)
+      return unless filepath
+
       count = %x(wc -l < #{filepath}).strip.to_i
       count -= 1 if @csv.headers
       count

diff --git a/lib/job-iteration/version.rb b/lib/job-iteration/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end