captive-release 0.16.4 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8c3f00a3a506e332e7db04b0566dacb21c9865b38ac76ca08ef591049ec540
-  data.tar.gz: 240e9128f724f932cdb96b05586abd09e87b1776b5ef2fd27a9e4232c4f492b3
+  metadata.gz: 2df99fcc517bafca108d34683c4329c57e7f6b535334799ca26e9413d12d2cba
+  data.tar.gz: d5356a1e70961d23c213b08f1d5e89daa45942d0743e936deaa39cf4cf9757c6
 SHA512:
-  metadata.gz: c7f8edef4ccb729148debbfa08eb87709b0091c04cc814185878f5e882db1036b08164cbdbf64b5bc99fe6ab318a3272d3ae2e280bd9a62a49adda4caa8a2d17
-  data.tar.gz: bdc89f8df5c2ccac587bac93ca0cbb372597e7b114d29735e4cd93928f38a3f96a2386d4b2f298551b682d5631d5249ceaed5dfb263e751b4e7d3ac3775ea344
+  metadata.gz: eb8856f58b568b22212898178938ce53d45c620b5ca88b74931662cde870fb9739b8f4c8e9d90b82ac6d48390f9279cd02b88b7824ec51cc9cd601089a33b806
+  data.tar.gz: 4c6a21bb1be54eeb5eb8d8e1ac3e8add804d8c1855dca50d8df43daf2e872fe974a1fbcac561f47f2dee53db373c0ab5fd6b40dd791504ec8cf7d270d59d59bc

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

@@ -15,7 +15,7 @@ module CaptiveRelease
       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)
+      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

data/lib/captive_release/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CaptiveRelease
-  VERSION = "0.16.4"
+  VERSION = "0.17.1"
 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,11 +26,21 @@ 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(suggested_version(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
 
+    # Depuis une pré-release, un minor suggéré n'a pas de version : le curseur reste sur le premier choix.
+    def suggested_version(current, suggestion)
+      VersionBumper.bump(current, suggestion)
+    rescue ArgumentError
+      nil
+    end
+
     # La valeur rendue est la version elle-même, sauf pour Custom qui n'en a pas encore une.
     # Depuis une pré-release, seules l'itération et la promotion sont proposées : patch, minor et major y
     # prêteraient à confusion.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-release
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.17.1
 platform: ruby
 authors:
 - Captive Studio