fastlane-plugin-semantic_release 1.13.1 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51884916218331bb9965b7005bdb173d6a4ce3a03fe4f348c99d495b71b8fb45
-  data.tar.gz: 9625cfb05fa43bd29976b9b1e345c0a2d1cfb61b49876363d57a2693a2adf4e6
+  metadata.gz: 75df4d8576b964aa25eb049f7327b6dca63e183e6ed2ee338a9bed8c52364c35
+  data.tar.gz: '08f19dc2c0343275cd8ad6df77e34c3cead327543beaab51ed6211005466977a'
 SHA512:
-  metadata.gz: 95a8a2168616e88c3a23fb8181941b8da9af9eab428b7260a7faf3ac504f812737066fb03c36ae503e4afa6fce62d31322088afe06676f97d558993e6705d559
-  data.tar.gz: e121b05b367d96cf315f15546957fd0dccb5c75538cd799981756a46279752d20ce6080b114f842ec9a3e09d4d9c18a5acb15a56afe04aced99b8c8921f6c15c
+  metadata.gz: 1fe944d2e2bb270c994d168fd5c0df781b425e7e92d53535f98fd13b72eb86d153ac76800374453769653ebc14359dcf9ca0db77858361a1b53661705f5b187d
+  data.tar.gz: 3eff9484e9f5d5bef71a0a8252daa782a9301401886371516a8c3bb041bd137413bf49defaccdabee5477aa18313b800cced10745a4edd790539ae5e5cee0fed

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

@@ -41,42 +41,76 @@ 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
+
+        # 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
 
-          UI.message("Found a tag #{tag_name} associated with version #{version}")
+        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

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,7 +172,7 @@ 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]
@@ -185,6 +185,14 @@ module Fastlane
             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]
@@ -273,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/version.rb

@@ -1 +1 @@
-module Fastlane module SemanticRelease VERSION = "1.13.1" 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.13.1
+  version: 1.14.1
 platform: ruby
 authors:
 - Jiří Otáhal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-14 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry