tidy_json 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf122c3cc2a34f2252b766f1a47f52bada4c4ff5b5334555ea62a572848d8531
-  data.tar.gz: bcd9134752408044711fc2b4ff3732afba7b65995b9c511c9df7e8fe666df4b5
+  metadata.gz: 53537db0fe360e1e7d7fe1ba75cb91418c6efa9ee9f108c2f8a2e3020bffed39
+  data.tar.gz: f665d2faff39441554d62de9cf91a6af9462d146501f1ba979d0b5ea21785e9d
 SHA512:
-  metadata.gz: 0d9d164a90b41f3c5793ebaa04b361a5e1c15bf8ed7580a367421e08c06bcc7cd0f5f8555adc1e9adcff57585c59554472b129797343f78714f964c45c8a7ce6
-  data.tar.gz: 950f0eab8248273ce6b80a37918226d2637f436b99552844450bec62d6b3ab40dbe887c81c6fadc4baabd53dc1a2faaac834e6e68082b17d6fd1ac0d709d16ba
+  metadata.gz: 01d9f6899b775b39c1cad8acbdf9bdbf563f5a61bd74ca5e395c47d0acb0cc8f963328d5a617c2366aeccd70d5b2f2d423c59485e828055e8743b945e45afd52
+  data.tar.gz: ae1c4ce4ee8b0b123b3627c694bfb9a2acec49b53387d830ce6acd2215347305552e6fbe2248197991f47ab0be07cd2888c824bb71fee3f56a86678dd05a063c

data/Gemfile

@@ -7,3 +7,10 @@ gemspec
 group :test do
   gem 'rake'
 end
+
+group :development do
+  install_if -> { ENV['COVERAGE'] } do
+    gem 'simplecov'
+    gem 'simplecov-cobertura'
+  end
+end

data/README.md

@@ -1,6 +1,6 @@
 # tidy_json
 
-![Gem Version][gem_version_badge]  ![Downloads][gem_downloads]  [![Travis CI][travis_build_status_badge]][travis_build_status]  [![Circle CI][cci_build_status_badge]][cci_build_status]  [![codecov][codecov_badge]][codecov_status]
+![Gem Version][gem_version_badge]  ![Downloads][gem_downloads]  [![Travis CI][travis_build_status_badge]][travis_build_status]  [![codecov][codecov_badge]][codecov_status]
 
 A mixin providing (recursive) JSON serialization and pretty printing.
 
@@ -107,7 +107,8 @@ After [installing the gem][], pass the name of a file containing JSON to `jtidy`
 formatting options:
 
 ```
-jtidy FILE[.json] [-i [2,4,6,8,10,12]] [-p [1..8]] [-v [1..8]] [-o D] [-a D] [-m N] [-e] [-A] [-N] [-s] [-P]
+jtidy FILE[.json] [-d out[.json]] [-i [2,4,6,8,10,12]] [-p [1..8]] [-v [1..8]] [-o D] [-a D] [-m N] [-e] [-A] [-N] [-s] [-f] [-P]
+    -d, --dest out[.json]            Name of output file
     -i, --indent [2,4,6,8,10,12]     The number of spaces to indent each object member [2]
     -p, --prop-name-space [1..8]     The number of spaces to put after property names [0]
     -v, --value-space [1..8]         The number of spaces to put before property values [1]
@@ -118,6 +119,7 @@ jtidy FILE[.json] [-i [2,4,6,8,10,12]] [-p [1..8]] [-v [1..8]] [-o D] [-a D] [-m
     -A, --ascii                      Generate ASCII characters only [false]
     -N, --nan                        Allow NaN, Infinity and -Infinity [false]
     -s, --sort                       Sort property names [false]
+    -f, --force                      Overwrite source file [false]
     -P, --preview                    Show preview of output [false]
     -V, --version                    Show version
     -h, --help                       Show this help message
@@ -134,12 +136,10 @@ More information is available [here](https://github.com/jtidy/jtidy/blob/master/
 Distributed under the terms of the [MIT License][].
 
 
-[travis_build_status]: https://travis-ci.com/rdipardo/tidy_json
-[cci_build_status]: https://circleci.com/gh/rdipardo/tidy_json/tree/testing
-[cci_build_status_badge]: https://circleci.com/gh/rdipardo/tidy_json.svg?style=svg
-[travis_build_status_badge]: https://travis-ci.com/rdipardo/tidy_json.svg?branch=master
-[codecov_status]: https://codecov.io/gh/rdipardo/tidy_json/branch/testing
-[codecov_badge]: https://codecov.io/gh/rdipardo/tidy_json/branch/testing/graph/badge.svg
+[travis_build_status]: https://app.travis-ci.com/github/rdipardo/tidy_json
+[travis_build_status_badge]: https://app.travis-ci.com/rdipardo/tidy_json.svg?branch=master
+[codecov_status]: https://codecov.io/gh/rdipardo/tidy_json/branch/master
+[codecov_badge]: https://codecov.io/gh/rdipardo/tidy_json/branch/master/graph/badge.svg
 [gem_version_badge]: https://img.shields.io/gem/v/tidy_json?color=%234ec820&label=gem%20version&logo=ruby&logoColor=%23e9573f
 [gem_downloads]: https://img.shields.io/gem/dt/tidy_json?logo=ruby&logoColor=%23e9573f
 [MIT License]: https://github.com/rdipardo/tidy_json/blob/master/LICENSE

data/bin/jtidy

@@ -7,6 +7,7 @@ require_relative 'jtidy_info'
 
 class Jtidy # :nodoc:
   OPTIONS = {
+    '-d out[.json]': [:dest, String, '--dest', 'Name of output file'],
     '-i [2,4,6,8,10,12]': [:indent, Integer, '--indent [2,4,6,8,10,12]',
                            'The number of spaces to indent each object member [2]'],
     '-p [1..8]': [:space_before, Integer, '--prop-name-space [1..8]',
@@ -24,6 +25,7 @@ class Jtidy # :nodoc:
     '-A': [:ascii_only, nil, '--ascii', 'Generate ASCII characters only [false]'],
     '-N': [:allow_nan, nil, '--nan', 'Allow NaN, Infinity and -Infinity [false]'],
     '-s': [:sort, nil, '--sort', 'Sort property names [false]'],
+    '-f': [:force, nil, '--force', 'Overwrite source file [false]'],
     # script-only options
     '-P': [:preview, nil, '--preview', 'Show preview of output [false]']
   }.freeze
@@ -93,16 +95,23 @@ begin
     raise OptionParser::InvalidArgument
   end
 
-  if !INPUT_FILE.nil? && !INPUT_FILE.empty?
+  if !(INPUT_FILE.nil? || INPUT_FILE.strip.empty?)
     tidy = ''
-    fname = INPUT_FILE.gsub('\\', '/')
+    fname = INPUT_FILE.strip.gsub('\\', '/')
     ext = File.extname(fname)
     input = File.join(
       File.expand_path(File.dirname(fname)), File.basename(fname, ext)
-    )
+    ).to_s
+    outfile = unless OPTS[:dest].nil? || OPTS[:dest].strip.empty?
+                fname = OPTS[:dest].strip.gsub('\\', '/')
+                ext = File.extname(fname)
+                File.join(
+                  File.expand_path(File.dirname(fname)), File.basename(fname, ext)
+                ).to_s
+              end
 
     begin
-      File.open((input + '.json').to_s, 'r') do |json|
+      File.open((input + '.json'), 'r') do |json|
         begin
           tidy = TidyJson.tidy(JSON.parse(json.read.strip), OPTS)
         rescue JSON::JSONError => e
@@ -111,7 +120,13 @@ begin
       end
 
       if tidy.length.positive?
-        output = (input + '-tidy.json').to_s
+        output = (if OPTS[:force]
+                    outfile.nil? ? input : outfile
+                  elsif Regexp.new("(#{outfile})", Regexp::IGNORECASE) =~ input
+                    warn "Can't overwrite #{input}.json without '--force' option"
+                    "#{input}-tidy"
+                  else outfile
+                  end) + '.json'
         File.open(output, 'w') { |fd| fd.write(tidy) }
         puts "\nWrote: #{output}"
         puts "#{tidy[0..1024]}\n . . ." if OPTS[:preview]

data/bin/jtidy_info.rb

@@ -20,9 +20,9 @@ module TidyJson # :nodoc:
     def initialize
       gem = Gem::Specification.find_by_name('tidy_json')
       @meta = {
-        name: "jtidy #{gem.version}",
-        license: "License: #{gem.license}",
-        bugs: "Bugs: #{gem.metadata['bug_tracker_uri']}",
+        name: "# jtidy #{gem.version}",
+        license: "# License: #{gem.license}",
+        bugs: "# Bugs: #{gem.metadata['bug_tracker_uri']}",
         notice: NOTICE
       }
     end

data/lib/tidy_json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TidyJson
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/test/codecov_runner.rb

@@ -7,8 +7,8 @@ if ENV['COVERAGE']
     SimpleCov.command_name 'Unit Tests'
 
     if ENV['CI']
-      require 'codecov'
-      SimpleCov.formatter = SimpleCov::Formatter::Codecov
+      require 'simplecov-cobertura'
+      SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
     end
   rescue LoadError
     warn "Can't locate coverage drivers! Try running: `bundle install` first."

data/tidy_json.gemspec

@@ -25,8 +25,6 @@ Gem::Specification.new do |spec|
   spec.executables = ['jtidy']
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3')
   spec.add_runtime_dependency 'json', '~> 2.5'
-  spec.add_development_dependency 'codecov', '~> 0.2.5'
-  spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'test-unit', '~> 3.4'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.rdoc_options = ['-x test/*']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tidy_json
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Di Pardo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -143,11 +115,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Serialize any Ruby object as readable JSON
 test_files:
 - test/JsonableObject.json
 - test/codecov_runner.rb
 - test/test_tidy_json.rb
+...