cvg 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGYyMzdiYzVmMjM0MDI5Y2MzMGNjN2QwNjdkNWM0ZDdlOGZhZDM1OA==
+    ZTczMWJiNzMyZGI2NTBjM2E4YmRjNjE4ZGRhODQ1ZTliYmQ4NTE2NA==
   data.tar.gz: !binary |-
-    N2IyN2E4ZDM5MDZiYzQwOTBiMmViNWJiMmM2YWIyZDMxMWNkNDQ4Mw==
+    NzJmZmMwMTFhOWNjZDZlM2MxNTcyNzU5NjgyYTA5NzA2YTQwZGZlNg==
 SHA512:
   metadata.gz: !binary |-
-    NGEyMjk2ODM0MmNjNjQ1NjllM2RiZWFhN2FlZDdlZTA5N2RmNzNlMjIyNWI1
-    ZWJhYjIxYzk5NGVjNWVmZGQ3NjlmNTc1Y2NlYmRlY2QxY2NmYWU5MzMzZTRm
-    Y2Q3MjJmYWZiYzVjZWU5MTgyMWMyNmE4MGYzMDY5Zjk0Yjg4ZTE=
+    MmZiZDk0MmYxYzVkMmIxYTY4YmQ2Njk3MjJiODM4YjIxMjZlMTExNjlhNzBi
+    ZjVjMTIyY2M5OTQwMzQ5MjlhMWUwNDQ3MzhjNWJhNTZhNzg4NmRlOGQ1ZDRi
+    ODg5NDg3ZjdlMDc0NTAxY2JlNzgyNDlhOWNiNTRjMWZmZjRkM2Q=
   data.tar.gz: !binary |-
-    MTliZjBlY2ZlM2JlZThhM2Y5YWFmYzk0NWEyNTc0MmNiOGYxMmYzYjk4OWIy
-    ODZmMmM4OGNhMTQxZWIzMzdlYzEyODJkMTFmMTU3MGFmYmE3Yzc1N2JlMTFk
-    ZTRjYWUxZjI5MzQ0ZmZmMWIxMjk2NjVkOGNiNTI0MDdmMWNlNDg=
+    ODlmNWM4NjA0ZDMwYTJlMWZkMzZmZmQ4NGEyOTk4NTM3YTYxYjYyY2JhNDk3
+    YzQ2MTYxMGI5ZWYwMGM0OTgyZGU0OTlmMzdjNDFmZmRiNmEyMTYwMDhiYjA3
+    ZWQ5YTFkNWY3ZDdmM2VlYWRiMmFmZGQzMGJlM2MzZWJkMGUyYzA=

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.1 / 2013-11-11
+
+* Enhancements
+
+  * --count outputs just "Count: %d" of passing rows
+
 0.1.0 / 2013-11-08
 
 * Breaking changes

data/bin/cvg

@@ -155,7 +155,26 @@ class Cvg
     end
   end
 
