fit-commit 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42a06e4e199108807d10a9df3d255f6c6feb8ea1
-  data.tar.gz: f38ceba417a635db118576be6387778555d63851
+  metadata.gz: 6d0e5940862e5d3bb79d5e2fd77eab59035ecb41
+  data.tar.gz: 2fa241ffb6eae0aa6cfbfda5d12f8cba52bf4823
 SHA512:
-  metadata.gz: fe2ab85e513e5c156ab4f05ad2d773d9893c09fec5efd36c2d1121284f7e9367d41a724cd0982589b11ec5985a04fc9d2e2be8f84e6d05df0db265bf0f7c6aa2
-  data.tar.gz: 12fddefb3e3665f20ea822f93f0a94a1f322d95d00a63c69cd5b6190c1130ea5d748c3ba51db256674c4a8e185faa34701fe20f54af7973e76f3a312c2e7baf3
+  metadata.gz: 3024e9600be177394c86f8037f08d2ee8b0253008b22352da8b36378b9557511db17e9dd88c5f6efa03f37d68acc6a7b39b26bf1584fe63bfde58902bf8a590f
+  data.tar.gz: e6ce9e0c4df171f734ad6dd613662e8d35fe31d7de4dc361a2f9546666b90cabce6709497d0b844aa670546cffdbca0347efc5feffcf3ac9484f3c6303a2701a

data/.rubocop.yml

@@ -40,3 +40,6 @@ Style/GuardClause:
 
 Style/FileName:
   Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: trailing

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 ### master
 - N/A
 
+### v2.2.0 (2015-09-09)
+- Configuration files to customize behavior.
+
 ### v2.1.1 (2015-08-31)
 - Compatibility for all POSIX shells.
 

data/README.md

@@ -38,9 +38,46 @@ This creates a `.git/hooks/commit-msg` script which will automatically check you
 * **Line Length**: All lines must be <= 72 chars (URLs excluded). First line should be <= 50 chars. Second line must be blank.
 * **Tense**: Message must use imperative present tense: "Fix bug" and not "Fixed bug" or "Fixes bug."
 * **Summary Period**: Do not end your summary with a period.
-* **WIP**: Do not commit WIPs to master.
-* **Frat House**: No frat house commit messages in master.
+* **WIP**: Do not commit WIPs to shared branches.
+* **Frat House**: No frat house commit messages in shared branches.
+
+## Configuration
+
+Settings are read from these files, in increasing precedence: `/etc/fit_commit.yml`, `$HOME/.fit_commit.yml`, `config/fit_commit.yml`, `./.fit_commit.yml`.
+
+The default settings are:
+
+```yaml
+---
+Validators/LineLength:
+  Enabled: true
+  MaxLineLength: 72
+  SummaryWarnLength: 50
+  AllowLongUrls: true
+Validators/Tense:
+  Enabled: true
+Validators/SummaryPeriod:
+  Enabled: true
+Validators/Wip:
+  Enabled:
+    - master
+Validators/Frathouse:
+  Enabled:
+    - master
+```
 
+The `Enabled` property accepts multiple formats:
+
+```yaml
+# true/false are branch agnostic
+Validators/Foo:
+  Enabled: false
+# Array of String/Regex matching each branch for which it's enabled
+Validators/Bar:
+  Enabled:
+    - master
+    - !ruby/regexp /\Afoo.+bar/
+```
 
 ## FAQ
 

data/Rakefile

@@ -7,4 +7,8 @@ Rake::TestTask.new do |test|
   test.verbose = false
 end
 
+task :console do
+  exec "irb -r fit-commit -I ./lib"
+end
+
 task default: :test

data/lib/fit_commit/configuration_loader.rb

