fastlane-plugin-semantic_release 1.9.2 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e12ea9120ab4bccc7f4206d24511fd0455d86cd38cd4b4eb3f6713a8a37a84
-  data.tar.gz: bdda044be599d10eb6843bbb197dbd3ab338a109bc72ff86ad0c221899c0a517
+  metadata.gz: 75df4d8576b964aa25eb049f7327b6dca63e183e6ed2ee338a9bed8c52364c35
+  data.tar.gz: '08f19dc2c0343275cd8ad6df77e34c3cead327543beaab51ed6211005466977a'
 SHA512:
-  metadata.gz: e3b583d81b5ba72b45a7698265667a698a7e3fc7c3070f1e39bcfc79393d38dc4436525d7482967a4a0d2995df5f652a4d5621866710dce91ef145179bd02669
-  data.tar.gz: 0c641c08118d7a8796fec1a5bf703e28f0dc3250870f374142e6cba442df88295c30d27615372eedded46c277ad613045a49214e1bd605a07b6d537dd7fc8740
+  metadata.gz: 1fe944d2e2bb270c994d168fd5c0df781b425e7e92d53535f98fd13b72eb86d153ac76800374453769653ebc14359dcf9ca0db77858361a1b53661705f5b187d
+  data.tar.gz: 3eff9484e9f5d5bef71a0a8252daa782a9301401886371516a8c3bb041bd137413bf49defaccdabee5477aa18313b800cced10745a4edd790539ae5e5cee0fed

data/lib/fastlane/plugin/semantic_release/actions/analyze_commits.rb

@@ -6,6 +6,7 @@ module Fastlane
     module SharedValues
       RELEASE_ANALYZED = :RELEASE_ANALYZED
       RELEASE_IS_NEXT_VERSION_HIGHER = :RELEASE_IS_NEXT_VERSION_HIGHER
+      RELEASE_IS_NEXT_VERSION_COMPATIBLE_WITH_CODEPUSH = :RELEASE_IS_NEXT_VERSION_COMPATIBLE_WITH_CODEPUSH
       RELEASE_LAST_TAG_HASH = :RELEASE_LAST_TAG_HASH
       RELEASE_LAST_VERSION = :RELEASE_LAST_VERSION
       RELEASE_NEXT_MAJOR_VERSION = :RELEASE_NEXT_MAJOR_VERSION
@@ -13,6 +14,7 @@ module Fastlane
       RELEASE_NEXT_PATCH_VERSION = :RELEASE_NEXT_PATCH_VERSION
       RELEASE_NEXT_VERSION = :RELEASE_NEXT_VERSION
       RELEASE_LAST_INCOMPATIBLE_CODEPUSH_VERSION = :RELEASE_LAST_INCOMPATIBLE_CODEPUSH_VERSION
+      CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN = :CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN
     end
 
     class AnalyzeCommitsAction < Action
@@ -39,47 +41,83 @@ module Fastlane
         commits.split("|>")
       end
 
-      def self.is_releasable(params)
-        # Hash of the commit where is the last version
-        # If the tag is not found we are taking HEAD as reference
-        hash = 'HEAD'
-        # Default last version
-        version = '0.0.0'
+      def self.get_beginning_of_next_sprint(params)
+        # command to get first commit
+        git_command = 'git rev-list --max-parents=0 HEAD'
 
-        tag = get_last_tag(
-          match: params[:match],
-          debug: params[:debug]
-        )
+        tag = get_last_tag(match: params[:match], debug: params[:debug])
 
+        # if tag doesn't exist it get's first commit or fallback tag (v*.*.*)
         if tag.empty?
-          UI.message("First commit of the branch is taken as a begining of next release")
+          UI.message("It couldn't match tag for #{params[:match]}. Check if first commit can be taken as a beginning of next release")
           # If there is no tag found we taking the first commit of current branch
