gfsm 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adb0619c155f4f5822638aaefbcf01f4c6d391afe7ec684b5f11c60ce87722e
-  data.tar.gz: 6c5d26fdec70a95caa05f4f2dc5c4849dda521a32a4d573e370a909c42c8b416
+  metadata.gz: f8f7e5ab344ba700d815ccb45c8517034ef447a54662085cb471a038722b3654
+  data.tar.gz: 77c2ecb3172f22400ca421aed782f1e432fe0f0e96edad34da75f7eb16ae3b3b
 SHA512:
-  metadata.gz: 5a7ddfc1af4e5f4407b107bb53ad799d9c2392fe72f62ed8bfee06d1ef259dd78358a1fc80d7de2f32e52b4dc29573ee24d00e41d2a5f202e979bd0d5f524811
-  data.tar.gz: 8682eb74f946d40dea90cc361f2035ec8c7003f63f8ba94ba3c2e91a550ad73ae2a6cce15909d85cecd9da85fe1742244a220075bec3195bc93e88bde55d837d
+  metadata.gz: fc6e772626ccfcb72805c0c0c7f6fbcc8aa5f9e434b2843978df1953fc8b39a03293e272e60f1244d2ce893f035f48024bf613887bcedbcbdc63d5b49f1384b3
+  data.tar.gz: dfd7b5c4fde16aaf750c9b5964f9c845b5600acbe82aea2a65733d8bc3a3c48b52284c0a9e1208361aa8fcfe649536e58eae05d24e21fc88a87adee2da3e2219

data/.gitlab-ci.yml

@@ -15,7 +15,7 @@ workflow:
 
 Update version:
   stage: version
-  image: ruby:2.7
+  image: ruby:2.7.5
   before_script:
     - gem install gfsm
   script:
@@ -33,7 +33,7 @@ Update version:
 # - GEM_HOST_API_KEY: A valid RubyGems API key.
 Publish gem:
   stage: deploy
-  image: ruby:2.7
+  image: ruby:2.7.5
   variables:
     GEMSPEC_FILE: "gfsm.gemspec"
     GEM_FILE: "gfsm-${RELEASE_VERSION}.gem"
@@ -54,6 +54,7 @@ Publish gem:
       when: never
     - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
       when: never
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
 Create release:
   stage: release
@@ -61,8 +62,6 @@ Create release:
   script:
     - |
       release-cli create --name "Release v$RELEASE_VERSION" --description CHANGELOG.md --tag-name "v$RELEASE_VERSION"
-  tags:
-    - unix
   needs:
     - job: "Update version"
       artifacts: true
@@ -72,4 +71,5 @@ Create release:
     - if: '$GEM_HOST_API_KEY == null'
       when: never
     - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
-      when: never
+      when: never
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'

data/.vscode/launch.json

@@ -8,8 +8,8 @@
             "name": "Debug Local File",
             "type": "Ruby",
             "request": "launch",
-            "program": "${workspaceRoot}/lib/gfsm.rb",
-            "args": ["changelog"]
+            "program": "${workspaceRoot}/bin/gfsm",
+            "args": ["version", "bump"]
         }
     ]
 }

data/bin/gfsm

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+
 require 'gfsm'
 GFSM.main

data/lib/commands/changelog.rb

@@ -76,11 +76,15 @@ module GFSM
 
         version_bumper = GFSM::Tools::VersionBumper.new()
         version = version_bumper.compute_version!(force, prerelease, prerelease_name, repository_path, configuration_file_path)
-        subdivisions = version_bumper.subdivisions
+        subdivisions = version_bumper.subdivisions.to_a
+        subdivisions.sort_by! { |subdivision_data| subdivision_data[0].priority }.reverse!
 
         changelog_entries = ""
 
-        subdivisions.each do |change_type, commits|
+        subdivisions.each do |subdivision_data|
+          change_type = subdivision_data[0]
+          commits = subdivision_data[1]
+          
           changelog_entries += "\n#{change_type.to_changelog_entry}\n\n"
 
           commits.each do |commit|

data/lib/data/configuration.rb

@@ -18,7 +18,7 @@ module GFSM
           end
         end
 
-        @change_types.sort_by! { |change_type| change_type.priority }.reverse!
+        @change_types
       end
 
       def get_change_type_from_category(category)

data/lib/tools/commits_extractor.rb

@@ -11,13 +11,13 @@ module GFSM
         repo = Git.open(repo_path)
 
         begin
-          last_tag_name = repo.describe(nil, { abbrev: 0 })
+          last_tag_name = repo.describe(nil, { :tags => true, :abbrev => 0 })
         rescue
           last_tag_name = nil
         end
 
         begin
-          commits = last_tag_name ? repo.log.between(last_tag_name, 'head') : repo.log
+          commits = last_tag_name ? repo.log.between(last_tag_name, 'HEAD') : repo.log
           commits.each_with_object([]) do |commit, memo|
             trailer = commit.message.match(CHANGELOG_TRAILER_REGEX)
             memo << GFSM::Data::Commit.new(commit, trailer[:name], trailer[:category]) if trailer

data/lib/tools/commits_subdivider.rb

@@ -18,8 +18,6 @@ module GFSM
 
         return subdivisions
       end
-
-      
     end
   end
 end

data/lib/tools/current_version_loader.rb

@@ -8,8 +8,9 @@ module GFSM
     class CurrentVersionLoader
       def self.load_current_version(repo_path = ".")
         repo = Git.open(repo_path)
+
         begin
-          last_tag_name = repo.describe(nil, { abbrev: 0 })
+          last_tag_name = repo.describe(nil, { :tags => true, :abbrev => 0 })
         rescue
           last_tag_name = nil
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gfsm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Zille Marco
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: This gem adds support to bump the semantic version bump and generate changelog