@@ -0,0 +1,62 @@
+require "yaml"
+
+module FitCommit
+  class ConfigurationLoader
+    def global_configuration
+      all_filepaths.each_with_object({}) do |filepath, config|
+        config.merge!(read_config(filepath))
+      end
+    end
+
+    private
+
+    def all_filepaths
+      # sorted by increasing precedence
+      [default_filepath, system_filepath, user_filepath, config_filepath, local_filepath]
+    end
+
+    def default_filepath
+      File.expand_path("../../../templates/config/fit_commit.default.yml", __FILE__)
+    end
+
+    def system_filepath
+      "/etc/fit_commit.yml"
+    end
+
+    def user_filepath
+      File.join(ENV["HOME"], ".fit_commit.yml")
+    end
+
+    def config_filepath
+      File.join(git_top_level, "config", "fit_commit.yml")
+    end
+
+    def local_filepath
+      ".fit_commit.yml"
+    end
+
+    def git_top_level
+      top_level = `git rev-parse --show-toplevel`.chomp.strip
+      fail "Git repo not found! Please submit a bug report." if top_level == ""
+      top_level
+    end
+
+    def read_config(path)
+      load_yaml(path).each_with_object({}) do |(key, value), config|
+        translated_key = translate_class_name(key)
+        config[translated_key] = value
+      end
+    end
+
+    def load_yaml(path)
+      content = YAML.load_file(path) if File.exist?(path)
+      content || {}
+    rescue => e
+      raise e, "Error parsing config file: #{e.message}"
+    end
+
+    def translate_class_name(config_class_name)
+      "FitCommit::" + config_class_name.gsub("/", "::")
+    end
+  end
+end

data/lib/fit_commit/runner.rb

@@ -1,5 +1,6 @@
 require "fit_commit/has_errors"
 require "fit_commit/message_parser"
+require "fit_commit/validator_loader"
 
 module FitCommit
   class Runner
@@ -38,17 +39,15 @@ module FitCommit
     private
 
     def run_validators
-      validator_classes.each do |validator_class|
-        validator = validator_class.new(lines, branch_name)
-        validator.validate
+      validators.each do |validator|
+        validator.validate(lines)
         merge_errors(validator.errors)
         merge_warnings(validator.warnings)
       end
     end
 
-    def validator_classes
-      Dir[File.dirname(__FILE__) + "/validators/*.rb"].each { |file| require file }
-      FitCommit::Validators::Base.all
+    def validators
+      FitCommit::ValidatorLoader.new(branch_name).validators
     end
 
     def print_results

data/lib/fit_commit/validator_loader.rb

@@ -0,0 +1,32 @@
+require "fit_commit/configuration_loader"
+
+module FitCommit
+  class ValidatorLoader
+    attr_accessor :branch_name, :configuration
+    def initialize(branch_name, configuration = load_configuration)
+      self.branch_name = branch_name
+      self.configuration = configuration
+    end
+
+    def validators
+      all_validators.select(&:enabled?)
+    end
+
+    private
+
+    def load_configuration
+      FitCommit::ConfigurationLoader.new.global_configuration
+    end
+
+    def all_validators
+      Dir[File.dirname(__FILE__) + "/validators/*.rb"].each { |file| require file }
+      FitCommit::Validators::Base.all.map do |validator_class|
+        validator_class.new(branch_name, config_for(validator_class))
+      end
+    end
+
+    def config_for(validator_class)
+      configuration[validator_class.name] || {}
+    end
+  end
+end

data/lib/fit_commit/validators/base.rb

@@ -5,10 +5,10 @@ module FitCommit
     class Base
       include FitCommit::HasErrors
 
-      attr_accessor :lines, :branch_name
-      def initialize(lines, branch_name)
-        self.lines = lines
+      attr_accessor :branch_name, :config
+      def initialize(branch_name, config)
         self.branch_name = branch_name
+        self.config = config
       end
 
       @all = []
@@ -19,15 +19,30 @@ module FitCommit
         end
       end
 
-      def validate
-        lines.each do |line|
-          validate_line(line.lineno, line.text, branch_name)
-        end
+      def validate(lines)
+        lines.each { |line| validate_line(line.lineno, line.text) }
       end
 
       def validate_line(*)
         fail NotImplementedError, "Implement in subclass"
       end
+
+      def enabled?
+        enabled_val = config.fetch("Enabled")
+        if enabled_val.is_a?(Array)
+          enabled_val.any? { |pattern| matches_branch?(pattern) }
+        else
+          enabled_val
+        end
+      end
+
+      def matches_branch?(pattern)
+        if pattern.is_a?(Regexp)
+          pattern =~ branch_name
+        else
+          pattern == branch_name
+        end
+      end
     end
   end
 end

data/lib/fit_commit/validators/frathouse.rb

@@ -4,9 +4,9 @@ require "swearjar"
 module FitCommit
   module Validators
     class Frathouse < Base
-      def validate_line(lineno, text, branch_name)
-        if branch_name == "master" && Swearjar.default.profane?(text)
-          add_error(lineno, "No frat house commit messages in master.")
+      def validate_line(lineno, text)
+        if Swearjar.default.profane?(text)
+          add_error(lineno, "No frat house commit messages in shared branches.")
         end
       end
     end

data/lib/fit_commit/validators/line_length.rb

@@ -3,30 +3,39 @@ require "fit_commit/validators/base"
 module FitCommit
   module Validators
     class LineLength < Base
-      FIRST_LINE_MAX_LENGTH = 50
-      LINE_MAX_LENGTH = 72
-
-      def validate_line(lineno, text, _branch_name)
+      def validate_line(lineno, text)
         if lineno == 1 && text.empty?
           add_error(lineno, "First line cannot be blank.")
         elsif lineno == 2 && !text.empty?
           add_error(lineno, "Second line must be blank.")
         elsif line_too_long?(text)
           add_error(lineno, format("Lines should be <= %i chars. (%i)",
-            LINE_MAX_LENGTH, text.length))
-        elsif lineno == 1 && text.length > FIRST_LINE_MAX_LENGTH
+            max_line_length, text.length))
+        elsif lineno == 1 && text.length > summary_warn_length
           add_warning(lineno, format("First line should be <= %i chars. (%i)",
-            FIRST_LINE_MAX_LENGTH, text.length))
+            summary_warn_length, text.length))
         end
       end
 
       def line_too_long?(text)
-        text.length > 72 && !contains_url?(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
+
+      def summary_warn_length
+        config.fetch("SummaryWarnLength")
+      end
+
+      def allow_long_urls?
+        config.fetch("AllowLongUrls")
+      end
     end
   end
 end

data/lib/fit_commit/validators/summary_period.rb

@@ -3,7 +3,7 @@ require "fit_commit/validators/base"
 module FitCommit
   module Validators
     class SummaryPeriod < Base
-      def validate_line(lineno, text, _branch_name)
+      def validate_line(lineno, text)
         if lineno == 1 && text.end_with?(".")
           add_error(lineno, "Do not end your summary with a period.")
         end

data/lib/fit_commit/validators/tense.rb

@@ -63,7 +63,7 @@ module FitCommit
         uses       using        used
       )
 
-      def validate_line(lineno, text, _branch_name)
+      def validate_line(lineno, text)
         if lineno == 1 && starts_with_blacklisted_verb?(text)
           add_error(lineno, "Message must use imperative present tense.")
         end

data/lib/fit_commit/validators/wip.rb

@@ -3,10 +3,9 @@ require "fit_commit/validators/base"
 module FitCommit
   module Validators
     class Wip < Base
-      def validate_line(lineno, text, branch_name)
-        if lineno == 1 && branch_name == "master" &&
-            text.split.any? { |word| word == "WIP" }
-          add_error(lineno, "Do not commit WIPs to master.")
+      def validate_line(lineno, text)
+        if lineno == 1 && text.split.any? { |word| word == "WIP" }
+          add_error(lineno, "Do not commit WIPs to shared branches.")
         end
       end
     end

data/lib/fit_commit/version.rb

@@ -1,3 +1,3 @@
 module FitCommit
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/templates/config/fit_commit.default.yml

@@ -0,0 +1,16 @@
+---
+Validators/LineLength:
+  Enabled: true
+  MaxLineLength: 72
+  SummaryWarnLength: 50
+  AllowLongUrls: true
+Validators/Tense:
+  Enabled: true
+Validators/SummaryPeriod:
+  Enabled: true
+Validators/Wip:
+  Enabled:
+    - master
+Validators/Frathouse:
+  Enabled:
+    - master

data/test/configuration_loader_test.rb

@@ -0,0 +1,77 @@
+require "minitest/autorun"
+require "fit_commit/configuration_loader"
+
+describe FitCommit::ConfigurationLoader do
+  subject { FitCommit::ConfigurationLoader.new }
+
+  after do
+    [system_file, user_file].compact.each(&:unlink)
+  end
+
+  let(:global_configuration) do
+    subject.stub :default_filepath, "nofile" do
+      subject.stub :system_filepath, (system_file ? system_file.path : "nofile") do
+        subject.stub :user_filepath, (user_file ? user_file.path : "nofile") do
+          subject.stub :config_filepath, "nofile" do
+            subject.stub :local_filepath, "nofile" do
+              subject.stub :git_top_level, "." do
+                subject.global_configuration
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def tempfile(filename, content)
+    Tempfile.new(filename).tap do |f|
+      f.write(content)
+      f.close
+    end
+  end
+
+  describe "no configuration files present" do
+    let(:system_file) { nil }
+    let(:user_file) { nil }
+    it "is empty" do
+      assert_equal({}, global_configuration)
+    end
+  end
+
+  describe "just one configuration file present" do
+    let(:system_file) { nil }
+    let(:user_file) { tempfile("user_file", user_file_content) }
+    let(:user_file_content) do
+      "Foo/Bar:\n  Baz: false\nQux/Norf/Blah:\n  - !ruby/regexp /\\Afoo/"
+    end
+
+    it "is a configuration equal to that file" do
+      expected = {
+        "FitCommit::Foo::Bar" => { "Baz" => false },
+        "FitCommit::Qux::Norf::Blah" => [/\Afoo/]
+      }
+      assert_equal expected, global_configuration
+    end
+  end
+
+  describe "multiple configuration files present" do
+    let(:system_file) { tempfile("system_file", system_file_content) }
+    let(:user_file) { tempfile("user_file", user_file_content) }
+    let(:system_file_content) do
+      "Foo/Bar:\n  Baz: false\nQux/Norf/Blah:\n  - !ruby/regexp /\\Afoo/"
+    end
+    let(:user_file_content) do
+      "Qux/Norf/Blah:\n  Foobar: true\nBuz:\n  - hi"
+    end
+
+    it "is a merged configuration that takes precedence into account" do
+      expected = {
+        "FitCommit::Foo::Bar" => { "Baz" => false },
+        "FitCommit::Qux::Norf::Blah" => { "Foobar" => true },
+        "FitCommit::Buz" => ["hi"]
+      }
+      assert_equal expected, global_configuration
+    end
+  end
+end

data/test/validator_loader_test.rb

@@ -0,0 +1,48 @@
+require "minitest/autorun"
+require "fit_commit/validator_loader"
+Dir[File.dirname(__FILE__) + "/validators/*.rb"].each { |file| require file }
+
+describe FitCommit::ValidatorLoader do
+  let(:validators) { loader.validators }
+  let(:loader) { FitCommit::ValidatorLoader.new(branch_name, configuration) }
+  let(:branch_name) { "foo" }
+  let(:configuration) do
+    {
+      "FitCommit::Validators::LineLength" => { "Enabled" => false },
+      "FitCommit::Validators::Tense" => { "Enabled" => false },
+      "FitCommit::Validators::SummaryPeriod" => { "Enabled" => true },
+      "FitCommit::Validators::Wip" => { "Enabled" => true },
+      "FitCommit::Validators::Frathouse" => { "Enabled" => ["bar", /\Abaz+/] }
+    }
+  end
+
+  it "loads enabled validators" do
+    assert validators.any? { |v| v.is_a? FitCommit::Validators::SummaryPeriod }
+    assert validators.any? { |v| v.is_a? FitCommit::Validators::Wip }
+  end
+
+  it "doesn't load disabled validators" do
+    assert validators.none? { |v| v.is_a? FitCommit::Validators::LineLength }
+    assert validators.none? { |v| v.is_a? FitCommit::Validators::Tense }
+  end
+
+  describe "non-boolean options for Enabled" do
+    it "doesn't load validators with a non-matching string/regex Enabled values" do
+      assert validators.none? { |v| v.is_a? FitCommit::Validators::Frathouse }
+    end
+
+    describe "validator has a matching string Enabled value" do
+      let(:branch_name) { "bar" }
+      it "loads validator" do
+        assert validators.any? { |v| v.is_a? FitCommit::Validators::Frathouse }
+      end
+    end
+
+    describe "validator has a matching regex Enabled value" do
+      let(:branch_name) { "bazzz" }
+      it "loads validator" do
+        assert validators.any? { |v| v.is_a? FitCommit::Validators::Frathouse }
+      end
+    end
+  end
+end

