conventional_commits 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5237c096ab7442455a3c8f42355540999f92d09e6d8c4ec7228865f6fffa7f04
-  data.tar.gz: 7443b732f6000b9179c7170ec5a9b331ac4bcc7d3c5c078ed464da238fd4a3a5
+  metadata.gz: 0e0c30235e345a6224bdff22ec8624f93609069208cecbb8a37423e502fc7e07
+  data.tar.gz: 920cd751c076e80e05e35be2c61ccf8019e00ec23be87a1bb3a73d9451fb45e6
 SHA512:
-  metadata.gz: 752200bf1659ee2bdfbb3d5c54de2f545a2446ef6289cc32e775ffd1d56b36625e708ea68aaa47a83c8024c124bd85c6cbbd80bd054213df5c9af6bc1c7e95ed
-  data.tar.gz: '03927930fdfd624a584477de522e27365cc6d18e99798f84a39fc5ba18a868c2a93655055f178ded02a00611f0e603e9f813dd9363b08d366491dc8ba1cf0db0'
+  metadata.gz: 33bbca653a41c902318db519625930deef5f5e87be84f695c81b335dd53040da9b7cce771833be391e7a242b69db4e101dce82640b3f8d4c9217c8ca46374208
+  data.tar.gz: 51551e59749b5c9db999ff8eaf9d99012a2aada1551cfff6ac4dc0eaa843f1e19937bd0567e6fa7a3cffb5db659ed2100b054b6c59ab355c666b7acb5088cc33

data/Gemfile

@@ -9,4 +9,4 @@ gem "gem-release"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
-gem "simplecov"
+gem "simplecov"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conventional_commits (0.2.4)
+    conventional_commits (0.2.6)
       open3
       thor
       yaml
@@ -16,39 +16,39 @@ GEM
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     ast (2.4.2)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     builder (3.2.4)
     contracts (0.17)
-    cucumber (9.1.2)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-ci-environment (~> 9.2, >= 9.2.0)
-      cucumber-core (~> 12.0)
+    cucumber (9.2.0)
+      builder (~> 3.2)
+      cucumber-ci-environment (> 9, < 11)
+      cucumber-core (> 13, < 14)
       cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 27)
+      cucumber-gherkin (> 24, < 28)
       cucumber-html-formatter (> 20.3, < 22)
       cucumber-messages (> 19, < 25)
       diff-lcs (~> 1.5)
-      mini_mime (~> 1.1, >= 1.1.5)
-      multi_test (~> 1.1, >= 1.1.0)
-      sys-uname (~> 1.2, >= 1.2.3)
-    cucumber-ci-environment (9.2.0)
-    cucumber-core (12.0.0)
-      cucumber-gherkin (>= 25, < 27)
+      mini_mime (~> 1.1)
+      multi_test (~> 1.1)
+      sys-uname (~> 1.2)
+    cucumber-ci-environment (10.0.1)
+    cucumber-core (13.0.2)
+      cucumber-gherkin (>= 27, < 28)
       cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (~> 5.0, >= 5.0.4)
-    cucumber-cucumber-expressions (17.0.2)
+      cucumber-tag-expressions (> 5, < 7)
+    cucumber-cucumber-expressions (17.1.0)
       bigdecimal
-    cucumber-gherkin (26.2.0)
-      cucumber-messages (>= 19.1.4, < 22.1)
-    cucumber-html-formatter (21.2.0)
+    cucumber-gherkin (27.0.0)
+      cucumber-messages (>= 19.1.4, < 23)
+    cucumber-html-formatter (21.3.1)
       cucumber-messages (> 19, < 25)
     cucumber-messages (22.0.0)
-    cucumber-tag-expressions (5.0.6)
+    cucumber-tag-expressions (6.1.0)
     diff-lcs (1.5.1)
     docile (1.4.0)
     ffi (1.16.3)
     gem-release (2.2.2)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     mini_mime (1.1.5)
     multi_test (1.1.0)
@@ -59,7 +59,7 @@ GEM
       racc
     racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.13.0)
@@ -75,7 +75,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rubocop (1.63.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

data/lib/branch/branch_name_generator.rb

@@ -27,7 +27,7 @@ module ConventionalCommits
       scope_is_included = out.length == Configuration::MAX_ELEMENTS_IN_PATTERN
       idx_adj = scope_is_included ? 1 : 0
       components = { scope: nil, type: nil, ticket_number: nil, description: nil }
-      components[:scope] = out.length == Configuration::MAX_ELEMENTS_IN_PATTERN ? out[0] : nil
+      components[:scope] = out.length == Configuration::MAX_ELEMENTS_IN_PATTERN ? sanitize(out[0]) : nil
       components[:type] = out[0 + idx_adj]
       components[:ticket_number] = out[1 + idx_adj]
       components[:description] = out[2 + idx_adj]
@@ -90,5 +90,9 @@ module ConventionalCommits
       raise(GenericError,
             "Doesnt match the pattern expect at least #{delimiters.length + 1} words")
     end
+
+    def sanitize(string)
+      string.gsub(/-/, " ").gsub(/_/, " ")
+    end
   end
 end

data/lib/commit/commit_message_generator.rb

@@ -12,7 +12,7 @@ module ConventionalCommits
       type = (components[:type] || "").downcase
       ticket_number = components[:ticket_number] || ""
       description = components[:description] || ""
-      description = description.gsub(/-/, " ").gsub(/_/, " ")
+      description = sanitize(description)
 
       unless main_config.type.is_allowed(type)
         raise ConventionalCommits::GenericError,
@@ -49,5 +49,9 @@ module ConventionalCommits
     def skippable_sources
       %w[message merge squash]
     end
+
+    def sanitize(string)
+      string.gsub(/-/, " ").gsub(/_/, " ")
+    end
   end
 end

data/lib/conventional_commits/version.rb

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

data/lib/helpers/file_extension.rb

@@ -28,6 +28,21 @@ class File
     end
   end
 
+  def self.add_to_file_data(path, data)
+    File.open(path, "a") do |f|
+      f.write(data)
+    end
+  end
+
+  def self.create_or_add_to_file_data(path, data)
+    if exist?(path)
+      data = data.empty? ? "" : "\n#{data}"
+      add_to_file_data(path, data)
+    else
+      create_new_file_with_data(path, data)
+    end
+  end
+
   def self.read_file(path)
     File.open(path, "r") do |f|
       data = f.read.to_s

data/lib/hooks/hooks_installer.rb

@@ -9,19 +9,17 @@ module ConventionalCommits
         cmd = (common_hooks + [
           cli_command(prepare_commit_cli)
         ])
-              .join("\n")
-        create_file_and_make_executable(path: "prepare-commit-msg", data: cmd)
+        create_file_and_make_executable(path: "prepare-commit-msg", commands: cmd)
       end
 
       def install_pre_commit
         cmd = common_hooks
-              .join("\n")
-        create_file_and_make_executable(path: "pre-commit", data: cmd)
+        create_file_and_make_executable(path: "pre-commit", commands: cmd)
       end
 
       def install_commit_msg
-        cmd = (common_hooks + [cli_command(validate_commit_msg)]).join("\n")
-        create_file_and_make_executable(path: "commit-msg", data: cmd)
+        cmd = (common_hooks + [cli_command(validate_commit_msg)])
+        create_file_and_make_executable(path: "commit-msg", commands: cmd)
       end
 
       def install_all
@@ -30,13 +28,22 @@ module ConventionalCommits
         install_prepare_commit_msg
       end
 
-      def create_file_and_make_executable(path:, data:)
+      def create_file_and_make_executable(path:, commands:)
         File.create_directory(path: hook_directory)
         full_path = "#{hook_directory}/#{path}"
-        File.create_new_file_with_data(full_path, data)
+        filtered_commands = filter_existed_values_in_script(path: full_path, commands:)
+        data = filtered_commands.join("\n")
+        File.create_or_add_to_file_data(full_path, data)
         FileUtils.chmod("+x", full_path)
       end
 
+      def filter_existed_values_in_script(path:, commands:)
+        return commands unless File.exist?(path)
+
+        data = File.read_file(path) || ""
+        commands.reject { |cmd| data.include?(cmd) }
+      end
+
       def initial_lines
         [start_line,
          ruby_eval]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conventional_commits
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Swift-Gurus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3