yaml-sort 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125cdbf70a136c2968ab9c18f99cbfaa62e3f4117a577187a37f43298910a7c9
-  data.tar.gz: 58ed8f15a8cd027871e17dbc8ccd8293fd1be1e3242e2b12012ea1efc9f50c87
+  metadata.gz: bbee3a96fd3ecb9c7610a0621d80d796bb656a338512655175f213727af356c6
+  data.tar.gz: 1b1609202ae8cd7cc002c6a868d836ddfb89681d75efc4c5b996264d85d3392d
 SHA512:
-  metadata.gz: 3e2580f860075dd74a69c5e5a31097d906cbba4c9293a8f3181ee6fbf72cc931ca371cbf3b5258ed5ac93d356d2ed82f2805477f039799ea4cd293a39458a236
-  data.tar.gz: 00d35a112f355e53e0fca7d3bc63349dc6c1da2b87fc8195af480754b1e81f31049da97282679eef282d412c42d2ec7788689879c915a6697860408d01f9f5cd
+  metadata.gz: adbbda3bc7d506f276266b8d3f8bdf88c2032f2b80f64061fb965b25368e735996e7c164737ebebeed0c73fc5757669c7b099b362126f4a05dd37c33b7606d95
+  data.tar.gz: affae50f2aeff9ec3e96709f162a06a8cc1b7d2cbeb8ab1f1c8e98a10be3efe36642c9b69d57a1fd07a6c2b17ed09e74d5695f89b488fffca905b4bddfaebaf1

data/CHANGELOG.md

@@ -3,9 +3,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.2](https://github.com/smortex/yaml-sort/tree/2.0.2) (2022-06-10)
+## [v2.1.0](https://github.com/smortex/yaml-sort/tree/v2.1.0) (2022-07-03)
 
-[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.0.1...2.0.2)
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.0.2...v2.1.0)
+
+**Implemented enhancements:**
+
+- Make the Rake tasks silent [\#11](https://github.com/smortex/yaml-sort/pull/11) ([smortex](https://github.com/smortex))
+- Improve --lint by showing a diff on error [\#10](https://github.com/smortex/yaml-sort/pull/10) ([smortex](https://github.com/smortex))
+
+## [v2.0.2](https://github.com/smortex/yaml-sort/tree/v2.0.2) (2022-06-10)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.0.1...v2.0.2)
 
 **Fixed bugs:**
 

data/Rakefile

@@ -24,7 +24,7 @@ task cucumber: ["lib/yaml/sort/parser.rb"]
 
 require "github_changelog_generator/task"
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = Yaml::Sort::VERSION
+  config.future_release = "v#{Yaml::Sort::VERSION}"
   config.header = <<~HEADER.chomp
     # Changelog
     All notable changes to this project will be documented in this file.

data/lib/yaml/sort/cli.rb

@@ -3,6 +3,7 @@
 require "optparse"
 
 require "cri"
+require "tempfile"
 
 module Yaml
   module Sort
@@ -25,7 +26,7 @@ module Yaml
           opts.on("-l", "--lint", "Ensure files content is sorted as expected") do
             options[:lint] = true
           end
-        end.parse!
+        end.parse!(argv)
 
         if !options[:in_place] && !options[:lint] && argv.count > 1
           warn "Sorting multiple YAML document to stdout does not make sense"
@@ -47,7 +48,7 @@ module Yaml
           end
         end
 
-        @exit_code
+        $kernel.exit(@exit_code) # rubocop:disable Style/GlobalVars
       end
 
       def process_document(filename, options)
@@ -78,13 +79,28 @@ module Yaml
           File.write(filename, sorted_yaml)
         elsif options[:lint]
           if yaml != sorted_yaml
-            warn "#{filename || "<stdin>"} is not sorted as expected"
+            show_diff(filename, yaml, sorted_yaml)
             @exit_code = 1
           end
         else
           puts sorted_yaml
         end
       end
+
+      def show_diff(filename, actual, expected)
+        filename ||= "<stdin>"
+
+        a = Tempfile.new
+        a.write(actual)
+        a.close
+
+        b = Tempfile.new
+        b.write(expected)
+        b.close
+
+        warn "diff #{File.join("a", filename)} #{File.join("b", filename)}"
+        warn `diff -u --label "#{File.join("a", filename)}" #{a.path} --label "#{File.join("b", filename)}" #{b.path}`
+      end
     end
   end
 end

data/lib/yaml/sort/tasks/puppet.rb

@@ -3,11 +3,11 @@
 namespace :lint do
   desc "Check Hiera data content ordering"
   task :hiera_data_ordering do
-    sh "yaml-sort", "--lint", *Dir.glob("data/**/*.yaml")
+    sh "yaml-sort", "--lint", *Dir.glob("data/**/*.yaml"), verbose: false
   end
 end
 
 desc "Reorder Hiera data in-place"
 task :reorder_hiera_data do
-  sh "yaml-sort", "--in-place", *Dir.glob("data/**/*.yaml")
+  sh "yaml-sort", "--in-place", *Dir.glob("data/**/*.yaml"), verbose: false
 end

data/lib/yaml/sort/tasks/rails.rb

@@ -3,11 +3,11 @@
 namespace :test do
   desc "Check translations content ordering"
   task :translations_ordering do
-    sh "yaml-sort", "--lint", *Dir.glob("config/locales/**/*.yml")
+    sh "yaml-sort", "--lint", *Dir.glob("config/locales/**/*.yml"), verbose: false
   end
 end
 
 desc "Reorder translations in-place"
 task :reorder_translations do
-  sh "yaml-sort", "--in-place", *Dir.glob("config/locales/**/*.yml")
+  sh "yaml-sort", "--in-place", *Dir.glob("config/locales/**/*.yml"), verbose: false
 end

data/lib/yaml/sort/version.rb

@@ -2,6 +2,6 @@
 
 module Yaml
   module Sort
-    VERSION = "2.0.2"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Romain Tartière
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - romain@blogreen.org
 executables:
@@ -104,7 +104,7 @@ metadata:
   source_code_uri: https://github.com/smortex/yaml-sort
   changelog_uri: https://github.com/smortex/yaml-sort/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.16
+signing_key:
 specification_version: 4
 summary: Sort lines in YAML files in a predictable order
 test_files: []