data/test/validators/frathouse_test.rb

@@ -1,47 +1,37 @@
-require "minitest/autorun"
+require File.expand_path "../validator_helper.rb", __FILE__
 require "fit_commit/validators/frathouse"
+require "fit_commit/line"
 
 describe FitCommit::Validators::Frathouse do
-  let(:validator) { FitCommit::Validators::Frathouse.new(commit_lines, branch_name) }
+  let(:validator) { FitCommit::Validators::Frathouse.new(branch_name, config) }
   let(:commit_lines) { FitCommit::Line.from_text_array(commit_msg.split("\n")) }
+  let(:default_config) { default_config_for("Validators/Frathouse") }
+  let(:config) { default_config }
+  let(:branch_name) { "any" }
 
-  describe "master branch" do
-    let(:branch_name) { "master" }
-    describe "contains swear word" do
-      let(:commit_msg) { "fucking foobar" }
-      it "has error" do
-        validator.validate
-        assert_equal 1, validator.errors[1].size
-        assert_empty validator.warnings
-      end
+  describe "contains swear word" do
+    let(:commit_msg) { "fucking foobar" }
+    it "has error" do
+      validator.validate(commit_lines)
+      assert_equal 1, validator.errors[1].size
+      assert_empty validator.warnings
     end
-    describe "contains swear words on multiple lines" do
-      let(:commit_msg) { "damn\n\nIE7 is fucking bullshit!" }
-      it "has 1 error per line" do
-        validator.validate
-        assert_equal 1, validator.errors[1].size
-        assert_equal 1, validator.errors[3].size
-        assert_empty validator.warnings
-      end
-    end
-    describe "does not contain swear words" do
-      let(:commit_msg) { "foo" }
-      it "does not have errors/warnings" do
-        validator.validate
-        assert_empty validator.errors
-        assert_empty validator.warnings
-      end
+  end
+  describe "contains swear words on multiple lines" do
+    let(:commit_msg) { "damn\n\nIE7 is fucking bullshit!" }
+    it "has 1 error per line" do
+      validator.validate(commit_lines)
+      assert_equal 1, validator.errors[1].size
+      assert_equal 1, validator.errors[3].size
+      assert_empty validator.warnings
     end
   end
-  describe "not master branch" do
-    let(:branch_name) { "notmaster" }
-    describe "contains swear word" do
-      let(:commit_msg) { "fucking foo" }
-      it "does not have errors/warnings" do
-        validator.validate
-        assert_empty validator.errors
-        assert_empty validator.warnings
-      end
+  describe "does not contain swear words" do
+    let(:commit_msg) { "foo" }
+    it "does not have errors/warnings" do
+      validator.validate(commit_lines)
+      assert_empty validator.errors
+      assert_empty validator.warnings
     end
   end
 end

data/test/validators/line_length_test.rb

@@ -1,17 +1,19 @@
-require "minitest/autorun"
+require File.expand_path "../validator_helper.rb", __FILE__
 require "fit_commit/validators/line_length"
+require "fit_commit/line"
 
 describe FitCommit::Validators::LineLength do
-  let(:validator) { FitCommit::Validators::LineLength.new(commit_lines, branch_name) }
+  let(:validator) { FitCommit::Validators::LineLength.new(branch_name, config) }
   let(:commit_lines) { FitCommit::Line.from_text_array(commit_msg.split("\n")) }
-
+  let(:default_config) { default_config_for("Validators/LineLength") }
+  let(:config) { default_config }
   let(:branch_name) { "any" }
 
   describe "first line" do
     describe "first line is empty" do
       let(:commit_msg) { "\n\nbar" }
       it "has error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_equal 1, validator.errors[1].size
         assert_empty validator.warnings
       end
@@ -19,47 +21,52 @@ describe FitCommit::Validators::LineLength do
     describe "first line is not empty" do
       let(:commit_msg) { "foo\n\nbar" }
       it "does not have error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_empty validator.errors
         assert_empty validator.warnings
       end
     end
     describe "first line is over warning limit" do
-      let(:commit_msg) do
-        "x" * (FitCommit::Validators::LineLength::FIRST_LINE_MAX_LENGTH + 1)
-      end
+      let(:commit_msg) { "x" * 51 }
       it "has a warning" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_empty validator.errors
         assert_equal 1, validator.warnings[1].size
       end
     end
     describe "first line is over error limit" do
-      let(:commit_msg) do
-        "x" * (FitCommit::Validators::LineLength::LINE_MAX_LENGTH + 1)
-      end
+      let(:commit_msg) { "x" * 73 }
       it "has an error and no warning" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_equal 1, validator.errors[1].size
         assert_empty validator.warnings
       end
     end
+    describe "SummaryWarnLength modified in config" do
+      let(:config) { default_config.merge("SummaryWarnLength" => 5) }
+      describe "first line is over modified warning limit" do
+        let(:commit_msg) { "x" * 6 }
+        it "has a warning" do
+          validator.validate(commit_lines)
+          assert_empty validator.errors
+          assert_equal 1, validator.warnings[1].size
+        end
+      end
+    end
   end
   describe "second line" do
     describe "second line is not empty" do
       let(:commit_msg) { "foo\nbar" }
       it "has error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_equal 1, validator.errors[2].size
         assert_empty validator.warnings
       end
     end
     describe "second line is not empty and too long" do
-      let(:commit_msg) do
-        "foo\n" + ("x" * (FitCommit::Validators::LineLength::LINE_MAX_LENGTH + 1))
-      end
+      let(:commit_msg) { "foo\n" + ("x" * 73) }
       it "only mentions blank error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_equal 1, validator.errors[2].size
         assert_match(/must be blank/, validator.errors[2][0])
         assert_empty validator.warnings
@@ -68,7 +75,7 @@ describe FitCommit::Validators::LineLength do
     describe "second line is empty" do
       let(:commit_msg) { "foo\n\nbar" }
       it "does not have error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_empty validator.errors
         assert_empty validator.warnings
       end
@@ -76,7 +83,7 @@ describe FitCommit::Validators::LineLength do
     describe "does not have a second line" do
       let(:commit_msg) { "foo" }
       it "does not have error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_empty validator.errors
         assert_empty validator.warnings
       end
@@ -84,24 +91,47 @@ describe FitCommit::Validators::LineLength do
   end
   describe "body text" do
     describe "line is over length limit" do
-      let(:commit_msg) do
-        "foo\n\n" + ("x" * (FitCommit::Validators::LineLength::LINE_MAX_LENGTH + 1))
-      end
+      let(:commit_msg) { "foo\n\n" + ("x" * 73) }
       it "has error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_equal 1, validator.errors[3].size
         assert_empty validator.warnings
       end
     end
-    describe "line is equal to length limit" do
-      let(:commit_msg) do
-        "foo\n\n" + ("x" * FitCommit::Validators::LineLength::LINE_MAX_LENGTH)
+    describe "line is over length limit and has an URL" do
+      let(:commit_msg) { "foo\n\nhttps://" + ("x" * 100) }
+      it "does not have error" do
+        validator.validate(commit_lines)
+        assert_empty validator.errors
+        assert_empty validator.warnings
+      end
+      describe "AllowLongUrls modified in config" do
+        let(:config) { default_config.merge("AllowLongUrls" => false) }
+        it "has error" do
+          validator.validate(commit_lines)
+          assert_equal 1, validator.errors[3].size
+          assert_empty validator.warnings
+        end
       end
+    end
+    describe "line is equal to length limit" do
+      let(:commit_msg) { "foo\n\n" + ("x" * 72) }
       it "does not have error" do
-        validator.validate
+        validator.validate(commit_lines)
         assert_empty validator.errors
         assert_empty validator.warnings
       end
     end
+    describe "MaxLineLength modified in config" do
+      let(:config) { default_config.merge("MaxLineLength" => 5) }
+      describe "line is over modified limit" do
+        let(:commit_msg) { "foo\n\n" + ("x" * 6) }
+        it "has error" do
+          validator.validate(commit_lines)
+          assert_equal 1, validator.errors[3].size
+          assert_empty validator.warnings
+        end
+      end
+    end
   end
 end

data/test/validators/summary_period_test.rb

@@ -1,15 +1,18 @@
-require "minitest/autorun"
+require File.expand_path "../validator_helper.rb", __FILE__
 require "fit_commit/validators/summary_period"
+require "fit_commit/line"
 
 describe FitCommit::Validators::SummaryPeriod do
-  let(:validator) { FitCommit::Validators::SummaryPeriod.new(commit_lines, branch_name) }
+  let(:validator) { FitCommit::Validators::SummaryPeriod.new(branch_name, config) }
   let(:commit_lines) { FitCommit::Line.from_text_array(commit_msg.split("\n")) }
+  let(:default_config) { default_config_for("Validators/SummaryPeriod") }
+  let(:config) { default_config }
   let(:branch_name) { "any" }
 
   describe "summary ends with period" do
     let(:commit_msg) { "foo bar." }
     it "has error" do
-      validator.validate
+      validator.validate(commit_lines)
       assert_equal 1, validator.errors[1].size
       assert_empty validator.warnings
     end
@@ -17,7 +20,7 @@ describe FitCommit::Validators::SummaryPeriod do
   describe "summary does not end with period" do
     let(:commit_msg) { "foo bar\n\nhi." }
     it "does not have errors/warnings" do
-      validator.validate
+      validator.validate(commit_lines)
       assert_empty validator.errors
       assert_empty validator.warnings
     end

data/test/validators/tense_test.rb

@@ -1,16 +1,18 @@
-require "minitest/autorun"
+require File.expand_path "../validator_helper.rb", __FILE__
 require "fit_commit/validators/tense"
+require "fit_commit/line"
 
 describe FitCommit::Validators::Tense do
-  let(:validator) { FitCommit::Validators::Tense.new(commit_lines, branch_name) }
+  let(:validator) { FitCommit::Validators::Tense.new(branch_name, config) }
   let(:commit_lines) { FitCommit::Line.from_text_array(commit_msg.split("\n")) }
-
-  let(:branch_name) { "anybranch" }
+  let(:default_config) { default_config_for("Validators/Tense") }
+  let(:config) { default_config }
+  let(:branch_name) { "any" }
 
   describe "uses incorrect tense on first line" do
     let(:commit_msg) { "Changed something" }
     it "has error" do
-      validator.validate
+      validator.validate(commit_lines)
       assert_equal 1, validator.errors[1].size
       assert_empty validator.warnings
     end
@@ -19,7 +21,7 @@ describe FitCommit::Validators::Tense do
   describe "uses incorrect tense on first line" do
     let(:commit_msg) { "[#ticketno] Changed something" }
     it "has error" do
-      validator.validate
+      validator.validate(commit_lines)
       assert_equal 1, validator.errors[1].size
       assert_empty validator.warnings
     end
@@ -28,7 +30,7 @@ describe FitCommit::Validators::Tense do
   describe "has incorrect tense after the first word" do
     let(:commit_msg) { "Document fixes to bug" }
     it "does not have errors/warnings" do
-      validator.validate
+      validator.validate(commit_lines)
       assert_empty validator.errors
       assert_empty validator.warnings
     end
@@ -37,7 +39,7 @@ describe FitCommit::Validators::Tense do
   describe "uses incorrect tense on a line other than first line" do
     let(:commit_msg) { "Fix bug\n\nChanged something" }
     it "does not have errors/warnings" do
-      validator.validate
+      validator.validate(commit_lines)
       assert_empty validator.errors
       assert_empty validator.warnings
     end

data/test/validators/validator_helper.rb

