git-smart 0.1.4 → 0.1.5

data/README.md

@@ -11,24 +11,18 @@ Adds some additional git commands to add some smarts to your workflow. These com
 
 # Installing
 
-First, grab the gem:
+All you need to do is grab the gem:
 
     gem install git-smart
 
-List the commands you can install (currently only the one):
+That'll put an executable file for each command as a gem executable. They can be removed by uninstalling the gem.
 
-    git-smart list
+You almost certainly want to run this as well, to allow git commands to be output with colour:
 
-Install away!
-
-    git-smart install smart-pull
-
-OR
-
-    git-smart install --all
-
-That'll put an executable file for each command in your ~/bin directory if that exists and is on the path, /usr/local/bin otherwise.
+    git config --global color.ui always
 
+Git normally only colours output when being run from the terminal, not from within scripts like these. This sorts that right out.
+  
 # Using
 
 Git allows custom commands with a simple convention - `git xyz` tries to find an executable `git-xyz` on the path. So, to run the commands, simply type

data/Rakefile

@@ -51,3 +51,29 @@ task :rocco do
 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}`
+    puts "Wrote #{filename}"
+  }
+end
+
+task :gemspec => :generate_binaries

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/git-smart-merge

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
+
+require 'git-smart'
+
+GitSmart.run('smart-merge', ARGV)

data/bin/git-smart-pull

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
+
+require 'git-smart'
+
+GitSmart.run('smart-pull', ARGV)

data/git-smart.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-smart}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glen Maddern"]
   s.date = %q{2011-01-05}
-  s.default_executable = %q{git-smart}
   s.description = %q{Installs some additional 'smart' git commands, like `git smart-pull`.}
   s.email = %q{glenmaddern@gmail.com}
-  s.executables = ["git-smart"]
+  s.executables = ["git-smart-pull", "git-smart-merge"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -25,7 +24,8 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "bin/git-smart",
+    "bin/git-smart-merge",
+    "bin/git-smart-pull",
     "docs/images/git-smart.png",
     "docs/smart-merge.html",
     "docs/smart-pull.html",

data/lib/commands/smart-pull.rb

@@ -48,6 +48,12 @@ GitSmart.register 'smart-pull' do |repo, args|
     #uses internally.
     merge_base = repo.merge_base(head, remote)
 
+    #Report how many commits are new locally, since that's useful information.
+    new_commits_locally = repo.rev_list(merge_base, head)
+    if !new_commits_locally.empty?
+      note "You have #{new_commits_locally.length} new commit#{'s' if new_commits_locally.length != 1} on '#{branch}'."
+    end
+
     #By comparing the merge_base to both HEAD and the remote, we can
     #determine whether both or only one have moved on.
     #If the remote hasn't changed, we're already up to date, so there's nothing
@@ -58,7 +64,7 @@ GitSmart.register 'smart-pull' do |repo, args|
     else
       #If the remote _has_ moved on, we actually have some work to do:
       #
-      #First, report how many commits are new on remote. Because that's useful information.
+      #First, report how many commits are new on remote. Because that's useful information, too.
       new_commits_on_remote = repo.rev_list(merge_base, remote)
       is_are, s_or_not = (new_commits_on_remote.length == 1) ? ['is', ''] : ['are', 's']
       note "There #{is_are} #{new_commits_on_remote.length} new commit#{s_or_not} on '#{upstream_branch}'."

data/lib/git-smart/git_repo.rb

@@ -60,10 +60,10 @@ class GitRepo
       map_values { |lines| lines.map(&:last) }.
       map_keys { |status|
         case status
-          when /^M/; :modified
-          when /^A/; :added
-          when /^\?\?/; :untracked
-          when /^UU/; :conflicted
+          when /^[^ ]*M/; :modified
+          when /^[^ ]*A/; :added
+          when /^[^ ]*\?\?/; :untracked
+          when /^[^ ]*UU/; :conflicted
           else raise GitSmart::UnexpectedOutput.new("Expected the output of git status to only have lines starting with A,M, or ??. Got: \n#{raw_status}")
         end
       }

data/spec/smart-pull_spec.rb

@@ -45,6 +45,7 @@ describe 'smart-pull' 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
@@ -121,6 +122,7 @@ describe 'smart-pull' do
       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.")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-smart
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Glen Maddern
@@ -16,7 +16,7 @@ bindir: bin
 cert_chain: []
 
 date: 2011-01-05 00:00:00 +11:00
-default_executable: git-smart
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -111,7 +111,8 @@ dependencies:
 description: Installs some additional 'smart' git commands, like `git smart-pull`.
 email: glenmaddern@gmail.com
 executables: 
-- git-smart
+- git-smart-pull
+- git-smart-merge
 extensions: []
 
 extra_rdoc_files: 
@@ -124,7 +125,8 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/git-smart
+- bin/git-smart-merge
+- bin/git-smart-pull
 - docs/images/git-smart.png
 - docs/smart-merge.html
 - docs/smart-pull.html

data/bin/git-smart

@@ -1,68 +0,0 @@
-#!/usr/bin/env ruby
-
-class GitSmartBinary
-  USAGE = %Q{Usage:
-    git-smart list                          List all the git commands that can be installed
-    git-smart install --all                 Install all git commands
-    git-smart install command [command]     Install these git commands
-  }
-
-  def initialize
-    # If this was called through a symlink, follow it and include the lib/git-smart.rb file
-    require File.expand_path(
-      File.join(
-        File.dirname(File.expand_path(
-          File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-        )),
-        '../lib/git-smart'
-      )
-    )
-  end
-
-  def list
-    puts "These commands available to install:"
-    puts GitSmart.commands.keys.map { |c| "  git-smart install " + c }.join("\n")
-    puts "\nOr install everything with: git-smart install --all"
-  end
-
-  def install(args)
-    cmds = if args.include? '--all'
-             GitSmart.commands.keys
-           else
-             args
-           end
-    install_dir = get_install_dir
-    puts "Installing #{cmds.join(', ')} to #{install_dir}:"
-    cmds.each { |cmd|
-      filename = "#{install_dir}/git-#{cmd}"
-      File.open(filename, 'w') { |out|
-        out.puts %Q{#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'git-smart'
-
-GitSmart.run('#{cmd}', ARGV)
-}
-      }
-      `chmod a+x #{filename}`
-      puts "Wrote #{filename}"
-    }
-  end
-
-  private
-
-  def get_install_dir
-    home_bin = File.expand_path('~/bin')
-    if File.exists?(home_bin) && ENV['PATH'].split(':').include?(home_bin)
-      home_bin
-    else
-      '/usr/local/bin'
-    end
-  end
-end
-
-case ARGV.shift
-  when 'list'; GitSmartBinary.new.list
-  when 'install'; GitSmartBinary.new.install(ARGV)
-  else puts GitSmartBinary::USAGE
-end