yaml-sort 1.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232d936095f9aac0e3f4098fa2cc4f1d608ddc79be9cb4e757fb476fa75999e3
-  data.tar.gz: be5949810ea40472c5d80e7f23d96886e964847b26d9526f67b337a77acfe490
+  metadata.gz: 125cdbf70a136c2968ab9c18f99cbfaa62e3f4117a577187a37f43298910a7c9
+  data.tar.gz: 58ed8f15a8cd027871e17dbc8ccd8293fd1be1e3242e2b12012ea1efc9f50c87
 SHA512:
-  metadata.gz: e90a5d3ff86076d86b0629ec1a387aa179588f678d17c5f60fcae2d01ffda38eb28f308d5d3d7df1a29d6b1a194701caab02409d26d364f8c2c8fb7403ca2a0a
-  data.tar.gz: e2fb3054b83242a9fad8c596c6f79ecfce1f66169234c7e1bc8a179214bd41288e08eb608981b08d2312dff721e3bfa18aadaa429dded7bae1eeb702dc06bdd3
+  metadata.gz: 3e2580f860075dd74a69c5e5a31097d906cbba4c9293a8f3181ee6fbf72cc931ca371cbf3b5258ed5ac93d356d2ed82f2805477f039799ea4cd293a39458a236
+  data.tar.gz: 00d35a112f355e53e0fca7d3bc63349dc6c1da2b87fc8195af480754b1e81f31049da97282679eef282d412c42d2ec7788689879c915a6697860408d01f9f5cd

data/CHANGELOG.md

@@ -3,9 +3,33 @@ 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).
 
-## [1.0.1](https://github.com/smortex/yaml-sort/tree/1.0.1) (2022-04-24)
+## [2.0.2](https://github.com/smortex/yaml-sort/tree/2.0.2) (2022-06-10)
 
-[Full Changelog](https://github.com/smortex/yaml-sort/compare/v1.0.0...1.0.1)
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v2.0.1...2.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:**
+
+- Fix parsing of keys with spaces [\#8](https://github.com/smortex/yaml-sort/pull/8) ([smortex](https://github.com/smortex))
+
+## [v2.0.0](https://github.com/smortex/yaml-sort/tree/v2.0.0) (2022-04-25)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v1.0.1...v2.0.0)
+
+**Merged pull requests:**
+
+- Rework list sorting [\#7](https://github.com/smortex/yaml-sort/pull/7) ([smortex](https://github.com/smortex))
+
+## [v1.0.1](https://github.com/smortex/yaml-sort/tree/v1.0.1) (2022-04-24)
+
+[Full Changelog](https://github.com/smortex/yaml-sort/compare/v1.0.0...v1.0.1)
 
 **Fixed bugs:**
 

data/lib/yaml/sort/dictionary.rb

@@ -20,13 +20,15 @@ module Yaml
         dict
       end
 
-      def to_s
+      def to_s(skip_first_indent: false)
+        n = -1
         super + items.map do |k, v|
+          n += 1
           case v
           when List, Dictionary
-            "#{k}\n#{v}"
+            "#{k.to_s(skip_first_indent: skip_first_indent && n.zero?)}\n#{v}"
           when Scalar
-            "#{k} #{v}"
+            "#{k.to_s(skip_first_indent: skip_first_indent && n.zero?)} #{v}"
           end
         end.join("\n")
       end

data/lib/yaml/sort/item.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "scalar"
+
+module Yaml
+  module Sort
+    class Item < Scalar
+      def to_s(*)
+        comments + value
+      end
+    end
+  end
+end

data/lib/yaml/sort/list.rb

@@ -22,15 +22,13 @@ module Yaml
 
       def to_s
         super + items.map do |item|
-          "#{item[0]}#{item[1]}"
+          "#{item[0]}#{item[1].to_s(skip_first_indent: true)}"
         end.join("\n")
       end
 
       def sort
-        List.new(items.sort { |a, b| a[1] <=> b[1] })
-      rescue ArgumentError
-        # Non-comparable items
-        self
+        # TODO: Add an option to sort scalar values
+        List.new(items.map { |i| [i[0], i[1].sort] })
       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
@@ -78,17 +77,30 @@ 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:]]*)([^[[:space:]]\n]+):(?=[ \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)
+        emit(:KEY, s.matched, indent: indent, value: s.captures[1])
 
       when s.scan(/\n\z/)
         # Done
       when s.match?(/./)
         scan_value = true
       else
-        raise "LoST: #{s.rest.inspect} #{s.eos?}"
+        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
@@ -110,16 +122,16 @@ def scan(text)
   @tokens
 end
 
-def emit(token, value, length: nil, indent: nil)
+def emit(token, match, length: nil, indent: nil, value: nil)
   indent.gsub!("-", " ") if indent
   if token && length.nil?
-    raise "length must be explicitly passed when value is not a String (#{value.class.name})" unless value.is_a?(String)
-    length = value.length
+    raise "length must be explicitly passed when match is not a String (#{match.class.name})" unless match.is_a?(String)
+    length = match.length
   end
 
-  if value.start_with?("\n")
+  if match.start_with?("\n")
     @lineno += 1
-    value = value[1..-1]
+    match = match[1..-1]
     length -= 1
     @position = 0
   end
@@ -130,7 +142,7 @@ def emit(token, value, length: nil, indent: nil)
   end
 
   exvalue = {
-    value: value,
+    value: value || match,
     lineno: @lineno,
     position: @position,
     length: length,
@@ -138,7 +150,7 @@ def emit(token, value, length: nil, indent: nil)
   }
   @tokens << [token, exvalue]
 
-  @lineno += value.count("\n")
+  @lineno += match.count("\n")
 
   @position += length
 end
@@ -351,7 +363,7 @@ module_eval(<<'.,.,', 'parser.ra', 22)
 
 module_eval(<<'.,.,', 'parser.ra', 24)
   def _reduce_11(val, _values, result)
-     result = [Scalar.new(val[0]), val[1]]
+     result = [Item.new(val[0]), val[1]]
     result
   end
 .,.,

data/lib/yaml/sort/scalar.rb

@@ -3,12 +3,13 @@
 module Yaml
   module Sort
     class Scalar < Value
-      attr_reader :value
+      attr_reader :value, :indent
 
       def initialize(value)
         super()
         @comment = value[:comment] || []
         @value = value[:value]
+        @indent = value[:indent] || ""
       end
 
       def <=>(other)
@@ -19,8 +20,12 @@ module Yaml
         end
       end
 
-      def to_s
-        super + value
+      def to_s(skip_first_indent: false)
+        if skip_first_indent
+          super + value
+        else
+          super + indent + value
+        end
       end
     end
   end

data/lib/yaml/sort/value.rb

@@ -7,7 +7,11 @@ module Yaml
         @comment = []
       end
 
-      def to_s
+      def to_s(*)
+        comments
+      end
+
+      def comments
         @comment.join
       end
 

data/lib/yaml/sort/version.rb

@@ -2,6 +2,6 @@
 
 module Yaml
   module Sort
-    VERSION = "1.0.1"
+    VERSION = "2.0.2"
   end
 end

data/lib/yaml/sort.rb

@@ -3,6 +3,7 @@
 require_relative "sort/parser"
 require_relative "sort/value"
 require_relative "sort/dictionary"
+require_relative "sort/item"
 require_relative "sort/list"
 require_relative "sort/scalar"
 require_relative "sort/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Romain Tartière
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2022-06-10 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:
@@ -86,6 +86,7 @@ files:
 - lib/yaml/sort.rb
 - lib/yaml/sort/cli.rb
 - lib/yaml/sort/dictionary.rb
+- lib/yaml/sort/item.rb
 - lib/yaml/sort/list.rb
 - lib/yaml/sort/parser.rb
 - lib/yaml/sort/scalar.rb
@@ -103,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
@@ -118,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
-signing_key:
+rubygems_version: 3.2.5
+signing_key: 
 specification_version: 4
 summary: Sort lines in YAML files in a predictable order
 test_files: []