legit 0.0.9 → 0.0.10

data/README.md

@@ -1,6 +1,7 @@
 # Legit
 
 [![Build Status](https://travis-ci.org/dillonkearns/legit.png)](https://travis-ci.org/dillonkearns/legit)
+[![Coverage Status](https://coveralls.io/repos/dillonkearns/legit/badge.png?branch=master)](https://coveralls.io/r/dillonkearns/legit)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/legit.png)](http://badge.fury.io/rb/legit)
 [![Dependency Status](https://gemnasium.com/dillonkearns/legit.png)](https://gemnasium.com/dillonkearns/legit)
 [![Code Climate](https://codeclimate.com/github/dillonkearns/legit.png)](https://codeclimate.com/github/dillonkearns/legit)

data/legit.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "guard-minitest"
   gem.add_development_dependency "growl"
   gem.add_development_dependency "rb-fsevent"
+  gem.add_development_dependency "coveralls"
 
   gem.add_runtime_dependency     "thor", "~> 0.17.0"
   gem.add_runtime_dependency     "rugged", "0.17.0.b7"    # need version 0.17 for a bug accessing Rugged::Repo.config in 0.16

data/lib/legit/version.rb

@@ -1,3 +1,3 @@
 module Legit
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/legit.rb

@@ -1,8 +1,9 @@
 require 'legit_helper'
-require 'thor'
 
 module Legit
   class CLI < Thor
+    include Thor::Actions
+
     desc "log [ARGS]", "print a graph-like log"
     method_option :me, :type => :boolean, :desc => 'Only include my commits'
     def log(*args)
@@ -19,14 +20,17 @@ module Legit
     desc "catch-todos [TODO_FORMAT]", "Abort commit if any todos in TODO_FORMAT found"
     method_option :enable, :type => :boolean, :desc => 'Enable todo checking'
     method_option :disable, :type => :boolean, :desc => 'Disable todo checking'
+    method_option :warn, :type => :boolean, :desc => 'Turn on warn mode'
     def catch_todos(todo_format = "TODO")
       if options[:enable]
-        repo.config.delete('hooks.ignore-todos')
+        repo.config.delete('hooks.catch-todos-mode')
       elsif options[:disable]
-        repo.config['hooks.ignore-todos'] = true
+        repo.config['hooks.catch-todos-mode'] = 'disable'
+      elsif options[:warn]
+        repo.config['hooks.catch-todos-mode'] = 'warn'
       else
-        if repo.config['hooks.ignore-todos'] == 'true'
-          show("[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :low_warning)
+        if repo.config['hooks.catch-todos-mode'] == 'disable'
+          say("[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :yellow)
         else
           run_catch_todos(todo_format)
         end
@@ -48,19 +52,19 @@ module Legit
 
     private
     def repo
-      @repo ||= Rugged::Repository.new('.')
+      @repo ||= Rugged::Repository.new(Rugged::Repository.discover)
     end
 
     def run_catch_todos(todo_format)
       if todos_staged?(todo_format)
-        if options[:warn]
+        if repo.config['hooks.catch-todos-mode'] == 'warn'
           exit 1 unless yes?("[pre-commit hook] Found staged `#{todo_format}`s. Do you still want to continue?", :yellow)
         else
-          show("[pre-commit hook] Aborting commit... found staged `#{todo_format}`s.", :warning)
+          say("[pre-commit hook] Aborting commit... found staged `#{todo_format}`s.", :red)
           exit 1
         end
       else
-        show("[pre-commit hook] Success: No `#{todo_format}`s staged.", :success)
+        say("[pre-commit hook] Success: No `#{todo_format}`s staged.", :green)
       end
     end
   end

data/lib/legit_helper.rb

@@ -1,4 +1,5 @@
 require 'rugged'
+require 'thor'
 
 LOG_BASE_COMMAND = "git log --pretty=format:'%C(yellow)%h%Creset%C(bold cyan)%d%Creset %s %Cgreen(%cr)%Creset %C(bold magenta) <%an>%Creset' --graph --abbrev-commit --date=relative"
 
@@ -38,26 +39,10 @@ def delete_remote_branch!(branch_name)
 end
 
 def run_command(command)
-  show(command, :low_warning) if ENV['DEBUG']
-  system(command)
-end
-
-def show(message, type = :success)
-  color =
-      case type
-      when :success
-        :green
-      when :warning
-        :red
-      when :low_warning
-        :yellow
-      when :normal
-        :white
-      else
-        raise 'Unknown prompt type'
-      end
-
-  say(message, color)
+  options = {
+    :verbose => ENV.has_key?('LEGIT_DEBUG')
+  }
+  run(command, options)
 end
 
 def todos_staged?(todo_format)

data/test/legit_test.rb

@@ -24,20 +24,53 @@ describe Legit::CLI do
   end
 
   describe 'legit catch-todos' do
-    it "calls exit 1 when TODOs staged but not when disabled" do
+    it "calls exit 1 when TODOs staged but not disabled" do
       Legit::CLI.any_instance.expects(:todos_staged?).with('TODO').returns(true)
       Legit::CLI.any_instance.expects(:exit).with(1)
-      Legit::CLI.any_instance.expects(:show).with("[pre-commit hook] Aborting commit... found staged `TODO`s.", :warning)
-      Legit::CLI.start(['catch-todos'])
-
-      Legit::CLI.start('catch-todos --disable'.split(' '))
-      Legit::CLI.any_instance.expects(:exit).never
+      Legit::CLI.any_instance.expects(:say).with("[pre-commit hook] Aborting commit... found staged `TODO`s.", :red)
+      Legit::CLI.start('catch-todos'.split(' '))
     end
 
     it "doesn't call exit 1 when no TODOs staged" do
       Legit::CLI.any_instance.expects(:todos_staged?).with('TODO').returns(false)
       Legit::CLI.any_instance.expects(:exit).never
-      Legit::CLI.any_instance.expects(:show).with("[pre-commit hook] Success: No `TODO`s staged.", :success)
+      Legit::CLI.any_instance.expects(:say).with("[pre-commit hook] Success: No `TODO`s staged.", :green)
+      Legit::CLI.start('catch-todos'.split(' '))
+    end
+
+    it "removes catch-todos-mode when called with --enable" do
+      config_mock = mock('config')
+      config_mock.expects(:delete).with('hooks.catch-todos-mode')
+      Legit::CLI.any_instance.stubs(:repo => stub({ :config => config_mock }))
+      Legit::CLI.start('catch-todos --enable'.split(' '))
+    end
+
+    it "sets catch-todos-mode to disable when called with --disable" do
+      config_mock = mock('config')
+      config_mock.expects(:[]=).with('hooks.catch-todos-mode', 'disable')
+      Legit::CLI.any_instance.stubs(:repo => stub({ :config => config_mock }))
+      Legit::CLI.start('catch-todos --disable'.split(' '))
+    end
+
+    it "sets catch-todos-mode to warn when called with --warn" do
+      config_mock = mock('config')
+      config_mock.expects(:[]=).with('hooks.catch-todos-mode', 'warn')
+      Legit::CLI.any_instance.stubs(:repo => stub({ :config => config_mock }))
+      Legit::CLI.start('catch-todos --warn'.split(' '))
+    end
+
+    it "skips catch-todos when disabled" do
+      stub_config('hooks.catch-todos-mode' => 'disable')
+      Legit::CLI.any_instance.expects(:run_catch_todos).never
+      Legit::CLI.any_instance.expects(:say).with("[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :yellow)
+      Legit::CLI.start('catch-todos'.split(' '))
+    end
+
+    it "have exit status of 0 in warn mode when positive response" do
+      stub_config('hooks.catch-todos-mode' => 'warn')
+      Legit::CLI.any_instance.expects(:todos_staged?).returns(true)
+      Legit::CLI.any_instance.expects(:exit).never
+      Legit::CLI.any_instance.expects(:yes?).with("[pre-commit hook] Found staged `TODO`s. Do you still want to continue?", :yellow).returns(true)
       Legit::CLI.start('catch-todos'.split(' '))
     end
   end

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require "minitest/autorun"
 require "minitest/reporters"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legit
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1036208191887355172
+      hash: 3336823418665542283
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23