fastlane-plugin-better_semantic_release 1.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56cbc72476d971316f6fa98a4a8d761270ea92ee1c1cc07662f0ff0121a123f5
-  data.tar.gz: 17c1f14c265f83d8fb37c518b5759afbe9a93c7c65de46981bd85bffa70cc765
+  metadata.gz: 07acfe8333f8d51d614bf67934dcce916dc921ab6430cf847b733ca9c1720079
+  data.tar.gz: 3d06659fa89cb3550264af43d2be11a76bf324d116289d3fa0319f38dd61a298
 SHA512:
-  metadata.gz: 65b093fb5a663eb41c29b5fb5194a58e47f0f68c025485d80620f9c5b94ac1f5ad5b9e9d0276d0c7344a0a96517309f8932bc4485870e793ecc84130f82f9ff8
-  data.tar.gz: e87fd555bcdd5e41da77c6b2febe97132febc31e0b46e39ed45d750ec9b1f617ba91a365f43692922f706ef544286b802922aaa094acbbc28fb1063b9362fdf3
+  metadata.gz: 4a6640db9100bde01932fcda01e0f0d918d5c38f923707475f04bb9ff0548b03d1ae54e218b6d1129baffa4ae2357be3e24a5444c4a4a49e9211c4e434881ba6
+  data.tar.gz: 7e7f49b2afbfdcb8583fc2fe72dd4b8b97e7b96ad411e3e2c219f55d4c88328f2481d54d7214d621a39b82b816c689b3f810a0da36a7b10e7979bf615ce9b30f

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

@@ -28,8 +28,16 @@ module Fastlane
       end
 
       def self.get_last_tag_hash(params)
-        command = "git rev-list -n 1 refs/tags/#{params[:tag_name]}"
-        Actions.sh(command, log: params[:debug]).chomp
+        #command = "git rev-list -n 1 refs/tags/#{params[:tag_name]}"
+        #Actions.sh(command, log: params[:debug]).chomp
+
+        command = "git log -2 --pretty=format:'%H' #{params[:tag_name]}"
+        command_output = Actions.sh(command, log: false).chomp
+        hashes = command_output.split("\n")
+        if hashes.length > 1
+          return hashes[1]
+        end
+        return nil
       end
 
       def self.get_commits_from_hash(params)
@@ -42,15 +50,14 @@ module Fastlane
       end
 
       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])
 
         # if tag doesn't exist it get's first commit or fallback tag (v*.*.*)
         if tag.empty?
           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
+           # command to get first commit
+          git_command = 'git rev-list --max-parents=0 HEAD'
           hash_lines = Actions.sh("#{git_command} | wc -l", log: params[:debug]).chomp
 
           if hash_lines.to_i == 1
@@ -126,43 +133,44 @@ module Fastlane
         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::BetterSemanticReleaseHelper.parse_commit(
-            commit_subject: subject,
-            commit_body: parts[1],
-            releases: releases,
-            pattern: format_pattern
-          )
+        splitted.each do |squashed_commit|
+          commits = squashed_commit.split("*")
+          commits.drop(1).each do |line|
+            # conventional commits are in format
+            # type: subject (fix: app crash - for example)
+            commit = Helper::BetterSemanticReleaseHelper.parse_commit(
+              commit_subject: line,
+              commit_body: line.split(":")[1].strip,
+              releases: releases,
+              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
 
-          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
+            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
 
-          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
+            unless commit[:is_codepush_friendly]
+              is_next_version_compatible_with_codepush = false
+            end
 
-          unless commit[:is_codepush_friendly]
-            is_next_version_compatible_with_codepush = false
+            next_version = "#{next_major}.#{next_minor}.#{next_patch}"
+            UI.message("#{next_version}: #{subject}") if params[:show_version_path]
           end
-
-          next_version = "#{next_major}.#{next_minor}.#{next_patch}"
-          UI.message("#{next_version}: #{subject}") if params[:show_version_path]
         end
 
         next_version = "#{next_major}.#{next_minor}.#{next_patch}"
@@ -188,7 +196,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=#{params[:start_hash]} 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
@@ -214,29 +222,34 @@ module Fastlane
 
         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)
