captive-release 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f164e66eb747a40700e3fb75708097cc3284dbaf52cd40719bcf72689d6c11df
-  data.tar.gz: 464925ca718160f9968ee03d1e4611c7a5ccc3fa5f3b076a7f29de96507696fd
+  metadata.gz: 423b36a49572d388825d68a5128239d40977d95642dbb88e9e430c12a2c828e1
+  data.tar.gz: 743a871e6213ac1c663ecc75bfeff8cecfeba16925bf95fa3b743d6186c0826c
 SHA512:
-  metadata.gz: 7ebed4eca5ded03e043ec51adc60da07141435c8aa368ae2caea3185605b9a5f86becb1e3bf1ccec66a6df42505da10d20f89d029a85217d60526b41fbc543cd
-  data.tar.gz: 788821f98efa0e1a3afbcf97a8307370fda1b6131c8769250bd5a157b8b929bb4cec13d3b6b3c19a8820209ff719ffcd0a080befb0820df0d0ac22b47c95aae2
+  metadata.gz: ab946e3effe06248e0633c40936cc572a9cf2b875e61b4dda50f26d915698cc8f5bceab19a5b1f39f7649d024a3b3dd46080a4046a7f12185a54d8e77f5474de
+  data.tar.gz: 5ce64635bc166ef4aacdb3cc468e07fda810941a8a0c73a3b085f466529aaf579e15240baf8e2e7ad37a18edd0a2a096a50183143c55d3784d127ebba7fcef6e

data/lib/captive_release/git_release.rb

@@ -20,25 +20,7 @@ module CaptiveRelease
       @terminal.done "git tag v#{version}"
       return @terminal.done("git push + tag") if GitCommands.push(version)
 
-      pull_request(version)
-    end
-
-    private
-
-    # Le tag est déjà poussé et reste sur le commit de version : la release GitHub peut
-    # suivre, et un merge commit le ramène sur la branche de base.
-    def pull_request(version)
-      @terminal.say "  #{@terminal.warn(Messages.t(:push_refused))}"
-      base    = GitCommands.current_branch
-      branche = "release/v#{version}"
-      GitCommands.push_branch(branche)
-      @terminal.done "git push origin #{branche}"
-
-      jeton = @token_provider.call
-      raise Messages.t(:pull_request_needs_token, branch: branche) unless jeton
-
-      @terminal.done ReleasePullRequest.create(version: version, base: base, head: branche,
-                                               remote_url: GitCommands.remote_url, token: jeton)
+      ProtectedBranchRelease.new(terminal: @terminal, token_provider: @token_provider).call(version)
     end
   end
 end

data/lib/captive_release/locales/fr.yml

@@ -89,8 +89,8 @@ fr:
     bump_patch: Patch
     bump_minor: Minor
     bump_major: Major
-    bump_pre: Itérer
-    nothing_to_iterate: 'Pas de pré-release à itérer : saisissez x.y.z-alpha.1'
+    bump_pre: Incrémenter
+    nothing_to_iterate: 'Pas de pré-release à incrémenter : saisissez x.y.z-alpha.1'
     bump_promote: Promouvoir
     bump_from_prerelease: 'Impossible de faire un %{type} depuis une pré-release : promouvez-la ou saisissez une version.'
     prerelease_on_app: "Pré-release %{version} impossible : %{path} porte une version d'app, qui n'admet pas de suffixe."

data/lib/captive_release/lockfiles_refreshing.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Relancer les Gemfile.lock que le bump a périmés, et le dire au fur et à mesure. Rend les
+  # locks relancés, qui partent dans le commit de version.
+  #
+  # Cette unité change quand la façon d'annoncer la relance change, GemfileLockRefresh quand
+  # la détection ou la relance changent, ReleaseCommand quand la suite des étapes change.
+  class LockfilesRefreshing
+    def initialize(terminal:, refresh: GemfileLockRefresh.new)
+      @terminal = terminal
+      @refresh  = refresh
+    end
+
+    def call
+      locks = @refresh.lockfiles
+      return locks if locks.empty?
+
+      @terminal.say "\n#{@terminal.bold(Messages.t(:refreshing_lockfile))}"
+      @refresh.call(locks)
+      locks.each { |lock| @terminal.done lock }
+    end
+  end
+end

data/lib/captive_release/protected_branch_release.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Le repli quand une branche protégée refuse le push direct : pousser une branche de
+  # release et ouvrir la PR qui la ramène sur la branche de base. Le tag est déjà poussé et
+  # reste sur le commit de version : la release GitHub peut suivre, et un merge commit le
+  # ramène sur la branche de base.
+  #
+  # Cette unité change quand la politique de repli change, GitRelease quand la séquence
+  # git nominale change.
+  class ProtectedBranchRelease
+    def initialize(terminal:, token_provider:)
+      @terminal       = terminal
+      @token_provider = token_provider
+    end
+
+    def call(version)
+      @terminal.say "  #{@terminal.warn(Messages.t(:push_refused))}"
+      base    = GitCommands.current_branch
+      branche = "release/v#{version}"
+      GitCommands.push_branch(branche)
+      @terminal.done "git push origin #{branche}"
+
+      jeton = @token_provider.call
+      raise Messages.t(:pull_request_needs_token, branch: branche) unless jeton
+
+      @terminal.done ReleasePullRequest.create(version: version, base: base, head: branche,
+                                               remote_url: GitCommands.remote_url, token: jeton)
+    end
+  end
+end

data/lib/captive_release/release_command.rb

@@ -30,16 +30,7 @@ module CaptiveRelease
     private
 
     def chemins_a_commiter
-      chemins = @config.version_files.map(&:path)
-      refresh = GemfileLockRefresh.new
-      locks = refresh.lockfiles
-      return chemins if locks.empty?
-
-      @terminal.say "\n#{@terminal.bold(Messages.t(:refreshing_lockfile))}"
-      refresh.call(locks)
-      locks.each { |lock| @terminal.done lock }
-
-      chemins + locks
+      @config.version_files.map(&:path) + LockfilesRefreshing.new(terminal: @terminal).call
     end
 
     def publication

data/lib/captive_release/update_check.rb

@@ -29,7 +29,7 @@ module CaptiveRelease
       derniere = @thread&.join(ATTENTE)&.value
       return unless derniere && Gem::Version.new(derniere) > Gem::Version.new(courante)
 
-      @output.puts "\e[31m#{Messages.t(:update_available, current: courante, latest: derniere)}\e[0m"
+      @output.puts "\e[33m#{Messages.t(:update_available, current: courante, latest: derniere)}\e[0m"
     end
 
     private

data/lib/captive_release/version.rb

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

data/lib/captive_release.rb

@@ -43,7 +43,9 @@ require_relative "captive_release/menu"
 require_relative "captive_release/version_choice"
 require_relative "captive_release/gemfile_lock_refresh"
 require_relative "captive_release/exclusion_input"
+require_relative "captive_release/lockfiles_refreshing"
 require_relative "captive_release/release_pull_request"
+require_relative "captive_release/protected_branch_release"
 require_relative "captive_release/git_release"
 require_relative "captive_release/changes_since"
 require_relative "captive_release/release_publication"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-release
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Captive Studio
@@ -52,11 +52,13 @@ files:
 - lib/captive_release/locale.rb
 - lib/captive_release/locales/en.yml
 - lib/captive_release/locales/fr.yml
+- lib/captive_release/lockfiles_refreshing.rb
 - lib/captive_release/menu.rb
 - lib/captive_release/messages.rb
 - lib/captive_release/options.rb
 - lib/captive_release/prerelease_guard.rb
 - lib/captive_release/prerelease_iteration.rb
+- lib/captive_release/protected_branch_release.rb
 - lib/captive_release/release_command.rb
 - lib/captive_release/release_confirmation.rb
 - lib/captive_release/release_notes.rb