yaml-sort 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8eee6a8ad9b5761ffc9e9ef08f6025c66e3c661acfef15f197b3d28f67e3253
-  data.tar.gz: 108d4ea68106e308eafbe6bce7cd372556ebde65010ade2b1b742e82f43f29d5
+  metadata.gz: 125cdbf70a136c2968ab9c18f99cbfaa62e3f4117a577187a37f43298910a7c9
+  data.tar.gz: 58ed8f15a8cd027871e17dbc8ccd8293fd1be1e3242e2b12012ea1efc9f50c87
 SHA512:
-  metadata.gz: 234b85bdf4dd61f2bfa5a8568c59979ad12c374af47daed35d0a7248b0e1b8f96aed17bc77ba17ca2d8a7233d55803c9d6c5a4fcfa962394d6183ff61a3e9e21
-  data.tar.gz: 525ca02351c0f79d86a6e367341b4c8750b294400ffd96a7d4ad00dfced59de0e16060b29a5ceb0b0dcb40d95db9f8d1f1b8fcaabbfb1dfb6c3a58fa470ad27d
+  metadata.gz: 3e2580f860075dd74a69c5e5a31097d906cbba4c9293a8f3181ee6fbf72cc931ca371cbf3b5258ed5ac93d356d2ed82f2805477f039799ea4cd293a39458a236
+  data.tar.gz: 00d35a112f355e53e0fca7d3bc63349dc6c1da2b87fc8195af480754b1e81f31049da97282679eef282d412c42d2ec7788689879c915a6697860408d01f9f5cd

data/CHANGELOG.md

@@ -3,9 +3,17 @@ 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).
 
-## [2.0.1](https://github.com/smortex/yaml-sort/tree/2.0.1) (2022-06-01)
+## [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/v2.0.0...2.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:**
 

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
@@ -88,23 +87,23 @@ def scan(text)
       when s.match?(/./)
         scan_value = true
       else
-				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
+        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
 
   unindent
 

data/lib/yaml/sort/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sort
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Romain Tartière
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri