fit-commit 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993eadcd7440c4c9d90a439b33fe1267130b588e
-  data.tar.gz: 288bd8d1af9bcd4ad34b868019ef25e59d6c0005
+  metadata.gz: 7ad77d4fef04820ea606a791e318dfd42b296b76
+  data.tar.gz: 636584b83de8821f587846dd5be38acc2867fdc4
 SHA512:
-  metadata.gz: 8657be275a9f8e7f1649b174fa01fc38e3f621eb546c138848f1269635b455e7f760dbfc38c653f2ea31feeb482ef40d0d1d4eb563a42afa976c9a1a04451509
-  data.tar.gz: 58084b2d2fb38dd72784ae8e44558c1b18f6b21caf51e190d1644a86fc0abe696c7cc7a583015a03cdf93d44d54ad6709e92821698b480f6aadc421903d42363
+  metadata.gz: d1a1af025a01e22528921a00201e9e6706d8d3c09eec51e51d6b5e55400cb92cbed7e3b87082c069bea2ffc9ce470bf10548e3ed095fd9b96e766d159834f13a
+  data.tar.gz: 2decbff9cb0fb3aa3e88170a962776d9384ed0b54efbfa30fb4db314eb0a739c9cc5baf422133f9d92e786bce9f7bd5a45ac95b658710eeba675452453ad1ae1

data/CHANGELOG.md

@@ -1,9 +1,9 @@
 # Changelog
 
-### master
-- N/A
+### v3.0.1 (2015-09-21)
+- Allow granular configuration overrides
 
-### v3.0.0 (2015-09-18)
+## v3.0.0 (2015-09-18)
 - Rename SummaryPeriod validator to SubjectPeriod (can break existing config files)
 - Add CapitalizeSubject validator
 
@@ -19,7 +19,7 @@
 ### v2.1.0 (2015-08-29)
 - Add `fit-commit uninstall` command
 
-### v2.0.0 (2015-08-27)
+## v2.0.0 (2015-08-27)
 - Breaking changes made to Git hook. If upgrading from an older version you'll need to re-run `fit-commit install` in your repos.
 
 ### v1.1.0 (2015-08-26)

data/lib/fit_commit/configuration_loader.rb

@@ -4,7 +4,9 @@ module FitCommit
   class ConfigurationLoader
     def global_configuration
       all_filepaths.each_with_object({}) do |filepath, config|
-        config.merge!(read_config(filepath))
+        config.merge!(read_config(filepath)) do |_key, oldval, newval|
+          oldval.merge(newval)
+        end
       end
     end
 
@@ -49,7 +51,7 @@ module FitCommit
     end
 
     def load_yaml(path)
-      content = YAML.load_file(path) if File.exist?(path)
+      content = YAML.load_file(path) if File.readable?(path)
       content || {}
     rescue => e
       raise e, "Error parsing config file: #{e.message}"

data/lib/fit_commit/version.rb

@@ -1,3 +1,3 @@
 module FitCommit
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/unit/configuration_loader_test.rb

@@ -9,11 +9,11 @@ describe FitCommit::ConfigurationLoader do
   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 :default_filepath, "/dev/null" do
+      subject.stub :system_filepath, (system_file ? system_file.path : "/dev/null") do
+        subject.stub :user_filepath, (user_file ? user_file.path : "/dev/null") do
+          subject.stub :config_filepath, "/dev/null" do
+            subject.stub :local_filepath, "/dev/null" do
               subject.stub :git_top_level, "." do
                 subject.global_configuration
               end
@@ -59,7 +59,7 @@ describe FitCommit::ConfigurationLoader 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/"
+      "Foo/Bar:\n  Baz: false\nQux/Norf/Blah:\n  Foobar:\n    - !ruby/regexp /\\Afoo/\n  Booyah: false"
     end
     let(:user_file_content) do
       "Qux/Norf/Blah:\n  Foobar: true\nBuz:\n  - hi"
@@ -68,7 +68,7 @@ describe FitCommit::ConfigurationLoader do
     it "is a merged configuration that takes precedence into account" do
       expected = {
         "FitCommit::Foo::Bar" => { "Baz" => false },
-        "FitCommit::Qux::Norf::Blah" => { "Foobar" => true },
+        "FitCommit::Qux::Norf::Blah" => { "Foobar" => true, "Booyah" => false },
         "FitCommit::Buz" => ["hi"]
       }
       assert_equal expected, global_configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit-commit
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Michael Foley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swearjar