fastlane-plugin-semantic_release 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac02402f73c5effd089ddc2f1ae514240bd9edc0dd7d14b2775b2999244d4d78
-  data.tar.gz: 5eb38e8a63b0164842031f808cda9cbcea4983fe034a2a23ef5452c9e11a0685
+  metadata.gz: aeb35e46cb525cfd276c6a00e9c7728e2c3ada68be25635c3985cf81ed3f26f8
+  data.tar.gz: eb1193bcbdc76425e87522ccb167b093de60e2ac5c1f26e48f752e3930f5acbe
 SHA512:
-  metadata.gz: 9382dc98a8981951e180c62993f1f6f91c115050fb37383f8919b2dde6fbf3338bec364df8ce9433a3b69d401f816393df5ec89849baa9b5a3f48e5ece103be7
-  data.tar.gz: b7adae6d27238228d8fce4d769e065a9e503863481cce5ff1db780d8cc759007b150a32b3d10c79bf0d2b9b1a9fe2ec93b2d0ecb2776cf9ae332adbc8c7c8f2f
+  metadata.gz: af63de182b4b1f0acac3fd30f8ee1f50bad6257ed086466c15b587482ad47fe64a70c84eef79af0604a3fbca29e3712421cb691e9b75c560dd1c53df1863ebf5
+  data.tar.gz: 2d2cccf19624829ed04bde556158208eb6e8b156bbfa5b37737b9eaca2d90608c57175b491547e4512dcc96f62d60428a1070062e5232d1f2a627c50d6dde337

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

@@ -29,41 +29,10 @@ module Fastlane
       end
 
       def self.get_commits_from_hash(params)
-        commits = Helper::SemanticReleaseHelper.git_log('%s', params[:hash])
+        commits = Helper::SemanticReleaseHelper.git_log('%s|%b', params[:hash])
         commits.split("\n")
       end
 
-      def self.parse_commit(params)
-        commit = params[:commit]
-        releases = params[:releases]
-        pattern = /(docs|fix|feat|chore|style|refactor|perf|test)(\((.*)\))?!?\: /
-        breaking_change_pattern = /BREAKING CHANGES?: (.*)/
-
-        matched = commit.match(pattern)
-        result = {
-          is_valid: false
-        }
-
-        unless matched.nil?
-          type = matched[1]
-          scope = matched[3]
-
-          result[:is_valid] = true
-          result[:type] = type
-          result[:scope] = scope
-          result[:release] = releases[type.to_sym]
-
-          breaking_change_matched = commit.match(breaking_change_pattern)
-
-          unless breaking_change_matched.nil?
-            result[:is_breaking_change] = true
-            result[:breaking_change] = breaking_change_matched[1]
-          end
-        end
-
-        result
-      end
-
       def self.run(params)
         # Hash of the commit where is the last version
         # If the tag is not found we are taking HEAD as reference
@@ -108,7 +77,11 @@ module Fastlane
         splitted.each do |line|
           # conventional commits are in format
           # type: subject (fix: app crash - for example)
-          commit = parse_commit(commit: line, releases: releases)
+          commit = Helper::SemanticReleaseHelper.parse_commit(
+            commit_subject: line.split("|")[0],
+            commit_body: line.split("|")[1],
+            releases: releases
+          )
 
           if commit[:release] == "major" || commit[:is_breaking_change]
             next_major += 1

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

@@ -7,6 +7,11 @@ module Fastlane
     end
 
     class ConventionalChangelogAction < Action
+      def self.get_commits_from_hash(params)
+        commits = Helper::SemanticReleaseHelper.git_log('%s%b|%H|%h|%an|%at', params[:hash])
+        commits.split("\n")
+      end
+
       def self.run(params)
         # Get next version number from shared values
         analyzed = lane_context[SharedValues::RELEASE_ANALYZED]
@@ -22,8 +27,8 @@ module Fastlane
         version = lane_context[SharedValues::RELEASE_NEXT_VERSION]
 
         # Get commits log between last version and head
-        commits = Helper::SemanticReleaseHelper.git_log('%s|%H|%h|%an|%at', last_tag_hash)
-        parsed = parse_commits(commits.split("\n"))
+        commits = get_commits_from_hash(hash: last_tag_hash)
+        parsed = parse_commits(commits)
 
         commit_url = params[:commit_url]
 
@@ -55,14 +60,43 @@ module Fastlane
           result += "\n"
 
           commits.each do |commit|
-            next if commit[:type] != type
+            next if commit[:type] != type || commit[:is_merge]
 
             author_name = commit[:author_name]
             short_hash = commit[:short_hash]
             hash = commit[:hash]
             link = "#{commit_url}/#{hash}"
 
-            result += "- #{commit[:subject]} ([#{short_hash}](#{link}))"
+            result += "-"
+
+            unless commit[:scope].nil?
+              result += " **#{commit[:scope]}:**"
+            end
+
+            result += " #{commit[:subject]} ([#{short_hash}](#{link}))"
+
+            if params[:display_author]
+              result += "- #{author_name}"
+            end
+
+            result += "\n"
+          end
+        end
+
+        if commits.any? { |commit| commit[:is_breaking_change] == true }
+          result += "\n\n"
+          result += "### BREAKING CHANGES"
+          result += "\n"
+
+          commits.each do |commit|
+            next unless commit[:is_breaking_change]
+
+            author_name = commit[:author_name]
+            short_hash = commit[:short_hash]
+            hash = commit[:hash]
+            link = "#{commit_url}/#{hash}"
+
+            result += "- #{commit[:breaking_change]} ([#{short_hash}](#{link}))"
 
             if params[:display_author]
               result += "- #{author_name}"
@@ -91,14 +125,43 @@ module Fastlane
           result += "\n"
 
           commits.each do |commit|
-            next if commit[:type] != type
+            next if commit[:type] != type || commit[:is_merge]
 
             author_name = commit[:author_name]
             short_hash = commit[:short_hash]
             hash = commit[:hash]
             link = "#{commit_url}/#{hash}"
 
-            result += "- #{commit[:subject]} (<#{link}|#{short_hash}>)"
+            result += "-"
+
+            unless commit[:scope].nil?
+              result += " *#{commit[:scope]}:*"
+            end
+
+            result += " #{commit[:subject]} (<#{link}|#{short_hash}>)"
+
+            if params[:display_author]
+              result += "- #{author_name}"
+            end
+
+            result += "\n"
+          end
+        end
+
+        if commits.any? { |commit| commit[:is_breaking_change] == true }
+          result += "\n\n"
+          result += "*BREAKING CHANGES*"
+          result += "\n"
+
+          commits.each do |commit|
+            next unless commit[:is_breaking_change]
+
+            author_name = commit[:author_name]
+            short_hash = commit[:short_hash]
+            hash = commit[:hash]
+            link = "#{commit_url}/#{hash}"
+
+            result += "- #{commit[:breaking_change]} (<#{link}|#{short_hash}>)"
 
             if params[:display_author]
               result += "- #{author_name}"
@@ -113,28 +176,19 @@ module Fastlane
 
       def self.parse_commits(commits)
         parsed = []
-        # %s|%H|%h|%an|%at
+        # %s|%b|%H|%h|%an|%at
         commits.each do |line|
           splitted = line.split("|")
 
-          subject_splitted = splitted[0].split(":")
-
-          if subject_splitted.length > 1
-            type = subject_splitted[0]
-            subject = subject_splitted[1]
-          else
-            type = 'no_type'
-            subject = subject_splitted[0]
-          end
+          commit = Helper::SemanticReleaseHelper.parse_commit(
+            commit_subject: splitted[0],
+            commit_body: splitted[1]
+          )
 
-          commit = {
-            type: type.strip,
-            subject: subject.strip,
-            hash: splitted[1],
-            short_hash: splitted[2],
-            author_name: splitted[3],
-            commitDate: splitted[4]
-          }
+          commit[:hash] = splitted[2]
+          commit[:short_hash] = splitted[3]
+          commit[:author_name] = splitted[4]
+          commit[:commit_date] = splitted[5]
 
           parsed.push(commit)
         end

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

@@ -13,6 +13,49 @@ module Fastlane
         Actions.sh(command, log: false).chomp
       end
 
+      def self.parse_commit(params)
+        commit_subject = params[:commit_subject]
+        commit_body = params[:commit_body]
+        releases = params[:releases]
+        pattern = /^(docs|fix|feat|chore|style|refactor|perf|test)(\((.*)\))?(!?)\: (.*)/
+        merge_pattern = /^Merge/
+        breaking_change_pattern = /BREAKING CHANGES?: (.*)/
+
+        matched = commit_subject.match(pattern)
+        result = {
+          is_valid: false,
+          subject: commit_subject,
+          is_merge: commit_subject.match?(merge_pattern),
+          type: 'no_type'
+        }
+
+        unless matched.nil?
+          type = matched[1]
+          scope = matched[3]
+
+          result[:is_valid] = true
+          result[:type] = type
+          result[:scope] = scope
+          result[:has_exclamation_mark] = matched[4] == '!'
+          result[:subject] = matched[5]
+
+          unless releases.nil?
+            result[:release] = releases[type.to_sym]
+          end
+
+          unless commit_body.nil?
+            breaking_change_matched = commit_body.match(breaking_change_pattern)
+
+            unless breaking_change_matched.nil?
+              result[:is_breaking_change] = true
+              result[:breaking_change] = breaking_change_matched[1]
+            end
+          end
+        end
+
+        result
+      end
+
       def self.semver_gt(first, second)
         first_major = (first.split('.')[0] || 0).to_i
         first_minor = (first.split('.')[1] || 0).to_i

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

@@ -1 +1 @@
-module Fastlane module SemanticRelease VERSION = "1.0.10" end end
+module Fastlane module SemanticRelease VERSION = "1.1.0" end end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-semantic_release
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Jiří Otáhal