fastlane-plugin-semantic_release 1.8.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 991694d09785835a5aee8a33b9d53ba0d30294942a13abbb5611a6a82b45022f
-  data.tar.gz: a65c5eb20db107b72792baad5bcf6e3e49629703f878cd0228530a2c892f48c8
+  metadata.gz: 801ae7e90c09769c435f3aa1640323338ff7b343d3005427208f371f2cd06711
+  data.tar.gz: '0790c9a548fd4d4bd59409bf659b488af3db65cfb098683dac62658b36b866c4'
 SHA512:
-  metadata.gz: 9d71f3cb33ac74a94a761a48d72ca42acd3babc5d9d8234352346bd56dd55ad4d79685be372f2c1e1d9ec834947ec53074fcd66146381a80d26b10870b3bdb58
-  data.tar.gz: b32097e494de9908a958039e115dfdff3e1cbc9a2d9f26bf59099cbc5803fa8bc998c776517a72978410056f8d9ceaec2c653936c3142ecd6b42f66e7c87ca94
+  metadata.gz: c8527660760ffa383de7ff51baa708323da17ed33a7d601becc88375f4ad789ee6d4b99970995b42ae010a6a8f976b661fd53c22dd522bef8d0df30d3fc091bd
+  data.tar.gz: 6935fab5c02ffa2cb63d6d5fde4a7012e4abd800263059265c75c2f29155d179af8a960e11ebb146a329cc6c7af44ae52dc8718da04ba1b7309a566fc80767c8

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

@@ -13,13 +13,14 @@ 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
       def self.get_last_tag(params)
         # Try to find the tag
         command = "git describe --tags --match=#{params[:match]}"
-        Actions.sh(command, log: false)
+        Actions.sh(command, log: params[:debug])
       rescue
         UI.message("Tag was not found for match pattern - #{params[:match]}")
         ''
@@ -27,11 +28,15 @@ module Fastlane
 
       def self.get_last_tag_hash(params)
         command = "git rev-list -n 1 refs/tags/#{params[:tag_name]}"
-        Actions.sh(command, log: false).chomp
+        Actions.sh(command, log: params[:debug]).chomp
       end
 
       def self.get_commits_from_hash(params)
-        commits = Helper::SemanticReleaseHelper.git_log('%s|%b|>', params[:hash])
+        commits = Helper::SemanticReleaseHelper.git_log(
+          pretty: '%s|%b|>',
+          start: params[:hash],
+          debug: params[:debug]
+        )
         commits.split("|>")
       end
 
@@ -42,16 +47,19 @@ module Fastlane
         # Default last version
         version = '0.0.0'
 
-        tag = get_last_tag(match: params[:match])
+        tag = get_last_tag(
+          match: params[:match],
+          debug: params[:debug]
+        )
 
         if tag.empty?
           UI.message("First commit of the branch is taken as a begining 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: false).chomp
+          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].strip
+          tag_name = tag.split('-')[0...-2].join('-').strip
           parsed_version = tag_name.match(params[:tag_version_match])
 
           if parsed_version.nil?
@@ -60,7 +68,10 @@ module Fastlane
 
           version = parsed_version[0]
           # Get a hash of last version tag
-          hash = get_last_tag_hash(tag_name: tag_name)
+          hash = get_last_tag_hash(
+            tag_name: tag_name,
+            debug: params[:debug]
+          )
 
           UI.message("Found a tag #{tag_name} associated with version #{version}")
         end
@@ -71,18 +82,25 @@ module Fastlane
         next_patch = (version.split('.')[2] || 0).to_i
 
         # Get commits log between last version and head
-        splitted = get_commits_from_hash(hash: hash)
+        splitted = get_commits_from_hash(
+          hash: hash,
+          debug: params[:debug]
+        )
 
         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?
@@ -105,7 +123,7 @@ module Fastlane
           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}"
@@ -130,18 +148,31 @@ module Fastlane
       end
 
       def self.is_codepush_friendly(params)
+        git_command = 'git rev-list --max-parents=0 HEAD'
         # Begining of the branch is taken for codepush analysis
-        hash = Actions.sh('git rev-list --max-parents=0 HEAD', log: false).chomp
+        hash_lines = Actions.sh("#{git_command} | wc -l", log: params[:debug]).chomp
+        hash = Actions.sh(git_command, log: params[:debug]).chomp
         next_major = 0
         next_minor = 0
         next_patch = 0
         last_incompatible_codepush_version = '0.0.0'
 
+        if hash_lines.to_i > 1
+          UI.error("#{git_command} resulted to more than 1 hash")
+          UI.error('This usualy happens when you pull only part of a git history. Check out how you pull the repo! "git fetch" should be enough.')
+          Actions.sh(git_command, log: true).chomp
+          return false
+        end
+
         # Get commits log between last version and head
-        splitted = get_commits_from_hash(hash: hash)
+        splitted = get_commits_from_hash(
+          hash: hash,
+          debug: params[:debug]
+        )
         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)
@@ -149,6 +180,7 @@ module Fastlane
             commit_subject: line.split("|")[0],
             commit_body: line.split("|")[1],
             releases: releases,
+            pattern: format_pattern,
             codepush_friendly: codepush_friendly
           )
 
@@ -202,6 +234,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)",
@@ -226,6 +279,20 @@ module Fastlane
             default_value: [],
             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",
+            default_value: false,
+            type: Boolean,
+            optional: true
           )
         ]
       end
@@ -242,7 +309,8 @@ module Fastlane
           ['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

@@ -8,7 +8,11 @@ module Fastlane
 
     class ConventionalChangelogAction < Action
       def self.get_commits_from_hash(params)
-        commits = Helper::SemanticReleaseHelper.git_log('%s|%b|%H|%h|%an|%at|>', params[:hash])
+        commits = Helper::SemanticReleaseHelper.git_log(
+          pretty: '%s|%b|%H|%h|%an|%at|>',
+          start: params[:hash],
+          debug: params[:debug]
+        )
         commits.split("|>")
       end
 
@@ -27,7 +31,10 @@ module Fastlane
         version = lane_context[SharedValues::RELEASE_NEXT_VERSION]
 
         # Get commits log between last version and head
-        commits = get_commits_from_hash(hash: last_tag_hash)
+        commits = get_commits_from_hash(
+          hash: last_tag_hash,
+          debug: params[:debug]
+        )
         parsed = parse_commits(commits)
 
         commit_url = params[:commit_url]
@@ -168,12 +175,14 @@ module Fastlane
       def self.parse_commits(commits)
         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
           )
 
           commit[:hash] = splitted[2]
@@ -263,6 +272,13 @@ module Fastlane
             default_value: true,
             type: Boolean,
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :debug,
+            description: "True if you want to log out a debug info",
+            default_value: false,
+            type: Boolean,
+            optional: true
           )
         ]
       end

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

@@ -5,12 +5,19 @@ 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`
       #
-      def self.git_log(pretty, start)
-        command = "git log --pretty='#{pretty}' --reverse #{start}..HEAD"
-        Actions.sh(command, log: false).chomp
+      def self.git_log(params)
+        command = "git log --pretty='#{params[:pretty]}' --reverse #{params[:start]}..HEAD"
+        Actions.sh(command, log: params[:debug]).chomp
       end
 
       def self.parse_commit(params)
@@ -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.8.0" end end
+module Fastlane module SemanticRelease VERSION = "1.12.0" end end

metadata

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