jsonlint 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9440424c5ce5284432200d4275be3ef815c55a87
-  data.tar.gz: b85712a8defcd3df4d0846d4993e0a967cc2283d
+SHA256:
+  metadata.gz: 865549ae7f81666a0d93c1ea750f1e58c49b72f9d122d337370512759970cceb
+  data.tar.gz: a219e77d9061374565d230057e2b9374e801b94f3a557f8a2aa9a8229c2fda0f
 SHA512:
-  metadata.gz: d2f64c73f7f4e8512dee6abc20228ad68de118a339fd45313766828c118e9bb0f370b067575017566d3138915ca0e6cce644b5db46e0bcba85f47f422585dea3
-  data.tar.gz: 1dd3cea2cca3437c3dc766b57d63d79690cdb5fcdb7588c2d071ab2c281431492c18ef079439b596527fb3b844509a81a4113de1a8ffdf73404d3fcd365767fd
+  metadata.gz: 5fa98267d4c36018a931084e42d66590755d272dc15fb880eef54e659300a8bdb3b3cec59d5e691cfbdaec899ed95269a56ee7a680b1c638b7dd8acf85f4334d
+  data.tar.gz: 84de08ff27a4fcec4d7a07b7e06e589ffda10adc91430b6b7ca689f9ac48dcb9b23bd982964ea48f28dafe446889a80412718e94f1f2a1ca45e1aff594884d3d

data/.travis.yml

@@ -1,6 +1,10 @@
+dist: xenial
 language: ruby
+before_install:
+  - gem update --system
+  - gem install bundler
 rvm:
-  - 2.0.0-p648
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6

data/README.md

@@ -1,6 +1,6 @@
 # jsonlint
 
