rake_commit 0.5.0 → 0.6.0

data/README.rdoc

@@ -1,21 +1,18 @@
-= rake_commit_tasks
+= rake_commit
 
-This plugin contains a set of rake tasks for checking your project into source control (git or subversion).  The most important is:
-
-  rake commit
-
-which does the following, depending on source control:
+This gem automates a pretty standard workflow when committing code to git, svn, and git-svn.  Run rake_commit in  your current project, which does the following, depending on source control:
 
 ==== git
 
-  1. Resets soft back to origin/branch (in order to collapse changes into one commit)
-  2. Adds new files to git and removes deleted files
-  3. Prompts for a commit message
-  4. Commits to git
-  5. Pulls changes from origin (and does a rebase to keep a linear history)
-  6. Runs the default rake task (which should run the tests)
-  7. Checks cruisecontrol.rb to see if the build is passing
-  8. Pushes the commit to origin
+  1. Checks in current changes into a temp commit just in case
+  2. Resets soft back to origin/branch (in order to collapse changes into one commit)
+  3. Adds new files to git and removes deleted files
+  4. Prompts for a commit message
+  5. Commits to git
+  6. Pulls changes from origin (and does a rebase to keep a linear history)
+  7. Runs the default rake task (which should run the tests)
+  8. Checks cruisecontrol.rb to see if the build is passing
+  9. Pushes the commit to origin
 
 ==== git-svn
 
@@ -43,14 +40,18 @@ Improvements have been added in from several more projects.
 
 == Installation
 
-  git clone git://github.com/pgr0ss/rake_commit_tasks.git vendor/plugins/rake_commit_tasks
-  rake commit
+  sudo gem install rake_commit
+
+== Usage
+
+  cd /path/to/project
+  rake_commit
 
-== Customization
+== Customization - these currently do not work in gem version yet
 
 === Preventing checkins on broken builds
 
-If you want the build to check your cruisecontrol.rb instance and prompt you 
+If you want the build to check your cruisecontrol.rb instance and prompt you
 before checking in on a broken build, set CCRB_RSS to the location of the RSS feed.
 
 For example, in your Rakefile:

data/lib/git.rb

@@ -21,6 +21,7 @@ class Git
     temp_commit
     reset_soft
     status
+    return if nothing_to_commit?
     commit_message = CommitMessage.new
     Shell.system("git config user.name #{commit_message.pair.inspect}")
     message = "#{commit_message.feature} - #{commit_message.message}"
@@ -50,10 +51,14 @@ class Git
   end
 
   def temp_commit
-    return if Shell.backtick("git status") =~ /nothing to commit/m
+    return if nothing_to_commit?
     Shell.system "git commit -m 'rake_commit backup commit'"
   end
 
+  def nothing_to_commit?
+    Shell.backtick("git status") =~ /nothing to commit/m
+  end
+
   def git_branch
     @git_branch ||= begin
       output = Shell.backtick("git symbolic-ref HEAD")
@@ -62,7 +67,7 @@ class Git
   end
 
   def merge_commits?
-    Shell.backtick("git log --merges #{merge_base}..HEAD").any?
+    Shell.backtick("git log #{merge_base}..HEAD") != Shell.backtick("git log --no-merges #{merge_base}..HEAD")
   end
 
   def merge_base

data/lib/shell.rb

@@ -5,7 +5,7 @@ class Shell
 
   def self.backtick(cmd)
     output = `#{cmd}`
-    raise unless $?.success?
+    raise "Command failed: #{cmd.inspect}" unless $?.success?
     output
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Paul Gross
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: []