legit 0.0.10 → 0.0.11

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+test/example_repo

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dotfile_linker.gemspec
 gemspec
+
+gem "pry", :group => :pry

data/legit.gemspec

@@ -17,14 +17,15 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">=1.8.7"
 
   gem.add_development_dependency "rake", "~> 10.0.3"
-  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 "minitest", "~> 5.0.1"
+  gem.add_development_dependency "mocha", "~> 0.14.0"
   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
+  gem.add_runtime_dependency     "json", "~> 1.8.0"
+  gem.add_runtime_dependency     "thor", "~> 0.18.1"
+  gem.add_runtime_dependency     "rugged", "0.18.0.b1"    # 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.10"
+  VERSION = "0.0.11"
 end

data/lib/legit.rb

@@ -45,6 +45,37 @@ module Legit
       run_command("git bisect reset")
     end
 
+    desc "checkout ARGS", "git checkout, matching an arg between /'s to a local branch, i.e. `legit checkout /my_feature/`"
+    def checkout(*args)
+      regex_index = args.index { |arg| arg =~ %r{\A/.*/\z} }
+
+      if regex_index
+        regex_argument = args.delete_at(regex_index)
+        regex_without_slashes = regex_argument[%r{\A/(.*)/\z}, 1]
+        regex = Regexp.new(regex_without_slashes)
+
+        local_branches = repo.branches.select { |b| b.branch? }
+        matching_branches = local_branches.select { |b| b.name =~ regex }
+
+        matched_branch =
+            case matching_branches.length
+            when 0
+              say("No branches match #{regex.inspect}", :red)
+              exit 1
+            when 1
+              matching_branches.first
+            else
+              matching_branches = matching_branches.sort_by {|b| b.name }
+              branch_list = matching_branches.each_with_index.map { |branch, index| "#{index + 1}. #{branch.name}"}
+              response = ask("Choose a branch to checkout:\n#{branch_list.join("\n")}", :yellow).to_i
+              matching_branches[response - 1]
+            end
+        args.insert(regex_index, matched_branch.name)
+      end
+
+      run_command("git checkout #{args.join(' ')}")
+    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)

data/lib/legit_helper.rb

@@ -35,7 +35,7 @@ def delete_remote_branch?(branch_name)
 end
 
 def delete_remote_branch!(branch_name)
-  system("git push --delete origin #{branch_name}")
+  run_command("git push --delete origin #{branch_name}")
 end
 
 def run_command(command)

data/test/legit_test.rb

@@ -1,11 +1,13 @@
 require File.expand_path('../test_helper', __FILE__)
 require 'legit'
+require File.expand_path('../setup_test_repo', __FILE__)
 
 describe Legit::CLI do
   include Mocha::Integration::MiniTest
 
   before do
     stub_config
+    Legit::CLI.any_instance.stubs(:run_command)
   end
 
   describe 'legit log' do
@@ -104,6 +106,51 @@ describe Legit::CLI do
     end
   end
 
+  describe "legit checkout" do
+    describe "when no regex passed" do
+      it "runs git checkout command" do
+        Legit::CLI.any_instance.expects(:run_command).with('git checkout plain_old_branch')
+        Legit::CLI.start('checkout plain_old_branch'.split(' '))
+      end
+
+      it "passes through git checkout options" do
+        Legit::CLI.any_instance.expects(:run_command).with('git checkout -b plain_old_branch')
+        Legit::CLI.start('checkout -b plain_old_branch'.split(' '))
+      end
+    end
+
+    describe "when passed a regex" do
+      before do
+        setup_example_repo
+      end
+
+      it "calls checkout on branch if unique match" do
+        Legit::CLI.any_instance.expects(:run_command).with('git checkout feature_with_unique_match')
+        Legit::CLI.start('checkout /unique/'.split(' '))
+      end
+
+      it "calls checkout with options passed through with a unique match" do
+        Legit::CLI.any_instance.expects(:run_command).with('git checkout --contains feature_with_unique_match')
+        Legit::CLI.start('checkout --contains /unique/'.split(' '))
+      end
+
+      it "doesn't call checkout and exits if no match" do
+        Legit::CLI.any_instance.expects(:run_command).never
+        Legit::CLI.any_instance.expects(:say).with("No branches match /this_shouldnt_match_anything/", :red)
+        assert_raises(SystemExit) { Legit::CLI.start('checkout /this_shouldnt_match_anything/'.split(' ')) }
+      end
+
+      it "lists options if non-unique match" do
+        Legit::CLI.any_instance.expects(:run_command).never
+        Legit::CLI.any_instance.expects(:ask).with(
+          "Choose a branch to checkout:\n1. multiple_matches_a\n2. multiple_matches_b", :yellow).returns('2')
+        Legit::CLI.any_instance.expects(:run_command).with('git checkout multiple_matches_b')
+        Legit::CLI.start('checkout /multiple_matches/'.split(' '))
+      end
+
+    end
+  end
+
   describe 'legit bisect' do
     command = 'ruby -n my/test/file "/testpattern/"'
     args = "bisect HEAD HEAD~5 #{command}"
@@ -117,3 +164,9 @@ end
 def stub_config(config = {})
   Legit::CLI.any_instance.stubs(:repo => stub({ :config => config }))
 end
+
+def setup_example_repo
+  SetupTestRepo.new.invoke(:create_repo)
+  example_repo = Rugged::Repository.new(File.expand_path('../example_repo', __FILE__))
+  Legit::CLI.any_instance.stubs(:repo => example_repo)
+end

data/test/setup_test_repo.rb

@@ -0,0 +1,27 @@
+require 'thor'
+
+class SetupTestRepo < Thor
+  include Thor::Actions
+
+  desc "SOMETHING", 'something else'
+  def create_repo
+    test_location = File.expand_path('../example_repo', __FILE__)
+    remove_dir(test_location)
+    inside(test_location) do
+      run 'git init'
+      run 'git config user.name "John Doe" && git config user.email johndoe@example.com'
+      setup_branches
+    end
+  end
+
+  private
+  def setup_branches
+    create_file('README.txt', 'Example repo for testing')
+    run "git add ."
+    run "git commit -m 'Add README'"
+    branch_names = %w{ feature_with_unique_match multiple_matches_a multiple_matches_b }
+    branch_names.each do |branch_name|
+      run "git branch #{branch_name}"
+    end
+  end
+end

data/test/test_helper.rb

@@ -2,9 +2,7 @@ require 'coveralls'
 Coveralls.wear!
 
 require "minitest/autorun"
-require "minitest/reporters"
-
-# for attaching tests to rubymine
-MiniTest::Reporters.use! if ENV['RUBYMINE']
 
 require 'mocha/setup'
+
+Bundler.require(:pry) if ENV["PRY"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legit
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,23 +42,7 @@ dependencies:
     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'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.b7
+        version: 0.18.0.b1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.b7
+        version: 0.18.0.b1
 description: A collection of scripts for common git tasks to simplify and improve
   workflow.
 email:
@@ -193,6 +193,7 @@ files:
 - lib/legit/version.rb
 - lib/legit_helper.rb
 - test/legit_test.rb
+- test/setup_test_repo.rb
 - test/test_helper.rb
 homepage: https://github.com/dillonkearns/legit
 licenses: []
@@ -214,13 +215,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3336823418665542283
+      hash: -1588079376854796946
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+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/legit_test.rb
+- test/setup_test_repo.rb
 - test/test_helper.rb