pcsv 0.1.1 → 0.1.2

data/lib/pcsv.rb

@@ -25,6 +25,9 @@ class PCSV
     options[:headers] = true
     thread_count = options.delete(:thread_count) || 10
     if_proc = options.delete(:if)
+    on_count_proc = options.delete(:on_count)
+    progress_bar_visible = options.has_key?(:progress_bar) ? options.delete(:progress_bar) : true
+    progress_bar = nil
 
     # Open CSV & build a worker queue.
     csv = CSV.read(path, options)
@@ -41,9 +44,12 @@ class PCSV
           value:field.to_s,
           header:headers[col_index]
         }
+        next if if_proc.nil? || !if_proc.call(item)
         queue << item
       end
     end
+    progress_bar = ::ProgressBar.create(:total => queue.length, :format => '%a |%B| %E %P%%') if progress_bar_visible
+    on_count_proc.call(queue.length) unless on_count_proc.nil?
     
     # Launch threads and iterate over queue until it's done.
     mutex = Mutex.new()
@@ -60,7 +66,6 @@ class PCSV
         
           # Invoke the block with the row info.
           begin
-            next if if_proc.nil? || !if_proc.call(item)
             result = yield item, mutex
           
             if action == :map
@@ -69,7 +74,10 @@ class PCSV
               }
             end
 
+            mutex.synchronize { progress_bar.increment } unless progress_bar.nil?
+
           rescue StandardError => e
+            mutex.synchronize { progress_bar.clear } unless progress_bar.nil?
             warn("[ERROR] #{e.message} [R#{item[:row_index]},C#{item[:col_index]}]")
           end
         end

data/lib/pcsv/version.rb

@@ -1,3 +1,3 @@
 class PCSV
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pcsv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +83,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -99,15 +115,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1237481695324050432
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1237481695324050432
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple, parallel processing framework for CSV files.