@@ -0,0 +1,8 @@
+require "minitest/autorun"
+require "yaml"
+
+def default_config_for(key)
+  YAML.load_file(
+    File.expand_path("../../../templates/config/fit_commit.default.yml", __FILE__)).
+    fetch(key)
+end

data/test/validators/wip_test.rb

@@ -1,38 +1,28 @@
-require "minitest/autorun"
+require File.expand_path "../validator_helper.rb", __FILE__
 require "fit_commit/validators/wip"
+require "fit_commit/line"
 
 describe FitCommit::Validators::Wip do
-  let(:validator) { FitCommit::Validators::Wip.new(commit_lines, branch_name) }
+  let(:validator) { FitCommit::Validators::Wip.new(branch_name, config) }
   let(:commit_lines) { FitCommit::Line.from_text_array(commit_msg.split("\n")) }
+  let(:default_config) { default_config_for("Validators/Wip") }
+  let(:config) { default_config }
+  let(:branch_name) { "any" }
 
-  describe "master branch" do
-    let(:branch_name) { "master" }
-    describe "contains WIP" do
-      let(:commit_msg) { "WIP foo" }
-      it "has error" do
-        validator.validate
-        assert_equal 1, validator.errors[1].size
-        assert_empty validator.warnings
-      end
-    end
-    describe "does not contain WIP" do
-      let(:commit_msg) { "foo" }
-      it "does not have errors/warnings" do
-        validator.validate
-        assert_empty validator.errors
-        assert_empty validator.warnings
-      end
+  describe "contains WIP" do
+    let(:commit_msg) { "WIP foo" }
+    it "has error" do
+      validator.validate(commit_lines)
+      assert_equal 1, validator.errors[1].size
+      assert_empty validator.warnings
     end
   end
-  describe "not master branch" do
-    let(:branch_name) { "notmaster" }
-    describe "contains WIP" do
-      let(:commit_msg) { "WIP foo" }
-      it "does not have errors/warnings" do
-        validator.validate
-        assert_empty validator.errors
-        assert_empty validator.warnings
-      end
+  describe "does not contain WIP" do
+    let(:commit_msg) { "foo" }
+    it "does not have errors/warnings" do
+      validator.validate(commit_lines)
+      assert_empty validator.errors
+      assert_empty validator.warnings
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit-commit
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael Foley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swearjar
@@ -73,11 +73,13 @@ files:
 - fit-commit.gemspec
 - lib/fit_commit.rb
 - lib/fit_commit/cli.rb
+- lib/fit_commit/configuration_loader.rb
 - lib/fit_commit/has_errors.rb
 - lib/fit_commit/installer.rb
 - lib/fit_commit/line.rb
 - lib/fit_commit/message_parser.rb
 - lib/fit_commit/runner.rb
+- lib/fit_commit/validator_loader.rb
 - lib/fit_commit/validators/base.rb
 - lib/fit_commit/validators/frathouse.rb
 - lib/fit_commit/validators/line_length.rb
@@ -85,13 +87,17 @@ files:
 - lib/fit_commit/validators/tense.rb
 - lib/fit_commit/validators/wip.rb
 - lib/fit_commit/version.rb
+- templates/config/fit_commit.default.yml
 - templates/hooks/commit-msg
+- test/configuration_loader_test.rb
 - test/message_parser_test.rb
 - test/runner_test.rb
+- test/validator_loader_test.rb
 - test/validators/frathouse_test.rb
 - test/validators/line_length_test.rb
 - test/validators/summary_period_test.rb
 - test/validators/tense_test.rb
+- test/validators/validator_helper.rb
 - test/validators/wip_test.rb
 homepage: https://github.com/m1foley/fit-commit
 licenses:
@@ -126,11 +132,14 @@ signing_key:
 specification_version: 4
 summary: A Git hook to validate your commit messages
 test_files:
+- test/configuration_loader_test.rb
 - test/message_parser_test.rb
 - test/runner_test.rb
+- test/validator_loader_test.rb
 - test/validators/frathouse_test.rb
 - test/validators/line_length_test.rb
 - test/validators/summary_period_test.rb
 - test/validators/tense_test.rb
+- test/validators/validator_helper.rb
 - test/validators/wip_test.rb
 has_rdoc: