legit 0.0.14 → 0.0.15

data/bin/legit

@@ -7,6 +7,6 @@ Signal.trap("INT") { exit 1 }
 $stdout.sync = true
 $stderr.sync = true
 
-require 'legit'
+require 'legit/cli'
 
 Legit::CLI.start

data/legit.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">=1.8.7"
 
+  gem.license = "MIT"
+
   gem.add_development_dependency "rake", "~> 10.1.0"
   gem.add_development_dependency "minitest", "~> 5.0.1"
   gem.add_development_dependency "rr", "~> 1.1.2"

data/lib/legit/helpers.rb

@@ -9,10 +9,6 @@ module Legit
       @repo ||= Rugged::Repository.new(Rugged::Repository.discover)
     end
 
-    def current_branch
-      system "git rev-parse --abbrev-ref HEAD"
-    end
-
     def local_branches
       repo.branches.select { |b| b.branch? }
     end

data/lib/legit/version.rb

@@ -1,3 +1,3 @@
 module Legit
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/test/legit_test.rb

@@ -1,100 +1,89 @@
 require File.expand_path('../test_helper', __FILE__)
-require 'legit'
-require File.expand_path('../test_repo', __FILE__)
 
 describe Legit::CLI do
-  def expects_command(command)
-    any_instance_of(Legit::CLI) { |cli| mock(cli).run_command(command) }
-  end
-
   before do
     stub_config
-    any_instance_of(Legit::CLI) do |cli|
-      stub(cli).run_command
-    end
   end
 
-  describe 'legit log' do
+  describe "legit log" do
     it "parses --me command and passes through other options" do
       stub_config({ 'user.name' => 'Stubbed Username' })
-      expects_command("#{Legit::Helpers::LOG_BASE_COMMAND} --author='Stubbed Username' -p -n 1")
-      legit 'log -p --me -n 1', :real_repo => false
+      legit 'log -p --me -n 1', [
+          [:run, "#{Legit::Helpers::LOG_BASE_COMMAND} --author='Stubbed Username' -p -n 1"]
+      ], :real_repo => false
     end
 
     it "passes through options that aren't defined by legit log" do
-      expects_command("#{Legit::Helpers::LOG_BASE_COMMAND} -p --stat")
-      legit 'log -p --stat', :real_repo => false
+      legit 'log -p --stat', [
+          [:run, "#{Legit::Helpers::LOG_BASE_COMMAND} -p --stat"]
+      ], :real_repo => false
     end
   end
 
-  describe 'legit catch-todos' do
+  describe "legit catch-todos" do
     it "calls exit 1 when TODOs staged but not disabled" do
-      any_instance_of(Legit::CLI) do |cli|
-        mock(cli).todos_staged?('TODO') { true }
-        mock(cli).exit(1)
-        mock(cli).say("[pre-commit hook] Aborting commit... found staged `TODO`s.", :red)
-      end
-      legit 'catch-todos', :real_repo => false
+      any_instance_of(Legit::CLI) { |cli| mock(cli).todos_staged?('TODO') { true } }
+      legit 'catch-todos', [
+          [:say, ['[pre-commit hook] Aborting commit... found staged `TODO`s.', :red]],
+          [:exit, 1],
+      ], :real_repo => false
     end
 
     it "doesn't call exit 1 when no TODOs staged" do
-      any_instance_of(Legit::CLI) do |cli|
-        mock(cli).todos_staged?('TODO') { false }
-        mock(cli).exit.never
-        mock(cli).say("[pre-commit hook] Success: No `TODO`s staged.", :green)
-      end
-      legit 'catch-todos', :real_repo => false
+      any_instance_of(Legit::CLI) { |cli| mock(cli).todos_staged?('TODO') { false } }
+      legit 'catch-todos', [
+          [:say, ["[pre-commit hook] Success: No `TODO`s staged.", :green]]
+      ], :real_repo => false
     end
 
     it "removes catch-todos-mode when called with --enable" do
       config_mock = mock(Object.new).delete('hooks.catch-todos-mode')
       stub_config(config_mock)
-      legit 'catch-todos --enable', :real_repo => false
+      legit 'catch-todos --enable', [], :real_repo => false
     end
 
     it "sets catch-todos-mode to disable when called with --disable" do
       config_mock = mock(Object.new).[]=('hooks.catch-todos-mode', 'disable')
       stub_config(config_mock)
-      legit 'catch-todos --disable', :real_repo => false
+      legit 'catch-todos --disable', [], :real_repo => false
     end
 
     it "sets catch-todos-mode to warn when called with --warn" do
       config_mock = mock(Object.new).[]=('hooks.catch-todos-mode', 'warn')
       stub_config(config_mock)
-      legit 'catch-todos --warn', :real_repo => false
+      legit 'catch-todos --warn', [], :real_repo => false
     end
 
     it "skips catch-todos when disabled" do
       stub_config('hooks.catch-todos-mode' => 'disable')
       any_instance_of(Legit::CLI) do |cli|
         mock(cli).run_catch_todos.never
