git-smart 0.1.0 → 0.1.1

data/README.md

@@ -7,6 +7,32 @@ Adds some additional git commands to add some smarts to your workflow. These com
 0. All git commands that modify the repository should be shown to the user - hopefully this helps the user eventually learn the underlying git commands, and when they're relevant.
 0. All git commands, destructive or not, and their output should be shown to the user with the -v/--verbose flag.
 
+# Installing
+
+First, grab the gem:
+
+    gem install git-smart
+
+List the commands you can install (currently only the one):
+
+    git-smart list
+
+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.
+
+# 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 smart-pull command, simply run:
+
+    git smart-pull
+
 ## git-smart-pull
 
 Calling 'git smart-pull' will fetch remote tracked changes and reapply your work on top of it. It's like a much, much smarter version of 'git pull --rebase'.
@@ -25,8 +51,7 @@ This is how it works:
     0. rebase -p onto the remote
     0. stash pop
     0. update ORIG\_HEAD to be the previous local HEAD, as expected (rebase -p doesn't set ORIG\_HEAD correctly)
-0. Output a summary of what just happened, as well as any new or updated branches that came down with the last fetch.
-0. Output a big, green GIT UP GOOD or red GIT UP BAD, depending on how things went.
+0. Output a big green or red message so, at a glance, you know if things worked or not.
 
 # Contributing to git-smart
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/git-smart

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'trollop'
-
 class GitSmartBinary
   USAGE = %Q{Usage:
     git-smart list                          List all the git commands that can be installed
@@ -33,7 +31,7 @@ class GitSmartBinary
            else
              args
            end
-    install_dir = File.dirname(`which git`)
+    install_dir = get_install_dir
     puts "Installing #{cmds.join(', ')} to #{install_dir}:"
     cmds.each { |cmd|
       filename = "#{install_dir}/git-#{cmd}"
@@ -43,13 +41,24 @@ class GitSmartBinary
 require 'rubygems'
 require 'git-smart'
 
-GitSmart.run(#{cmd}, ARGV)
+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

data/git-smart.gemspec

@@ -0,0 +1,81 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{git-smart}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Glen Maddern"]
+  s.date = %q{2011-01-04}
+  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.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/git-smart",
+    "git-smart.gemspec",
+    "lib/commands/smart-pull.rb",
+    "lib/core_ext/array.rb",
+    "lib/core_ext/hash.rb",
+    "lib/core_ext/object.rb",
+    "lib/git-smart.rb",
+    "lib/git-smart/exceptions.rb",
+    "lib/git-smart/execution_context.rb",
+    "lib/git-smart/git_repo.rb",
+    "lib/git-smart/git_smart.rb",
+    "lib/git-smart/safe_shell.rb",
+    "spec/smart-pull_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/geelen/git-smart}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Add some smarts to your git workflow}
+  s.test_files = [
+    "spec/smart-pull_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<colorize>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+    else
+      s.add_dependency(%q<colorize>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    end
+  else
+    s.add_dependency(%q<colorize>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+  end
+end
+

data/lib/commands/smart-pull.rb

@@ -14,7 +14,7 @@ GitSmart.register 'smart-pull' do |repo, args|
 
   # Fetch the remote. This pulls down all new commits from the server, not just our branch,
   # but generally that's a good thing. This is the only communication we need to do with the server.
-  puts_with_done("Fetching '#{tracking_remote}'") { repo.fetch(tracking_remote) }
+  repo.fetch!(tracking_remote)
 
   # Try grabbing the tracking branch from the config. If it doesn't exist,
   # notify the user and choose the branch of the same name
@@ -51,18 +51,24 @@ GitSmart.register 'smart-pull' do |repo, args|
         puts "No uncommitted changes, no need to stash."
       end
 
+      success_messages = []
+
       if merge_base == head
         puts "Local branch '#{branch}' has not moved on. Fast-forwarding..."
         repo.fast_forward!(upstream_branch)
+        success_messages << "Fast forwarded from #{head[0,7]} to #{remote[0,7]}"
       else
         note "Both local and remote branches have moved on. Branch 'master' needs to be rebased onto 'origin/master'"
         repo.rebase_preserving_merges!(upstream_branch)
+        success_messages << "HEAD moved from #{head[0,7]} to #{repo.sha('HEAD')[0,7]}."
       end
 
       if stash_required
         note "Reapplying local changes..."
         repo.stash_pop!
       end
+
+      success ["All good.", *success_messages].join(" ")
     end
 
   end

data/lib/git-smart/git_repo.rb

@@ -26,8 +26,8 @@ class GitRepo
     end
   end
 
-  def fetch(remote)
-    git('fetch', remote)
+  def fetch!(remote)
+    log_git('fetch', remote)
   end
 
   def merge_base(ref_a, ref_b)

data/spec/smart-pull_spec.rb

@@ -25,7 +25,7 @@ describe 'smart-pull' do
 
   it "should tell us there's nothing to do" do
     out = run_command(local_dir, 'smart-pull')
-    out.should report("Fetching 'origin'")
+    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
@@ -43,7 +43,7 @@ describe 'smart-pull' do
 
     it "should report that no remote changes were found" do
       out = run_command(local_dir, 'smart-pull')
-      out.should report("Fetching 'origin'")
+      out.should report("Executing: git fetch origin")
       out.should report("Remote branch 'origin/master' has not moved on.")
       out.should report("Already up-to-date")
     end
@@ -61,7 +61,8 @@ describe 'smart-pull' do
 
     it "should fast-forward" do
       out = run_command(local_dir, 'smart-pull')
-      out.should report("Fetching 'origin'")
+      out.should report("Executing: git fetch origin")
+      out.should report(/master +-> +origin\/master/)      
       out.should report("There is 1 new commit on master.")
       out.should report("No uncommitted changes, no need to stash.")
       out.should report("Local branch 'master' has not moved on. Fast-forwarding.")
@@ -119,7 +120,8 @@ describe 'smart-pull' do
 
     it "should rebase" do
       out = run_command(local_dir, 'smart-pull')
-      out.should report("Fetching 'origin'")
+      out.should report("Executing: git fetch origin")
+      out.should report(/master +-> +origin\/master/)
       out.should report("There is 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")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-smart
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Glen Maddern
@@ -125,6 +125,7 @@ files:
 - Rakefile
 - VERSION
 - bin/git-smart
+- git-smart.gemspec
 - lib/commands/smart-pull.rb
 - lib/core_ext/array.rb
 - lib/core_ext/hash.rb