yaml-sort 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 813b1d18ae4a2cb6b57ebde8dc720c06ff9125417ab245d6cc15e22467e8f5ef
-  data.tar.gz: 5d334e4fd7ab15319c225e549a1e7e38319f62a3ecec62a855b40c8e00cba036
+  metadata.gz: 6c27eb85cd2257c1d9ae801f0de2bcf360f4980e40479599745ecea41f4aa1f0
+  data.tar.gz: 05a1eb6551c2c671ca4e1ff01ce6acd91f3954fd7eeb8b70238bb48df45c1365
 SHA512:
-  metadata.gz: 84b534524792c4218449a7724e1673d09058afb2b2c838001e2092e144d8caaeadf51ea5cf415d52a6f5b1ca284ac3977785871344e317d0c61a0414b715d2d8
-  data.tar.gz: 211409b7ade1b5cace67a86ea71a3fe952398a03165a099a201760ad47e3a01a2da99e7ecd359bc80f63d988396b63afc7a42141899f7ef316ac1dd0aa2c1e5a
+  metadata.gz: 28b1e39e69330c1d4f4f68884fb84a8ba8dcc5411315a4b37e51391a4f32b1495fbb2f90eeaa78fea283e1c1ed06f0d030f35c9642de578e4e2665d76546a8ed
+  data.tar.gz: '0218e2f44f0a27dc1d5ca720493be401f2e9e55276b4de733ca37f716e9b92cc1c963a0c716c34f219fe3efc6704e21df570564f356394253bc790ecc7c9644f'

data/.simplecov

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# vim:set syntax=ruby:
+
+SimpleCov.start do
+  add_filter "/spec/"
+end

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.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)
+
+**Implemented enhancements:**
+
+- Add support for &anchor / \*alias [\#17](https://github.com/smortex/yaml-sort/pull/17) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix relocation of comments following UNINDENT [\#18](https://github.com/smortex/yaml-sort/pull/18) ([smortex](https://github.com/smortex))
+
+**Merged pull requests:**
+
+- Add CodeClimate integration [\#15](https://github.com/smortex/yaml-sort/pull/15) ([smortex](https://github.com/smortex))
+
 ## [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.1.0...v2.1.1)

data/Gemfile

@@ -12,3 +12,4 @@ gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
 gem "rubocop-rake"
 gem "rubocop-rspec"
+gem "simplecov"

data/README.md

@@ -1,5 +1,9 @@
 # yaml-sort
 
+[![CI](https://github.com/smortex/yaml-sort/actions/workflows/ci.yaml/badge.svg)](https://github.com/smortex/yaml-sort/actions/workflows/ci.yaml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/4df28a3babe44d1a83c0/maintainability)](https://codeclimate.com/github/smortex/yaml-sort/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/4df28a3babe44d1a83c0/test_coverage)](https://codeclimate.com/github/smortex/yaml-sort/test_coverage)
+
 An utility to manage YAML files and ensure their lines is in a predictable order.
 
 This is mainly indended to manage [Hiera files](https://puppet.com/docs/puppet/7/hiera_intro.html) for [Puppet](https://puppet.com/) and translation files in [Ruby on Rails](https://rubyonrails.org/) applications.

data/Rakefile

@@ -13,7 +13,7 @@ require "cucumber/rake/task"
 
 Cucumber::Rake::Task.new
 
-task default: %i[rubocop spec cucumber]
+task default: %i[spec cucumber]
 
 file "lib/yaml/sort/parser.rb": ["lib/yaml/sort/parser.ra"] do
   sh "racc --output-status --output-file=lib/yaml/sort/parser.rb lib/yaml/sort/parser.ra"

data/lib/yaml/sort/alias.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Yaml
+  module Sort
+    class Alias < Value
+      attr_reader :name
+
+      def initialize(anchors, name)
+        super()
+        @anchors = anchors
+        @name = name[:value]
+      end
+
+      def value?
+        @anchors[@name]
+      end
+
+      def delete_value
+        @anchors.delete(@name)
+      end
+
+      def to_s(*)
+        if (s = @anchors.delete(@name))
+          separator = case s
+                      when List, Dictionary then "\n"
+                      else " "
+                      end
+          "&#{name}#{separator}#{s}"
+        else
+          "*#{name}"
+        end
+      end
+
+      def <=>(_other)
+        0
+      end
+    end
+  end
+end

data/lib/yaml/sort/dictionary.rb

@@ -25,10 +25,9 @@ module Yaml
         super + items.map do |k, v|
           n += 1
           case v
-          when List, Dictionary
-            "#{k.to_s(skip_first_indent: skip_first_indent && n.zero?)}\n#{v}"
-          when Scalar
-            "#{k.to_s(skip_first_indent: skip_first_indent && n.zero?)} #{v}"
+          when List, Dictionary then "#{k.to_s(skip_first_indent: skip_first_indent && n.zero?)}\n#{v}"
+          when Scalar, Alias    then "#{k.to_s(skip_first_indent: skip_first_indent && n.zero?)} #{v}"
+          else raise "Unexpected type"
           end
         end.join("\n")
       end

data/lib/yaml/sort/parser.rb

@@ -111,7 +111,7 @@ def scan(text)
   @tokens.each do |token|
     if token[0] == :COMMENT
       comment << token[1][:value] + "\n"
-    elsif comment.any?
+    elsif comment.any? && token[0] != :UNINDENT
       token[1][:comment] = comment
       comment = []
     end

data/lib/yaml/sort/version.rb

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

data/lib/yaml/sort.rb

@@ -2,6 +2,7 @@
 
 require_relative "sort/parser"
 require_relative "sort/value"
+require_relative "sort/alias"
 require_relative "sort/dictionary"
 require_relative "sort/item"
 require_relative "sort/list"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Romain Tartière
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -84,6 +85,7 @@ files:
 - Rakefile
 - exe/yaml-sort
 - lib/yaml/sort.rb
+- lib/yaml/sort/alias.rb
 - lib/yaml/sort/cli.rb
 - lib/yaml/sort/dictionary.rb
 - lib/yaml/sort/item.rb
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Sort lines in YAML files in a predictable order