fit-commit 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22158ab17b4462ca5896322c36f8466ffc029c2b
-  data.tar.gz: 53e609a83fc276e43aba9d3c23c15dc971c71c10
+  metadata.gz: fc08ac065b8b63def448a55dde83e4c2415041eb
+  data.tar.gz: 2e32ba91af1f3d49d24fc1702995c34dc7e6a5e8
 SHA512:
-  metadata.gz: f3aa2b49980aea8801f0675b72d7a72a1e8e6f3e17fba4827f3c14f6cd144681f50504ae66da81df5a5ac0bea70b63e496e4a9f2236444e863b6932c26b2279f
-  data.tar.gz: 8db493b9b6665f618ab93769192908d8ab2c5fa14e7002706b59fb0fbb0c49747aee3d45a0fbdcb665d29fea06c4ec557bf74e5d3260848cb0fc37abfbb22894
+  metadata.gz: 7500dd39439a0c74810b31ee50c3d035ae5de0534e40d7d742a934061fbc3c5b7f6906bd536c23565aa65351bc4c29ae7bdc121f96d4ff8c6dc70ecc9f87f9ee
+  data.tar.gz: 595a6b8f2bdd25ab000e66c6014c64bdc62da3277764e44321570edcfb7026cc90f694619ab7d9edde1184a52e3c33e044285b45dce7728aa03053d96c61b845

data/.gitignore

@@ -17,9 +17,9 @@
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+### master
+- N/A
+
+### 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)
+- Add support for `git commit -v`.
+
+### v1.0.4 (2015-08-26)
+- Improve error output in Git hook.

data/TODO.txt

@@ -1,3 +1,4 @@
+- Document adding fit-commit to ~/.git_template
 - Customize which are "business" branches (not just master)
 - Configuration to disable validations.
 - `fit-commit uninstall`

data/lib/fit-commit/runner.rb

@@ -5,6 +5,9 @@ module FitCommit
   class Runner
     include FitCommit::HasErrors
 
+    EXIT_CODE_ALLOW_COMMIT  = 0
+    EXIT_CODE_REJECT_COMMIT = 1
+
     attr_accessor :message_path, :branch_name, :stdout, :stdin
     def initialize(message_path, branch_name, stdout = $stdout, stdin = $stdin)
       self.message_path = message_path
@@ -14,22 +17,22 @@ module FitCommit
     end
 
     def run
-      return true if empty_commit?
+      return EXIT_CODE_ALLOW_COMMIT if empty_commit?
       run_validators
-      return true if [errors, warnings].all?(&:empty?)
+      return EXIT_CODE_ALLOW_COMMIT if [errors, warnings].all?(&:empty?)
       print_results
 
       allow_commit = errors.empty?
       unless allow_commit
         stdout.print "\nForce commit? [y/n] "
-        return false unless stdin.gets =~ /y/i
+        return EXIT_CODE_REJECT_COMMIT unless stdin.gets =~ /y/i
         allow_commit = true
       end
 
       stdout.print "\n"
-      allow_commit
+      allow_commit ? EXIT_CODE_ALLOW_COMMIT : EXIT_CODE_REJECT_COMMIT
     rescue Interrupt # Ctrl-c
-      false
+      EXIT_CODE_REJECT_COMMIT
     end
 
     private
@@ -77,7 +80,7 @@ module FitCommit
     end
 
     def message_text
-      File.open(message_path, "r").read
+      File.read(message_path)
     end
 
     def empty_commit?

data/lib/fit-commit/version.rb

@@ -1,3 +1,3 @@
 module FitCommit
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/fit-commit.rb

@@ -2,7 +2,8 @@ require "fit-commit/runner"
 
 module FitCommit
   def self.run
-    runner.run || exit(1)
+    exit_code = runner.run
+    exit(exit_code)
   end
 
   private
@@ -16,6 +17,6 @@ module FitCommit
   end
 
   def self.branch_name
-    `git branch | grep '^\*' | cut -b3-`.strip
+    ENV.fetch("GIT_BRANCH_NAME")
   end
 end

