git-smart 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ad55375b56d448e73868a6f94752cfdff26dc5ab5fda21c36e4ee25e7388cf
-  data.tar.gz: 795a52c8fc520bbc3c37cdc5b66b36a2482f9820f19e1da6cdebd8365a1531bd
+  metadata.gz: a4bd50ad86b016ea6af4c9b2df62562bfbc296c94d8801b0cec1d52771c1d285
+  data.tar.gz: 670bdb88c994280c6c1daead755674ac162d1902762e465cfcc64111a7733681
 SHA512:
-  metadata.gz: c5c6c4acd4930017ea59a695a457232f62fc18807adbf6f93ec65f73289cb9377cbd8fb9a00758ce78e44ee76b29cf979451db27c21313ead3a6f21d7806a331
-  data.tar.gz: 9644dcbaaa3e69c34f53d42c87b21cf8aacd29ec7b6d8241694882dcdbcd0c1e1670a0b40354c70cc7d4b3f467a312349295fa85c7ea235344cfceeabbfd915e
+  metadata.gz: e266373a717d627c54fb64d902c8103e029f82746f3092302de7063622a03d61254a8014a4b224056d4c4da73c9c11c3300dd3c4574f1550a0f916b8e4c074a1
+  data.tar.gz: 3b4c75ec3931c94ab3eba06049f50f7f09589cf6b0c9e0319e717de70e74c673a25ed1b44ab86ff04d2e6fbfb75c8109811c86b72ea9c969827fd45fd9e535d2

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/git-smart/git_repo.rb

@@ -20,7 +20,7 @@ class GitRepo
   def git_dir
     gitdir = Pathname.new(@dir).join('.git')
 
-    unless File.exists?(gitdir)
+    unless File.exist?(gitdir)
       @dir = git('rev-parse', '--show-toplevel').chomp
       gitdir = Pathname.new(@dir).join('.git') unless @dir.empty?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-smart
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Glen Maddern
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-01-06 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rocco
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Installs some additional 'smart' git commands, like `git smart-pull`.
 email: glenmaddern@gmail.com
 executables:
@@ -77,11 +49,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
 - VERSION
 - bin/git-smart-log
 - bin/git-smart-merge
@@ -105,15 +74,13 @@ files:
 - lib/git-smart/git_repo.rb
 - lib/git-smart/git_smart.rb
 - lib/git-smart/safe_shell.rb
-- spec/smart-merge_failures_spec.rb
-- spec/smart-merge_spec.rb
-- spec/smart-pull_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/geelen/git-smart
+homepage: https://github.com/geelen/git-smart
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/geelen/git-smart
+  changelog_uri: https://github.com/geelen/git-smart/commits/main
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,19 +88,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Add some smarts to your git workflow
-test_files:
-- spec/smart-merge_failures_spec.rb
-- spec/smart-merge_spec.rb
-- spec/smart-pull_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/Gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'colorize'
-
-group :development do
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'rocco'
-  gem 'rake'
-end

data/Gemfile.lock

@@ -1,36 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    colorize (0.5.8)
-    diff-lcs (1.1.3)
-    docile (1.1.1)
-    multi_json (1.8.2)
-    mustache (0.99.4)
-    rake (10.0.3)
-    redcarpet (1.17.2)
-    rocco (0.8.2)
-      mustache
-      redcarpet
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  colorize
-  rake
-  rocco
-  rspec
-  simplecov

data/Rakefile

