legit 0.0.11 → 0.0.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 496dfcd5cb7b062ac51f2371e752980fe4104e82
+  data.tar.gz: ef4efafa23bd59980490b00997cc92fc9c5b115d
+SHA512:
+  metadata.gz: 1f80616786cb2fe52f054131ff0debb1cd1df3b1ef43e1c3a72ce244b670027c2c6f9f1b7c8d701c3477d03b19a45102aef80fde62797c00862d7bb971e0ed95
+  data.tar.gz: 058acddbcdd1ba8ec4ea7c2012a32f765ce955b02cce1a76de8a2ac3c0d6adf9ffdbb351abfc9a316395b885f28acf644e72fbe6f374c0c02d5b223a7a26d879

data/legit.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">=1.8.7"
 
-  gem.add_development_dependency "rake", "~> 10.0.3"
+  gem.add_development_dependency "rake", "~> 10.1.0"
   gem.add_development_dependency "minitest", "~> 5.0.1"
   gem.add_development_dependency "mocha", "~> 0.14.0"
   gem.add_development_dependency "guard-minitest"
@@ -26,6 +26,5 @@ Gem::Specification.new do |gem|
 
   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
-
+  gem.add_runtime_dependency     "rugged", "~> 0.19.0"
 end

data/lib/legit/helpers.rb

@@ -0,0 +1,63 @@
+require 'rugged'
+require 'thor'
+
+module Legit
+  module Helpers
+    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 repo
+      @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
+
+    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 force_delete_local_branch!(branch_name)
+      run_command("git branch -D #{branch_name}")
+    end
+
+    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)
+      run_command("git push --delete origin #{branch_name}")
+    end
+
+    def run_command(command)
+      options = {
+          :verbose => ENV.has_key?('LEGIT_DEBUG')
+      }
+      run(command, options)
+    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
+  end
+end

data/lib/legit/version.rb

@@ -1,3 +1,3 @@
 module Legit
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

data/lib/legit.rb

@@ -1,14 +1,15 @@
-require 'legit_helper'
+require 'legit/helpers'
 
 module Legit
   class CLI < Thor
     include Thor::Actions
+    include Legit::Helpers
 
     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 << Legit::Helpers::LOG_BASE_COMMAND
       command << "--author='#{repo.config['user.name']}'" if options[:me]
       args.each do |arg|
         command << arg
@@ -45,35 +46,26 @@ 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} }
+    desc "checkout REGEX", "fuzzy git checkout - can use ruby regex notation `legit checkout BUG-40\\d`"
+    def checkout(branch_pattern)
+      regex = Regexp.new(branch_pattern, Regexp::IGNORECASE)
+      matching_branches = local_branches.select { |b| b.name =~ regex }
 
-      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)
+      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
 
-        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(' ')}")
+      run_command("git checkout #{matched_branch.name}")
     end
 
     desc "delete BRANCH", "Delete BRANCH both locally and remotely"
@@ -82,10 +74,6 @@ module Legit
     end
 
     private
-    def repo
-      @repo ||= Rugged::Repository.new(Rugged::Repository.discover)
-    end
-
     def run_catch_todos(todo_format)
       if todos_staged?(todo_format)
         if repo.config['hooks.catch-todos-mode'] == 'warn'

data/test/legit_test.rb

@@ -8,19 +8,20 @@ describe Legit::CLI do
   before do
     stub_config
     Legit::CLI.any_instance.stubs(:run_command)
+    Legit::CLI.expects(:exit).never
   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.any_instance.expects(:run_command).with("#{Legit::Helpers::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.any_instance.expects(:run_command).with("#{Legit::Helpers::LOG_BASE_COMMAND} -p --stat")
       Legit::CLI.start(args.split(' '))
     end
   end
@@ -107,47 +108,48 @@ describe Legit::CLI do
   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(
+    before do
+      setup_example_repo
+    end
+
+    it "checks out branch that matches substring" do
+      Legit::CLI.any_instance.expects(:run_command).with('git checkout feature_with_unique_match')
+      Legit::CLI.start('checkout niqu'.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
+      Legit::CLI.any_instance.expects(:run_command).with('git checkout multiple_matches_b')
+      Legit::CLI.start('checkout multiple_matches'.split(' '))
+    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 "uses case-insensitive regex" do
+      Legit::CLI.any_instance.expects(:run_command).with('git checkout UPPERCASE_BRANCH')
+      Legit::CLI.start('checkout uppercase'.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/i", :red)
+      assert_raises(SystemExit) { Legit::CLI.start('checkout this_shouldnt_match_anything'.split(' ')) }
+    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 _wit.'.split(' '))
+    end
 
+    it "doesn't call checkout and exits if there is no regex match" do
+      Legit::CLI.any_instance.expects(:run_command).never
+      Legit::CLI.any_instance.expects(:say).with("No branches match /^_wit./i", :red)
+      assert_raises(SystemExit) { Legit::CLI.start('checkout ^_wit.'.split(' ')) }
     end
   end
 

data/test/setup_test_repo.rb

@@ -19,7 +19,7 @@ class SetupTestRepo < Thor
     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 = %w{ feature_with_unique_match multiple_matches_a multiple_matches_b UPPERCASE_BRANCH }
     branch_names.each do |branch_name|
       run "git branch #{branch_name}"
     end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: legit
 version: !ruby/object:Gem::Version
-  version: 0.0.11
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Dillon Kearns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,71 +55,62 @@ dependencies:
 - !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: 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: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,19 +139,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0.b1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0.b1
+        version: 0.19.0
 description: A collection of scripts for common git tasks to simplify and improve
   workflow.
 email:
@@ -190,37 +169,33 @@ files:
 - bin/legit
 - legit.gemspec
 - lib/legit.rb
+- lib/legit/helpers.rb
 - 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: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1588079376854796946
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A collection of scripts for common git tasks to simplify and improve workflow.
 test_files:
 - test/legit_test.rb

data/lib/legit_helper.rb

@@ -1,51 +0,0 @@
-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"
-
-def current_branch
-  system "git rev-parse --abbrev-ref HEAD"
-end
-
-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 force_delete_local_branch!(branch_name)
-  run_command("git branch -D #{branch_name}")
-end
-
-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)
-  run_command("git push --delete origin #{branch_name}")
-end
-
-def run_command(command)
-  options = {
-    :verbose => ENV.has_key?('LEGIT_DEBUG')
-  }
-  run(command, options)
-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