fastlane-plugin-semantic_versioning 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85cd9cae201bc1df61f042591928d143e3be6b16f2118af031d8277872bb2602
-  data.tar.gz: a1bc72d14b4866bf874ff0f1ad0b47e965baa895bcfed5ded778120e17a66ec8
+  metadata.gz: d8564caab2d111a1099b9c876d794673d124b89fea24c4d6ef3b7886f096e9c5
+  data.tar.gz: cf726334226530356e0180b112080ffb30bce81aa6709c9b072ac9d152070234
 SHA512:
-  metadata.gz: 51ea808a889665240814d26ce939f1c006c9bd03b6544a3a289e38afb460668dc51e4f723a4507b6a8f3a3112b71bb1bd407bfd2da5df513a22b085b3053337e
-  data.tar.gz: 0227ac5c1726f2e9954f9d272bb36e99fbf83af5280e7831ffb823ccd44ed32f1b5528c57188a4bd927956e9cdcbd7940183604369fcbcf6c95e830c1e9cd85c
+  metadata.gz: 7119102889ba20b58d153f92cbd9ae6d7b118c3e01c963773bfd0a1320976f5a55e336e9356822f2f64e2bc5be6e08fb6b61151ac005fc6c73fbdc1867ee5b90
+  data.tar.gz: bf0e95b1a39df59564cf3b47e6418fb8cc754d7a6f53b0ccce793f1e93557336e5ce988a17d711f7b26a9acaf8672ee0183226013867af3e39cdd0f48abe038c

data/lib/fastlane/plugin/semantic_versioning/actions/get_versioning_info_action.rb

@@ -18,6 +18,7 @@ module Fastlane
         params[:allowed_types].map!(&:to_sym)
         params[:bump_map].transform_keys!(&:to_sym)
         params[:bump_map].transform_values!(&:to_sym)
+        params[:force_type] = params[:force_type]&.to_sym
 
         UI.message("The semantic_versioning plugin is working!")
 
@@ -26,10 +27,11 @@ module Fastlane
 
         commits = Helper::SemanticVersioningHelper.git_commits(
           from: Helper::SemanticVersioningHelper.git_tag_exists?(formatted_tag) ? formatted_tag : nil,
-          allowed_types: params[:allowed_types]
+          allowed_types: params[:allowed_types],
+          bump_map: params[:bump_map]
         )
 
-        bump_type = Helper::SemanticVersioningHelper.bump_type(commits: commits, bump_map: params[:bump_map])
+        bump_type = Helper::SemanticVersioningHelper.bump_type(commits: commits, force_type: params[:force_type])
         new_version = Helper::SemanticVersioningHelper.increase_version(current_version: current_version, bump_type: bump_type)
         new_changelog = Helper::SemanticVersioningHelper.build_changelog(version: new_version, commits: commits, type_map: params[:type_map])
         bumpable = current_version != new_version
@@ -88,6 +90,12 @@ module Fastlane
                                        default_value: { breaking: :major, feat: :minor, fix: :patch },
                                        is_string: false,
                                        verify_block: ->(value) { verify_bump_map(value) }),
+          FastlaneCore::ConfigItem.new(key: :force_type,
+                                       env_name: "SEMANTIC_VERSIONING_FORCE_TYPE",
+                                       description: "Force a minimum bump type",
+                                       optional: true,
+                                       default_value: nil,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :tag_format,
                                        env_name: "SEMANTIC_VERSIONING_TAG_FORMAT",
                                        description: "The format for the git tag",

data/lib/fastlane/plugin/semantic_versioning/helper/semantic_versioning_helper.rb

@@ -27,36 +27,53 @@ module Fastlane
       end
 
       # Retrieves git commits and returns them grouped by type
-      def self.git_commits(from:, allowed_types:)
+      def self.git_commits(from:, allowed_types:, bump_map:)
         logs = from ? git.log(-1).between(from) : git.log(-1)
         logs.reverse_each.map do |commit|
-          parse_conventional_commit(commit: commit, allowed_types: allowed_types)
+          parse_conventional_commit(commit: commit, allowed_types: allowed_types, bump_map: bump_map)
         end.compact
       end
 
-      def self.group_commits(commits:, allowed_types:)
-        result = allowed_types.to_h { |type| [type, []] }
+      def self.parse_conventional_commit(commit:, allowed_types:, bump_map:)
+        types = allowed_types.join("|")
+        commit.message.match(/^(?<type>#{types})(\((?<scope>\S+)\))?(?<major>!)?:\s+(?<subject>[^\n\r]+)(\z|\n\n(?<body>.*\z))/m) do |match|
+          cc = {
+            type: match[:type].to_sym,
+            major: !!match[:major],
+            scope: match[:scope],
+            subject: match[:subject],
+            body: match[:body],
+            breaking: nil,
+            original_message: commit.message
+          }
 
-        commits.each do |commit|
-          if commit[:breaking] && allowed_types.include?(:breaking)
-            result[:breaking] << commit
+          match[:body]&.match(/^BREAKING CHANGE?: (.+)\z/) do |breaking|
+            cc[:breaking] = breaking[1]
           end
-          next unless allowed_types.include?(commit[:type])
 
-          # If the breaking change is made from the actual feature subject, don't repeat it.
-          next if commit[:breaking] == commit[:subject]
+          cc[:bump] = commit_bump_type(commit: cc, bump_map: bump_map)
 
-          result[commit[:type]] << commit
+          return cc
         end
+      end
 
-        return result
+      def self.commit_bump_type(commit:, bump_map:)
+        return :major if commit[:major]
+
+        return bump_map[:breaking] if commit[:breaking]
+
+        return bump_map[commit[:type]]
       end
 
-      def self.bump_type(commits:, bump_map:)
-        result = nil
+      def self.bump_type(commits:, force_type: nil)
+        return force_type if force_type == :major # can't go any higher
+
+        result = force_type
 
         commits.each do |commit|
-          bump_type = commit[:breaking] ? bump_map[:breaking] : bump_map[commit[:type]]
+          return :major if commit[:major]
+
+          bump_type = commit[:bump]
           if bump_type == :major
             return :major
           elsif bump_type == :minor
@@ -69,29 +86,26 @@ module Fastlane
         return result
       end
 
-      def self.parse_conventional_commit(commit:, allowed_types:)
-        types = allowed_types.join("|")
-        commit.message.match(/^(?<type>#{types})(\((?<scope>\S+)\))?(?<breaking>!)?:\s+(?<subject>[^\n\r]+)(\z|\n\n(?<body>.*\z))/m) do |match|
-          unless allowed_types.include?(match[:type].to_sym)
-            UI.important("Commit #{commit.sha} has invalid type: #{match[:type]}. Ignoring")
-            break
-          end
+      def self.group_commits(commits:, allowed_types:)
+        result = allowed_types.to_h { |type| [type, []] }
+        result[:none] = []
 
-          cc = {
-            type: match[:type].to_sym,
-            scope: match[:scope],
-            subject: match[:subject],
-            body: match[:body],
-            breaking: match[:breaking] ? match[:subject] : nil,
-            original_message: commit.message
-          }
+        commits.each do |commit|
+          if commit[:breaking] && allowed_types.include?(:breaking)
+            result[:breaking] << commit
+          end
 
-          match[:body]&.match(/^BREAKING CHANGE?: (.+)\z/) do |breaking|
-            cc[:breaking] = breaking[1]
+          if commit[:major] && !allowed_types.include?(commit[:type])
+            result[:none] << commit
+            next
           end
 
-          return cc
+          next unless allowed_types.include?(commit[:type])
+
+          result[commit[:type]] << commit
         end
+
+        return result
       end
 
       def self.increase_version(current_version:, bump_type:)
@@ -123,7 +137,7 @@ module Fastlane
         grouped_commits.each do |key, section_commits|
           next unless section_commits.any?
 
-          lines << "### #{type_map[key]}:"
+          lines << "### #{type_map[key]}:" if key != :none
           lines << ""
 
           section_commits.each do |commit|

data/lib/fastlane/plugin/semantic_versioning/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module SemanticVersioning
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-semantic_versioning
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Karsten Silkenbäumer