cvg 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2U0OTc4YjRkMDc1NzBlZGM1OGM3MTU1OTVkYmMyMGEwN2I1ZWM4OQ==
+    NGYyMzdiYzVmMjM0MDI5Y2MzMGNjN2QwNjdkNWM0ZDdlOGZhZDM1OA==
   data.tar.gz: !binary |-
-    OGM3NmFmZmM0YmExY2MyZjI3MmNmMTBkNjljYzU3MWI5ZTc5NDdkOA==
+    N2IyN2E4ZDM5MDZiYzQwOTBiMmViNWJiMmM2YWIyZDMxMWNkNDQ4Mw==
 SHA512:
   metadata.gz: !binary |-
-    YzZjYzUyMmM3ZWEyNDRiYThkOTk3M2YyOTFiNGI5OTJlOGQ0YWRhNjdhYzBk
-    NWIxNThhZmJiN2YzYTE0OTgzNjhiODc3MTk0NmJkZDhmOWU4ZTBmM2MzYzU2
-    ZDJhZmEzYmVmZDZhZDY4MTAyNGE3MjFhZWUxNGIzYjQxOWNiMGI=
+    NGEyMjk2ODM0MmNjNjQ1NjllM2RiZWFhN2FlZDdlZTA5N2RmNzNlMjIyNWI1
+    ZWJhYjIxYzk5NGVjNWVmZGQ3NjlmNTc1Y2NlYmRlY2QxY2NmYWU5MzMzZTRm
+    Y2Q3MjJmYWZiYzVjZWU5MTgyMWMyNmE4MGYzMDY5Zjk0Yjg4ZTE=
   data.tar.gz: !binary |-
-    Zjk0NTRmNTI5YTA1MTFlMGZkZTY3OTVlY2FjYjU3OWQzZTQzNGM3Mjg3YWMy
-    NmVkNGQzMjM2OTA2ZDc3MWVmODBkYTBiZGQyZTU5MTZiMjg0MTIzNjhmNWE2
-    ZDJjYjM0ZmU3YWVkZGUyOTAzMWQ2N2JlNjNlMTYxNWNiY2JlOTg=
+    MTliZjBlY2ZlM2JlZThhM2Y5YWFmYzk0NWEyNTc0MmNiOGYxMmYzYjk4OWIy
+    ODZmMmM4OGNhMTQxZWIzMzdlYzEyODJkMTFmMTU3MGFmYmE3Yzc1N2JlMTFk
+    ZTRjYWUxZjI5MzQ0ZmZmMWIxMjk2NjVkOGNiNTI0MDdmMWNlNDg=

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.0 / 2013-11-08
+
+* Breaking changes
+
+  * --value and --regex have been combined and replaced with --match
+
 0.0.2 / 2013-11-05
 
 * Enhancements

data/README.md

@@ -6,7 +6,9 @@ cvg --present colA input.csv
 
 cvg --missing colA input.csv
 
-cvg --regex 'colA:/\d+/' input.csv
+cvg --match 'colA:/\d+/' input.csv
+
+cvg --match 'colA:one,two,three,/\d+/' input.csv
 
 cvg --detect-missing input.csv
 
@@ -42,6 +44,8 @@ DONE treat as missing %w{ N/A n/a NULL null - #DIV/0 #REF! #NAME? NIL nil NA na
 
 writes report (why rejected row, checks missing and extra columns across input files)
 
-dup checks on certain cols
+DONE dup checks on certain cols
 
 optionall uses minimal set of headers shared by all
+
+make it possible to match a field that starts with a /

data/bin/cvg

@@ -68,32 +68,33 @@ class Cvg
     end
   end
 
-  class Regex < Test
+  class Match < Test
     class << self
       def accept(k, arg)
-        new(k, arg) if k == 'regex'
-      end
-    end
-    def pass?(row)
-      !!(row.fetch(col).to_s =~ regex)
-    end
-    def regex
-      @regex ||= arg.split(':', 2)[1].to_regexp(detect: true) or raise("#{arg.inspect} doesn't have a valid regex")
-    end
-  end
-
-  class Value < Test
-    class << self
-      def accept(k, arg)
-        new(k, arg) if k == 'value'
+        new(k, arg) if k == 'match'
       end
     end
+    REGEX_START_1 = '/'
+    REGEX_START_2 = '%r{'
     def pass?(row)
       v = row.fetch(col).to_s
-      values.include? v
+      matchers.any? do |matcher|
+        case matcher
+        when ::Regexp
+          matcher =~ v
+        else
+          matcher == v
+        end
+      end
     end
-    def values
-      @values ||= CSV.parse_line arg.split(':', 2)[1]
+    def matchers
+      @matchers ||= CSV.parse_line(arg.split(':', 2)[1]).map do |x|
+        if x.start_with?(REGEX_START_1) or x.start_with?(REGEX_START_2)
+          x.to_regexp or die("invalid regex #{x.inspect}")
+        else
+          x
+        end
+      end
     end
   end
 
@@ -165,7 +166,7 @@ class Cvg
     end
   end
 
-  TESTS = [Present, Missing, Regex, Value, GreaterOrLesser, Dedup]
+  TESTS = [Present, Missing, Match, GreaterOrLesser, Dedup]
   FLAGS = {
     'detect-missing' => DetectMissing,
   }

data/features/basic.feature

@@ -45,7 +45,7 @@ Feature: Basic functionality
       yes,a1
       yes,1a
       """
-    When you pass arguments --regex 'b:/\d+/'
+    When you pass arguments --match 'b:/\d+/'
     Then you get output
       """
       a,b
@@ -65,7 +65,7 @@ Feature: Basic functionality
       no,zz
       no,ZZ
       """
-    When you pass arguments --value 'b:z'
+    When you pass arguments --match 'b:z'
     Then you get output
       """
       a,b
@@ -83,7 +83,7 @@ Feature: Basic functionality
       no,ZZ
       yes,Z
       """
-    When you pass arguments --value 'b:z,Z'
+    When you pass arguments --match 'b:z,Z'
     Then you get output
       """
       a,b
@@ -91,6 +91,24 @@ Feature: Basic functionality
       yes,Z
       """
 
+  Scenario: Mixed regex and literals
+    Given an input csv
+      """
+      a,b
+      yes,z
+      yes,a
+      yes,Z
+      no,
+      """
+    When you pass arguments --match 'b:a,/Z/i'
+    Then you get output
+      """
+      a,b
+      yes,z
+      yes,a
+      yes,Z
+      """
+
   Scenario: Less than
     Given an input csv
       """

data/lib/cvg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cvg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport