yaml-sort 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fc2f27d56aec98cd2639b6751d584ef595133831e237de2424f9d4f4fef8495
-  data.tar.gz: 89e5a82b06b5458c5592c65e28b97916b6a357203e65ac058b5bc167423dba3c
+  metadata.gz: aad6c908f5ec9b2e7f77a4cda39a1df1fa5f1410b7936588bcaad088245beb74
+  data.tar.gz: d83defb489b3f9bbe9843dbe7b922ca8f1b22200048a29d0e693e8861515e7d3
 SHA512:
-  metadata.gz: e1bd41a83d2ddade59a115f681cb832d0761a7cc27deee193fb8c3aa711137508e288ce4fd736019e161184cf1257160d04b7088f51a4931c695fd9a5ec67ee3
-  data.tar.gz: 3d5f6d8359d14e62735bf7981a3c670c3156649ec4892f6eb6b4ef4c7019998f4940804795a34f5fad99f0fedd960a245af94fbb274d90fa5532e28da5370650
+  metadata.gz: 24118848842df1eb6a683209a81f11f2c708307677db5f724657742b42bd9d98f0c2ee47c6a870e7a13b88b6e9f073392dad11c595420d3fbe4a981915bd5ba7
+  data.tar.gz: f905f585a39e7526553f4e3a0d59560a3ed0330c7fb9354f3882406317a75c52771af6e5ee083fb323238047da2954b87a902b2ce7e611141993748a9db245d4

data/CHANGELOG.md

@@ -3,6 +3,22 @@ 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).
 
+## [v2.2.4](https://github.com/smortex/yaml-sort/tree/v2.2.4) (2023-01-11)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.2.3...v2.2.4)
+
+**Fixed bugs:**
+
+- Fix parsing of lists with empty values [\#30](https://github.com/smortex/yaml-sort/pull/30) ([smortex](https://github.com/smortex))
+
+## [v2.2.3](https://github.com/smortex/yaml-sort/tree/v2.2.3) (2023-01-09)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.2.2...v2.2.3)
+
+**Fixed bugs:**
+
+- Fix parsing of blank lines in multi-line VALUE [\#27](https://github.com/smortex/yaml-sort/pull/27) ([smortex](https://github.com/smortex))
+
 ## [v2.2.2](https://github.com/smortex/yaml-sort/tree/v2.2.2) (2023-01-06)
 
 [Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.2.1...v2.2.2)

data/lib/yaml/sort/parser.rb

@@ -13,7 +13,7 @@ module Yaml
   module Sort
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.ra/module_eval...', 'parser.ra', 36)
+module_eval(<<'...end parser.ra/module_eval...', 'parser.ra', 40)
 
 def scan(text)
   text = "---\n#{text}" unless text.start_with?("---\n")
@@ -37,13 +37,6 @@ def scan(text)
         emit(:ANCHOR, s.matched[1..-1])
       when s.scan(/\*[[:alnum:]]+/)
         emit(:ALIAS, s.matched[1..-1])
-      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
@@ -66,8 +59,8 @@ def scan(text)
       when s.match?(/\S+/)
         match = s.scan_until(/$/)
 
-        while s.match?("\n" + last_indent_value + " ")
-          match += s.scan(/\n[^\n]+(?=\n)/)
+        while s.match?("\n" + last_indent_value + " ") || s.match?(/\n[[:blank:]]*(?=\n)/)
+          match += s.scan(/\n[^\n]*(?=\n)/)
         end
         emit(:VALUE, match)
       end
@@ -212,25 +205,25 @@ end
 
 racc_action_table = [
      5,    10,     2,    12,     3,     8,     5,    10,    13,    12,
-    19,     8,     5,    10,    14,    12,    21,     8,     5,    10,
-   nil,    12,   nil,     8,     5,    10,   nil,    12,   nil,     8,
-    10,    15,    17,    12 ]
+    19,     8,     5,    10,    10,    15,    21,     8,     5,    10,
+    14,    12,   nil,     8,     5,    10,   nil,    12,   nil,     8,
+    17,    12 ]
 
 racc_action_check = [
      2,     2,     0,     2,     1,     2,    10,    10,     3,    10,
-    10,    10,    12,    12,     4,    12,    12,    12,    19,    19,
-   nil,    19,   nil,    19,    21,    21,   nil,    21,   nil,    21,
-     6,     6,     7,     7 ]
+    10,    10,    12,    12,     6,     6,    12,    12,    19,    19,
+     4,    19,   nil,    19,    21,    21,   nil,    21,   nil,    21,
+     7,     7 ]
 
 racc_action_pointer = [
-     0,     4,    -4,     8,    11,   nil,    25,    26,   nil,   nil,
+     0,     4,    -4,     8,    17,   nil,     9,    24,   nil,   nil,
      2,   nil,     8,   nil,   nil,   nil,   nil,   nil,   nil,    14,
    nil,    20,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -15,   -15,   -15,   -15,    -2,    -3,   -15,   -15,    -6,    -8,
-   -15,   -12,   -15,    25,    -1,    -4,    -7,    -5,   -11,   -15,
-   -10,   -15,   -14,    -9,   -13 ]
+   -16,   -16,   -16,   -16,    -2,    -3,   -16,   -16,    -6,    -8,
+   -16,   -12,   -15,    25,    -1,    -4,    -7,    -5,   -11,   -16,
+   -10,   -16,   -14,    -9,   -13 ]
 
 racc_goto_table = [
      4,     1,    16,    18,   nil,   nil,   nil,   nil,    20,   nil,
@@ -261,9 +254,10 @@ racc_reduce_table = [
   2, 14, :_reduce_11,
   1, 14, :_reduce_12,
   3, 16, :_reduce_13,
-  2, 16, :_reduce_14 ]
+  2, 16, :_reduce_14,
+  1, 16, :_reduce_15 ]
 
-racc_reduce_n = 15
+racc_reduce_n = 16
 
 racc_shift_n = 25
 
@@ -324,104 +318,111 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parser.ra', 9)
+module_eval(<<'.,.,', 'parser.ra', 12)
   def _reduce_1(val, _values, result)
      result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 10)
+module_eval(<<'.,.,', 'parser.ra', 13)
   def _reduce_2(val, _values, result)
      result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 12)
+module_eval(<<'.,.,', 'parser.ra', 15)
   def _reduce_3(val, _values, result)
      result = Scalar.new(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 13)
+module_eval(<<'.,.,', 'parser.ra', 16)
   def _reduce_4(val, _values, result)
      result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 14)
+module_eval(<<'.,.,', 'parser.ra', 17)
   def _reduce_5(val, _values, result)
      result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 15)
+module_eval(<<'.,.,', 'parser.ra', 18)
   def _reduce_6(val, _values, result)
      result = Alias.new(@anchors, val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 17)
+module_eval(<<'.,.,', 'parser.ra', 20)
   def _reduce_7(val, _values, result)
      val[0].add_item(*val[1]); result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 18)
+module_eval(<<'.,.,', 'parser.ra', 21)
   def _reduce_8(val, _values, result)
      result = Dictionary.create(*val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 20)
+module_eval(<<'.,.,', 'parser.ra', 23)
   def _reduce_9(val, _values, result)
      @anchors[val[1][:value]] = val[2]; result = [Scalar.new(val[0]), Alias.new(@anchors, val[1])]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 21)
+module_eval(<<'.,.,', 'parser.ra', 24)
   def _reduce_10(val, _values, result)
      result = [Scalar.new(val[0]), val[1]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 23)
+module_eval(<<'.,.,', 'parser.ra', 26)
   def _reduce_11(val, _values, result)
      val[0].add_item(*val[1]); result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 24)
+module_eval(<<'.,.,', 'parser.ra', 27)
   def _reduce_12(val, _values, result)
      result = List.create(*val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 26)
+module_eval(<<'.,.,', 'parser.ra', 29)
   def _reduce_13(val, _values, result)
      @anchors[val[1][:value]] = val[2]; result = [Item.new(val[0]),  Alias.new(@anchors, val[1])]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 27)
+module_eval(<<'.,.,', 'parser.ra', 30)
   def _reduce_14(val, _values, result)
      result = [Item.new(val[0]), val[1]]
     result
   end
 .,.,
 
+module_eval(<<'.,.,', 'parser.ra', 31)
+  def _reduce_15(val, _values, result)
+     result = [Item.new(val[0]), Scalar.new({value: ''})]
+    result
+  end
+.,.,
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/yaml/sort/version.rb

@@ -2,6 +2,6 @@
 
 module Yaml
   module Sort
-    VERSION = "2.2.2"
+    VERSION = "2.2.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Romain Tartière
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-11 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:
@@ -106,7 +106,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
@@ -121,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.2.5
+signing_key: 
 specification_version: 4
 summary: Sort lines in YAML files in a predictable order
 test_files: []