-[![Build Status](https://travis-ci.org/PagerDuty/jsonlint.svg?branch=master)](https://travis-ci.org/PagerDuty/jsonlint)
+[![Build Status](https://travis-ci.org/dougbarth/jsonlint.svg?branch=master)](https://travis-ci.org/dougbarth/jsonlint)
 [![Gem Version](http://img.shields.io/gem/v/jsonlint.svg)](https://rubygems.org/gems/jsonlint)
 
 jsonlint checks your JSON files for syntax errors or silly mistakes. Currently it checks for:
@@ -65,9 +65,20 @@ spec/data/overlapping_keys.json
   The same key is defined twice: foo
 ```
 
+### Rake task options
+
+Add these options similarly to the path option seen above.
+
+| Option | Description | Default |
+| ------------- | ------------- | ------------- |
+| `exclude_paths` | List of files or paths to exclude from linting | `nil` |
+| `fail_on_error` | Continue on to the next rake task when false and don't fail even if JsonLint finds errors | `true` |
+| `log_level` | Logger level (DEBUG, INFO, WARN, ERROR, FATAL, or UNKNOWN) | `INFO` |
+| `paths` | List of files or paths to lint | `nil` |
+
 ## Contributing
 
-1. Fork it ( https://github.com/PagerDuty/jsonlint/fork )
+1. Fork it ( https://github.com/dougbarth/jsonlint/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/jsonlint.gemspec

@@ -6,22 +6,22 @@ require 'jsonlint/version'
 Gem::Specification.new do |spec|
   spec.name          = "jsonlint"
   spec.version       = JsonLint::VERSION
-  spec.authors       = ["Doug Barth"]
-  spec.email         = ["dougbarth@gmail.com"]
+  spec.authors       = ['Doug Barth']
+  spec.email         = ['dougbarth@gmail.com']
   spec.summary       = %q{JSON lint checker}
   spec.description   = %q{Checks JSON files for correct syntax and no silly mistakes}
-  spec.license       = "MIT"
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'oj', '~> 2'
-  spec.add_dependency 'trollop', '~> 2'
+  spec.add_dependency 'oj', '~> 3'
+  spec.add_dependency 'optimist', '~> 3'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "aruba"
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency 'aruba', '~> 0.14'
 end

data/lib/jsonlint/cli.rb

@@ -1,4 +1,4 @@
-require 'trollop'
+require 'optimist'
 
 module JsonLint
   class CLI
@@ -11,7 +11,7 @@ module JsonLint
 
       files_to_check = @argv
 
-      Trollop::die 'need at least one JSON file to check' if files_to_check.empty?
+      Optimist::die 'need at least one JSON file to check' if files_to_check.empty?
 
       linter = JsonLint::Linter.new
       begin
@@ -36,7 +36,7 @@ module JsonLint
     private
 
     def parse_options
-      @opts = Trollop.options(@argv) do
+      @opts = Optimist.options(@argv) do
         banner 'Usage: jsonlint [options] file1.json [file2.json ...]'
         version(JsonLint::VERSION)
         banner ''

data/lib/jsonlint/linter.rb

@@ -42,6 +42,11 @@ module JsonLint
       !errors.empty?
     end
 
+    # Return the number of lint errors found
+    def errors_count
+      errors.length
+    end
+
     def display_errors
       errors.each do |path, errors|
         puts path

data/lib/jsonlint/rake_task.rb

@@ -7,9 +7,14 @@ module JsonLint
   class RakeTask < Rake::TaskLib
     attr_accessor :name
     attr_accessor :paths
+    attr_accessor :exclude_paths
+    attr_accessor :fail_on_error
+    attr_accessor :log_level
 
     def initialize(name = :jsonlint)
       @name = name
+      @exclude_paths = []
+      @fail_on_error = true
 
       yield self if block_given?
 
@@ -22,14 +27,26 @@ module JsonLint
       desc 'Run jsonlint' unless ::Rake.application.last_description
 
       task(name) do
-        files_to_check = Rake::FileList.new(paths)
+        puts 'Running JsonLint...'
+
+        JsonLint.logger.level = Logger.const_get(log_level) if log_level
+
+        files_to_check_raw = Rake::FileList.new(paths)
+        files_to_exclude = Rake::FileList.new(exclude_paths)
+        files_to_check = files_to_check_raw.exclude(files_to_exclude)
+
+        puts "Checking #{files_to_check.flatten.length} files"
+        puts "Excluding #{files_to_exclude.flatten.length} files"
 
         linter = ::JsonLint::Linter.new
         linter.check_all(files_to_check)
 
         if linter.errors?
           linter.display_errors
-          abort('JSON lint found')
+          puts "JSON lint found #{linter.errors_count} errors"
+          abort('JsonLint failed!') if fail_on_error
+        else
+          puts 'JsonLint found no errors'
         end
       end
     end

data/lib/jsonlint/version.rb

@@ -1,3 +1,3 @@
 module JsonLint
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/cli_spec.rb

@@ -48,9 +48,9 @@ describe 'jsonlint' do
   end
 
   it 'should fail with a path that is unreadable' do
-    run_simple('mkdir -p tmp')
-    run_simple('touch tmp/unreadable_file.json')
-    run_simple('chmod -r tmp/unreadable_file.json')
+    run_command_and_stop('mkdir -p tmp')
+    run_command_and_stop('touch tmp/unreadable_file.json')
+    run_command_and_stop('chmod -r tmp/unreadable_file.json')
 
     jsonlint 'tmp/unreadable_file.json'
     expect(last_command_started).to_not be_successfully_executed
@@ -58,13 +58,13 @@ describe 'jsonlint' do
   end
 
   it 'should be able to lint good JSON from STDIN' do
-    run "#{jsonlint_bin} -"
+    run_command "#{jsonlint_bin} -"
     pipe_in_file('../../spec/data/valid.json') and close_input
     expect(last_command_started).to be_successfully_executed
   end
 
   it 'should be able to lint bad JSON from STDIN' do
-    run "#{jsonlint_bin} -"
+    run_command "#{jsonlint_bin} -"
     pipe_in_file('../../spec/data/missing_comma.json') and close_input
     expect(last_command_started).to_not be_successfully_executed
   end

data/spec/linter_spec.rb

@@ -12,10 +12,12 @@ describe 'JsonLint::Linter' do
     expect(linter.check(spec_data('valid.json'))).to be(true)
     expect(linter.check(spec_data('valid_array_of_objects.json'))).to be(true)
     expect(linter.check(spec_data('valid_array_of_arrays.json'))).to be(true)
+    expect(linter.errors_count).to eq(0)
   end
 
   it 'should be unhappy with an invalid JSON file' do
     expect(linter.check(spec_data('missing_comma.json'))).to be(false)
+    expect(linter.errors_count).to eq(1)
   end
 
   it 'should be unhappy with JSON that has overlapping keys' do

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ end
 
 module CliSpecHelpers
   def jsonlint(args = nil)
-    run_simple("#{jsonlint_bin} #{args}", fail_on_error: false)
+    run_command_and_stop("#{jsonlint_bin} #{args}", fail_on_error: false)
   end
 
   def jsonlint_bin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonlint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Doug Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 description: Checks JSON files for correct syntax and no silly mistakes
 email:
 - dougbarth@gmail.com
@@ -147,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: JSON lint checker
@@ -165,4 +164,3 @@ test_files:
 - spec/data/valid_array_of_objects.json
 - spec/linter_spec.rb
 - spec/spec_helper.rb
-has_rdoc: