captive-release 0.16.1 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2523bc6af5687a507068ff5e95f50bf46e686ac639af47888c540ef5d9f17c
-  data.tar.gz: b61f763485c298ff7eca5254367fb7da0cf14cd74eba6d78b762fa3a247e3b3a
+  metadata.gz: ee8c3f00a3a506e332e7db04b0566dacb21c9865b38ac76ca08ef591049ec540
+  data.tar.gz: 240e9128f724f932cdb96b05586abd09e87b1776b5ef2fd27a9e4232c4f492b3
 SHA512:
-  metadata.gz: cf83f1cac7aee5c449d2288920913781273f6016d896887091c27e1ab2c5ff83a9c838c891efb9d363d4d7e2386aacf73bdc4edaff55e1931afb26339ca7b2b2
-  data.tar.gz: f3e2c84758f1860a04bdd696ea8c7a792769b85b4745e01c36aa32b388cafa52b1b2b9cfee577b3050b15e09991f179f1a69b44347f412d09f503cd9eb2ee0ac
+  metadata.gz: c7f8edef4ccb729148debbfa08eb87709b0091c04cc814185878f5e882db1036b08164cbdbf64b5bc99fe6ab318a3272d3ae2e280bd9a62a49adda4caa8a2d17
+  data.tar.gz: bdc89f8df5c2ccac587bac93ca0cbb372597e7b114d29735e4cd93928f38a3f96a2386d4b2f298551b682d5631d5249ceaed5dfb263e751b4e7d3ac3775ea344

data/lib/captive_release/default_branch_guard.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Alerte quand la release part d'une autre branche que la principale : le tag désignerait
+  # un commit que la branche principale ne contient pas.
+  #
+  # Cette unité change quand la politique de branche change, ReleasePreconditions quand les
+  # conditions bloquantes changent.
+  class DefaultBranchGuard
+    def initialize(terminal:)
+      @terminal = terminal
+    end
+
+    def verifier!
+      courante = GitCommands.current_branch
+      principale = GitCommands.default_branch
+      return if courante == principale
+
+      @terminal.say Messages.t(:not_on_default_branch, branch: courante, default: principale)
+      exit 1 unless Messages.yes?(@terminal.ask(Messages.t(:continue_anyway)))
+    end
+  end
+end

data/lib/captive_release/git_commands.rb

@@ -21,6 +21,13 @@ module CaptiveRelease
       Shell.capture_lines("git log --pretty=%s #{Shell.escape(tag)}..HEAD")
     end
 
+    def self.repository? = Shell.run?("git rev-parse --is-inside-work-tree >/dev/null 2>&1")
+
+    # La branche par défaut du remote ; sans origin/HEAD connu, main par convention.
+    def self.default_branch
+      Shell.capture("git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null")[%r{\Aorigin/(.+)}, 1] || "main"
+    end
+
     def self.current_branch
       branche = Shell.capture("git rev-parse --abbrev-ref HEAD 2>/dev/null")
       branche.empty? ? "main" : branche

data/lib/captive_release/locales/en.yml

@@ -79,6 +79,8 @@ en:
     workflow_not_found: |-
       Workflow %{workflow} not found on %{repo}.
       Add .github/workflows/%{workflow} to the default branch, or fix build_workflow in the configuration.
+    not_a_git_repository: Not a git repository. Run captive-release from inside a repository.
+    not_on_default_branch: "⚠️  You are on branch %{branch}, not on the default branch %{default}."
     dirty_tree: The working tree is not clean.
     dirty_tree_hint: Commit or stash your changes before releasing.
     current_version: 'Current version: %{version}'

data/lib/captive_release/locales/fr.yml

@@ -79,6 +79,8 @@ fr:
     workflow_not_found: |-
       Workflow %{workflow} introuvable sur %{repo}.
       Ajoutez .github/workflows/%{workflow} sur la branche par défaut, ou corrigez build_workflow dans la configuration.
+    not_a_git_repository: Pas de dépôt git ici. Lancez captive-release depuis un dépôt.
+    not_on_default_branch: "⚠️  Vous êtes sur la branche %{branch}, pas sur la branche principale %{default}."
     dirty_tree: L'arbre de travail n'est pas propre.
     dirty_tree_hint: Commitez ou remisez vos modifications avant de releaser.
     current_version: 'Version actuelle : %{version}'

data/lib/captive_release/release_command.rb

@@ -13,14 +13,8 @@ module CaptiveRelease
     end
 
     def run(bump_arg, confirmation:)
-      ReleasePreconditions.new(terminal: @terminal).verifier!
-      courante = @config.current_version
-      suggestion = ReleaseOverview.new(terminal: @terminal).call(courante)
-
-      prochaine = VersionChoice.new(terminal: @terminal).call(courante, bump_arg)
-      PrereleaseGuard.new(terminal: @terminal).verifier!(prochaine, @config.version_files)
-      ReleaseConfirmation.new(terminal: @terminal).verifier!(suggestion, courante, prochaine) if confirmation
-
+      prochaine = ReleaseVersionDecision.new(terminal: @terminal, version_files: @config.version_files)
+                                        .call(@config.current_version, bump_arg, confirmation: confirmation)
       VersionFilesWriting.new(terminal: @terminal).call(prochaine, @config.version_files)
       GitRelease.new(terminal: @terminal, token_provider: @token_provider).call(prochaine, chemins_a_commiter)
       publication.call(prochaine)

data/lib/captive_release/release_preconditions.rb

@@ -14,11 +14,21 @@ module CaptiveRelease
     end
 
     def verifier!
+      verifier_depot!
       return unless GitCommands.dirty?
 
       @terminal.say @terminal.error(Messages.t(:dirty_tree))
       @terminal.say "#{Messages.t(:dirty_tree_hint)}\n"
       exit 1
     end
+
+    private
+
+    def verifier_depot!
+      return if GitCommands.repository?
+
+      @terminal.say @terminal.error(Messages.t(:not_a_git_repository))
+      exit 1
+    end
   end
 end

data/lib/captive_release/release_version_decision.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Décider vers quelle version on part : préconditions, choix, garde-fous, confirmation.
+  #
+  # Cette unité change quand la manière de choisir ou de valider la version change,
+  # ReleaseCommand quand les étapes qui appliquent cette version changent.
+  class ReleaseVersionDecision
+    def initialize(terminal:, version_files:)
+      @terminal      = terminal
+      @version_files = version_files
+    end
+
+    def call(courante, bump_arg, confirmation:)
+      ReleasePreconditions.new(terminal: @terminal).verifier!
+      DefaultBranchGuard.new(terminal: @terminal).verifier! if confirmation
+      suggestion = ReleaseOverview.new(terminal: @terminal).call(courante)
+      prochaine = VersionChoice.new(terminal: @terminal).call(courante, bump_arg)
+      PrereleaseGuard.new(terminal: @terminal).verifier!(prochaine, @version_files)
+      ReleaseConfirmation.new(terminal: @terminal).verifier!(suggestion, courante, prochaine) if confirmation
+      prochaine
+    end
+  end
+end

data/lib/captive_release/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CaptiveRelease
-  VERSION = "0.16.1"
+  VERSION = "0.16.4"
 end

data/lib/captive_release.rb

@@ -24,6 +24,7 @@ require_relative "captive_release/bump_suggestion"
 require_relative "captive_release/version_severity"
 require_relative "captive_release/bump_safety_net"
 require_relative "captive_release/prerelease_guard"
+require_relative "captive_release/default_branch_guard"
 require_relative "captive_release/github_repo"
 require_relative "captive_release/github_http"
 require_relative "captive_release/github_api"
@@ -56,6 +57,7 @@ require_relative "captive_release/version_files_writing"
 require_relative "captive_release/release_preconditions"
 require_relative "captive_release/release_overview"
 require_relative "captive_release/release_confirmation"
+require_relative "captive_release/release_version_decision"
 require_relative "captive_release/release_command"
 require_relative "captive_release/update_check"
 require_relative "captive_release/help"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-release
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.4
 platform: ruby
 authors:
 - Captive Studio
@@ -35,6 +35,7 @@ files:
 - lib/captive_release/config_file.rb
 - lib/captive_release/config_loader.rb
 - lib/captive_release/config_writer.rb
+- lib/captive_release/default_branch_guard.rb
 - lib/captive_release/direct_commits.rb
 - lib/captive_release/exclusion_input.rb
 - lib/captive_release/framework_detector.rb
@@ -69,6 +70,7 @@ files:
 - lib/captive_release/release_preconditions.rb
 - lib/captive_release/release_publication.rb
 - lib/captive_release/release_pull_request.rb
+- lib/captive_release/release_version_decision.rb
 - lib/captive_release/repo_files.rb
 - lib/captive_release/ruby_gems_version.rb
 - lib/captive_release/semver.rb