gfsm 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e0ba6497503d24cc631e5a561879a5b8fddd9b0b98243b4b92d2f05f5add90
-  data.tar.gz: ac56fb2b77daf823e235cf7c06e6ca8ad29d585f261e83a90506efe7a3f30fd2
+  metadata.gz: f1328d98b44c0777e42445b9ef8f67b9b88e37d8a7bdc517a3e6393b2543d2a3
+  data.tar.gz: 5ee4cf826f1c4b608bad7f58193db6c744e4c33868f31c5b477994a475bc69d6
 SHA512:
-  metadata.gz: 99373328bcc6e18fa2bd4c588a98fca5ff359fa83c2f1281049236a23f5f8631aafb9676ab813461dd2a6b87a89a83a3b595cc81db9d7266f141d412ca0c8f61
-  data.tar.gz: 1928c819f0a3bc20d324cacfb038506ed6eaf0cacb425070bcd09c4f85ea65bde18374cd4029aa2808552b2e6a71f4e46169811a3404e034177f9c0c32a2ab66
+  metadata.gz: 50c2d64b74ed354024fffb5825c28e309e9ddfcdd99889613b2c12cbef85f4ee32cae3c3089e8e5a466bfc0c7abd150d1398c9a3f13bc57df81472ff57640c59
+  data.tar.gz: 178a21e2f2212bc7427bb0ac4b894ae83b4b3846ed1e9bd2b29287ba30500012397a69bdc77f8d408020ca055891f495bad7774a40a18c5d66ff63928ae8faf6

data/lib/gfsm.rb

@@ -7,11 +7,11 @@ require 'data/configuration'
 require 'data/version'
 
 # Load the tools
-require 'tools/commits_extractor'
 require 'tools/commits_subdivider'
 require 'tools/current_version_loader'
-require 'tools/version_bumper'
+require 'tools/git_utilities'
 require 'tools/output'
+require 'tools/version_bumper'
 
 # Load the commands
 require 'commands/base_command'

data/lib/tools/current_version_loader.rb

@@ -7,13 +7,9 @@ module GFSM
   module Tools
     class CurrentVersionLoader
       def self.load_current_version(repo_path = ".")
-        repo = Git.open(repo_path)
-
-        begin
-          last_tag_name = repo.describe(nil, { :tags => true, :abbrev => 0 })
-        rescue
-          last_tag_name = nil
-        end
+        last_tag_name = GFSM::Tools::GitUtilities.extract_last_tag_name(
+          GFSM::Tools::GitUtilities.load_repo(repo_path)
+        )
 
         return GFSM::Data::Version.new("0.0.0") unless last_tag_name
 

data/lib/tools/{commits_extractor.rb → git_utilities.rb}

@@ -4,17 +4,28 @@ require 'git'
 
 module GFSM
   module Tools
-    class CommitsExtractor
+    class GitUtilities
       CHANGELOG_TRAILER_REGEX = /^(?<name>Changelog):\s*(?<category>.+)$/i
 
-      def self.extract_commits_with_changelog_trailer(repo_path = ".")
-        repo = Git.open(repo_path)
+      def self.load_repo(repo_path)
+        Git.open(repo_path)
+      end
 
+      def self.extract_last_tag_name(repo)
         begin
-          last_tag_name = repo.describe(nil, { :tags => true, :abbrev => 0 })
+          current_sort_order = repo.config("tag.sort")
+
+          repo.config("tag.sort", "-v:refname")
+          tags = repo.tags
+          repo.config("tag.sort", current_sort_order)
+
+          tags[0].name if !tags.empty?
         rescue
-          last_tag_name = nil
         end
+      end
+
+      def self.extract_commits_with_changelog_trailer(repo)
+        last_tag_name = self.extract_last_tag_name(repo)
 
         begin
           commits = last_tag_name ? repo.log.between(last_tag_name, 'HEAD') : repo.log

data/lib/tools/version_bumper.rb

@@ -10,7 +10,9 @@ module GFSM
 
       def compute_version!(force, prerelease, prerelease_name, repository_path, configuration_file_path)
         configuration = GFSM::Data::Configuration.new(configuration_file_path)
-        changelog_commits = GFSM::Tools::CommitsExtractor.extract_commits_with_changelog_trailer(repository_path)
+        changelog_commits = GFSM::Tools::GitUtilities.extract_commits_with_changelog_trailer(
+          GFSM::Tools::GitUtilities.load_repo(repository_path)
+        )
 
         @version = GFSM::Tools::CurrentVersionLoader.load_current_version(repository_path)
         @subdivisions = GFSM::Tools::CommitsSubdivider.subdivide_commits(configuration, changelog_commits)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gfsm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Zille Marco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -81,9 +81,9 @@ files:
 - lib/data/configuration.rb
 - lib/data/version.rb
 - lib/gfsm.rb
-- lib/tools/commits_extractor.rb
 - lib/tools/commits_subdivider.rb
 - lib/tools/current_version_loader.rb
+- lib/tools/git_utilities.rb
 - lib/tools/output.rb
 - lib/tools/version_bumper.rb
 homepage: https://gitlab.com/zillemarco/gitlab-flavored-semantic-versioning