-        mock(cli).say("[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :yellow)
       end
-      legit 'catch-todos', :real_repo => false
+      legit 'catch-todos', [
+          [:say, ["[pre-commit hook] ignoring todos. Re-enable with `legit catch-todos --enable`", :yellow]],
+      ], :real_repo => false
     end
 
     it "have exit status of 0 in warn mode when positive response" do
       stub_config('hooks.catch-todos-mode' => 'warn')
       any_instance_of(Legit::CLI) do |cli|
         mock(cli).todos_staged?('TODO') { true }
-        mock(cli).exit.never
         mock(cli).yes?("[pre-commit hook] Found staged `TODO`s. Do you still want to continue?", :yellow) { true }
       end
 
-      legit 'catch-todos', :real_repo => false
+      legit 'catch-todos', [], :real_repo => false
     end
   end
 
-  describe 'legit delete' do
-    it 'force deletes branch when user responds yes' do
+  describe "legit delete" do
+    it "force deletes branch when user responds yes" do
       any_instance_of(Legit::CLI) do |cli|
         mock(cli).delete_local_branch!('branch_to_delete') { false }
         mock(cli).yes?('Force delete branch?', :red) { true }
         mock(cli).force_delete_local_branch!('branch_to_delete')
         mock(cli).delete_remote_branch?('branch_to_delete') { false }
       end
-
-      legit 'delete branch_to_delete', :real_repo => false
+      legit 'delete branch_to_delete', [], :real_repo => false
     end
 
     it "doesn't force delete branch when user responds no" do
@@ -103,15 +92,17 @@ describe Legit::CLI do
         mock(cli).yes?('Force delete branch?', :red) { false }
         mock(cli).force_delete_local_branch!.never
       end
-      legit 'delete branch_to_delete', :real_repo => false
+      legit 'delete branch_to_delete', [], :real_repo => false
     end
 
-    it 'deletes remotely when user responds yes' do
+    it "deletes remotely when user responds yes" do
       any_instance_of(Legit::CLI) do |cli|
-        mock(cli).delete_local_branch!('branch_to_delete') { true }
         mock(cli).yes?.with('Delete branch remotely?', :red) { true }
       end
-      legit 'delete branch_to_delete', :real_repo => false
+      legit 'delete branch_to_delete', [
+          [:run, "git branch -d branch_to_delete"],
+          [:run, "git push --delete origin branch_to_delete"],
+      ], :real_repo => false
     end
 
     it "doesn't delete remotely when user responds no" do
@@ -119,7 +110,7 @@ describe Legit::CLI do
         mock(cli).delete_local_branch!('branch_to_delete') { true }
         mock(cli).yes?('Delete branch remotely?', :red) { false }
       end
-      legit 'delete branch_to_delete', :real_repo => false
+      legit 'delete branch_to_delete', [], :real_repo => false
     end
   end
 
@@ -129,63 +120,61 @@ describe Legit::CLI do
     end
 
     it "checks out branch that matches substring" do
-      expects_command('git checkout feature_with_unique_match')
-      legit 'checkout niqu', :branches => @branches
+      legit 'checkout niqu', [
+          [:run, 'git checkout feature_with_unique_match'],
+      ], :branches => @branches
     end
 
     it "lists options if non-unique match" do
       any_instance_of(Legit::CLI) do |cli|
-        mock(cli).run_command.never
         mock(cli).ask("Choose a branch to checkout:\n1. multiple_matches_a\n2. multiple_matches_b", :yellow) { '2' }
       end
-
-      expects_command('git checkout multiple_matches_b')
-      legit 'checkout multiple_matches', :branches => @branches
+      legit 'checkout multiple_matches', [
+          [:run, 'git checkout multiple_matches_b']
+      ], :branches => @branches
     end
 
     it "calls checkout on branch if unique match" do
-      expects_command('git checkout feature_with_unique_match')
-      legit 'checkout unique', :branches => @branches
+      legit 'checkout unique', [
+          [:run, 'git checkout feature_with_unique_match'],
+      ], :branches => @branches
     end
 
     it "uses case-insensitive regex" do
-      expects_command('git checkout UPPERCASE_BRANCH')
-      legit 'checkout uppercase', :branches => @branches
+      legit 'checkout uppercase', [
+          [:run, 'git checkout UPPERCASE_BRANCH'],
+      ], :branches => @branches
     end
 
     it "doesn't call checkout and exits if no match" do
-      any_instance_of(Legit::CLI) do |cli|
-        mock(cli).run_command.never
-        mock(cli).say("No branches match /this_shouldnt_match_anything/i", :red)
-      end
-      assert_raises(SystemExit) do
-        legit 'checkout this_shouldnt_match_anything', :branches => @branches
-      end
+      legit 'checkout this_shouldnt_match_anything', [
+          [:say, ['No branches match /this_shouldnt_match_anything/i', :red]],
+          [:exit, 1],
+      ], :branches => @branches
     end
 
     it "calls checkout on branch if unique match" do
-      expects_command('git checkout feature_with_unique_match')
-      legit 'checkout _wit.', :branches => @branches
+      legit 'checkout _wit.', [
+          [:run, 'git checkout feature_with_unique_match']
+      ], :branches => @branches
     end
 
     it "doesn't call checkout and exits if there is no regex match" do
-      any_instance_of(Legit::CLI) do |cli|
-        mock(cli).run_command.never
-        mock(cli).say("No branches match /^_wit./i", :red)
-      end
-      assert_raises(SystemExit) do
-        legit 'checkout ^_wit.', :branches => @branches
-      end
+      legit 'checkout ^_wit.', [
+          [:say, ['No branches match /^_wit./i', :red]],
+          [:exit, 1],
+      ], :branches => @branches
     end
   end
 
-  describe 'legit bisect' do
+  describe "legit bisect" do
     it "calls the right commands" do
       command = 'ruby -n my/test/file "/testpattern/"'
-      expects_command('git bisect start HEAD HEAD~5')
-      expects_command("git bisect run #{command}")
-      expects_command("git bisect reset")
-      legit "bisect HEAD HEAD~5 #{command}", :real_repo => false
+      legit "bisect HEAD HEAD~5 #{command}", [
+          [:run, 'git bisect start HEAD HEAD~5'],
+          [:run, "git bisect run #{command}"],
+          [:run, 'git bisect reset'],
+      ], :real_repo => false
     end
   end
 end

data/test/test_helper.rb

@@ -1,5 +1,8 @@
 Bundler.require(:pry) if ENV['PRY']
 
+require 'legit/cli'
+require File.expand_path('../test_repo', __FILE__)
+
 require 'coveralls'
 Coveralls.wear!
 
@@ -26,13 +29,12 @@ class Thor
   end
 end
 
-def legit(command, options = {})
+def legit(command, expected_flow, options = {})
   fake_repo = options.delete(:fake_repo)
-  run_command = Proc.new { Legit::CLI.start(command.split(' ')) }
   if fake_repo
-    run_command.call
+    capture_legit_output(command, expected_flow)
   else
-    TestRepo.inside(options, &run_command)
+    TestRepo.inside(options) { capture_legit_output(command, expected_flow) }
   end
 end
 
@@ -41,3 +43,21 @@ def stub_config(config = {})
     stub(repo).config { config }
   end
 end
+
+def capture_legit_output(command, expected_flow)
+  flow = []
+  any_instance_of(Legit::CLI) do |cli|
+    stub(cli).run { |cmd, options| flow << [:run, cmd] }   # throw away options; only used for verbosity in debug mode
+    stub(cli).say { |*args| flow << [:say, args] }
+    stub(cli).exit do |code|
+      flow << [:exit, code]
+      exit code   # must call exit manually instead of using proxy or it will exit before it captures the flow
+    end
+  end
+  begin
+    Legit::CLI.start(command.split(' '))
+  rescue SystemExit
+    # exit stops the thor command, but not the test runner
+  end
+  assert_equal expected_flow, flow
+end

metadata

@@ -1,187 +1,185 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: legit
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.0.15
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 14
-  version: 0.0.14
 platform: ruby
-authors: 
+authors:
 - Dillon Kearns
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2013-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 75
-        segments: 
-        - 10
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 10.1.0
-  version_requirements: *id001
-  prerelease: false
-  name: rake
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 5
-        - 0
-        - 1
-        version: 5.0.1
-  version_requirements: *id002
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
   name: minitest
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+- !ruby/object:Gem::Dependency
   name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
   name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
   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
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
   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
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.8.0
-  version_requirements: *id008
-  prerelease: false
-  name: json
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 85
-        segments: 
-        - 0
-        - 18
-        - 1
-        version: 0.18.1
-  version_requirements: *id009
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
   name: thor
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3106864031
-        segments: 
-        - 0
-        - 18
-        - 0
-        - b
-        - 1
-        version: 0.18.0.b1
-  version_requirements: *id010
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
   name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.0.b1
   type: :runtime
-description: A collection of scripts for common git tasks to simplify and improve workflow.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.0.b1
+description: A collection of scripts for common git tasks to simplify and improve
+  workflow.
+email:
 - dillon@dillonkearns.com
-executables: 
+executables:
 - legit
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -191,49 +189,41 @@ files:
 - Rakefile
 - bin/legit
 - legit.gemspec
-- lib/legit.rb
+- lib/legit/cli.rb
 - lib/legit/helpers.rb
 - lib/legit/version.rb
 - test/legit_test.rb
 - test/test_helper.rb
 - test/test_repo.rb
-has_rdoc: true
 homepage: https://github.com/dillonkearns/legit
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3882495596057636106
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.25
 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
 - test/test_repo.rb