yaml-sort 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c27eb85cd2257c1d9ae801f0de2bcf360f4980e40479599745ecea41f4aa1f0
-  data.tar.gz: 05a1eb6551c2c671ca4e1ff01ce6acd91f3954fd7eeb8b70238bb48df45c1365
+  metadata.gz: 8fc2f27d56aec98cd2639b6751d584ef595133831e237de2424f9d4f4fef8495
+  data.tar.gz: 89e5a82b06b5458c5592c65e28b97916b6a357203e65ac058b5bc167423dba3c
 SHA512:
-  metadata.gz: 28b1e39e69330c1d4f4f68884fb84a8ba8dcc5411315a4b37e51391a4f32b1495fbb2f90eeaa78fea283e1c1ed06f0d030f35c9642de578e4e2665d76546a8ed
-  data.tar.gz: '0218e2f44f0a27dc1d5ca720493be401f2e9e55276b4de733ca37f716e9b92cc1c963a0c716c34f219fe3efc6704e21df570564f356394253bc790ecc7c9644f'
+  metadata.gz: e1bd41a83d2ddade59a115f681cb832d0761a7cc27deee193fb8c3aa711137508e288ce4fd736019e161184cf1257160d04b7088f51a4931c695fd9a5ec67ee3
+  data.tar.gz: 3d5f6d8359d14e62735bf7981a3c670c3156649ec4892f6eb6b4ef4c7019998f4940804795a34f5fad99f0fedd960a245af94fbb274d90fa5532e28da5370650

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.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)
+
+**Fixed bugs:**
+
+- Fix parsing of "simple" multi-line VALUE [\#24](https://github.com/smortex/yaml-sort/pull/24) ([smortex](https://github.com/smortex))
+
+## [v2.2.1](https://github.com/smortex/yaml-sort/tree/v2.2.1) (2023-01-04)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.2.0...v2.2.1)
+
+**Fixed bugs:**
+
+- Fix parsing of dictionaries with quotes in KEY/VALUE [\#21](https://github.com/smortex/yaml-sort/pull/21) ([smortex](https://github.com/smortex))
+
 ## [v2.2.0](https://github.com/smortex/yaml-sort/tree/v2.2.0) (2022-09-27)
 
 [Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.1.1...v2.2.0)

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', 33)
+module_eval(<<'...end parser.ra/module_eval...', 'parser.ra', 36)
 
 def scan(text)
   text = "---\n#{text}" unless text.start_with?("---\n")
@@ -27,11 +27,16 @@ def scan(text)
   @fakelineno = 0
   @position = 0
   @indent_stack = []
+  @anchors = {}
 
   until s.eos?
     if scan_value
       @position += s.matched_size if s.scan(/[[:blank:]]*/)
       case
+      when s.scan(/&[[:alnum:]]+/)
+        emit(:ANCHOR, s.matched[1..-1])
+      when s.scan(/\*[[:alnum:]]+/)
+        emit(:ALIAS, s.matched[1..-1])
       when s.scan(/[|>][-+]?(?=\n)/)
         match = s.matched
 
@@ -58,10 +63,11 @@ def scan(text)
           match += s.scan(/'/)
         end
         emit(:VALUE, match)
-      when s.scan(/\S+/)
-        match = s.matched
-        until s.match?(/[\n]/) || s.eos?
-          match += s.scan(/[^\n]+/)
+      when s.match?(/\S+/)
+        match = s.scan_until(/$/)
+
+        while s.match?("\n" + last_indent_value + " ")
+          match += s.scan(/\n[^\n]+(?=\n)/)
         end
         emit(:VALUE, match)
       end
@@ -77,10 +83,11 @@ def scan(text)
       when s.scan(/\n[[:blank:]]*#.*/)      then emit(:COMMENT, s.matched)
       when s.scan(/\n([[:blank:]]*-) */)    then emit(:ITEM, s.matched, indent: s.captures[0])
       when s.scan(/\n[[:blank:]]*\.\.\./)   then emit(:END_OF_DOCUMENT, s.matched)
-      when s.scan(/\n?([[:blank:]]*)(.+:)(?=[ \n])/)
+      when s.scan(/\n?([[:blank:]]*)(.+?:)(?=[ \n])/)
         indent = s.captures[0]
         indent = last_indent_value + indent + " " unless s.matched.start_with?("\n")
         emit(:KEY, s.matched, indent: indent, value: s.captures[1])
+        scan_value = true if s.rest
 
       when s.scan(/\n\z/)
         # Done
@@ -141,8 +148,19 @@ def emit(token, match, length: nil, indent: nil, value: nil)
     @indent_stack.push(indent) unless @indent_stack.last == indent
   end
 
+  value ||= match
+
+  if token == :KEY && value == '<<:'
+    message = <<~MESSAGE
+      #{@filename}:#{@lineno}: '<<:' references are not sortable:
+      #{@lines[@lineno - 1].chomp}
+      #{indent}#{" " * @position}^#{"~" * (length - indent.length - 1)}
+    MESSAGE
+    raise(Racc::ParseError, message)
+  end
+
   exvalue = {
-    value: value || match,
+    value: value,
     lineno: @lineno,
     position: @position,
     length: length,
@@ -193,50 +211,61 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,     9,     2,    11,     5,     9,     3,    11,     5,     9,
-    12,    11,     9,    14,    16,    11,    13 ]
+     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 ]
 
 racc_action_check = [
-     2,     2,     0,     2,     9,     9,     1,     9,    11,    11,
-     3,    11,     6,     6,     7,     7,     4 ]
+     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 ]
 
 racc_action_pointer = [
-     0,     6,    -4,    10,    13,   nil,     7,     8,   nil,     0,
-   nil,     4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+     0,     4,    -4,     8,    11,   nil,    25,    26,   nil,   nil,
+     2,   nil,     8,   nil,   nil,   nil,   nil,   nil,   nil,    14,
+   nil,    20,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -12,   -12,   -12,   -12,    -2,    -3,   -12,   -12,    -7,   -12,
-   -10,   -12,    20,    -1,    -4,    -6,    -5,    -9,    -8,   -11 ]
+   -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 ]
 
 racc_goto_table = [
-     4,     1,    15,    17,   nil,   nil,   nil,    18,   nil,    19 ]
+     4,     1,    16,    18,   nil,   nil,   nil,   nil,    20,   nil,
+    22,   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,    24 ]
 
 racc_goto_check = [
-     2,     1,     5,     6,   nil,   nil,   nil,     2,   nil,     2 ]
+     2,     1,     5,     6,   nil,   nil,   nil,   nil,     2,   nil,
+     2,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,     2 ]
 
 racc_goto_pointer = [
    nil,     1,    -2,   nil,   nil,    -4,    -4 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     6,     7,     8,    10 ]
+   nil,   nil,   nil,     6,     7,     9,    11 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 9, :_reduce_1,
-  2, 9, :_reduce_2,
-  1, 10, :_reduce_3,
-  2, 10, :_reduce_4,
-  2, 10, :_reduce_5,
-  2, 11, :_reduce_6,
-  1, 11, :_reduce_7,
-  2, 13, :_reduce_8,
-  2, 12, :_reduce_9,
-  1, 12, :_reduce_10,
-  2, 14, :_reduce_11 ]
-
-racc_reduce_n = 12
-
-racc_shift_n = 20
+  3, 11, :_reduce_1,
+  2, 11, :_reduce_2,
+  1, 12, :_reduce_3,
+  2, 12, :_reduce_4,
+  2, 12, :_reduce_5,
+  1, 12, :_reduce_6,
+  2, 13, :_reduce_7,
+  1, 13, :_reduce_8,
+  3, 15, :_reduce_9,
+  2, 15, :_reduce_10,
+  2, 14, :_reduce_11,
+  1, 14, :_reduce_12,
+  3, 16, :_reduce_13,
+  2, 16, :_reduce_14 ]
+
+racc_reduce_n = 15
+
+racc_shift_n = 25
 
 racc_token_table = {
   false => 0,
@@ -246,9 +275,11 @@ racc_token_table = {
   :VALUE => 4,
   :KEY => 5,
   :UNINDENT => 6,
-  :ITEM => 7 }
+  :ITEM => 7,
+  :ANCHOR => 8,
+  :ALIAS => 9 }
 
-racc_nt_base = 8
+racc_nt_base = 10
 
 racc_use_result_var = true
 
@@ -277,6 +308,8 @@ Racc_token_to_s_table = [
   "KEY",
   "UNINDENT",
   "ITEM",
+  "ANCHOR",
+  "ALIAS",
   "$start",
   "document",
   "value",
@@ -326,43 +359,64 @@ module_eval(<<'.,.,', 'parser.ra', 14)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 16)
+module_eval(<<'.,.,', 'parser.ra', 15)
   def _reduce_6(val, _values, result)
-     val[0].add_item(*val[1]); result = val[0]
+     result = Alias.new(@anchors, val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ra', 17)
   def _reduce_7(val, _values, result)
-     result = Dictionary.create(*val[0])
+     val[0].add_item(*val[1]); result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 19)
+module_eval(<<'.,.,', 'parser.ra', 18)
   def _reduce_8(val, _values, result)
-     result = [Scalar.new(val[0]), val[1]]
+     result = Dictionary.create(*val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 21)
+module_eval(<<'.,.,', 'parser.ra', 20)
   def _reduce_9(val, _values, result)
-     val[0].add_item(*val[1]); result = val[0]
+     @anchors[val[1][:value]] = val[2]; result = [Scalar.new(val[0]), Alias.new(@anchors, val[1])]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 22)
+module_eval(<<'.,.,', 'parser.ra', 21)
   def _reduce_10(val, _values, result)
-     result = List.create(*val[0])
+     result = [Scalar.new(val[0]), val[1]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.ra', 24)
+module_eval(<<'.,.,', 'parser.ra', 23)
   def _reduce_11(val, _values, result)
+     val[0].add_item(*val[1]); result = val[0]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.ra', 24)
+  def _reduce_12(val, _values, result)
+     result = List.create(*val[0])
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.ra', 26)
+  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)
+  def _reduce_14(val, _values, result)
      result = [Item.new(val[0]), val[1]]
     result
   end

data/lib/yaml/sort/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Romain Tartière
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Sort lines in YAML files in a predictable order