reissue 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4d0a53280207aedc9381894922ca1efb28e0acb20d5bd97bbcb7fe2cd6a7cc
-  data.tar.gz: d649658ae57c53e5d3e78c5096d9248ddf941f85c074e1e3543e0eeda12678d2
+  metadata.gz: b279a283d58ba13af326acf3eec52c805deffd80bfc0cd6e4e9a7d320cc9dd0f
+  data.tar.gz: 4394e68a43bb33c0068fcb9869dac6bfa4f1a27bdd890afe2e65d3cdd2fe1cd6
 SHA512:
-  metadata.gz: 9b7adacabff52f5c82e2a0f703d2f808174caf2af29fd244200ea9f0f9ff91887a31336d69ed0d8e37ff52084128fc01677e70d0fc5d3c12b738ada62f916ede
-  data.tar.gz: 330d439a724f349bc7b1f18ee1a47ca7fecf913749452d460894d5e659a8a7fcc80e13140f6b78d3c36d66ec7d28caa6110877e0cf742a191b6203676ee7bd67
+  metadata.gz: 7d1d3335bf01a5563b93cf3dd4ba030f2e851a5a5cbbbfd23d38e9fdcda21634fa4cd0fb6cfe3fd9ba0b56bf55f3ab744116d77b38dadbda98844676dccd9a88
+  data.tar.gz: 3ece0d9ecfe89e38c0dfef00304acaf1502760a7e9c3759f380d18b9698e2f1233e8cc2716d0c1184a00a11f5c7c457e4d386adf63dbabcd70ec0fb43f001eb4

data/CHANGELOG.md

@@ -5,26 +5,14 @@ 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.2.1] - 2024-07-29
+## [0.3.0] - 2024-09-06
 
 ### Added
 
-- Release notes and the checksum for the 0.2.0 version
+- Add `push_reissue` option to control pushing changes to the remote repository.
 
 ### Changed
 
-- Return the new version from the reissue task
+- Default behavior of _this_ gem's release is to push finalize without a branch.
 
-## [0.2.0] - 2024-07-02
-
-### Added
-
-- Reissue::Markdown class to implement the Reissue::Parser.parse behavior
-
-### Removed
-
-- Reissue::Parser implementation
-
-### Fixed
-
-- Handle multiline changes
+## [0.2.3] - Unreleased

data/README.md

@@ -52,6 +52,10 @@ This will add the following rake tasks:
   the latest version.
 - `rake reissue:reformat[version_limit]` - Reformat the CHANGELOG.md file and
   optionally limit the number of versions to maintain.
+- `rake reissue:branch[branch-name]` - Create a new branch for the next version.
+  Controlled by the `push_finalize` and `commit_finalize` options.
+- `rake reissue:push` - Push the changes to the remote repository. Controlled
+  by the `push_finalize` and `commit_finalize` options.
 
 This will also update the `build` task from rubygems to first run
 `reissue:finalize` and then build the gem, ensuring that your changelog is
@@ -105,6 +109,9 @@ Reissue::Task.create :your_name_and_namespace do |task|
 
   # Optional: Whether or not to commit the results of the finalize task. Defaults to true.
   task.commit_finalize = false
+
+  # Optional: Whether to push the changes automatically. Defaults to false.
+  task.push_finalize = :branch # or false, or true to push the working branch
 end
 ```
 

data/Rakefile

@@ -16,5 +16,5 @@ require_relative "lib/reissue/gem"
 
 Reissue::Task.create :reissue do |task|
   task.version_file = "lib/reissue/version.rb"
-  task.commit = true
+  task.push_finalize = true
 end

data/lib/reissue/printer.rb

@@ -28,7 +28,7 @@ module Reissue
         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")
+        [version_string, changes_string].reject { |str| str.empty? }.join("\n\n")
       end.then do |data|
         if data.empty?
           "## [0.0.0] - Unreleased"

data/lib/reissue/rake.rb

@@ -32,7 +32,11 @@ module Reissue
     attr_accessor :changelog_file
 
     # Additional paths to add to the commit.
-    attr_accessor :updated_paths
+    attr_writer :updated_paths
+
+    def updated_paths
+      Array(@updated_paths)
+    end
 
     # Whether to commit the changes. Default: true.
     attr_accessor :commit
@@ -40,6 +44,22 @@ module Reissue
     # Whether to commit the finalize change to the changelog. Default: true.
     attr_accessor :commit_finalize
 
+    # Whether to branch and push the changes. Default: :branch.
+    # Requires commit_finialize to be true.
+    #
+    # Set this to false to disable pushing.
+    # Set this to true to push to the current branch.
+    # Set this to :branch to push to a new branch.
+    attr_accessor :push_finalize
+
+    # Whether to push the changes when a new version is created. Default: :branch.
+    # Requires commit to be true.
+    #
+    # Set this to false to disable pushing.
+    # Set this to true to push to the current branch.
+    # Set this to :branch to push to a new branch.
+    attr_accessor :push_reissue
+
     def initialize(name = :reissue)
       @name = name
       @description = "Prepare the code for work on a new version."
@@ -48,8 +68,26 @@ module Reissue
       @changelog_file = "CHANGELOG.md"
       @commit = true
       @commit_finalize = true
+      @push_finalize = false
       @version_limit = 2
       @version_redo_proc = nil
+      @push_reissue = :branch
+    end
+
+    def finalize_with_branch?
+      push_finalize == :branch
+    end
+
+    def push_finalize?
+      !!push_finalize
+    end
+
+    def reissue_version_with_branch?
+      push_reissue == :branch
+    end
+
+    def push_reissue?
+      !!push_reissue
     end
 
     def define
@@ -70,7 +108,11 @@ module Reissue
 
         bump_message = "Bump version to #{new_version}"
         if commit
+          if reissue_version_with_branch?
+            Rake::Task["#{name}:branch"].invoke("reissue/#{new_version}")
+          end
           system("git commit -m '#{bump_message}'")
+          Rake::Task["#{name}:push"].invoke if push_reissue?
         else
           system("echo '#{bump_message}'")
         end
@@ -94,12 +136,25 @@ module Reissue
         version, date = Reissue.finalize(date, changelog_file:)
         finalize_message = "Finalize the changelog for version #{version} on #{date}"
         if commit_finalize
+          Rake::Task["#{name}:branch"].invoke("reissue/#{version}") if finalize_with_branch?
           system("git add -u")
           system("git commit -m '#{finalize_message}'")
+          Rake::Task["#{name}:push"].invoke if push_finalize?
         else
           system("echo '#{finalize_message}'")
         end
       end
+
+      desc "Create a new branch for the next version."
+      task "#{name}:branch", [:branch] do |task, args|
+        raise "No branch name specified" unless args[:branch]
+        system("git checkout -b #{args[:branch]}")
+      end
+
+      desc "Push the current branch to the remote repository."
+      task "#{name}:push" do
+        system("git push origin HEAD")
+      end
     end
   end
 end

data/lib/reissue/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reissue
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jim Gay
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake