captive-release 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9e947f971c93535758990c20c7684e5178c345bfee6abddef43ee6584b1378a
-  data.tar.gz: bc5c688c4d49ad3326104a42e4209e9b99f22cd3dd3511cf5761c8843465053c
+  metadata.gz: 766da20e3b1cd49bbc782ea4a7dbf483bc852b025daf791c70a69b6bedc02088
+  data.tar.gz: 4b01cdae087a0c6b8990843d076b76325e158578df44278e40f28b6b7364b660
 SHA512:
-  metadata.gz: c289101fc72ca8463baad9fd904c060c6a67890d2b0ece8c61e44ddca8df0d2ff387487b67facfcf1c16e69d90ac61516b83728ef1025ad8d8894bea76fbd680
-  data.tar.gz: 00bf4e5aad63a7ce24786c6a4c39aa1481244ec8bdf5725595084e49c783f98f66d5222a2f39b7adc149d553c931471dd23457fb49b6cf278df64bbf7f3cbc94
+  metadata.gz: 0f6d0e2c5c1e1fe133c7260b0ad9dba99c99d6224efe152250f9472fb95f19a3ad367d45222f0f27afec06a0d2e89101f4ae851b395e4adc89763fb4741b8ff9
+  data.tar.gz: cafef79eae71b7c328cefe468d83981723967bdc2a49f0bb2cf4294c59f217aad8204c9e42f60d109eebe296d4793fb99f0b6fed0a68810ee3fd8eaa040ee343

data/lib/captive_release/bump_safety_net.rb

@@ -10,7 +10,8 @@ module CaptiveRelease
     end
 
     def verifier!(suggestion, courante, prochaine)
-      return unless suggestion
+      # La gravité d'une version a déjà été assumée par sa première pré-release.
+      return if suggestion.nil? || Semver.prerelease?(courante)
 
       choisie = VersionSeverity.classify(from: courante, to: prochaine)
       return if BumpSeverity::RANK.fetch(choisie, -1) >= BumpSeverity::RANK.fetch(suggestion)

data/lib/captive_release/github_release.rb

@@ -27,7 +27,7 @@ module CaptiveRelease
       tag = "v#{version}"
       @api.post("releases",
                 { "tag_name" => tag, "name" => tag, "body" => notes(tag),
-                  "draft" => false, "prerelease" => false, },
+                  "draft" => false, "prerelease" => Semver.prerelease?(version), },
                 attendu: "201")["html_url"]
     end
 

data/lib/captive_release/locales/en.yml

@@ -5,7 +5,7 @@ en:
 
       Usage:
         captive-release init [--files path[:type],...]
-        captive-release new [patch|minor|major|x.y.z] [--yes]
+        captive-release new [patch|minor|major|promote|x.y.z] [--yes]
         captive-release build [--profile staging|production]
         captive-release version
 
@@ -82,7 +82,13 @@ en:
     suggestion_patch: no notable commit detected
     choose_release_type: 'Choose release type:'
     custom: Custom
-    enter_version: 'Enter version (x.y.z): '
+    bump_patch: Patch
+    bump_minor: Minor
+    bump_major: Major
+    bump_promote: Promote
+    bump_from_prerelease: 'Cannot %{type} from a pre-release: promote it or enter a version.'
+    prerelease_on_app: 'Cannot release pre-release %{version}: %{path} carries an app version, which allows no suffix.'
+    enter_version: 'Enter version (x.y.z or x.y.z-alpha.1): '
     invalid_bump_type: 'Invalid bump type: %{type}. Use patch|minor|major|x.y.z'
     invalid_semver: 'Invalid semver: %{value}'
     invalid_version: 'Invalid version: %{value}'

data/lib/captive_release/locales/fr.yml

@@ -5,7 +5,7 @@ fr:
 
       Utilisation :
         captive-release init [--files path[:type],...]
-        captive-release new [patch|minor|major|x.y.z] [--yes]
+        captive-release new [patch|minor|major|promote|x.y.z] [--yes]
         captive-release build [--profile staging|production]
         captive-release version
 
@@ -82,7 +82,13 @@ fr:
     suggestion_patch: aucun commit notable détecté
     choose_release_type: 'Choisissez le type de release :'
     custom: Personnalisée
-    enter_version: 'Saisissez la version (x.y.z) : '
+    bump_patch: Patch
+    bump_minor: Minor
+    bump_major: Major
+    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."
+    enter_version: 'Saisissez la version (x.y.z ou x.y.z-alpha.1) : '
     invalid_bump_type: 'Type de bump invalide : %{type}. Utilisez patch|minor|major|x.y.z'
     invalid_semver: 'Semver invalide : %{value}'
     invalid_version: 'Version invalide : %{value}'

data/lib/captive_release/prerelease_guard.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Refuse une pré-release dès qu'une app porte la version : la version marketing iOS
+  # (CFBundleShortVersionString, que nourrissent aussi app.json et app.config.js) n'admet
+  # pas de suffixe. Une alpha d'app passe par un build interne, pas par une version.
+  class PrereleaseGuard
+    APP_TYPES = %w[ios_plist android_gradle app_json app_config_js].freeze
+
+    def initialize(terminal:)
+      @terminal = terminal
+    end
+
+    def verifier!(version, fichiers)
+      return unless Semver.prerelease?(version)
+
+      app = fichiers.find { |fichier| APP_TYPES.include?(fichier.type) }
+      return unless app
+
+      @terminal.say @terminal.error(Messages.t(:prerelease_on_app, version: version, path: app.path))
+      exit 1
+    end
+  end
+end

data/lib/captive_release/release_command.rb

@@ -18,6 +18,7 @@ module CaptiveRelease
       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
 
       VersionFilesWriting.new(terminal: @terminal).call(prochaine, @config.version_files)

data/lib/captive_release/ruby_gems_version.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module CaptiveRelease
+  # Traduit entre semver et RubyGems, qui refuse 2.0.0-alpha.1 et attend 2.0.0.alpha.1.
+  # Le reste de l'outil ne voit que du semver ; seul le fichier parle RubyGems.
+  class RubyGemsVersion
+    extend Forwardable
+
+    GEM_PRERELEASE = /\A(\d+\.\d+\.\d+)\.(.+)\z/
+
+    def initialize(format)
+      @format = format
+    end
+
+    def_delegator :@format, :expected
+
+    def read(content)
+      @format.read(content)&.sub(GEM_PRERELEASE, '\1-\2')
+    end
+
+    def write(content, old_version, new_version)
+      @format.write(content, vers_gem(old_version), vers_gem(new_version))
+    end
+
+    private
+
+    def vers_gem(version) = version.sub("-", ".")
+  end
+end

data/lib/captive_release/semver.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Ce qu'est une version pour l'outil : x.y.z, éventuellement suivi d'une pré-release
+  # (-alpha, -rc.2). Les métadonnées de build (+sha) ne servent à rien ici et sont refusées.
+  module Semver
+    IDENT   = /[0-9A-Za-z-]+/
+    PATTERN = /\A(\d+\.\d+\.\d+)(?:-#{IDENT}(?:\.#{IDENT})*)?\z/
+
+    def self.valid?(version) = version.to_s.match?(PATTERN)
+
+    def self.prerelease?(version) = version.to_s.include?("-")
+
+    def self.core(version) = version.to_s[PATTERN, 1]
+  end
+end

data/lib/captive_release/version.rb

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

data/lib/captive_release/version_bumper.rb

@@ -2,28 +2,53 @@
 
 module CaptiveRelease
   class VersionBumper
-    SEMVER_RE = /\A\d+\.\d+\.\d+\z/
+    BUMP_TYPES = %w[patch minor major].freeze
+    PROMOTE    = "promote"
 
     def self.bump(current, type)
       new(current).bump(type)
     end
 
     def initialize(current)
-      raise ArgumentError, Messages.t(:invalid_semver, value: current) unless current.match?(SEMVER_RE)
+      raise ArgumentError, Messages.t(:invalid_semver, value: current) unless Semver.valid?(current)
 
-      @major, @minor, @patch = current.split(".").map(&:to_i)
+      @current = current
+      @major, @minor, @patch = Semver.core(current).split(".").map(&:to_i)
     end
 
     def bump(type)
-      case type.to_s
+      type = type.to_s
+      verifier_depuis_prerelease!(type)
+
+      case type
       when "major" then "#{@major + 1}.0.0"
       when "minor" then "#{@major}.#{@minor + 1}.0"
       when "patch" then "#{@major}.#{@minor}.#{@patch + 1}"
-      else
-        raise ArgumentError, Messages.t(:invalid_version, value: type) unless type.to_s.match?(SEMVER_RE)
-
-        type.to_s
+      when PROMOTE then promouvoir
+      else saisie(type)
       end
     end
+
+    private
+
+    # Depuis une pré-release, seule la promotion a un sens : un patch de 2.0.0-alpha
+    # donnerait 2.0.0 en semver, ce que personne ne lit comme un patch.
+    def verifier_depuis_prerelease!(type)
+      return unless Semver.prerelease?(@current) && BUMP_TYPES.include?(type)
+
+      raise ArgumentError, Messages.t(:bump_from_prerelease, type: type)
+    end
+
+    def promouvoir
+      raise ArgumentError, Messages.t(:invalid_version, value: PROMOTE) unless Semver.prerelease?(@current)
+
+      Semver.core(@current)
+    end
+
+    def saisie(type)
+      raise ArgumentError, Messages.t(:invalid_version, value: type) unless Semver.valid?(type)
+
+      type
+    end
   end
 end

data/lib/captive_release/version_choice.rb

@@ -7,8 +7,7 @@ module CaptiveRelease
   # Cette unité change quand les façons de nommer une version changent, ReleaseCommand quand
   # le geste de release change.
   class VersionChoice
-    BUMP_TYPES = %w[patch minor major].freeze
-    SEMVER_RE  = /\A\d+\.\d+\.\d+\z/
+    BUMP_TYPES = (VersionBumper::BUMP_TYPES + [ VersionBumper::PROMOTE ]).freeze
     CUSTOM     = "Custom"
 
     def initialize(terminal:)
@@ -22,7 +21,7 @@ module CaptiveRelease
     private
 
     def resolve(current, type)
-      return VersionBumper.bump(current, type) if type.match?(SEMVER_RE) || BUMP_TYPES.include?(type)
+      return VersionBumper.bump(current, type) if Semver.valid?(type) || BUMP_TYPES.include?(type)
 
       refuse(Messages.t(:invalid_bump_type, type: type))
     end
@@ -33,17 +32,20 @@ module CaptiveRelease
     end
 
     # La valeur rendue est la version elle-même, sauf pour Custom qui n'en a pas encore une.
+    # Depuis une pré-release, seule la promotion est proposée : patch, minor et major y
+    # prêteraient à confusion.
     def candidates_for(current)
-      candidats = BUMP_TYPES.to_h do |type|
+      types = Semver.prerelease?(current) ? [ VersionBumper::PROMOTE ] : VersionBumper::BUMP_TYPES
+      candidats = types.to_h do |type|
         version = VersionBumper.bump(current, type)
-        [ "#{type.capitalize}  → #{@terminal.bold(version)}", version ]
+        [ "#{Messages.t(:"bump_#{type}")}  → #{@terminal.bold(version)}", version ]
       end
       candidats.merge("#{Messages.t(:custom)}  → ?" => CUSTOM)
     end
 
     def type_it
       version = @terminal.ask(Messages.t(:enter_version))
-      return version if version.match?(SEMVER_RE)
+      return version if Semver.valid?(version)
 
       refuse(Messages.t(:invalid_semver, value: version))
     end

data/lib/captive_release/version_format.rb

@@ -63,12 +63,13 @@ module CaptiveRelease
                             },
                             expected: %("version": "x.y.z")),
 
-      # Le style de guillemets du fichier est conservé : réécrire en double quand le fichier
-      # écrit en simple produirait un diff plus large que le changement de version.
-      "ruby_version" => by_pattern(/VERSION\s*=\s*["'](.+?)["']/, %(VERSION = "x.y.z")) \
-        { |occurrence, nouvelle|
+      "ruby_version" => RubyGemsVersion.new(
+        by_pattern(/VERSION\s*=\s*["'](.+?)["']/, %(VERSION = "x.y.z")) { |occurrence, nouvelle|
+          # Le style de guillemets du fichier est conservé : réécrire en double quand le
+          # fichier écrit en simple produirait un diff plus large que le changement de version.
           occurrence.include?('"') ? %(VERSION = "#{nouvelle}") : %(VERSION = '#{nouvelle}')
         },
+      ),
 
       "app_config_js"  => by_label(/version:\s*/, "version: "),
       "android_gradle" => by_label(/versionName\s+/, "versionName "),

data/lib/captive_release/version_severity.rb

@@ -3,11 +3,11 @@
 module CaptiveRelease
   # Classe la taille réelle d'un bump en comparant les composants major.minor.patch entre
   # deux versions - y compris un semver tapé à la main, qui ne porte plus de "type" une fois
-  # sorti de VersionChoice.
+  # sorti de VersionChoice. Le suffixe de pré-release ne compte pas : 2.0.0-alpha est un major.
   class VersionSeverity
     def self.classify(from:, to:)
-      depart = from.split(".").map(&:to_i)
-      arrivee = to.split(".").map(&:to_i)
+      depart = Semver.core(from).split(".").map(&:to_i)
+      arrivee = Semver.core(to).split(".").map(&:to_i)
 
       return "major" if depart[0] != arrivee[0]
       return "minor" if depart[1] != arrivee[1]

data/lib/captive_release.rb

@@ -2,7 +2,9 @@
 
 require_relative "captive_release/version"
 require_relative "captive_release/messages"
+require_relative "captive_release/semver"
 require_relative "captive_release/version_bumper"
+require_relative "captive_release/ruby_gems_version"
 require_relative "captive_release/version_format"
 require_relative "captive_release/version_file"
 require_relative "captive_release/build_config"
@@ -18,6 +20,7 @@ require_relative "captive_release/gitmoji_severity"
 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/github_repo"
 require_relative "captive_release/github_http"
 require_relative "captive_release/github_api"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-release
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Captive Studio
@@ -54,12 +54,15 @@ files:
 - lib/captive_release/menu.rb
 - lib/captive_release/messages.rb
 - lib/captive_release/options.rb
+- lib/captive_release/prerelease_guard.rb
 - lib/captive_release/release_command.rb
 - lib/captive_release/release_confirmation.rb
 - lib/captive_release/release_overview.rb
 - lib/captive_release/release_preconditions.rb
 - lib/captive_release/release_publication.rb
 - lib/captive_release/repo_files.rb
+- lib/captive_release/ruby_gems_version.rb
+- lib/captive_release/semver.rb
 - lib/captive_release/shell.rb
 - lib/captive_release/terminal.rb
 - lib/captive_release/version.rb