sem_ver_components 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 387992ffe83f018c9096f517580fc810be55fce48f32ed519091d226aa480fed
-  data.tar.gz: 6b624945d92655aee943be4e1f380498b70e0fbb070917a1d1bd7eaacf00d353
+  metadata.gz: 3bd9072dcf7ef8166885ae3f8cf08c3d50cf5b99e557f9c22b51c9523ddb263a
+  data.tar.gz: 66036176a6028833f51c4f5f5118f4d68c934106c8e90dc08f478ae4a57e78d0
 SHA512:
-  metadata.gz: a4d1bf087e0922fe5eaa3439497279d8562fd865527c65f915d61ffe0fe5abd594af4ba6290f085297028dbf903e3c3d428bbb3ef885393ccabad3690b7107f2
-  data.tar.gz: dc626df24fc0c635c86aeed396e4eeed80ef11840d65008846dd1c40568f0f6955385d93aa5c2b9cef767dca3b65793e3acd76022dd930dce2fdcdfbe6ea6f55
+  metadata.gz: '049f38d9969d07d80af92c82ec6a70f9e9de84ac1df68e549c72962ce0d63958d182ebb8ae9b966e9371511d2d76fc7539ebb0c62e7f6b0d0d9e2df2a93ee13f'
+  data.tar.gz: 355307ad5bee9481fdc7d7b29c0dad165c5d573ae805a77d2241a1826ee6b6ef35bcf4013b652d56f57b761fe67b00a24e1d2945f8c76d7e7b4354cba7a069da

data/lib/sem_ver_components/outputs/semantic_release_generate_notes.rb

@@ -47,10 +47,14 @@ module SemVerComponents
           # If we are dealing with a merge commit, consider the components' bump levels of the merged commits
           if merge_commits.key?(git_commit_sha)
             merge_commits[git_commit_sha].each do |merged_commit_sha|
-              components_bump_levels = components_bump_levels.merge(
-                commits_info.find { |search_commit_info| search_commit_info[:commit].sha == merged_commit_sha }[:components_bump_levels]
-              ) do |component, bump_level_1, bump_level_2|
-                [bump_level_1, bump_level_2].max
+              merged_commit_info = commits_info.find { |search_commit_info| search_commit_info[:commit].sha == merged_commit_sha }
+              # If the merged commit is not part of the list of commits, it means that the merge commit was not rebased on the previous release tag.
+              # In this case we can have some merged commits that are already part of the previous release.
+              # So we can ignore them.
+              unless merged_commit_info.nil?
+                components_bump_levels = components_bump_levels.merge(merged_commit_info[:components_bump_levels]) do |component, bump_level_1, bump_level_2|
+                  [bump_level_1, bump_level_2].max
+                end
               end
             end
           end

data/lib/sem_ver_components/version.rb

@@ -1,5 +1,5 @@
 module SemVerComponents
 
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sem_ver_components
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git