captive-release 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02b5a5f09284656a970f59483743859269916f30e253648baa2d0f2fbadbb36
-  data.tar.gz: d198e07c7ed8d9875baf64a01fa49dd5cf8e3d361e91d035f0c876ba196fc092
+  metadata.gz: 8b6fb2c222824add2e6fe62b462240609b233535e610ef7bd70513bf6ff5f931
+  data.tar.gz: ffb5b3704f4a4a4a94cb31c6d2275683077a3437d0b8b841ac727a893d32ff2f
 SHA512:
-  metadata.gz: b2fa91cd1c63ba4d1b423979d5aa1b40445fa31e91aafd386baed6e4a1da5eb7b776c4c43f14772e2309f32c8b187cd77d25da4e8bc8b227521edc683f0a0115
-  data.tar.gz: 8c29dc85a62025e705c5b111137d964b1d76d103cdf6caa044440f64557032a52fe7f15a29814d9ba10d91904ab7abe0df5102928e6c13f9be59fb5a2353ba8f
+  metadata.gz: 4045d5e368e362b1307a2f27ce16df74ff0c7f0fc1ae021b9d62af6673441deb0b7a66c8d9623a27ae10a46662f8b51d7214c2b8d32cd1878d5c490acf56e7cc
+  data.tar.gz: 6a3f85ea5c5da1e82a3131c10f4b6f0e0dd59ec744b8134b2d470b5c47b11b4dcfe37f227d1f74285e03cdfc41fdcaa7ac9d98e39a798c6e23f6a82886fe41b5

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

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

data/lib/captive_release/version_detector.rb

@@ -3,9 +3,23 @@
 module CaptiveRelease
   # Quels fichiers d'un dépôt portent une version, et sous quel format.
   class VersionDetector
-    RUBY_VERSION_PATTERN  = /VERSION\s*=\s*["'].+?["']/
-    EXPO_APP_JSON_PATTERN = /"expo"\s*:.*"version"\s*:/m
-    GRADLE_PATH           = %w[android app build.gradle].freeze
+    GRADLE_PATH        = %w[android app build.gradle].freeze
+    CLAUDE_PLUGIN_PATH = %w[.claude-plugin plugin.json].freeze
+
+    # Où chercher, quel format y lire, et ce que le fichier doit contenir pour en être un.
+    RULES = [
+      [ %w[** package.json], "package_json" ],
+      [ %w[** app.config.js], "app_config_js" ],
+      [ %w[** app.json], "app_json", /"expo"\s*:.*"version"\s*:/m ],
+      [ %w[lib ** version.rb], "ruby_version", /VERSION\s*=\s*["'].+?["']/ ],
+      [ %w[** VERSION], "plain" ],
+      # Chemin fixe : un glob remonterait les build.gradle des modules Android embarqués, qui ne
+      # portent pas la version de l'app.
+      [ GRADLE_PATH, "android_gradle", /versionName\s+['"]/ ],
+      # Un dépôt publie un seul plugin : son manifeste est à la racine.
+      [ CLAUDE_PLUGIN_PATH, "claude_plugin", /"version"/ ],
+      [ %w[ios ** Info.plist], "ios_plist", /CFBundleShortVersionString/ ],
+    ].freeze
 
     def self.scan(root = ".")
       new(root).scan
@@ -16,33 +30,15 @@ module CaptiveRelease
     end
 
     def scan
-      by_name("package.json", "package_json") +
-        by_name("app.config.js", "app_config_js") +
-        by_content(%w[** app.json], "app_json", EXPO_APP_JSON_PATTERN) +
-        by_content(%w[lib ** version.rb], "ruby_version", RUBY_VERSION_PATTERN) +
-        by_name("VERSION", "plain") +
-        android_gradle +
-        by_content(%w[ios ** Info.plist], "ios_plist", /CFBundleShortVersionString/)
+      RULES.flat_map { |segments, type, pattern| detect(segments, type, pattern) }
     end
 
     private
 
-    def by_name(filename, type)
-      @files.glob("**", filename).map { |chemin| version_file(chemin, type) }
-    end
-
-    def by_content(segments, type, pattern)
+    def detect(segments, type, pattern)
       @files.glob(*segments)
-            .select { |chemin| contient?(chemin, pattern) }
-            .map { |chemin| version_file(chemin, type) }
-    end
-
-    # Le build.gradle est à un chemin fixe : le chercher par glob remonterait ceux des
-    # modules Android embarqués, qui ne portent pas la version de l'app.
-    def android_gradle
-      return [] unless contient?(@files.path(*GRADLE_PATH), /versionName\s+['"]/)
-
-      [ VersionFile.new(GRADLE_PATH.join("/"), "android_gradle") ]
+            .select { |chemin| pattern.nil? || contient?(chemin, pattern) }
+            .map { |chemin| VersionFile.new(@files.relative(chemin), type) }
     end
 
     def contient?(chemin, pattern)
@@ -50,7 +46,5 @@ module CaptiveRelease
     rescue StandardError
       false
     end
-
-    def version_file(chemin, type) = VersionFile.new(@files.relative(chemin), type)
   end
 end

data/lib/captive_release/version_files_argument.rb

@@ -15,6 +15,8 @@ module CaptiveRelease
     end
 
     def self.type_deduit(chemin)
+      return "claude_plugin" if chemin == VersionDetector::CLAUDE_PLUGIN_PATH.join("/")
+
       File.basename(chemin) == "package.json" ? "package_json" : "plain"
     end
   end

data/lib/captive_release/version_format.rb

@@ -52,16 +52,19 @@ module CaptiveRelease
 
     PLIST_VALUE = %r{(?<=<string>).+?(?=</string>)}
 
+    PACKAGE_JSON = new(read: ->(content) { JSON.parse(content)["version"] },
+                       write: lambda { |content, old, nouvelle|
+                         content.gsub(/"version": "#{Regexp.escape(old)}"/, %("version": "#{nouvelle}"))
+                       },
+                       expected: %("version": "x.y.z"))
+
     FORMATS = {
       "plain" => new(read: ->(content) { content.strip },
                      write: ->(_content, _old, nouvelle) { "#{nouvelle}\n" },
                      expected: "x.y.z"),
-      "package_json" => new(read: ->(content) { JSON.parse(content)["version"] },
-                            write: lambda { |content, old, nouvelle|
-                              content.gsub(/"version": "#{Regexp.escape(old)}"/,
-                                           %("version": "#{nouvelle}"))
-                            },
-                            expected: %("version": "x.y.z")),
+      "package_json"  => PACKAGE_JSON,
+      # Le manifeste d'un plugin Claude porte sa version comme un package.json.
+      "claude_plugin" => PACKAGE_JSON,
 
       "ruby_version" => RubyGemsVersion.new(
         by_pattern(/VERSION\s*=\s*["'](.+?)["']/, %(VERSION = "x.y.z")) { |occurrence, nouvelle|

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.1
+  version: 0.14.0
 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