fastlane-plugin-better_semantic_release 2.0.10 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de491d690f759ee47eae0ae508c236eaf519c6e58a965007080789582af273fd
-  data.tar.gz: 22663fc26a454d407e8369a8f21ca7639f70fed295e6ae6629b4d815ecc57026
+  metadata.gz: 142599a4d25ff2dd47428c8de7684bba89a392e0f2e6786c8195cb9956f3c21f
+  data.tar.gz: c9151dee2b0fd22d54e35def74031e9a70e658c2958daa6985ef3d333f8669ea
 SHA512:
-  metadata.gz: 329a5678abd24454d9f8794d9151a653b68525307f0e8cac2e2e9490f78502ea75840b2caaf1543d11092a3b2c8e6ac0095d2fcd9a36cab1f0f543578c7033f9
-  data.tar.gz: b98b692de65a55fbe3e0fbf33ad0dba3138a37192c5676b0bed3b0b3ca8770e9f6a3c0ed38e91030491e10b9666cd6090aa3b4bbc13ad05f5f26596408db7ffc
+  metadata.gz: 03ba6831f38b10712fb28f1b412c2742e9ff194f196ec178b847b50066b97979a88f8dfbf8fd5180290af5e36a0bb6f97f30816817c0b8626484de9984c33903
+  data.tar.gz: c25bc5f97209c6a9a52c6ccd33e85dbe1507db458e23a358db315d521f11a47c8da26b620b1bd853af54533c1fd65144b17db6296ec30f005e2de8388c8e53a5

data/README.md

@@ -85,6 +85,13 @@ And you can access these like this:
 
 To run the test suite (contained in `./spec`), call `bundle exec rake`
 
+# Publishing Update
+
+Increment version number and run: 
+
+`bundle install && rake install && rake release`
+
+
 ## Questions
 
 If you need anything ping us on [twitter](http://bit.ly/t-xotahal).

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

@@ -135,7 +135,10 @@ module Fastlane
         format_pattern = lane_context[SharedValues::CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN]
         splitted.each do |squashed_commit|
           commits = squashed_commit.split("*")
-          commits.drop(1).each do |line|
+          # This works for Bitbucket
+          #commits.drop(1).each do |line|
+          # This works for Gitlab
+          commits.each do |line|
             parts = line.split(":")
             if parts.length > 1
               # conventional commits are in format

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

@@ -178,29 +178,66 @@ module Fastlane
         format_pattern = lane_context[SharedValues::CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN]
         squashed_commits.each do |squashed_commit|
           commits = squashed_commit.split("*")
-          commits.drop(1).each do |line|
+          # This works for Bitbucket
+          #commits.drop(1).each do |line|
+          # This works for Gitlab
+          commits.each do |line|
             splitted = line.split("|")
 
-            commit = Helper::BetterSemanticReleaseHelper.parse_commit(
-              commit_subject: splitted[0],
-              commit_body: splitted[1],
-              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
+            # This is a regular commit
+            # every `line` in commits array has it's own hash and other info
+            if splitted.length() > 1
+              commit = Helper::BetterSemanticReleaseHelper.parse_commit(
+                commit_subject: splitted[0],
+                commit_body: splitted[1],
+                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
+  
+              commit[:hash] = splitted[2]
+              commit[:short_hash] = splitted[3]
+              commit[:author_name] = splitted[4]
+              commit[:commit_date] = splitted[5]
+              parsed.push(commit)
+
+            # This is a rebased-squash commit
+            # Every line is one commit message but hash and other details
+            # are on the very last `line` in the commits array. 
+            elsif
+              # Skip any empty space
+              unless line.to_s.strip.empty?
+                # Split last commit since that's the squashed commit that has the extra details on it for all these commits
+                splitted = commits[commits.length() -1]
+    
+                commit = Helper::BetterSemanticReleaseHelper.parse_commit(
+                  commit_subject: line.to_s.strip,
+                  commit_body: "",
+                  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
+    
+                commit[:hash] = splitted[2]
+                commit[:short_hash] = splitted[3]
+                commit[:author_name] = splitted[4]
+                commit[:commit_date] = splitted[5]
+    
+                parsed.push(commit)
+              end
             end
-
-            commit[:hash] = splitted[2]
-            commit[:short_hash] = splitted[3]
-            commit[:author_name] = splitted[4]
-            commit[:commit_date] = splitted[5]
-
-            parsed.push(commit)
           end
         end
 

data/lib/fastlane/plugin/better_semantic_release/helper/better_semantic_release_helper.rb

@@ -21,7 +21,15 @@ module Fastlane
       end
 
       def self.parse_commit(params)
-        commit_subject = params[:commit_subject].strip
+        #UI.message "-------------"
+        #begin
+        #  UI.message "body: " + params[:commit_body]
+        #rescue
+        #  UI.message "ERROR_HERE: "
+        #  UI.message params
+        #end
+        #UI.message "subject: " + params[:commit_subject].delete("\n")
+        commit_subject = params[:commit_subject].delete("\n")
         commit_body = params[:commit_body]
         releases = params[:releases]
         codepush_friendly = params[:codepush_friendly]
@@ -58,7 +66,8 @@ module Fastlane
           unless commit_body.nil?
             breaking_change_matched = commit_body.match(breaking_change_pattern)
             codepush_matched = commit_body.match(codepush_pattern)
-
+            
+            #UI.message commit_body
             unless breaking_change_matched.nil?
               result[:is_breaking_change] = true
               result[:breaking_change] = breaking_change_matched[1]
@@ -69,6 +78,9 @@ module Fastlane
           end
         end
 
+
+        #UI.message result
+
         result
       end
 

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

@@ -1 +1 @@
-module Fastlane module BetterSemanticRelease VERSION = "2.0.10" end end
+module Fastlane module BetterSemanticRelease VERSION = "2.0.12" end end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-better_semantic_release
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.12
 platform: ruby
 authors:
 - Tom Greco
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry