conventional_commits 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94ddfbbf30fd22858780223ccc4251e6b6aeeef1935e0bff4f792686b973423
-  data.tar.gz: f1c41daf369141f2af48e6d022661e00177a645a9797cb176693433c4d4579c0
+  metadata.gz: f435dcc6d50497ef6fa5851415569724110d6de0d717237e2aff3ad9f481761b
+  data.tar.gz: 5a0515fd06a107fd2f89c03663ac2365d0045f23545b1790a25874e51d33e337
 SHA512:
-  metadata.gz: e711c88f885c94c5e920d89f9f6c3d97c3faa35b21df2af332a5016623aa4df2759d5ad73d1456452262f3005489f8ba0bbb2813f36a743c623e95630581cc4d
-  data.tar.gz: 6a314e124e6a37b296624fcceda4b3b0a4a0a72e729018535fcf7fa8752e7ab148aba23cd9771f6f8156820c37a96efc02b83bfbcf34da04caad9be970c459d3
+  metadata.gz: 5c9fbebbcb8a9ef25c720a8ab3cb25545f179d70058fa61f2e939461d31a946f7e9bff88c733762e7f7daaf83982a445a9d7c76cf8cfa875145135ad561d7c26
+  data.tar.gz: fb2fff5c46bdbfc23ad2bf20e0245a08192b696d6be5c0e7e76ed3c247c1e27e7bf2815a3e14dc6285dfa9660416e86819a9ff208e087df5d3c859bbb7e09c8a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conventional_commits (0.2.1)
+    conventional_commits (0.2.4)
       open3
       thor
       yaml

data/lib/branch/branch_name_generator.rb

@@ -22,20 +22,7 @@ module ConventionalCommits
 
     def branch_name_components(_input, path: Configuration::DEFAULT_CONFIGURATION_PATH)
       configuration = reader.get_configuration(path:)
-      delimiters = find_delimiters_from_pattern(pattern: configuration.pattern)
-      received = _input
-      modified_input = _input
-      out = []
-      delimiters.each do |d|
-        splits = modified_input.split(d, 2)
-        out.push(splits[0]) if splits.length.positive?
-        modified_input = splits[1] || ""
-      end
-      out.push(modified_input) unless modified_input.empty?
-      if delimiters.length > out.length
-        raise ConventionalCommits::GenericError,
-              "The branch doesnt respect the template, expect #{delimiters.length} delimiters. Received: #{received}".strip
-      end
+      out = components_using(_input, configuration.pattern)
 
       scope_is_included = out.length == Configuration::MAX_ELEMENTS_IN_PATTERN
       idx_adj = scope_is_included ? 1 : 0
@@ -65,6 +52,32 @@ module ConventionalCommits
       delimiters
     end
 
+    def components_using(input, pattern)
+      delimiters = find_delimiters_from_pattern(pattern:)
+      out = split_name_using_delimiters(delimiters, input)
+      if delimiters.length > out.length && pattern.include?("<scope>")
+        components_using(input, pattern.gsub(%r{<scope>/}, ""))
+      elsif delimiters.length > out.length
+        raise ConventionalCommits::GenericError,
+              "The branch doesnt respect the template, expect at least #{delimiters.length} delimiters. Received: #{out}".strip
+      end
+
+      out
+    end
+
+    def split_name_using_delimiters(delimiters, input)
+      received = input
+      modified_input = input
+      out = []
+      delimiters.each do |d|
+        splits = modified_input.split(d, 2)
+        out.push(splits[0]) if splits.length.positive?
+        modified_input = splits[1] || ""
+      end
+      out.push(modified_input) unless modified_input.empty?
+      out
+    end
+
     def transform_input_using_delimiters(_input, delimiters)
       splits = _input.gsub(/_/, " ").scan(/\w+/)
       validate_delimiters(delimiters, splits.length)

data/lib/commit/commit_message_generator.rb

@@ -8,7 +8,7 @@ module ConventionalCommits
       main_config = Configuration::MainConfigurationReader.new.get_configuration(path: cfg_path)
       configuration = main_config.branch
       components = BranchNameGenerator.new.branch_name_components(branch_name, path: cfg_path)
-      scope = (components[:scope] || "").downcase
+      scope = components[:scope] ? "(#{components[:scope].downcase})" : ""
       type = (components[:type] || "").downcase
       ticket_number = components[:ticket_number] || ""
       description = components[:description] || ""
@@ -19,7 +19,7 @@ module ConventionalCommits
               "The type #{type} is not allowed. Allowed types #{main_config.type.all_types}"
       end
 
-      type = "#{main_config.type.main_type(type)}(#{scope}): #{description}".strip
+      type = "#{main_config.type.main_type(type)}#{scope}: #{description}".strip
 
       ticket_ref = "#{configuration.ticket_prefix}#{configuration.ticket}#{configuration.ticket_separator}#{ticket_number}"
       body = custom_body.strip.empty? ? Configuration::DEFAULT_COMMIT_BODY_TEMPLATE : custom_body.strip

data/lib/conventional_commits/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConventionalCommits
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conventional_commits
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Swift-Gurus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Make your commit unified.