-          hash = Actions.sh('git rev-list --max-parents=0 HEAD', log: params[:debug]).chomp
-        else
-          # Tag's format is v2.3.4-5-g7685948
-          # See git describe man page for more info
-          tag_name = tag.split('-')[0...-2].join('-').strip
-          parsed_version = tag_name.match(params[:tag_version_match])
-
-          if parsed_version.nil?
-            UI.user_error!("Error while parsing version from tag #{tag_name} by using tag_version_match - #{params[:tag_version_match]}. Please check if the tag contains version as you expect and if you are using single brackets for tag_version_match parameter.")
+          hash_lines = Actions.sh("#{git_command} | wc -l", log: params[:debug]).chomp
+
+          if hash_lines.to_i == 1
+            UI.message("First commit of the branch is taken as a begining of next release")
+            return {
+              # here we know this command will return 1 line
+              hash: Actions.sh(git_command, log: params[:debug]).chomp
+            }
           end
 
-          version = parsed_version[0]
-          # Get a hash of last version tag
-          hash = get_last_tag_hash(
-            tag_name: tag_name,
-            debug: params[:debug]
-          )
+          # neighter matched tag and first hash could be used - as fallback we try vX.Y.Z
+          UI.message("It couldn't match tag for #{params[:match]} and couldn't use first commit. Check if tag vX.Y.Z can be taken as a begining of next release")
+          tag = get_last_tag(match: "v*", debug: params[:debug])
+
+          # even fallback tag doesn't work
+          if tag.empty?
+            return false
+          end
+        end
 
-          UI.message("Found a tag #{tag_name} associated with version #{version}")
+        # Tag's format is v2.3.4-5-g7685948
+        # See git describe man page for more info
+        tag_name = tag.split('-')[0...-2].join('-').strip
+        parsed_version = tag_name.match(params[:tag_version_match])
+
+        if parsed_version.nil?
+          UI.user_error!("Error while parsing version from tag #{tag_name} by using tag_version_match - #{params[:tag_version_match]}. Please check if the tag contains version as you expect and if you are using single brackets for tag_version_match parameter.")
         end
 
+        version = parsed_version[0]
+        # Get a hash of last version tag
+        hash = get_last_tag_hash(
+          tag_name: tag_name,
+          debug: params[:debug]
+        )
+
+        UI.message("Found a tag #{tag_name} associated with version #{version}")
+
+        return {
+          hash: hash,
+          version: version
+        }
+      end
+
+      def self.is_releasable(params)
+        # Hash of the commit where is the last version
+        beginning = get_beginning_of_next_sprint(params)
+
+        unless beginning
+          UI.error('It could not find a begining of this sprint. How to fix this:')
+          UI.error('-- ensure there is only one commit with --max-parents=0 (this command should return one line: "git rev-list --max-parents=0 HEAD")')
+          UI.error('-- tell us explicitely where the release starts by adding tag like this: vX.Y.Z (where X.Y.Z is version from which it starts computing next version number)')
+          return false
+        end
+
+        # Default last version
+        version = beginning[:version] || '0.0.0'
+        # If the tag is not found we are taking HEAD as reference
+        hash = beginning[:hash] || 'HEAD'
+
         # converts last version string to the int numbers
         next_major = (version.split('.')[0] || 0).to_i
         next_minor = (version.split('.')[1] || 0).to_i
         next_patch = (version.split('.')[2] || 0).to_i
 
