fit-commit 3.8.2 → 3.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9ee059898dd05efeddc0f82670d3c3d7a12861fcee02100d532d895b5cce1a
-  data.tar.gz: 5c5fe5c2784347d7a0b79e3fea0fe3bbfd70849e9d0682d2d308096a471b7ecf
+  metadata.gz: d208481fa7e6d24b87d13377174a9bf8cd24cb9216be8419af43de28fc95a743
+  data.tar.gz: 9bd15f6e38177245dc717eb8e47765b97802c67c4767ad520af784c32e1d22fb
 SHA512:
-  metadata.gz: 5555c157f4f4cc3418e807aa5aa5f1ef897939d2963bc6d00335017b8ff7948f9f2a71d016957ad9c8c988d0696ac01bd42d439bf20f5912f8f48b9da7f516b2
-  data.tar.gz: 22b8772ed37089bbb8671a2ea38492d4a3fe10591ff498d1f3a5ae4f23f730acc76b879145651d52e7402bc7d89afeb2a4e3836af0515426edc7f93a992ba038
+  metadata.gz: f77e6d5d22b3e5f5ccb77da1cb6e6dc0a7806ca47ae515866ce113fd0296ed6d9d90eaffea727bcb8139bdc062f89b4aa2ce1319df321c10db15e670a4806c92
+  data.tar.gz: 1fa6486fddcc4dde6553955f28fa25379225198667e1f574a1c571c842ff5d31b254fd889202cf9ae6bf20621dcadf770966738ccc93a9d392eb4e1ac6006feb

data/README.md

@@ -14,7 +14,7 @@ foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar
 2: Error: Second line must be blank.
 3: Error: Lines should be <= 72 chars. (76)
 
