yaml-sort 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 645ea28f8b87a81c89e34ef07785fead69c974b290788c33ef86824f4f62501a
-  data.tar.gz: e1590c97f5fda4c67b8c4429793a66c8f6acedad33e419ffbc0014abf2a9fbd8
+  metadata.gz: 72258bb4d23f93e70c95417efcafe0aaef23356d9f10c9d5134df32fb78839a5
+  data.tar.gz: e39ea336150c107f6e414ccec16078eef4d672be78a3aef14eced6954ae4e49e
 SHA512:
-  metadata.gz: 568da6c958f9aea830b39370125ac80ded2172004b6cfa699026599b5a31f528a4a7898c3dff3e6cb25c744f7d8934028e755d737f30ef1713862620b9f848a8
-  data.tar.gz: 4345a7ea2741f29a510584cc4d51a2b4c4e708841b8052870de413e3ce7f62733274c94928ac38feb061e6e3c3c5a52c00a0337104f4f288672f24324dff9716
+  metadata.gz: 465d39f27065f31158a910959771fcae865fb5097af023ec40ab8702a197e3384655c15ea7332c59d17554112b8cd33ea773470115c9770657c83d4c06df5d19
+  data.tar.gz: ccced630f1624985fece8ecf8e4c2870f7dede0d07996f91b825b093541ca627700796ef4dcc16519f7ddaede0098a331c8f3df1139831b794ffd34e6b7e7891

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.5](https://github.com/smortex/yaml-sort/tree/v2.2.5) (2023-03-10)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.2.4...v2.2.5)
+
+**Fixed bugs:**
+
+- Fix sorting dictionaries when they have an anchor [\#33](https://github.com/smortex/yaml-sort/pull/33) ([smortex](https://github.com/smortex))
+
+## [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)

data/Gemfile

@@ -5,10 +5,14 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in yaml-sort.gemspec
 gemspec
 
+gem "racc"
 gem "rake", "~> 13.0"
 
+gem "aruba"
 gem "rspec", "~> 3.0"
 
+gem "github_changelog_generator"
+
 gem "rubocop", "~> 1.21"
 gem "rubocop-rake"
 gem "rubocop-rspec"

data/lib/yaml/sort/cli.rb

@@ -70,6 +70,7 @@ module Yaml
 
       def sort_yaml(yaml, filename)
         document = @parser.parse(yaml, filename: filename)
+        @parser.sort_anchors!
         document = document.sort
         "---\n#{document}\n"
       end

data/lib/yaml/sort/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 
@@ -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")
@@ -200,30 +200,34 @@ def on_error(error_token_id, error_value, value_stack)
 
   raise(Racc::ParseError, message)
 end
+
+def sort_anchors!
+  @anchors.transform_values!(&:sort)
+end
 ...end parser.ra/module_eval...
 ##### State transition tables begin ###
 
 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,
@@ -254,9 +258,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
 
@@ -317,104 +322,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.3"
+    VERSION = "2.2.5"
   end
 end

data/yaml-sort.gemspec

@@ -30,8 +30,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "cri"
-
-  spec.add_development_dependency "aruba"
-  spec.add_development_dependency "github_changelog_generator"
-  spec.add_development_dependency "racc"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Romain Tartière
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -24,48 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 - romain@blogreen.org
@@ -121,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Sort lines in YAML files in a predictable order