-  class DetectMissing
+  class Flag
+    attr_reader :parent
+    def initialize(parent)
+      @parent = parent
+    end
+    def mode
+      nil
+    end
+    def per_row_pre_test?
+      nil
+    end
+    def per_row_passed_test?
+      nil
+    end
+    def final?
+      nil
+    end
+  end
+
+  class DetectMissing < Flag
     MISSING = %w{ N/A n/a NULL null - #DIV/0 #REF! #NAME? NIL nil NA na #VALUE! #NULL! NaN #N/A #NUM! ? }
     def apply!(row)
       row.each do |k, v|
@@ -164,11 +183,38 @@ class Cvg
         end
       end
     end
+    def per_row_pre_test?
+      true
+    end
+  end
+
+  class Count < Flag
+    attr_reader :num
+    def initialize(*)
+      super
+      @num = 0
+    end
+    def apply!(row)
+      @num += 1
+    end
+    def finalize
+      parent.output_f.puts "Count: #{num}"
+    end
+    def mode
+      :dont_write_rows
+    end
+    def per_row_passed_test?
+      true
+    end
+    def final?
+      true
+    end
   end
 
   TESTS = [Present, Missing, Match, GreaterOrLesser, Dedup]
   FLAGS = {
     'detect-missing' => DetectMissing,
+    'count'          => Count,
   }
 
   attr_reader :options
@@ -179,24 +225,35 @@ class Cvg
   end
 
   def perform
-    write_headers
+    if write_rows?
+      write_headers
+    end
 
     each_input_row do |row|
       if tests.all? { |t| t.pass?(row) }
-        write_row row
+        per_row_passed_test_flags.each { |flag| flag.apply! row }
+        if write_rows?
+          write_row row
+        end
       end
     end
 
+    final_flags.each { |flag| flag.finalize }
+
     close_output
   end
 
+  def output_f
+    @output_f ||= $stdout
+  end
+
   private
 
   def each_input_row
     input_paths.each do |path|
       CSV.foreach(path, headers: :first_row) do |row|
         row = row.to_hash
-        flags.each { |flag| flag.apply! row }
+        per_row_pre_test_flags.each { |flag| flag.apply! row }
         yield row
       end
     end
@@ -216,10 +273,31 @@ class Cvg
     end
   end
 
+  def write_rows?
+    return @write_rows_query if defined?(@write_rows_query)
+    @write_rows_query = !modes.include?(:dont_write_rows)
+  end
+
+  def modes
+    @modes ||= flags.map(&:mode).flatten.compact
+  end
+
+  def per_row_pre_test_flags
+    @per_row_pre_test_flags ||= flags.select { |flag| flag.per_row_pre_test? }
+  end
+
+  def per_row_passed_test_flags
+    @per_row_passed_test_flags ||= flags.select { |flag| flag.per_row_passed_test? }
+  end
+
+  def final_flags
+    @final_flags ||= flags.select { |flag| flag.final? }
+  end
+
   def flags
     @_flags ||= begin
       @flags.map do |flag|
-        FLAGS.fetch(flag).new
+        FLAGS.fetch(flag).new(self)
       end
     end
   end
@@ -232,10 +310,6 @@ class Cvg
     output_f.puts fields.to_csv
   end
 
-  def output_f
-    @output_f ||= $stdout
-  end
-
   def close_output
     output_f.close
   end

data/cvg.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-expectations"
   spec.add_development_dependency "posix-spawn"
+  spec.add_development_dependency "pry"
 end

data/features/step_definitions/cvg_steps.rb

@@ -1,3 +1,16 @@
+def cvgme(args, input_csv_paths)
+  bin_path = File.expand_path '../../../bin/cvg', __FILE__
+  cmd = "#{bin_path} #{args.join(' ')} #{input_csv_paths.join(' ')}"
+  child = POSIX::Spawn::Child.new cmd
+  if child.err.present?
+    $stderr.puts
+    $stderr.puts cmd
+    $stderr.puts child.err
+    $stderr.puts
+  end
+  child.out.strip
+end
+
 Before do
   @input_csv_paths = []
   @args = []
@@ -14,16 +27,13 @@ When(/^you pass arguments (.+)$/) do |args|
 end
 
 Then(/^you get output$/) do |expected_output_csv|
-  bin_path = File.expand_path '../../../bin/cvg', __FILE__
-  cmd = "#{bin_path} #{@args.join(' ')} #{@input_csv_paths.join(' ')}"
-  child = POSIX::Spawn::Child.new cmd
-  if child.err.present?
-    $stderr.puts
-    $stderr.puts cmd
-    $stderr.puts child.err
-    $stderr.puts
-  end
-  expect(child.out.strip).to eq(expected_output_csv.strip)
+  got_csv = cvgme(@args, @input_csv_paths)
+  expect(got_csv).to eq(expected_output_csv.strip)
+
+  expected_count = CSV.parse(expected_output_csv.strip, headers: :first_row).length
+  got_count = cvgme((@args + ['--count']), @input_csv_paths)
+  expect(got_count).to match(/Count: #{expected_count}/)
+
   @input_csv_paths.each do |path|
     if File.dirname(File.expand_path(path)).start_with?(Dir.tmpdir)
       File.unlink path

data/features/support/env.rb

@@ -1,5 +1,6 @@
 # require 'bundler/setup'
 require 'tmpdir'
+require 'csv'
 require 'rspec/expectations'
 require 'posix/spawn'
 require 'active_support/core_ext'

data/lib/cvg.rb

@@ -1,5 +1,5 @@
 require "cvg/version"
 
-module Cvg
+class Cvg
   # Your code goes here...
 end

data/lib/cvg/version.rb

@@ -1,3 +1,3 @@
-module Cvg
-  VERSION = "0.1.0"
+class Cvg
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cvg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Like jq or grep for csv. Combine one or more CSVs while filtering on
   fields with regular expressions, whitelists, presence, missing, etc.
 email: