fastlane-plugin-semantic_release 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f275a6ba5ed94f9ddca8382caab148ca9d3eb5258f69929e2dbf812b685076
-  data.tar.gz: 9e1e30f5f2e34a270f972d2dc5ea41121898ff386b0d092ae3ea0a26cc3f483d
+  metadata.gz: ac02402f73c5effd089ddc2f1ae514240bd9edc0dd7d14b2775b2999244d4d78
+  data.tar.gz: 5eb38e8a63b0164842031f808cda9cbcea4983fe034a2a23ef5452c9e11a0685
 SHA512:
-  metadata.gz: 8f75f488c4c526ff5c4e225f3ade6767fa50b9dcba9ac76bda5850f2cd3cc6c58e70fe6742921911dbb766df8bc1538df79af8f1561faed0483720490eb6ed20
-  data.tar.gz: f73eb17cd7638e7a90283522eef7c67b8b42d7c2f68aa51a26b726519dcf1026dde3d53678301a6496c968e42bbb98b2aed2d536ec7568f2d7701a069a5b44de
+  metadata.gz: 9382dc98a8981951e180c62993f1f6f91c115050fb37383f8919b2dde6fbf3338bec364df8ce9433a3b69d401f816393df5ec89849baa9b5a3f48e5ece103be7
+  data.tar.gz: b7adae6d27238228d8fce4d769e065a9e503863481cce5ff1db780d8cc759007b150a32b3d10c79bf0d2b9b1a9fe2ec93b2d0ecb2776cf9ae332adbc8c7c8f2f

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

@@ -15,22 +15,63 @@ module Fastlane
     end
 
     class AnalyzeCommitsAction < Action
+      def self.get_last_tag(params)
+        # Try to find the tag
+        command = "git describe --tags --match=#{params[:match]}"
+        Actions.sh(command, log: false)
+      rescue
+        UI.message("Tag was not found for match pattern - #{params[:match]}")
+      end
+
+      def self.get_last_tag_hash(params)
+        command = "git rev-list -n 1 #{params[:tag_name]}"
+        Actions.sh(command, log: false).chomp
+      end
+
+      def self.get_commits_from_hash(params)
+        commits = Helper::SemanticReleaseHelper.git_log('%s', 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)
-        # Last version tag name
-        tag = ""
         # 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'
 
-        begin
-          # Try to find the tag
-          command = "git describe --tags --match=#{params[:match]}"
-          tag = Actions.sh(command, log: false)
-        rescue
-          UI.message("Tag was not found for match pattern - #{params[:match]}")
-        end
+        tag = get_last_tag(match: params[:match])
 
         if tag.empty?
           UI.message("First commit of the branch is taken as a begining of next release")
@@ -48,8 +89,7 @@ module Fastlane
 
           version = parsed_version[0]
           # Get a hash of last version tag
-          command = "git rev-list -n 1 #{tag_name}"
-          hash = Actions.sh(command, log: false).chomp
+          hash = get_last_tag_hash(tag_name: tag_name)
 
           UI.message("Found a tag #{tag_name} associated with version #{version}")
         end
@@ -60,8 +100,7 @@ module Fastlane
         next_patch = (version.split('.')[2] || 0).to_i
 
         # Get commits log between last version and head
-        commits = Helper::SemanticReleaseHelper.git_log('%s', hash)
-        splitted = commits.split("\n")
+        splitted = get_commits_from_hash(hash: hash)
 
         UI.message("Found #{splitted.length} commits since last release")
         releases = params[:releases]
@@ -69,18 +108,17 @@ module Fastlane
         splitted.each do |line|
           # conventional commits are in format
           # type: subject (fix: app crash - for example)
-          type = line.split(":")[0]
-          release = releases[type.to_sym]
+          commit = parse_commit(commit: line, releases: releases)
 
-          if release == "patch"
-            next_patch += 1
-          elsif release == "minor"
-            next_minor += 1
-            next_patch = 0
-          elsif release == "major"
+          if commit[:release] == "major" || commit[:is_breaking_change]
             next_major += 1
             next_minor = 0
             next_patch = 0
+          elsif commit[:release] == "minor"
+            next_minor += 1
+            next_patch = 0
+          elsif commit[:release] == "patch"
+            next_patch += 1
           end
 
           next_version = "#{next_major}.#{next_minor}.#{next_patch}"

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-semantic_release
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Jiří Otáhal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry