sem_ver_components 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185deb09195baa6edae7e07fbd2bcc12950e68bdca1e7a2d8dac5701bc7ffeac
-  data.tar.gz: 201606f2490c02ba2819582bf787c7f8264d577f6c7feeebc1ef9ddfbf41ce0e
+  metadata.gz: 387992ffe83f018c9096f517580fc810be55fce48f32ed519091d226aa480fed
+  data.tar.gz: 6b624945d92655aee943be4e1f380498b70e0fbb070917a1d1bd7eaacf00d353
 SHA512:
-  metadata.gz: 9af95c9e8a9fb2377eafaa277cd730f4a11d698484b6794441b49d88e0022faf7aa77a89fe883a4f5489faafc822e1c522c539b3a4f2061c4d428c43a63ea5cb
-  data.tar.gz: 373c35bad5e6a655c80fa0a7a2430203309380cf98a645ba99bcefb9bae9cad6fdb777e679dfcfcc0789755e6998c8ad2398d9ab3aca02ba660ff9aa7a9470dc
+  metadata.gz: a4d1bf087e0922fe5eaa3439497279d8562fd865527c65f915d61ffe0fe5abd594af4ba6290f085297028dbf903e3c3d428bbb3ef885393ccabad3690b7107f2
+  data.tar.gz: dc626df24fc0c635c86aeed396e4eeed80ef11840d65008846dd1c40568f0f6955385d93aa5c2b9cef767dca3b65793e3acd76022dd930dce2fdcdfbe6ea6f55

data/lib/sem_ver_components/local_git.rb

@@ -60,6 +60,14 @@ module SemVerComponents
       end
     end
 
+    # Is the git to ref part of a release branch?
+    #
+    # Result::
+    # * Boolean: Is the git to ref part of a release branch?
+    def on_release_branch?
+      @git_to == 'master'
+    end
+
   end
 
 end

data/lib/sem_ver_components/outputs/info.rb

@@ -1,3 +1,5 @@
+require 'sem_ver_components/semver'
+
 module SemVerComponents
 
   module Outputs
@@ -12,11 +14,12 @@ module SemVerComponents
       #   * *commit* (Git::Object::Commit): Corresponding git commit
       def process(commits_info)
         # Display bump levels per component
-        commits_info.inject({}) do |components_bump_levels, commit_info|
+        bumps_per_component = commits_info.inject({}) do |components_bump_levels, commit_info|
           components_bump_levels.merge(commit_info[:components_bump_levels]) do |_component, bump_level_1, bump_level_2|
             [bump_level_1, bump_level_2].max
           end
-        end.each do |component, bump_level|
+        end
+        bumps_per_component.each do |component, bump_level|
           puts "#{component.nil? ? 'Global' : component}: Bump #{
               case bump_level
               when 0
@@ -30,6 +33,15 @@ module SemVerComponents
               end
             } version"
         end
+        # Compute new version
+        global_bump_level = bumps_per_component.values.max
+        if global_bump_level.nil?
+          puts 'No next version'
+        else
+          puts "Next global version#{@local_git.on_release_branch? ? '' : ' (not on release branch)'}: #{
+            Semver.next_version_from(Semver.version_from_git_ref(@local_git.git_from), global_bump_level, pre_release: !@local_git.on_release_branch?)
+          }"
+        end
       end
 
     end

data/lib/sem_ver_components/outputs/semantic_release_generate_notes.rb

@@ -1,4 +1,5 @@
 require 'time'
+require 'sem_ver_components/semver'
 
 module SemVerComponents
 
@@ -14,31 +15,10 @@ module SemVerComponents
       #   * *commit* (Git::Object::Commit): Corresponding git commit
       def process(commits_info)
         # Compute new version
-        new_version =
-          if @local_git.git_from.nil?
-            '0.0.1'
-          elsif @local_git.git_from =~ /^v(\d+)\.(\d+)\.(\d+)$/
-            major = Integer($1)
-            minor = Integer($2)
-            patch = Integer($3)
-            bump_level = commits_info.map { |commit_info| commit_info[:components_bump_levels].values }.flatten(1).max
-            case bump_level
-            when 0
-              patch += 1
-            when 1
-              minor += 1
-              patch = 0
-            when 2
-              major += 1
-              minor = 0
-              patch = 0
-            else
-              raise "Invalid bump level: #{bump_level}"
-            end
-            "#{major}.#{minor}.#{patch}"
-          else
-            raise "Can't generate release notes from a git ref that is not a semantic release (#{@local_git.git_from})"
-          end
+        new_version = Semver.next_version_from(
+          Semver.version_from_git_ref(@local_git.git_from),
+          commits_info.map { |commit_info| commit_info[:components_bump_levels].values }.flatten(1).max
+        )
         git_url = @local_git.git.remote('origin').url
         git_url = git_url[0..-5] if git_url.end_with?('.git')
         # Reference merge commits: merged commits will not be part of the changelog, but their bump level will be taken into account when reporting the merge commit.

data/lib/sem_ver_components/semver.rb

@@ -0,0 +1,66 @@
+module SemVerComponents
+
+  # Helpers giving ways to adapt to semantic versioning conventions
+  module Semver
+
+    # Compute next version from an existing one and a bump level
+    #
+    # Parameters::
+    # * *version* (String): Existing version
+    # * *bump_level* (Integer): The bump level (0: patch, 1: minor, 2: major)
+    # * *pre_release* (Boolean): Should we get a pre-release version (adding a unique metadata)? [default: false]
+    # Result::
+    # * String: The next version
+    def self.next_version_from(version, bump_level, pre_release: false)
+      if version =~ /^(\d+)\.(\d+)\.(\d+)$/
+        major = Integer($1)
+        minor = Integer($2)
+        patch = Integer($3)
+        case bump_level
+        when 0
+          patch += 1
+        when 1
+          minor += 1
+          patch = 0
+        when 2
+          major += 1
+          minor = 0
+          patch = 0
+        else
+          raise "Invalid bump level: #{bump_level}"
+        end
+        "#{major}.#{minor}.#{patch}#{pre_release ? "-#{pre_release_metadata}" : ''}"
+      else
+        raise "Invalid version: #{version}"
+      end
+    end
+
+    # Get a version from a git ref
+    #
+    # Parameters::
+    # * *git_ref* (String): The git ref
+    # Result::
+    # * String: Corresponding version
+    def self.version_from_git_ref(git_ref)
+      if git_ref.nil?
+        '0.0.0'
+      elsif git_ref =~ /^v(\d+\.\d+\.\d+)$/
+        $1
+      else
+        raise "Can't assume version from git ref: #{git_ref}"
+      end
+    end
+
+    private
+
+    # Get a pre-release metadata to be appended to a version
+    #
+    # Result::
+    # * String: The pre-release metadata
+    def self.pre_release_metadata
+      "#{`whoami`.strip}-#{Time.now.utc.strftime('%Y%m%d%H%M%S')}-SNAPSHOT"
+    end
+
+  end
+
+end

data/lib/sem_ver_components/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sem_ver_components
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -71,6 +71,7 @@ files:
 - lib/sem_ver_components/outputs/semantic_release_analyze.rb
 - lib/sem_ver_components/outputs/semantic_release_generate_notes.rb
 - lib/sem_ver_components/plugins.rb
+- lib/sem_ver_components/semver.rb
 - lib/sem_ver_components/version.rb
 homepage: https://github.com/Muriel-Salvan/sem_ver_components
 licenses: