csvlint 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTJlZWM1ZDA0ZDMzMjBkM2I1OGUxYjM1NTIxZTA1NWVkODJlMDFiYQ==
+    MDdiMTU5MDRkOWMzODllZGVjZTE1NWU0NzgyMjNkODgzYjlkNDE3NQ==
   data.tar.gz: !binary |-
-    MWE1MWYzZjk3YjgwMTJhNzBjZGM4NTMyOGYzYTU1ZWM4ZDc4NTI2YQ==
+    MmY0YjQyZTM1ODBkOTA2OWQxOGRkOWYxYmI2ZDA2NWEyZjRjM2U2YQ==
 SHA512:
   metadata.gz: !binary |-
-    MWU5NTAxZDVjMGI3YTNiYTBlNTJmODkxNTBkYzdiN2ExN2E3NGE2ZjI5M2Nl
-    ZGY0OWM3ZTVjODNiNjcyZDMwODhhNTc3ODIyZGMyMzUzYWE2ZTMyZmFmNGIw
-    NDFiYzc5YzNlNTFlODQ1ODE1YzZkMDU0MDdkMzE3MmVlNWUyYmU=
+    NWM1OGNjNDk0MzgzY2MwZmY5NjJhOTBiNDFjYTA3YjBkYTAzN2IzNzUyYjg3
+    NDdlZjVlYzEzZTFkMmI2ODQzZjIwY2IwZDU1Mjk5Y2QwNzdjNTg3YjYxM2Zj
+    MzFkNWM5ZWUzOTY1NGUzZTgyMWZhYzRhNDI2ZWI0NmQyNWNjYzQ=
   data.tar.gz: !binary |-
-    MjBhYTU1ZWMzNjcxMmU1NjU1ZjZkYTE5M2YwOTQ5NzYyOWYzNmM2NzkxNWJk
-    Y2VlM2JkMmRlYmNhNzM5MGI0ZDg2YWQzOTNhYzg1YjAyNDRiNTFiNmRlZjk4
-    Nzc0YjJlOWM0MGVmMjAzZTBiZjQwZTc4MTU5YTVjMGFiZDFjNmQ=
+    ODc3MjNlZDRmOGFmNmJiYWM4OWJmN2IzZGYzNTI5YWY1Zjg5YzZmMmYyYjhi
+    NWZhMjQ3ZTc4NGRhYTQ5ZjBlZjQ5ZjcwOThhYzQ5NjNhZDViZDVjYTFjYjlk
+    YzgwNGM3NjMxMWNkOTI4ODU1ZDM4YmIwODc4MTExOWUyZWJkYjA=

data/.travis.yml

@@ -1,3 +1,4 @@
+---
 rvm:
 - 2.0.0
 - 2.1.0
@@ -9,7 +10,7 @@ notifications:
     channels:
     - irc.freenode.net#theodi
     template:
-    - '%{repository} %{branch} - %{message} %{build_url}'
+    - "%{repository} %{branch} - %{message} %{build_url}"
     on_success: change
     on_failure: always
 deploy:
@@ -17,7 +18,7 @@ deploy:
   api_key:
     secure: fjnPS61/skQ1PsRJu1SYWIct0vjdkTyQhj0ria9zfcJfbWbfiHnpehVh1ege3sTUkDSTvoOFT35jzEeozvtKZOlAWMU5QbL8LTXu+JSp9olOdSuGeWRWVuQT3NLgRJW0+2c7N66piZvnRUUTyt2P8VIR8c/Ltuhc32bUGL7X6Gw=
   gem: csvlint
-  on:
+  true:
     tags: true
     repo: theodi/csvlint.rb
     all_branches: true
@@ -26,7 +27,10 @@ after_success:
 - '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && curl
   -v -X POST -d ''{"ref":"refs/tags/''$GEM_VERSION''","sha":"''$TRAVIS_COMMIT''"}''  --header
   "Content-Type:application/json" -u $GITHUB_USER:$GITHUB_PASSWORD "https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs"'
+- gem install henry
+- henry deploy
 env:
   global:
   - secure: hM8Pv/EAZoB4fGGEUwKQQ/2+mgKbUac+PH2cwud25l2MJ64eoKEMZzfy4TF6+XMIzXhlWpsg4s51y6K3+W8pUyRAuwo2MsN5Iee7HnLz+LlYTiT0//iQdAmxQ0JlOyh8vd2SEFBcVfwpp/iZFIHAfbBO73ZDXhtGMEieMk025I0=
   - secure: hsKbZ0kVKVU/e8oVCPJpRmBxbbieN2tVbyjdhJo/UYchcyLWeGAmAj/ApUDL4SyR0HZxpfi+SIsGFNRy5LnrFeCFgY9aZ6u9ma4n0Y2cTElMRt5kvI/c28FehsRjCzAe6W8dxwhJ8wSkvFDNpLml47/iy8bw4a7aUZDdq3OYXck=
