legit 0.0.7 → 0.0.8

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'minitest' do
+  watch(%r|^test/(.*)_test\.rb|)
+  watch(%r|^lib/(.*)\.rb|)     { "test" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
+end

data/README.md

@@ -1,8 +1,9 @@
 # Legit
 
+[![Build Status](https://travis-ci.org/dillonkearns/legit.png)](https://travis-ci.org/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/badge.png)](https://codeclimate.com/github/dillonkearns/dotfile-linker)
+[![Code Climate](https://codeclimate.com/github/dillonkearns/dotfile-linker.png)](https://codeclimate.com/github/dillonkearns/dotfile-linker)
 
 ## Installation
 ```bash

data/Rakefile

@@ -1,2 +1,9 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/**/*_test.rb'
+end
+
+task :default => :test

data/bin/legit

@@ -9,4 +9,4 @@ $stderr.sync = true
 
 require 'legit'
 
-Legit.start
+Legit::CLI.start

data/legit.gemspec

@@ -17,7 +17,13 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">=1.8.7"
 
   gem.add_development_dependency "rake", "~> 10.0.3"
-  gem.add_runtime_dependency     "colorize", "~> 0.5.8"
+  gem.add_development_dependency "minitest", "~> 4.6.2"
+  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "mocha", "~> 0.13.2"
+  gem.add_development_dependency "guard-minitest"
+  gem.add_development_dependency "growl"
+  gem.add_development_dependency "rb-fsevent"
+
   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
 end

data/lib/legit/version.rb

@@ -1,3 +1,3 @@
 module Legit
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/legit.rb

@@ -1,79 +1,67 @@
 require 'legit_helper'
 require 'thor'
 
-class Legit < Thor
-  desc "log [ARGS]", "print a graph-like log"
-  method_option :me, :type => :boolean, :desc => 'Only include my commits'
-  def log(*args)
-    command = []
-    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"
-    command << author_equals_me if options[:me]
-    args.each do |arg|
-      command << arg
-    end
+module Legit
+  class CLI < Thor
+    desc "log [ARGS]", "print a graph-like log"
+    method_option :me, :type => :boolean, :desc => 'Only include my commits'
+    def log(*args)
+      command = []
+      command << LOG_BASE_COMMAND
+      command << "--author='#{repo.config['user.name']}'" if options[:me]
+      args.each do |arg|
+        command << arg
+      end
 
-    run_command(command.join(' '))
-  end
+      run_command(command.join(' '))
+    end
 
-  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'
-  def catch_todos(todo_format = "TODO")
-    if options[:enable]
-      repo.config.delete('hooks.ignore-todos')
-    elsif options[:disable]
-      repo.config['hooks.ignore-todos'] = true
-    else
-      if repo.config['hooks.ignore-todos'] == 'true'
-        show("[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :low_warning)
+    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'
+    def catch_todos(todo_format = "TODO")
+      if options[:enable]
+        repo.config.delete('hooks.ignore-todos')
+      elsif options[:disable]
+        repo.config['hooks.ignore-todos'] = true
       else
-        run_catch_todos(todo_format)
+        if repo.config['hooks.ignore-todos'] == 'true'
+          show("[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :low_warning)
+        else
+          run_catch_todos(todo_format)
+        end
       end
     end
-  end
-
-  desc "bisect BAD GOOD COMMAND", "Find the first bad commit by running COMMAND, using GOOD and BAD as the first known good and bad commits"
-  def bisect(bad, good, *command_args)
-    command = command_args.join(' ')
-    run_command("git bisect start #{bad} #{good}")
-    run_command("git bisect run #{command}")
-    run_command("git bisect reset")
-  end
 
-  desc "delete BRANCH", "Delete BRANCH both locally and remotely"
-  def delete(branch_name)
-    run_command("git branch -d #{branch_name}")
-
-    if $?.success?
-      delete_remote_branch(branch_name)
-    else
-      show("Force delete branch #{branch_name}? (y/n)", :warning)
-      if STDIN.gets.chomp =~ /^y/
-        run_command("git branch -D #{branch_name}")
-        delete_remote_branch(branch_name)
-      else
-        puts "Abort. #{branch_name} not deleted"
-      end
+    desc "bisect BAD GOOD COMMAND", "Find the first bad commit by running COMMAND, using GOOD and BAD as the first known good and bad commits"
+    def bisect(bad, good, *command_args)
+      command = command_args.join(' ')
+      run_command("git bisect start #{bad} #{good}")
+      run_command("git bisect run #{command}")
+      run_command("git bisect reset")
     end
-  end
 
-  private
-  def repo
-    @repo ||= Rugged::Repository.new('.')
-  end
+    desc "delete BRANCH", "Delete BRANCH both locally and remotely"
+    def delete(branch_name)
+      delete_local_branch!(branch_name) || force_delete_local_branch?(branch_name) and delete_remote_branch?(branch_name)
+    end
 
-  def run_catch_todos(todo_format)
-    run_command("git diff --staged | grep '^+' | grep #{todo_format}")
+    private
+    def repo
+      @repo ||= Rugged::Repository.new('.')
+    end
 
-    if $?.success?
-      if options[:warn]
-        exit 1 unless positive_response?("[pre-commit hook] Found staged `#{todo_format}`s. Do you still want to continue?", :warning)
+    def run_catch_todos(todo_format)
+      if todos_staged?(todo_format)
+        if options[:warn]
+          exit 1 unless positive_response?("[pre-commit hook] Found staged `#{todo_format}`s. Do you still want to continue?", :warning)
+        else
+          show("[pre-commit hook] Aborting commit... found staged `#{todo_format}`s.", :warning)
+          exit 1
+        end
       else
-        show("[pre-commit hook] Aborting commit... found staged `#{todo_format}`s.", :warning)
-        exit 1
+        show("[pre-commit hook] Success: No `#{todo_format}`s staged.", :success)
       end
-    else
-      show("Success: No #{todo_format}s staged.", :success)
     end
   end
 end

data/lib/legit_helper.rb

@@ -1,20 +1,40 @@
-require 'colorize'
 require 'rugged'
 
+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"
+
 def current_branch
   system "git rev-parse --abbrev-ref HEAD"
 end
 
-def delete_remote_branch(branch_name)
-  system("git push --delete origin #{branch_name}")
+def delete_local_branch!(branch_name)
+  run_command("git branch -d #{branch_name}")
+  $?.success?
+end
+
+def force_delete_local_branch?(branch_name)
+  if yes?("Force delete branch?", :red)
+    force_delete_local_branch!(branch_name)
+    true
+  else
+    false
+  end
 end
 
-def author_equals_me
-  "--author='#{user_name}'"
+def force_delete_local_branch!(branch_name)
+  run_command("git branch -D #{branch_name}")
 end
 
-def user_name
-  `git config --get user.name`.chomp
+def delete_remote_branch?(branch_name)
+  if yes?("Delete branch remotely?", :red)
+    delete_remote_branch!(branch_name)
+    true
+  else
+    false
+  end
+end
+
+def delete_remote_branch!(branch_name)
+  system("git push --delete origin #{branch_name}")
 end
 
 def run_command(command)
@@ -37,9 +57,13 @@ def show(message, type = :success)
         raise 'Unknown prompt type'
       end
 
-  puts message.send(color)
+  show(message, color)
 end
 
+def todos_staged?(todo_format)
+  run_command("git diff --staged | grep '^+' | grep #{todo_format}")
+  $?.success?  # grep returns 0 if there is a match
+end
 
 def positive_response?(message, type = :normal)
   show("#{message} (y/n)", type)

data/test/legit_test.rb

@@ -0,0 +1,86 @@
+require File.expand_path('../test_helper', __FILE__)
+require 'legit'
+
+describe Legit::CLI do
+  include Mocha::Integration::MiniTest
+
+  before do
+    stub_config
+  end
+
+  describe 'legit log' do
+    it "parses --me command and passes through other options" do
+      args = 'log -p --me -n 1'
+      stub_config({ 'user.name' => 'Stubbed Username' })
+      Legit::CLI.any_instance.expects(:run_command).with("#{LOG_BASE_COMMAND} --author='Stubbed Username' -p -n 1")
+      Legit::CLI.start(args.split(' '))
+    end
+
+    it "passes through options that aren't defined by legit log" do
+      args = 'log -p --stat'
+      Legit::CLI.any_instance.expects(:run_command).with("#{LOG_BASE_COMMAND} -p --stat")
+      Legit::CLI.start(args.split(' '))
+    end
+  end
+
+  describe 'legit catch-todos' do
+    it "calls exit 1 when TODOs staged but not when 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
+    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.start('catch-todos'.split(' '))
+    end
+  end
+
+  describe 'legit delete' do
+    it 'force deletes branch when user responds yes' do
+      Legit::CLI.any_instance.expects(:delete_local_branch!).with('branch_to_delete').returns(false)
+      Legit::CLI.any_instance.expects(:yes?).with('Force delete branch?', :red).returns(true)
+      Legit::CLI.any_instance.expects(:force_delete_local_branch!).with('branch_to_delete')
+      Legit::CLI.any_instance.expects(:delete_remote_branch?).with('branch_to_delete').returns(false)
+      Legit::CLI.start('delete branch_to_delete'.split(' '))
+    end
+
+    it "doesn't force delete branch when user responds no" do
+      Legit::CLI.any_instance.expects(:delete_local_branch!).with('branch_to_delete').returns(false)
+      Legit::CLI.any_instance.expects(:yes?).with('Force delete branch?', :red).returns(false)
+      Legit::CLI.any_instance.expects(:force_delete_local_branch!).never
+      Legit::CLI.start('delete branch_to_delete'.split(' '))
+    end
+
+    it 'deletes remotely when user responds yes' do
+      Legit::CLI.any_instance.expects(:delete_local_branch!).with('branch_to_delete').returns(true)
+      Legit::CLI.any_instance.expects(:yes?).with('Delete branch remotely?', :red).returns(true)
+      Legit::CLI.start('delete branch_to_delete'.split(' '))
+    end
+
+    it "doesn't delete remotely when user responds no" do
+      Legit::CLI.any_instance.expects(:delete_local_branch!).with('branch_to_delete').returns(true)
+      Legit::CLI.any_instance.expects(:yes?).with('Delete branch remotely?', :red).returns(false)
+      Legit::CLI.start('delete branch_to_delete'.split(' '))
+    end
+  end
+
+  describe 'legit bisect' do
+    command = 'ruby -n my/test/file "/testpattern/"'
+    args = "bisect HEAD HEAD~5 #{command}"
+    Legit::CLI.any_instance.expects(:run_command).with('git bisect start HEAD HEAD~5')
+    Legit::CLI.any_instance.expects(:run_command).with("git bisect run #{command}")
+    Legit::CLI.any_instance.expects(:run_command).with("git bisect reset")
+    Legit::CLI.start(args.split(' '))
+  end
+end
+
+def stub_config(config = {})
+  Legit::CLI.any_instance.stubs(:repo => stub({ :config => config }))
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+require "minitest/autorun"
+require "minitest/reporters"
+
+# for attaching tests to rubymine
+MiniTest::Reporters.use! if ENV['RUBYMINE']
+
+require 'mocha/setup'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legit
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,21 +28,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
-  type: :runtime
+        version: 4.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  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: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.13.2
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  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: growl
+  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: rb-fsevent
+  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
@@ -85,7 +165,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -94,6 +176,8 @@ files:
 - lib/legit.rb
 - lib/legit/version.rb
 - lib/legit_helper.rb
+- test/legit_test.rb
+- test/test_helper.rb
 homepage: https://github.com/dillonkearns/legit
 licenses: []
 post_install_message: 
@@ -114,11 +198,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1460548303740247406
+      hash: 1919928434083848105
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A collection of scripts for common git tasks to simplify and improve workflow.
-test_files: []
+test_files:
+- test/legit_test.rb
+- test/test_helper.rb