yaml-sort 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8eee6a8ad9b5761ffc9e9ef08f6025c66e3c661acfef15f197b3d28f67e3253
-  data.tar.gz: 108d4ea68106e308eafbe6bce7cd372556ebde65010ade2b1b742e82f43f29d5
+  metadata.gz: 813b1d18ae4a2cb6b57ebde8dc720c06ff9125417ab245d6cc15e22467e8f5ef
+  data.tar.gz: 5d334e4fd7ab15319c225e549a1e7e38319f62a3ecec62a855b40c8e00cba036
 SHA512:
-  metadata.gz: 234b85bdf4dd61f2bfa5a8568c59979ad12c374af47daed35d0a7248b0e1b8f96aed17bc77ba17ca2d8a7233d55803c9d6c5a4fcfa962394d6183ff61a3e9e21
-  data.tar.gz: 525ca02351c0f79d86a6e367341b4c8750b294400ffd96a7d4ad00dfced59de0e16060b29a5ceb0b0dcb40d95db9f8d1f1b8fcaabbfb1dfb6c3a58fa470ad27d
+  metadata.gz: 84b534524792c4218449a7724e1673d09058afb2b2c838001e2092e144d8caaeadf51ea5cf415d52a6f5b1ca284ac3977785871344e317d0c61a0414b715d2d8
+  data.tar.gz: 211409b7ade1b5cace67a86ea71a3fe952398a03165a099a201760ad47e3a01a2da99e7ecd359bc80f63d988396b63afc7a42141899f7ef316ac1dd0aa2c1e5a

data/CHANGELOG.md

@@ -3,9 +3,34 @@ 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.1](https://github.com/smortex/yaml-sort/tree/2.0.1) (2022-06-01)
+## [v2.1.1](https://github.com/smortex/yaml-sort/tree/v2.1.1) (2022-07-03)
 
-[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.0.0...2.0.1)
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.1.0...v2.1.1)
+
+**Fixed bugs:**
+
+- Fix passing-around Aruba FakeKernel [\#13](https://github.com/smortex/yaml-sort/pull/13) ([smortex](https://github.com/smortex))
+
+## [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.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:**
+
+- Fix infinite loops when processing files with trailing whitespace [\#9](https://github.com/smortex/yaml-sort/pull/9) ([smortex](https://github.com/smortex))
+
+## [v2.0.1](https://github.com/smortex/yaml-sort/tree/v2.0.1) (2022-06-01)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.0.0...v2.0.1)
 
 **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
@@ -11,7 +12,7 @@ module Yaml
         @parser = Yaml::Sort::Parser.new
       end
 
-      def execute(argv) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def execute(argv, kernel = Kernel) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         options = {
           in_place: false,
           lint: false,
@@ -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)
       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/parser.rb

@@ -30,43 +30,42 @@ def scan(text)
 
   until s.eos?
     if scan_value
-      unless s.match?(/[[:space:]]*\n/)
-        @position += s.matched_size if s.scan(/[[:blank:]]*/)
-        case
-        when s.scan(/[|>][-+]?(?=\n)/)
-          match = s.matched
-          
-          while s.match?("\n" + last_indent_value + " ")
-            match += s.scan(/\n[^\n]+(?=\n)/)
-          end
-          emit(:VALUE, match)
-        when s.scan(/"/)
-          match = s.matched
-          loop do
-            match += s.scan_until(/"|\\/)
-            if match[-1] == "\\"
-              match += s.scan(/.|\n/)
-            else
-              break
-            end
-          end
-          emit(:VALUE, match)
-        when s.scan(/'/)
-          match = s.matched
-          loop do
-            match += s.scan_until(/'/)
-            break unless s.match?(/'/)
-            match += s.scan(/'/)
-          end
-          emit(:VALUE, match)
-        when s.scan(/\S+/)
-          match = s.matched
-          until s.match?(/[\n]/) || s.eos?
-            match += s.scan(/[^\n]+/)
+      @position += s.matched_size if s.scan(/[[:blank:]]*/)
+      case
+      when s.scan(/[|>][-+]?(?=\n)/)
+        match = s.matched
+
+        while s.match?("\n" + last_indent_value + " ")
+          match += s.scan(/\n[^\n]+(?=\n)/)
+        end
+        emit(:VALUE, match)
+      when s.scan(/"/)
+        match = s.matched
+        loop do
+          match += s.scan_until(/"|\\/)
+          if match[-1] == "\\"
+            match += s.scan(/.|\n/)
+          else
+            break
           end
-          emit(:VALUE, match)
         end
+        emit(:VALUE, match)
+      when s.scan(/'/)
+        match = s.matched
+        loop do
+          match += s.scan_until(/'/)
+          break unless s.match?(/'/)
+          match += s.scan(/'/)
+        end
+        emit(:VALUE, match)
+      when s.scan(/\S+/)
+        match = s.matched
+        until s.match?(/[\n]/) || s.eos?
+          match += s.scan(/[^\n]+/)
+        end
+        emit(:VALUE, match)
       end
+      s.scan(/[[:blank:]]*/)
       scan_value = false
     else
       case
@@ -88,23 +87,23 @@ def scan(text)
       when s.match?(/./)
         scan_value = true
       else
-				message = if @lines[@lineno - 1][@position] == "\n"
-									<<~MESSAGE
-										#{@filename}:#{@lineno + 1}: unexpected content
-										#{@lines[@lineno].chomp}
-										^#{"~" * (@lines[@lineno].chomp.length - 1)}
-										MESSAGE
-									else
-									<<~MESSAGE
-										#{@filename}:#{@lineno}: unexpected content
-										#{@lines[@lineno - 1].chomp}
-										#{" " * @position}^
-										MESSAGE
-									end
-				raise(Racc::ParseError, message)
-			end
-		end
-	end
+        message = if @lines[@lineno - 1][@position] == "\n"
+                  <<~MESSAGE
+                    #{@filename}:#{@lineno + 1}: unexpected content
+                    #{@lines[@lineno].chomp}
+                    ^#{"~" * (@lines[@lineno].chomp.length - 1)}
+                    MESSAGE
+                  else
+                  <<~MESSAGE
+                    #{@filename}:#{@lineno}: unexpected content
+                    #{@lines[@lineno - 1].chomp}
+                    #{" " * @position}^
+                    MESSAGE
+                  end
+        raise(Racc::ParseError, message)
+      end
+    end
+  end
 
   unindent
 

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.1"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Romain Tartière
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 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: []