+  - secure: FW0iyoq4yS55yVTxWXv0OrnOQWuUzpsv32w0FsE7E6OgS/UtCSAQeXO+T448+JXVbJClQDQNM9Pimdfzz/znGzHF6//UVmIbxfKwbyGtvzg4dZUexK8KlGnQy1na/4qiOi5xBSQQ5q/CwtblkCkklhDIs8CwV1M7mCIK5Sf0HZ4=

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [0.3.0](https://github.com/theodi/csvlint.rb/tree/0.3.0) (2016-01-12)
+
+[Full Changelog](https://github.com/theodi/csvlint.rb/compare/0.2.6...0.3.0)
+
+**Merged pull requests:**
+
+- still increment current\_line after invalid\_encoding error [\#174](https://github.com/theodi/csvlint.rb/pull/174) ([wjordan213](https://github.com/wjordan213))
+
+- Support for CSV on the Web transformations [\#173](https://github.com/theodi/csvlint.rb/pull/173) ([JeniT](https://github.com/JeniT))
+
+## [0.2.6](https://github.com/theodi/csvlint.rb/tree/0.2.6) (2015-11-16)
+
+[Full Changelog](https://github.com/theodi/csvlint.rb/compare/0.2.5...0.2.6)
+
 ## [0.2.5](https://github.com/theodi/csvlint.rb/tree/0.2.5) (2015-11-16)
 
 [Full Changelog](https://github.com/theodi/csvlint.rb/compare/0.2.4...0.2.5)

data/features/cli.feature

@@ -65,6 +65,20 @@ Feature: CSVlint CLI
     Then the output should contain "http://example.com/example1.csv is INVALID"
     And the output should contain "whitespace"
 
+  Scenario: Invalid CSV from url with JSON
+    Given I have a CSV with the following content:
+    """
+    "Foo",	"Bar"	,	"Baz"
+    """
+    And it is stored at the url "http://example.com/example1.csv"
+    When I run `csvlint http://example.com/example1.csv --json`
+    Then the output should contain JSON
+    And the JSON should have a state of "invalid"
+    And the JSON should have 1 error
+    And that error should have the "type" "whitespace"
+    And that error should have the "category" "structure"
+    And that error should have the "row" "1"
+
   Scenario: Specify schema
     Given I have a CSV with the following content:
     """

data/features/step_definitions/cli_steps.rb

@@ -9,3 +9,21 @@ end
 Then(/^nothing should be outputted to STDERR$/) do
   expect(STDERR).to_not receive(:puts)
 end
+
+Then(/^the output should contain JSON$/) do
+  @json = JSON.parse(all_stdout)
+  expect(@json['validation']).to be_present
+end
+
+Then(/^the JSON should have a state of "(.*?)"$/) do |state|
+  expect(@json['validation']['state']).to eq(state)
+end
+
+Then(/^the JSON should have (\d+) error$/) do |count|
+  @index = count.to_i - 1
+  expect(@json['validation']['errors'].count).to eq(count.to_i)
+end
+
+Then(/^that error should have the "(.*?)" "(.*?)"$/) do |k, v|
+  expect(@json['validation']['errors'][@index][k].to_s).to eq(v)
+end

data/lib/csvlint/cli.rb

@@ -10,12 +10,13 @@ module Csvlint
     desc "myfile.csv OR csvlint http://example.com/myfile.csv", "Supports validating CSV files to check their syntax and contents"
     option :dump_errors, desc: "Pretty print error and warning objects.", type: :boolean, aliases: :d
     option :schema, banner: "FILENAME OR URL", desc: "Schema file", aliases: :s
+    option :json, desc: "Output errors as JSON", type: :boolean, aliases: :j
     def validate(source = nil)
       source = read_source(source)
       @schema = get_schema(options[:schema]) if options[:schema]
       fetch_schema_tables(@schema, options) if source.nil?
 
-      valid = validate_csv(source, @schema, options[:dump])
+      valid = validate_csv(source, @schema, options[:dump], options[:json])
       exit 1 unless valid
     end
 
@@ -77,7 +78,7 @@ module Csvlint
           rescue Errno::ENOENT
             return_error "#{source} not found"
           end unless source =~ /^http(s)?/
-          valid &= validate_csv(source, schema, options[:dump])
+          valid &= validate_csv(source, schema, options[:dump], nil)
         end
 
         exit 1 unless valid
@@ -124,10 +125,14 @@ module Csvlint
         exit 1
       end
 
-      def validate_csv(source, schema, dump)
+      def validate_csv(source, schema, dump, json)
         @error_count = 0
 
-        validator = Csvlint::Validator.new( source, {}, schema, { lambda: report_lines } )
+        if json === true
+          validator = Csvlint::Validator.new( source, {}, schema )
+        else
+          validator = Csvlint::Validator.new( source, {}, schema, { lambda: report_lines } )
+        end
 
         if source.class == String
           csv = source
@@ -137,18 +142,39 @@ module Csvlint
           csv = "CSV"
         end
 
-        if $stdout.tty?
-          puts "\r\n#{csv} is #{validator.valid? ? "VALID".green : "INVALID".red}"
+        if json === true
+          json = {
+            validation: {
+              state: validator.valid? ? "valid" : "invalid",
+              errors: validator.errors.map { |v| hashify(v) },
+              warnings: validator.warnings.map { |v| hashify(v) },
+              info: validator.info_messages.map { |v| hashify(v) },
+            }
+          }.to_json
+          print json
         else
-          puts "\r\n#{csv} is #{validator.valid? ? "VALID" : "INVALID"}"
-        end
+          if $stdout.tty?
+            puts "\r\n#{csv} is #{validator.valid? ? "VALID".green : "INVALID".red}"
+          else
+            puts "\r\n#{csv} is #{validator.valid? ? "VALID" : "INVALID"}"
+          end
 
-        print_errors(validator.errors, dump)
-        print_errors(validator.warnings, dump)
+          print_errors(validator.errors, dump)
+          print_errors(validator.warnings, dump)
+        end
 
         return validator.valid?
       end
 
+      def hashify(error)
+        {
+          type: error.type,
+          category: error.category,
+          row: error.row,
+          col: error.column,
+        }
+      end
+
       def report_lines
         lambda do |row|
           new_errors = row.errors.count

data/lib/csvlint/version.rb

@@ -1,3 +1,3 @@
 module Csvlint
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvlint
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - pezholio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types