fastlane-plugin-semantic_release 1.12.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 801ae7e90c09769c435f3aa1640323338ff7b343d3005427208f371f2cd06711
-  data.tar.gz: '0790c9a548fd4d4bd59409bf659b488af3db65cfb098683dac62658b36b866c4'
+  metadata.gz: bfdd6b224d265922b3de9f42697de102ceacca38c4222e21295ace3e695c204c
+  data.tar.gz: cd348da86de7b4eba45d92672b67f6ce2af63ddd441b0a6d187296c9c9a5f8e4
 SHA512:
-  metadata.gz: c8527660760ffa383de7ff51baa708323da17ed33a7d601becc88375f4ad789ee6d4b99970995b42ae010a6a8f976b661fd53c22dd522bef8d0df30d3fc091bd
-  data.tar.gz: 6935fab5c02ffa2cb63d6d5fde4a7012e4abd800263059265c75c2f29155d179af8a960e11ebb146a329cc6c7af44ae52dc8718da04ba1b7309a566fc80767c8
+  metadata.gz: 6f91ea3be74683aeca782926fd80ca13e6f43ba1a6814cc89f76c055cc3e0b57183f885fc47ee97bfaac6cd8592cb02d0c1298ed57885ca4464801b5e8bbdcb6
+  data.tar.gz: e7d77b750b04093063de46eb83ba151b4a600e990c8e3e14bf97e5c0e548262f0a515b3b348a643de6fdf6877198889a2a0947947079579cf80233cfa19bc2fe

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
@@ -40,47 +41,85 @@ 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]
-          )
+          unless params[:prevent_tag_fallback]
+            # neither 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])
+          end
+
+          # 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
+
+        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)
 
-          UI.message("Found a tag #{tag_name} associated with version #{version}")
+        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,
@@ -103,13 +142,11 @@ 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
+          next if Helper::SemanticReleaseHelper.should_exclude_commit(
+            commit_scope: commit[:scope],
+            include_scopes: params[:include_scopes],
+            ignore_scopes: params[:ignore_scopes]
+          )
 
           if commit[:release] == "major" || commit[:is_breaking_change]
             next_major += 1
@@ -122,6 +159,10 @@ 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}: #{subject}") if params[:show_version_path]
         end
@@ -132,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
@@ -148,7 +190,7 @@ module Fastlane
       end
 
       def self.is_codepush_friendly(params)
-        git_command = 'git rev-list --max-parents=0 HEAD'
+        git_command = "git rev-list --max-parents=0 HEAD"
         # Begining of the branch is taken for codepush analysis
         hash_lines = Actions.sh("#{git_command} | wc -l", log: params[:debug]).chomp
         hash = Actions.sh(git_command, log: params[:debug]).chomp
@@ -273,6 +315,20 @@ module Fastlane
             description: "To parse version number from tag name",
             default_value: '\d+\.\d+\.\d+'
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :prevent_tag_fallback,
+            description: "Prevent tag from falling back to vX.Y.Z when there is no match",
+            default_value: false,
+            type: Boolean,
+            optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :include_scopes,
+            description: "To only include certain scopes when calculating releases",
+            default_value: [],
+            type: Array,
+            optional: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :ignore_scopes,
             description: "To ignore certain scopes when calculating releases",
@@ -303,6 +359,7 @@ 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'],

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,12 @@ module Fastlane
             pattern: format_pattern
           )
 
+          next if Helper::SemanticReleaseHelper.should_exclude_commit(
+            commit_scope: commit[:scope],
+            include_scopes: params[:include_scopes],
+            ignore_scopes: params[:ignore_scopes]
+          )
+
           commit[:hash] = splitted[2]
           commit[:short_hash] = splitted[3]
           commit[:author_name] = splitted[4]
@@ -273,6 +279,20 @@ module Fastlane
             type: Boolean,
             optional: true
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :include_scopes,
+            description: "To only include certain scopes when calculating releases",
+            default_value: [],
+            type: Array,
+            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

@@ -20,6 +20,20 @@ module Fastlane
         Actions.sh(command, log: params[:debug]).chomp
       end
 
+      def self.should_exclude_commit(params)
+        commit_scope = params[:commit_scope]
+        scopes_to_include = params[:include_scopes]
+        scopes_to_ignore = params[:ignore_scopes]
+
+        unless scopes_to_include.empty?
+          return !scopes_to_include.include?(commit_scope)
+        end
+
+        unless commit_scope.nil?
+          return scopes_to_ignore.include?(commit_scope)
+        end
+      end
+
       def self.parse_commit(params)
         commit_subject = params[:commit_subject].strip
         commit_body = params[:commit_body]

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

@@ -1 +1 @@
-module Fastlane module SemanticRelease VERSION = "1.12.0" end end
+module Fastlane module SemanticRelease VERSION = "1.18.0" end end

metadata

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