reissue 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d162c9fe97d9ebd55f3ead6651db035f574ba3fedbd5108dc8b73207f14d2f
-  data.tar.gz: 4cd9b74c2be2f24bf00cea642f454666f0cad712cbcd53107678a3302cae3f71
+  metadata.gz: b29a6f2ef60fb2fcd7c8a87473a6331b7761c6396f1274128821540f562ec06c
+  data.tar.gz: fd813df98ea7a642b4b65895db0155a5ba34100f65358fbd0fb65863fcb992d4
 SHA512:
-  metadata.gz: c73d252f2528d09a79b298853bce7d27c82e786f50e85f3ed77bd13945d7ceeb072d47417f26ea09108bcf1ce55e3f64f9eb09620d7dc098eea44d83053eaa0c
-  data.tar.gz: 4df58b81ac4bfaea5c713be2305553b3e754bff512990f2db35cdb08cc3481f284e9a6c77b738378860b424c59fa6fd9209df4436e1e460c8521a425f70d02e9
+  metadata.gz: ed99a9041e9ab54640c75d5eb5ff6dc86688a120069d8b5d9c866f0299c15c883bc4e7aecb7cd511c43e44dc4667d4f029e7cbab794ad84a4d45b9c43a7b8da7
+  data.tar.gz: f693b77d20a53cd92619efc3d3c984d93788b98caaac3d88a853bed175b8c7f589f8d4837196769dd8f9f6f7650a5c23dab1a956140c4bf774f5001df6b953d1

data/CHANGELOG.md

@@ -5,18 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.1.6] - 2024-06-10
+## [0.2.0] - 2024-07-02
 
 ### Added
 
-- The ability to specify the version_redo_proc to customize the version number update process.
+- Reissue::Markdown class to implement the Reissue::Parser.parse behavior
+
+### Removed
+
+- Reissue::Parser implementation
 
 ### Fixed
 
-- Incorrect testing of Reissue.reformat
+- Handle multiline changes
+
+## [0.1.8] - Unreleased
+
+### Changed
+
+- Update the README.md to specify the default values for some configuration.
 
-## [0.1.5] - 2024-06-09
+## [0.1.7] - 2024-06-10
 
 ### Fixed
 
-- Fixed incorrect handling of missing empty last line
+- Pass the version_redo_proc to the Reissue.call in the reissue task.

data/README.md

@@ -89,15 +89,15 @@ Reissue::Task.create :your_name_and_namespace do |task|
   # Required: The file to update with the new version number.
   task.version_file = "path/to/version.rb"
 
-  # Optional: The number of versions to maintain in the changelog.
+  # Optional: The number of versions to maintain in the changelog. Defaults to 2.
   task.version_limit = 5
 
   # Optional: A Proc to format the version number. Receives a Gem::Version object, and segment.
-  task.format_version = ->(version, segment) do
+  task.version_redo_proc = ->(version, segment) do
     # your special versioning logic
   end
 
-  # Optional: The file to update with the new version number.
+  # Optional: The file to update with the new version number. Defaults to "CHANGELOG.md".
   task.changelog_file = "path/to/CHANGELOG.md"
 
   # Optional: Whether to commit the changes automatically. Defaults to true.

data/lib/reissue/markdown.rb

@@ -0,0 +1,115 @@
+module Reissue
+  class Markdown
+    def self.parse(changelog)
+      new(changelog).to_h
+    end
+
+    def initialize(changelog)
+      @changelog = changelog
+      @versions = {}
+      @header = nil
+      @parts = []
+    end
+
+    def parse
+      return unless @header.nil? && @versions.empty?
+
+      header, *chunks = @changelog.split(/^## /)
+
+      @header = Header.new(header)
+      @versions = Array(chunks).map { |part| Version.new(part) }
+    end
+
+    def to_h
+      parse
+      @header.to_h.merge("versions" => @versions.map(&:to_h))
+    end
+
+    class Header
+      def initialize(chunk)
+        @chunk = chunk.to_s
+        @title = nil
+        @preamble = nil
+      end
+
+      def parse
+        return unless @title.nil? && @preamble.nil?
+
+        scanner = StringScanner.new(@chunk.dup << "\n")
+        scanner.scan(/# ([\w\s]+)$/)
+        @title = scanner[1].to_s.strip
+        # the rest of the text is the preamble
+        @preamble = scanner.rest.strip
+      end
+
+      def to_h
+        parse
+        {
+          "title" => @title,
+          "preamble" => @preamble
+        }
+      end
+    end
+
+    class Version
+      def initialize(chunk)
+        @chunk = chunk
+        @version = nil
+        @date = nil
+        @changes = []
+      end
+
+      def parse
+        return unless @version.nil? && @date.nil? && @changes.empty?
+        # the first line contains the version and date
+        scanner = StringScanner.new(@chunk) << "\n"
+        scanner.scan(/\[?(.[^\]]+)\]? - (.+)$/)
+        @version = scanner[1].to_s.strip
+        @date = scanner[2].to_s.strip || "Unreleased"
+
+        # the rest of the text is the changes
+        @changes = scanner.rest.strip.split("### ").reject(&:empty?).map { |change| Change.new(change) }
+      end
+
+      def to_h
+        parse
+        {
+          "version" => @version,
+          "date" => @date,
+          "changes" => @changes.inject({}) { |h, change| h.merge(change.to_h) }
+        }
+      end
+    end
+
+    class Change
+      def initialize(chunk)
+        @chunk = chunk
+        @type = nil
+        @changes = []
+      end
+
+      def parse
+        return unless @type.nil? && @changes.empty?
+        scanner = StringScanner.new(@chunk) << "\n"
+        scanner.scan(/([\w\s]+)$/)
+
+        @type = scanner[1].to_s.strip
+
+        # the rest of the text are the changes
+        @changes = scanner
+          .rest
+          .strip
+          .split(/^-/m)
+          .map { |change| change.strip.gsub(/^- /m, "") }
+          .reject(&:empty?)
+      end
+
+      def to_h
+        parse
+        {
+          @type => @changes.map { |change| change.split("\n").map(&:strip).join("\n  ") }
+        }
+      end
+    end
+  end
+end

data/lib/reissue/parser.rb

@@ -1,4 +1,5 @@
 require "strscan"
+require_relative "markdown"
 
 module Reissue
   class Parser
@@ -8,94 +9,10 @@ module Reissue
 
     def initialize(changelog)
       @changelog = changelog
-      @versions = {}
-      @parts = []
     end
 
     def parse
-      scanner = StringScanner.new(@changelog) << "\n"
-      @parts << parse_title(scanner)
-      @parts << parse_preamble(scanner)
-      @parts << parse_versions(scanner)
-      @parts.compact.reduce(&:merge)
-    end
-
-    VERSION_BREAK = "## "
-    CHANGE_BREAK = "### "
-    VERSION_MATCH = /^#{VERSION_BREAK}/
-    VERSION_OR_CHANGE_MATCH = Regexp.union(CHANGE_BREAK, VERSION_BREAK)
-    VERSION_OR_CHANGE_OR_NEWLINE_MATCH = Regexp.union(/\n/, CHANGE_BREAK, VERSION_BREAK)
-
-    private
-
-    def parse_title(scanner)
-      scanner.scan(/# ([\w\s]+)$/)
-      title = scanner[1].to_s.strip
-      {"title" => title}
-    end
-
-    def parse_preamble(scanner)
-      preamble = scanner.scan_until(VERSION_MATCH)
-      preamble = preamble.to_s.gsub(VERSION_BREAK, "").strip
-      scanner.unscan unless preamble.empty?
-      {"preamble" => preamble.strip}
-    end
-
-    def parse_versions(scanner)
-      until scanner.eos?
-        scanner.skip(/\s+/)
-        next_line = scanner.scan_until(VERSION_OR_CHANGE_OR_NEWLINE_MATCH)
-        break if next_line.nil? || next_line.strip.empty?
-        unless next_line.match?(VERSION_OR_CHANGE_MATCH)
-          parse_versions(scanner)
-        end
-        if next_line.match?(VERSION_MATCH)
-          scanner.scan_until(/(.+)\n/)
-          version, date = scanner[1].split(" - ")
-          date ||= "Unreleased"
-          version = version.gsub(VERSION_BREAK, "").strip.tr("[]", "")
-          changes = parse_changes(scanner)
-          @versions[version] = {"version" => version, "date" => date, "changes" => changes}
-          parse_versions(scanner)
-        end
-      end
-      {"versions" => @versions.values}
-    end
-
-    def parse_changes(scanner, changes: {})
-      return changes if scanner.eos?
-      scanner.skip(/\s+/)
-
-      next_line = scanner.scan_until(/\n/)
-      if next_line.nil? || next_line.strip.empty?
-        return changes
-      elsif next_line.match?(VERSION_MATCH)
-        scanner.unscan
-        return changes
-      end
-
-      if next_line.match?(CHANGE_BREAK)
-        change_type = next_line.gsub(CHANGE_BREAK, "").strip
-        changes[change_type] = parse_change_list(scanner)
-      end
-      parse_changes(scanner, changes: changes)
-    end
-
-    def parse_change_list(scanner, collection: [])
-      return collection if scanner.eos?
-      scanner.skip(/\s+/)
-      change = scanner.scan_until(/\n/)
-      if change.nil? || change.strip.empty?
-        return collection
-      elsif change.match?(VERSION_OR_CHANGE_MATCH)
-        scanner.unscan
-        return collection
-      else
-        item = change.sub(/^\s?-\s?/, "").strip
-        collection << item
-        parse_change_list(scanner, collection:)
-      end
-      collection.reject(&:empty?).compact
+      Markdown.parse(@changelog).to_h
     end
   end
 end

data/lib/reissue/printer.rb

@@ -25,8 +25,8 @@ module Reissue
           {}
         end
         version_string = "## [#{version}] - #{date}"
-        changes_string = changes.map do |section, changes|
-          format_section(section, changes)
+        changes_string = changes.map do |section, section_changes|
+          format_section(section, section_changes)
         end.join("\n\n")
         [version_string, changes_string].filter_map { |str| str unless str.empty? }.join("\n\n")
       end.then do |data|

data/lib/reissue/rake.rb

@@ -49,13 +49,14 @@ module Reissue
       @commit = true
       @commit_finalize = true
       @version_limit = 2
+      @version_redo_proc = nil
     end
 
     def define
       desc description
       task name, [:segment] do |task, args|
         segment = args[:segment] || "patch"
-        new_version = Reissue.call(segment:, version_file:, version_limit:)
+        new_version = Reissue.call(segment:, version_file:, version_limit:, version_redo_proc:)
         if defined?(Bundler)
           Bundler.with_unbundled_env do
             system("bundle install")

data/lib/reissue/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Reissue
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reissue
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Jim Gay
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,7 @@ files:
 - lib/reissue.rb
 - lib/reissue/changelog_updater.rb
 - lib/reissue/gem.rb
+- lib/reissue/markdown.rb
 - lib/reissue/parser.rb
 - lib/reissue/printer.rb
 - lib/reissue/rake.rb