-Force commit? [y/n/e] ▊
+Commit anyway? [y/n/e] ▊
 ```
 
 ## Prerequisites

data/lib/fit_commit/message_parser.rb

@@ -2,6 +2,9 @@ require "fit_commit/line"
 
 module FitCommit
   class MessageParser
+    GIT_VERBOSE_MARKER = "# ------------------------ >8 ------------------------"
+    COMMENT_REGEX = /\A#/
+
     attr_accessor :message_path
     def initialize(message_path)
       self.message_path = message_path
@@ -13,9 +16,6 @@ module FitCommit
 
     private
 
-    GIT_VERBOSE_MARKER = "# ------------------------ >8 ------------------------"
-    COMMENT_REGEX = /\A#/
-
     def relevant_lines
       message_text.lines.each_with_object([]) do |line, relevant_lines|
         line.chomp!

data/lib/fit_commit/runner.rb

@@ -8,6 +8,7 @@ module FitCommit
 
     EXIT_CODE_ALLOW_COMMIT  = 0
     EXIT_CODE_REJECT_COMMIT = 1
+    DEFAULT_EDITOR = "vim"
 
     attr_accessor :message_path, :branch_name, :stderr, :stdin
     def initialize(message_path, branch_name, stderr = $stderr, stdin = $stdin)
@@ -51,7 +52,7 @@ module FitCommit
 
     def ask_force_commit
       return unless interactive?
-      stderr.print "\nForce commit? [y/n/e] "
+      stderr.print "\nCommit anyway? [y/n/e] "
       input = stdin.gets
       fail StartOverOnEditException if input =~ /e/i
       input =~ /y/i
@@ -105,8 +106,6 @@ module FitCommit
       system(editor, message_path)
     end
 
-    DEFAULT_EDITOR = "vim"
-
     def editor
       editor = ENV["EDITOR"]
       editor = DEFAULT_EDITOR unless editor && editor != "none"

data/lib/fit_commit/validators/line_length.rb

@@ -3,28 +3,32 @@ require "fit_commit/validators/base"
 module FitCommit
   module Validators
     class LineLength < Base
+      MERGE_COMMIT = /\AMerge branch '[^']+' into ./
+      URL = %r{[a-z]+://}
+
       def validate_line(lineno, text)
-        if lineno == 1 && text.empty?
-          add_error(lineno, "Subject line cannot be blank.")
-        elsif lineno == 2 && !text.empty?
-          add_error(lineno, "Second line must be blank.")
-        elsif line_too_long?(text)
+        if lineno == 1
+          if text.empty?
+            add_error(lineno, "Subject line cannot be blank.")
+          elsif text !~ MERGE_COMMIT
+            if text.length > max_line_length
+              add_error(lineno, format("Lines should be <= %i chars. (%i)",
+                max_line_length, text.length))
+            elsif text.length > subject_warn_length
+              add_warning(lineno, format("Subject line should be <= %i chars. (%i)",
+                subject_warn_length, text.length))
+            end
+          end
+        elsif lineno == 2
+          unless text.empty?
+            add_error(lineno, "Second line must be blank.")
+          end
+        elsif text.length > max_line_length && !(allow_long_urls? && text =~ URL)
           add_error(lineno, format("Lines should be <= %i chars. (%i)",
             max_line_length, text.length))
-        elsif lineno == 1 && text.length > subject_warn_length
-          add_warning(lineno, format("Subject line should be <= %i chars. (%i)",
-            subject_warn_length, text.length))
         end
       end
 
-      def line_too_long?(text)
-        text.length > max_line_length && !(allow_long_urls? && contains_url?(text))
-      end
-
-      def contains_url?(text)
-        text =~ %r{[a-z]+://}
-      end
-
       def max_line_length
         config.fetch("MaxLineLength")
       end

data/lib/fit_commit/version.rb

@@ -1,3 +1,3 @@
 module FitCommit
-  VERSION = "3.8.2"
+  VERSION = "3.8.4"
 end

data/test/integration/new_repo_test.rb

@@ -14,7 +14,7 @@ describe "Install and run in a fresh Git repo" do
     Dir.mktmpdir do |gitdir|
       PTY.spawn(shell_commands(gitdir)) do |pty_out, _pty_in, _pty_pid|
         if user_input
-          pty_out.expect(/Force commit\?/, 3) do |expect_out|
+          pty_out.expect(/Commit anyway\?/, 3) do |expect_out|
             output << Array(expect_out).join
             user_input
           end

data/test/unit/runner_test.rb

@@ -74,7 +74,7 @@ describe FitCommit::Runner do
       assert_match(/\A2: Error: /, stderr_lines[5])
       if interactive
         assert_empty stderr_lines[6]
-        assert_match(/\AForce commit\? \[y\/n\/e\] /, stderr_lines[7])
+        assert_match(/\ACommit anyway\? \[y\/n\/e\] /, stderr_lines[7])
       end
     end
 

data/test/unit/validators/capitalize_subject_test.rb

@@ -37,14 +37,6 @@ describe FitCommit::Validators::CapitalizeSubject do
       end
     end
   end
-  describe "test " do
-    let(:commit_msg) { "\nsdf" }
-    it "has a warning" do
-      validator.validate(commit_lines)
-      assert_empty validator.errors
-      assert_empty validator.warnings
-    end
-  end
   describe "subject is a single uncapitalized word with a body" do
     let(:commit_msg) { "foo\n\nbaz" }
     it "has error" do

data/test/unit/validators/line_length_test.rb

@@ -42,6 +42,22 @@ describe FitCommit::Validators::LineLength do
         assert_empty validator.warnings
       end
     end
+    describe "first line is over error limit and has an URL" do
+      let(:commit_msg) { "foo https://" + ("x" * 70) }
+      it "has an error and no warning" do
+        validator.validate(commit_lines)
+        assert_equal 1, validator.errors[1].size
+        assert_empty validator.warnings
+      end
+    end
+    describe "merge commit is over error limit" do
+      let(:commit_msg) { "Merge branch '#{"x" * 30}' into #{"y" * 30}" }
+      it "does not have error" do
+        validator.validate(commit_lines)
+        assert_empty validator.errors
+        assert_empty validator.warnings
+      end
+    end
     describe "SubjectWarnLength modified in config" do
       let(:config) { default_config.merge("SubjectWarnLength" => 5) }
       describe "first line is over modified warning limit" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit-commit
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 3.8.4
 platform: ruby
 authors:
 - Michael Foley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swearjar
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: A Git hook to validate your commit messages