-          commit = Helper::BetterSemanticReleaseHelper.parse_commit(
-            commit_subject: line.split("|")[0],
-            commit_body: line.split("|")[1],
-            releases: releases,
-            pattern: format_pattern,
-            codepush_friendly: codepush_friendly
-          )
-
-          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
+          parts = line.split(':')
+          if parts.length > 1
+            # conventional commits are in format
+            # type: subject (fix: app crash - for example)
+            commit = Helper::BetterSemanticReleaseHelper.parse_commit(
+              commit_subject: line,
+              commit_body: parts[1].strip,
+              releases: releases,
+              pattern: format_pattern,
+              codepush_friendly: codepush_friendly
+            )
+
+            #UI.message commit
+
+            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
 
-          unless commit[:is_codepush_friendly]
-            last_incompatible_codepush_version = "#{next_major}.#{next_minor}.#{next_patch}"
+            unless commit[:is_codepush_friendly]
+              last_incompatible_codepush_version = "#{next_major}.#{next_minor}.#{next_patch}"
+            end
           end
         end
 
@@ -304,7 +317,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :codepush_friendly,
             description: "These types are consider as codepush friendly automatically",
-            default_value: ["chore", "test", "docs"],
+            default_value: ["build", "chore", "ci", "docs", "fix", "feat", "perf", "refactor", "style", "test"],
             type: Array,
             optional: true
           ),
@@ -333,6 +346,13 @@ module Fastlane
             default_value: false,
             type: Boolean,
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :start_hash,
+            description: "Hash to start from when calculating versions",
+            default_value: "HEAD",
+            type: String,
+            optional: true
           )
         ]
       end

data/lib/fastlane/plugin/better_semantic_release/helper/{semantic_release_helper.rb → better_semantic_release_helper.rb}

@@ -4,7 +4,7 @@ module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
 
   module Helper
-    class SemanticReleaseHelper
+    class BetterSemanticReleaseHelper
       def self.format_patterns
         return {
           "default" => /^(docs|fix|feat|chore|style|refactor|perf|test)(?:\((.*)\))?(!?)\: (.*)/,
@@ -13,7 +13,7 @@ module Fastlane
       end
 
       # class methods that you define here become available in your action
-      # as `Helper::SemanticReleaseHelper.your_method`
+      # as `Helper::BetterSemanticReleaseHelper.your_method`
       #
       def self.git_log(params)
         command = "git log --pretty='#{params[:pretty]}' --reverse #{params[:start]}..HEAD"
@@ -34,7 +34,8 @@ module Fastlane
           is_valid: false,
           subject: commit_subject,
           is_merge: !(commit_subject =~ /^Merge/).nil?,
-          type: 'no_type'
+          type: 'no_type',
+          is_codepush_friendly: true
         }
 
         unless matched.nil?

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

@@ -1 +1 @@
-module Fastlane module BetterSemanticRelease VERSION = "1.0.0" end end
+module Fastlane module BetterSemanticRelease VERSION = "2.0.2" end end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-better_semantic_release
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Tom Greco
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -144,11 +144,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- lib/fastlane/plugin/better_semantic_release.rb
 - lib/fastlane/plugin/better_semantic_release/actions/analyze_commits.rb
 - lib/fastlane/plugin/better_semantic_release/actions/conventional_changelog.rb
-- lib/fastlane/plugin/better_semantic_release/helper/semantic_release_helper.rb
+- lib/fastlane/plugin/better_semantic_release/helper/better_semantic_release_helper.rb
 - lib/fastlane/plugin/better_semantic_release/version.rb
-- lib/fastlane/plugin/semantic_release.rb
 homepage: https://github.com/tomgreco/fastlane-plugin-better_semantic_release
 licenses:
 - MIT