data/templates/hooks/commit-msg

@@ -10,7 +10,6 @@ else cmd="ruby"
 fi
 
 export COMMIT_MESSAGE_PATH=$1
-
 if (! [[ "$COMMIT_MESSAGE_PATH" ]] ); then
   >&2 echo "fit-commit: WARNING: Skipping checks because the Git hook was not passed the"
   >&2 echo "fit-commit: commit message file path. This is usually \`.git/COMMIT_EDITMSG\`."
@@ -19,6 +18,13 @@ if (! [[ "$COMMIT_MESSAGE_PATH" ]] ); then
   exit 0
 fi
 
+export GIT_BRANCH_NAME=`git name-rev --name-only HEAD`
+if (! [[ "$GIT_BRANCH_NAME" ]] ); then
+  >&2 echo "fit-commit: WARNING: Skipping checks because the Git branch cannot be determined."
+  >&2 echo "fit-commit: Please submit a bug report with the project."
+  exit 0
+fi
+
 ${cmd} -rrubygems -e '
   begin
     require "fit-commit"

data/test/runner_test.rb

@@ -7,9 +7,9 @@ describe FitCommit::Runner do
   end
 
   def call_runner
-    allow_commit = runner.run
+    exit_code = runner.run
     stdout.rewind
-    allow_commit
+    exit_code
   end
 
   let(:commit_msg_file) do
@@ -28,7 +28,7 @@ describe FitCommit::Runner do
   describe "empty commit msg" do
     let(:commit_msg) { "" }
     it "returns truthy value without printing to stdout" do
-      assert call_runner
+      assert_equal FitCommit::Runner::EXIT_CODE_ALLOW_COMMIT, call_runner
       assert stdout.read.empty?
     end
   end
@@ -36,7 +36,7 @@ describe FitCommit::Runner do
   describe "commit msg consists of all comments" do
     let(:commit_msg) { "\n#hi\n#yo\n#" }
     it "returns truthy value without printing to stdout" do
-      assert call_runner
+      assert_equal FitCommit::Runner::EXIT_CODE_ALLOW_COMMIT, call_runner
       assert stdout.read.empty?
     end
   end
@@ -44,7 +44,7 @@ describe FitCommit::Runner do
   describe "commit msg is present but no errors" do
     let(:commit_msg) { "hello\n\nhi\n#" }
     it "returns truthy value without printing to stdout" do
-      assert call_runner
+      assert_equal FitCommit::Runner::EXIT_CODE_ALLOW_COMMIT, call_runner
       assert stdout.read.empty?
     end
   end
@@ -57,7 +57,7 @@ describe FitCommit::Runner do
       ].join("\n")
     end
     it "returns truthy value without printing to stdout" do
-      assert call_runner
+      assert_equal FitCommit::Runner::EXIT_CODE_ALLOW_COMMIT, call_runner
       assert stdout.read.empty?
     end
   end
@@ -79,14 +79,14 @@ describe FitCommit::Runner do
     describe "user does not force commit" do
       let(:stdin) { StringIO.new("n") }
       it "prints errors to stdout and returns falsey value" do
-        assert !call_runner
+        assert_equal FitCommit::Runner::EXIT_CODE_REJECT_COMMIT, call_runner
         assert_error_output
       end
     end
     describe "user forces commit" do
       let(:stdin) { StringIO.new("y") }
       it "prints errors to stdout and returns truthy value" do
-        assert call_runner
+        assert_equal FitCommit::Runner::EXIT_CODE_ALLOW_COMMIT, call_runner
         assert_error_output
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit-commit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Foley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swearjar
@@ -63,8 +63,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,25 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fit-commit (1.0.0)
-      swearjar (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    fuzzyhash (0.0.11)
-    minitest (5.8.0)
-    rake (10.4.2)
-    swearjar (1.0.0)
-      fuzzyhash (~> 0.0.11)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fit-commit!
-  minitest (~> 5.8)
-  rake (~> 10.4)
-
-BUNDLED WITH
-   1.10.6