@@ -1,71 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "git-smart #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Generate the rocco docs"
-task :rocco do
-  base_dir = File.dirname(__FILE__)
-  %x[cd #{base_dir}/lib/commands && rocco *.rb -o ../../docs]
-  %x[cd #{base_dir} && git add docs]
-end
-
-task :release => :rocco
-
-desc "Generate a binary for each of our commands"
-task :generate_binaries do
-  base_dir = File.dirname(__FILE__)
-  require "#{base_dir}/lib/git-smart"
-
-  require 'fileutils'
-  FileUtils.mkdir_p "#{base_dir}/bin"
-  GitSmart.commands.keys.each { |cmd|
-    filename = "#{base_dir}/bin/git-#{cmd}"
-    File.open(filename, 'w') { |out|
-      out.puts %Q{#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
-
-require 'git-smart'
-
-GitSmart.run('#{cmd}', ARGV)
-}
-    }
-    `chmod a+x #{filename}`
-    `cd #{base_dir} && git add #{filename}`
-    puts "Wrote #{filename}"
-  }
-end
-
-task :build => :generate_binaries

data/spec/smart-merge_failures_spec.rb

@@ -1,49 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-require 'fileutils'
-
-describe 'smart-merge with failures' do
-  def local_dir;  WORKING_DIR + '/local';  end
-
-  before :each do
-    %x[
-      cd #{WORKING_DIR}
-        mkdir local
-        cd local
-          git init
-          git config --local user.name 'Maxwell Smart'
-          git config --local user.email 'agent86@control.gov'
-          git config --local core.pager 'cat'
-          echo -e 'one\ntwo\nthree\nfour\n' > README
-          mkdir lib
-          echo 'puts "pro hax"' > lib/codes.rb
-          git add .
-          git commit -m 'first'
-    ]
-  end
-
-  context "with conflicting changes on master and newbranch" do
-    before :each do
-      %x[
-        cd #{local_dir}
-          git checkout -b newbranch 2> /dev/null
-          echo 'one\nnewbranch changes\nfour\n' > README
-          git commit -am 'newbranch_commit'
-
-          git checkout master 2> /dev/null
-
-          echo 'one\nmaster changes\nfour\n' > README
-          git commit -am 'master_commit'
-      ]
-    end
-
-    it "should report the failure and give instructions to the user" do
-      out = run_command(local_dir, 'smart-merge', 'newbranch')
-      local_dir.should have_git_status(:conflicted => ['README'])
-      out.should_not report("All good")
-      out.should report("Executing: git merge --no-ff newbranch")
-      out.should report("CONFLICT (content): Merge conflict in README")
-      out.should report("Automatic merge failed; fix conflicts and then commit the result.")
-    end
-  end
-end

data/spec/smart-merge_spec.rb

@@ -1,104 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-require 'fileutils'
-
-describe 'smart-merge' do
-  def local_dir;  WORKING_DIR + '/local';  end
-
-  before :each do
-    %x[
-      cd #{WORKING_DIR}
-        mkdir local
-        cd local
-          git init
-          git config --local user.name 'Maxwell Smart'
-          git config --local user.email 'agent86@control.gov'
-          git config --local core.pager 'cat'
-          echo 'hurr durr' > README
-          mkdir lib
-          echo 'puts "pro hax"' > lib/codes.rb
-          git add .
-          git commit -m 'first'
-    ]
-  end
-
-  it "should require an argument" do
-    out = run_command(local_dir, 'smart-merge')
-    out.should report("Usage: git smart-merge ref")
-  end
-
-  it "should require a valid branch" do
-    out = run_command(local_dir, 'smart-merge', 'foo')
-    out.should report("Branch to merge 'foo' not recognised by git!")
-  end
-
-  it "should report nothing to do if the branch hasn't moved on" do
-    %x[
-      cd #{local_dir}
-      git branch unmoved
-    ]
-    out = run_command(local_dir, 'smart-merge', 'unmoved')
-    out.should report("Branch 'unmoved' has no new commits. Nothing to merge in.")
-    out.should report("Already up-to-date.")
-  end
-
-  context "with local changes to newbranch" do
-    before :each do
-      %x[
-        cd #{local_dir}
-          git checkout -b newbranch 2> /dev/null
-          echo 'moar things!' >> README
-          echo 'puts "moar code!"' >> lib/moar.rb
-          git add .
-          git commit -m 'moar'
-
-          git checkout master 2> /dev/null
-      ]
-    end
-
-    it "should merge --no-ff, despite the branch being fast-forwardable" do
-      out = run_command(local_dir, 'smart-merge', 'newbranch')
-      out.should report("Branch 'newbranch' has diverged by 1 commit. Merging in.")
-      out.should report("* Branch 'master' has not moved on since 'newbranch' diverged. Running with --no-ff anyway, since a fast-forward is unexpected behaviour.")
-      out.should report("Executing: git merge --no-ff newbranch")
-      out.should report(/2 files changed, 2 insertions\(\+\)(, 0 deletions\(-\))?$/)
-      out.should report(/All good\. Created merge commit [\w]{7}\./)
-    end
-
-    context "and changes on master" do
-      before :each do
-        %x[
-          cd #{local_dir}
-            echo "puts 'moar codes too!'" >> lib/codes.rb
-            git add .
-            git commit -m 'changes on master'
-        ]
-      end
-
-      it "should merge in ok" do
-        out = run_command(local_dir, 'smart-merge', 'newbranch')
-        out.should report("Branch 'newbranch' has diverged by 1 commit. Merging in.")
-        out.should report("Branch 'master' has 1 new commit since 'newbranch' diverged.")
-        out.should report("Executing: git merge --no-ff newbranch")
-        out.should report(/2 files changed, 2 insertions\(\+\)(, 0 deletions\(-\))?$/)
-        out.should report(/All good\. Created merge commit [\w]{7}\./)
-      end
-
-      it "should stash then merge if working tree is dirty" do
-        %x[
-          cd #{local_dir}
-            echo "i am nub" > noob
-            echo "puts 'moar codes too!'" >> lib/codes.rb
-            git add noob
-        ]
-        out = run_command(local_dir, 'smart-merge', 'newbranch')
-        out.should report("Executing: git stash")
-        out.should report("Executing: git merge --no-ff newbranch")
-        out.should report(/2 files changed, 2 insertions\(\+\)(, 0 deletions\(-\))?$/)
-        out.should report("Reapplying local changes...")
-        out.should report("Executing: git stash pop")
-        out.should report(/All good\. Created merge commit [\w]{7}\./)
-      end
-    end
-  end
-end

data/spec/smart-pull_spec.rb

@@ -1,215 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-require 'fileutils'
-
-describe 'smart-pull' do
-  def local_dir;  WORKING_DIR + '/local';  end
-  def remote_dir; WORKING_DIR + '/remote'; end
-
-  before :each do
-    %x[
-      cd #{WORKING_DIR}
-        mkdir remote
-        cd remote
-          git init
-          git config --local user.name 'Maxwell Smart'
-          git config --local user.email 'agent86@control.gov'
-          git config --local core.pager 'cat'
-          echo 'hurr durr' > README
-          mkdir lib
-          echo 'puts "pro hax"' > lib/codes.rb
-          git add .
-          git commit -m 'first'
-        cd ..
-        git clone remote/.git local
-        cd local
-          git config --local user.name 'Agent 99'
-          git config --local user.email 'agent99@control.gov'
-          git config --local core.pager 'cat'
-    ]
-  end
-
-  it "should tell us there's nothing to do" do
-    out = run_command(local_dir, 'smart-pull')
-    out.should report("Executing: git fetch origin")
-    out.should report("Neither your local branch 'master', nor the remote branch 'origin/master' have moved on.")
-    out.should report("Already up-to-date")
-  end
-
-  context "with only local changes" do
-    before :each do
-      %x[
-        cd #{local_dir}
-          echo 'moar things!' >> README
-          echo 'puts "moar code!"' >> lib/moar.rb
-          git add .
-          git commit -m 'moar'
-      ]
-    end
-
-    it "should report that no remote changes were found" do
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Executing: git fetch origin")
-      out.should report("Remote branch 'origin/master' has not moved on.")
-      out.should report("You have 1 new commit on 'master'.")
-      out.should report("Already up-to-date")
-    end
-  end
-
-  context "with only remote changes" do
-    before :each do
-      %x[
-        cd #{remote_dir}
-          echo 'changed on the server!' >> README
-          git add .
-          git commit -m 'upstream changes'
-      ]
-    end
-
-    it "should fast-forward" do
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Executing: git fetch origin")
-      out.should report(/master +-> +origin\/master/)
-      out.should report("There is 1 new commit on 'origin/master'.")
-      out.should report("Local branch 'master' has not moved on. Fast-forwarding.")
-      out.should report("Executing: git merge --ff-only origin/master")
-      out.should report(/Updating [^\.]+..[^\.]+/)
-      out.should report(/1 files? changed, 1 insertions?\(\+\)(, 0 deletions\(-\))?$/)
-    end
-
-    it "should not stash before fast-forwarding if untracked files are present" do
-      %x[
-        cd #{local_dir}
-          echo "i am nub" > noob
-      ]
-      local_dir.should have_git_status({:untracked => ['noob']})
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Executing: git merge --ff-only origin/master")
-      out.should report(/1 files? changed, 1 insertions?\(\+\)(, 0 deletions\(-\))?$/)
-      local_dir.should have_git_status({:untracked => ['noob']})
-    end
-
-    it "should stash, fast forward, pop if there are local changes" do
-      %x[
-        cd #{local_dir}
-          echo "i am nub" > noob
-          echo "puts 'moar codes too!'" >> lib/codes.rb
-          git add noob
-      ]
-      local_dir.should have_git_status({:added => ['noob'], :modified => ['lib/codes.rb']})
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Working directory dirty. Stashing...")
-      out.should report("Executing: git stash")
-      out.should report("Executing: git merge --ff-only origin/master")
-      out.should report(/1 files? changed, 1 insertions?\(\+\)(, 0 deletions\(-\))?$/)
-      out.should report("Reapplying local changes...")
-      out.should report("Executing: git stash pop")
-      local_dir.should have_git_status({:added => ['noob'], :modified => ['lib/codes.rb']})
-    end
-  end
-
-  context "with diverged branches" do
-    before :each do
-      %x[
-        cd #{remote_dir}
-          echo 'changed on the server!' >> README
-          git add .
-          git commit -m 'upstream changes'
-
-        cd #{local_dir}
-          echo "puts 'moar codes too!'" >> lib/codes.rb
-          git add .
-          git commit -m 'local changes'
-      ]
-    end
-
-    it "should rebase" do
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Executing: git fetch origin")
-      out.should report(/master +-> +origin\/master/)
-      out.should report("There is 1 new commit on 'origin/master'.")
-      out.should report("You have 1 new commit on 'master'.")
-      out.should report("Both local and remote branches have moved on. Branch 'master' needs to be rebased onto 'origin/master'")
-      out.should report("Executing: git rebase -p origin/master")
-      out.should report("Successfully rebased and updated refs/heads/master.")
-      local_dir.should have_last_few_commits(['local changes', 'upstream changes', 'first'])
-    end
-
-    it "should not stash before rebasing if untracked files are present" do
-      %x[
-        cd #{local_dir}
-          echo "i am nub" > noob
-      ]
-      local_dir.should have_git_status({:untracked => ['noob']})
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Executing: git rebase -p origin/master")
-      out.should report("Successfully rebased and updated refs/heads/master.")
-      local_dir.should have_git_status({:untracked => ['noob']})
-      local_dir.should have_last_few_commits(['local changes', 'upstream changes', 'first'])
-    end
-
-    it "should stash, rebase, pop if there are local uncommitted changes" do
-      %x[
-        cd #{local_dir}
-          echo "i am nub" > noob
-          echo "puts 'moar codes too!'" >> lib/codes.rb
-          git add noob
-      ]
-      local_dir.should have_git_status({:added => ['noob'], :modified => ['lib/codes.rb']})
-      out = run_command(local_dir, 'smart-pull')
-      out.should report("Working directory dirty. Stashing...")
-      out.should report("Executing: git stash")
-      out.should report("Executing: git rebase -p origin/master")
-      out.should report("Successfully rebased and updated refs/heads/master.")
-      local_dir.should have_git_status({:added => ['noob'], :modified => ['lib/codes.rb']})
-      local_dir.should have_last_few_commits(['local changes', 'upstream changes', 'first'])
-    end
-  end
-
-  context 'with a submodule' do
-    before do
-      %x[
-      cd #{WORKING_DIR}
-        mkdir submodule
-        cd submodule
-          git init
-          git config --local user.name 'The Chief'
-          git config --local user.email 'agentq@control.gov'
-          git config --local core.pager 'cat'
-          echo 'Unusual, but effective.' > README
-          git add .
-          git commit -m 'first'
-        cd ..
-        cd local
-          git submodule add "${PWD}/../submodule/.git" submodule
-          git commit -am 'Add submodule'
-      ]
-    end
-    let(:submodule_dir) { local_dir + '/submodule' }
-
-    it 'can smart-pull the repo containing the submodule' do
-      out = run_command(local_dir, 'smart-pull')
-      out.should report('Executing: git fetch origin')
-      out.should report("Remote branch 'origin/master' has not moved on.")
-      out.should report("You have 1 new commit on 'master'.")
-    end
-
-    it 'can smart-pull the submodule' do
-      out = run_command(submodule_dir, 'smart-pull')
-      out.should report('Executing: git fetch origin')
-      out.should report("Neither your local branch 'master', nor the remote branch 'origin/master' have moved on.")
-      out.should report('Already up-to-date')
-    end
-  end
-
-  context 'outside of a repo' do
-    it 'should report a meaningful error' do
-      Dir.mktmpdir do |non_repo_dir|
-        out = run_command(non_repo_dir, 'smart-pull')
-        out.should report 'You need to run this from within a Git directory'
-        out.should report 'Current working directory: '
-        out.should report 'Expected .git directory: '
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,65 +0,0 @@
-require 'rspec'
-require 'tmpdir'
-
-require File.dirname(__FILE__) + '/../lib/git-smart'
-
-WORKING_DIR = File.dirname(__FILE__) + '/working'
-
-RSpec.configure do |config|
-  config.before :each do
-    FileUtils.rm_rf WORKING_DIR
-    FileUtils.mkdir_p WORKING_DIR
-  end
-
-  config.after :each do
-    FileUtils.rm_rf WORKING_DIR
-  end
-end
-
-def run_command(dir, command, *args)
-  require 'stringio'
-  $stdout = stdout = StringIO.new
-
-  Dir.chdir(dir) { GitSmart.run(command, args) }
-
-  $stdout = STDOUT
-  stdout.string.split("\n")
-end
-
-RSpec::Matchers.define :report do |expected|
-  failure_message_for_should do |actual|
-    "expected to see #{expected.inspect}, got \n\n#{actual.map { |line| "  #{line}" }.join("\n")}"
-  end
-  failure_message_for_should_not do |actual|
-    "expected not to see #{expected.inspect} in \n\n#{actual.map { |line| "  #{line}" }.join("\n")}"
-  end
-  match do |actual|
-    actual.any? { |line| line[expected] }
-  end
-end
-
-
-RSpec::Matchers.define :have_git_status do |expected|
-  failure_message_for_should do |dir|
-    "expected '#{dir}' to have git status of #{expected.inspect}, got #{GitRepo.new(dir).status.inspect}"
-  end
-  failure_message_for_should_not do |actual|
-    "expected '#{dir}' to not have git status of #{expected.inspect}, got #{GitRepo.new(dir).status.inspect}"
-  end
-  match do |dir|
-    GitRepo.new(dir).status == expected
-  end
-end
-
-
-RSpec::Matchers.define :have_last_few_commits do |expected|
-  failure_message_for_should do |dir|
-    "expected '#{dir}' to have last few commits of #{expected.inspect}, got #{GitRepo.new(dir).last_commit_messages(expected.length).inspect}"
-  end
-  failure_message_for_should_not do |actual|
-    "expected '#{dir}' to not have git status of #{expected.inspect}, got #{GitRepo.new(dir).last_commit_messages(expected.length).inspect}"
-  end
-  match do |dir|
-    GitRepo.new(dir).last_commit_messages(expected.length) == expected
-  end
-end