captive-release 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e9173ce70fddbcdb2396933256c39ff04a92bf10d6c8700ef60973719e4219
-  data.tar.gz: c9d2f0905a0064ddd920122c3772ee1f0486c246230f5d6eccb08b376a8220fc
+  metadata.gz: 738c0d7d62daeac44f226af30cd8302da632fee9594333d987506aaf693ad4df
+  data.tar.gz: c2ca4738b0ec50e08ed89bb266b802d23910c5475911e5974c93f1dbf31bd9ec
 SHA512:
-  metadata.gz: d4fd5159885998ca8f9cddc485ea63bc4b6091883d7e44bd03c2b2b16167e0778c6c4c5557480f956a7551f93ac5c0c98354c7b4d4c5c54c009cb4685d142798
-  data.tar.gz: fb9985934097f181c116a21b82f5ae8b27eec355f157e5ff462bf74baf9d45ee97c1bd18bfd4d581feedcde3b520822a2181e53e183db53e02830c8b8ec0b571
+  metadata.gz: 803d40e8e76c908d9a90603610e60419b55102cb06cb44c22834d62e60066d285f2ff3c9d96a51f7481febe32ba35330144c105363cf5cc7847c104944525919
+  data.tar.gz: 323f968489ed58d7dd12d58ae44249223a1c6ed3e5ec5bd4478c28730dbb204507f2aca0d1585c2f02c5ea4c48d2709cfa994079018831b3f0a8be5a0557cde3

data/lib/captive_release/arrow_select.rb

@@ -13,8 +13,7 @@ module CaptiveRelease
       @keys     = keys
     end
 
-    def call(libelles)
-      rang = 0
+    def call(libelles, rang = 0)
       loop do
         draw(libelles, rang)
         touche = @keys.read

data/lib/captive_release/build_config_prompt.rb

@@ -13,7 +13,7 @@ module CaptiveRelease
     def call(framework, workflow_par_defaut)
       titre = "\n#{@terminal.bold(Messages.t(:framework_detected, framework: framework))} " \
               "#{Messages.t(:configure_build)}"
-      return nil unless Menu.new(terminal: @terminal).choose(titre, Messages.t(:yes) => true, Messages.t(:no) => false)
+      return nil unless Menu.new(terminal: @terminal).choose(titre, { Messages.t(:yes) => true, Messages.t(:no) => false })
 
       BuildConfig.new(build_workflow: workflow(workflow_par_defaut))
     end

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/menu.rb

@@ -13,10 +13,11 @@ module CaptiveRelease
     end
 
     # entries : un Hash {libellé affiché => valeur rendue}, dans l'ordre d'affichage.
-    def choose(title, entries)
+    def choose(title, entries, default: 0)
       @terminal.say "#{title}\n"
       libelles = entries.keys
-      entries.values[@keys.interactive? ? ArrowSelect.new(terminal: @terminal, keys: @keys).call(libelles) : numbered(libelles)]
+      rang = @keys.interactive? ? ArrowSelect.new(terminal: @terminal, keys: @keys).call(libelles, default) : numbered(libelles)
+      entries.values[rang]
     end
 
     private

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, suggestion)
+      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.2"
+  VERSION = "0.17.0"
 end

data/lib/captive_release/version_choice.rb

@@ -14,8 +14,8 @@ module CaptiveRelease
       @terminal = terminal
     end
 
-    def call(current, bump_arg)
-      bump_arg ? resolve(current, bump_arg) : ask(current)
+    def call(current, bump_arg, suggestion = nil)
+      bump_arg ? resolve(current, bump_arg) : ask(current, suggestion)
     end
 
     private
@@ -26,8 +26,11 @@ module CaptiveRelease
       refuse(Messages.t(:invalid_bump_type, type: type))
     end
 
-    def ask(current)
-      choisi = Menu.new(terminal: @terminal).choose(Messages.t(:choose_release_type), candidates_for(current))
+    # Le curseur part sur le bump suggéré par les commits, s'il fait partie des candidats.
+    def ask(current, suggestion)
+      candidats = candidates_for(current)
+      defaut    = candidats.values.index { |version| version == VersionBumper.bump(current, suggestion) } if suggestion
+      choisi    = Menu.new(terminal: @terminal).choose(Messages.t(:choose_release_type), candidats, default: defaut || 0)
       choisi == CUSTOM ? type_it : choisi
     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.2
+  version: 0.17.0
 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