+        is_next_version_compatible_with_codepush = true
+
         # Get commits log between last version and head
         splitted = get_commits_from_hash(
           hash: hash,
@@ -89,13 +127,17 @@ module Fastlane
         UI.message("Found #{splitted.length} commits since last release")
         releases = params[:releases]
 
+        format_pattern = lane_context[SharedValues::CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN]
         splitted.each do |line|
+          parts = line.split("|")
+          subject = parts[0].strip
           # conventional commits are in format
           # type: subject (fix: app crash - for example)
           commit = Helper::SemanticReleaseHelper.parse_commit(
-            commit_subject: line.split("|")[0],
-            commit_body: line.split("|")[1],
-            releases: releases
+            commit_subject: subject,
+            commit_body: parts[1],
+            releases: releases,
+            pattern: format_pattern
           )
 
           unless commit[:scope].nil?
@@ -117,8 +159,12 @@ module Fastlane
             next_patch += 1
           end
 
+          unless commit[:is_codepush_friendly]
+            is_next_version_compatible_with_codepush = false
+          end
+
           next_version = "#{next_major}.#{next_minor}.#{next_patch}"
-          UI.message("#{next_version}: #{line}")
+          UI.message("#{next_version}: #{subject}") if params[:show_version_path]
         end
 
         next_version = "#{next_major}.#{next_minor}.#{next_patch}"
@@ -127,6 +173,7 @@ module Fastlane
 
         Actions.lane_context[SharedValues::RELEASE_ANALYZED] = true
         Actions.lane_context[SharedValues::RELEASE_IS_NEXT_VERSION_HIGHER] = is_next_version_releasable
+        Actions.lane_context[SharedValues::RELEASE_IS_NEXT_VERSION_COMPATIBLE_WITH_CODEPUSH] = is_next_version_compatible_with_codepush
         # Last release analysis
         Actions.lane_context[SharedValues::RELEASE_LAST_TAG_HASH] = hash
         Actions.lane_context[SharedValues::RELEASE_LAST_VERSION] = version
@@ -167,6 +214,7 @@ module Fastlane
         releases = params[:releases]
         codepush_friendly = params[:codepush_friendly]
 
+        format_pattern = lane_context[SharedValues::CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN]
         splitted.each do |line|
           # conventional commits are in format
           # type: subject (fix: app crash - for example)
@@ -174,6 +222,7 @@ module Fastlane
             commit_subject: line.split("|")[0],
             commit_body: line.split("|")[1],
             releases: releases,
+            pattern: format_pattern,
             codepush_friendly: codepush_friendly
           )
 
@@ -227,6 +276,27 @@ module Fastlane
               UI.user_error!("No match for analyze_commits action given, pass using `match: 'expr'`") unless value && !value.empty?
             end
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :commit_format,
+            description: "The commit format to apply. Presets are 'default' or 'angular', or you can provide your own Regexp. Note: the supplied regex _must_ have 4 capture groups, in order: type, scope, has_exclamation_mark, and subject",
+            default_value: "default",
+            is_string: false,
+            verify_block: proc do |value|
+              case value
+              when String
+                unless Helper::SemanticReleaseHelper.format_patterns.key?(value)
+                  UI.user_error!("Invalid format preset: #{value}")
+                end
+
+                pattern = Helper::SemanticReleaseHelper.format_patterns[value]
+              when Regexp
+                pattern = value
+              else
+                UI.user_error!("Invalid option type: #{value.inspect}")
+              end
+              Actions.lane_context[SharedValues::CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN] = pattern
+            end
+          ),
           FastlaneCore::ConfigItem.new(
             key: :releases,
             description: "Map types of commit to release (major, minor, patch)",
@@ -252,6 +322,13 @@ module Fastlane
             type: Array,
             optional: true
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :show_version_path,
+            description: "True if you want to print out the version calculated for each commit",
+            default_value: true,
+            type: Boolean,
+            optional: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :debug,
             description: "True if you want to log out a debug info",
@@ -268,13 +345,15 @@ module Fastlane
         [
           ['RELEASE_ANALYZED', 'True if commits were analyzed.'],
           ['RELEASE_IS_NEXT_VERSION_HIGHER', 'True if next version is higher then last version'],
+          ['RELEASE_IS_NEXT_VERSION_COMPATIBLE_WITH_CODEPUSH', 'True if next version is compatible with codepush'],
           ['RELEASE_LAST_TAG_HASH', 'Hash of commit that is tagged as a last version'],
           ['RELEASE_LAST_VERSION', 'Last version number - parsed from last tag.'],
           ['RELEASE_NEXT_MAJOR_VERSION', 'Major number of the next version'],
           ['RELEASE_NEXT_MINOR_VERSION', 'Minor number of the next version'],
           ['RELEASE_NEXT_PATCH_VERSION', 'Patch number of the next version'],
           ['RELEASE_NEXT_VERSION', 'Next version string in format (major.minor.patch)'],
-          ['RELEASE_LAST_INCOMPATIBLE_CODEPUSH_VERSION', 'Last commit without codepush']
+          ['RELEASE_LAST_INCOMPATIBLE_CODEPUSH_VERSION', 'Last commit without codepush'],
+          ['CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN', 'The format pattern Regexp used to match commits (mainly for internal use)']
         ]
       end
 

data/lib/fastlane/plugin/semantic_release/actions/conventional_changelog.rb

@@ -35,7 +35,7 @@ module Fastlane
           hash: last_tag_hash,
           debug: params[:debug]
         )
-        parsed = parse_commits(commits)
+        parsed = parse_commits(commits, params)
 
         commit_url = params[:commit_url]
         format = params[:format]
@@ -172,17 +172,27 @@ module Fastlane
         end
       end
 
-      def self.parse_commits(commits)
+      def self.parse_commits(commits, params)
         parsed = []
         # %s|%b|%H|%h|%an|%at
+        format_pattern = lane_context[SharedValues::CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN]
         commits.each do |line|
           splitted = line.split("|")
 
           commit = Helper::SemanticReleaseHelper.parse_commit(
             commit_subject: splitted[0],
-            commit_body: splitted[1]
+            commit_body: splitted[1],
+            pattern: format_pattern
           )
 
+          unless commit[:scope].nil?
+            # if this commit has a scope, then we need to inspect to see if that is one of the scopes we're trying to exclude
+            scope = commit[:scope]
+            scopes_to_ignore = params[:ignore_scopes]
+            # if it is, we'll skip this commit when bumping versions
+            next if scopes_to_ignore.include?(scope) #=> true
+          end
+
           commit[:hash] = splitted[2]
           commit[:short_hash] = splitted[3]
           commit[:author_name] = splitted[4]
@@ -271,6 +281,13 @@ module Fastlane
             type: Boolean,
             optional: true
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :ignore_scopes,
+            description: "To ignore certain scopes when calculating releases",
+            default_value: [],
+            type: Array,
+            optional: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :debug,
             description: "True if you want to log out a debug info",

data/lib/fastlane/plugin/semantic_release/helper/semantic_release_helper.rb

@@ -5,6 +5,13 @@ module Fastlane
 
   module Helper
     class SemanticReleaseHelper
+      def self.format_patterns
+        return {
+          "default" => /^(docs|fix|feat|chore|style|refactor|perf|test)(?:\((.*)\))?(!?)\: (.*)/,
+          "angular" => /^(\w*)(?:\((.*)\))?(): (.*)/
+        }
+      end
+
       # class methods that you define here become available in your action
       # as `Helper::SemanticReleaseHelper.your_method`
       #
@@ -18,7 +25,7 @@ module Fastlane
         commit_body = params[:commit_body]
         releases = params[:releases]
         codepush_friendly = params[:codepush_friendly]
-        pattern = /^(docs|fix|feat|chore|style|refactor|perf|test)(\((.*)\))?(!?)\: (.*)/
+        pattern = params[:pattern]
         breaking_change_pattern = /BREAKING CHANGES?: (.*)/
         codepush_pattern = /codepush?: (.*)/
 
@@ -32,13 +39,13 @@ module Fastlane
 
         unless matched.nil?
           type = matched[1]
-          scope = matched[3]
+          scope = matched[2]
 
           result[:is_valid] = true
           result[:type] = type
           result[:scope] = scope
-          result[:has_exclamation_mark] = matched[4] == '!'
-          result[:subject] = matched[5]
+          result[:has_exclamation_mark] = matched[3] == '!'
+          result[:subject] = matched[4]
 
           unless releases.nil?
             result[:release] = releases[type.to_sym]

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

@@ -1 +1 @@
-module Fastlane module SemanticRelease VERSION = "1.9.2" end end
+module Fastlane module SemanticRelease VERSION = "1.14.1" end end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-semantic_release
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.14.1
 platform: ruby
 authors:
 - Jiří Otáhal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry