rake_commit 0.9.0 → 0.10.0

data/lib/commit.rb

@@ -18,10 +18,12 @@ class Commit
 
   def commit
     collapse_commits = true
+    incremental = false
 
     opts = GetoptLong.new(
       [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-      [ '--no-collapse', '-n', GetoptLong::NO_ARGUMENT ]
+      [ '--no-collapse', '-n', GetoptLong::NO_ARGUMENT ],
+      [ '--incremental', '-i', GetoptLong::NO_ARGUMENT ]
     )
     opts.each do |opt, arg|
       case opt
@@ -30,13 +32,15 @@ class Commit
         return
       when '--no-collapse'
         collapse_commits = false
+      when '--incremental'
+        incremental = true
       end
     end
 
     if git_svn?
       GitSvn.new.commit
     elsif git?
-      Git.new(collapse_commits).commit
+      Git.new(collapse_commits, incremental).commit
     else
       Svn.new.commit
     end
@@ -48,6 +52,7 @@ Usage: rake_commit [OPTION]
 
   --help, -h: show help
   --no-collapse, -n: do not collapse merge commits
+  --incremental, -i: do not push commit to origin (git only)
     END
   end
 end

data/lib/git.rb

@@ -1,16 +1,22 @@
 class Git
 
-  def initialize(collapse_commits = true)
+  def initialize(collapse_commits = true, incremental = false)
     @collapse_commits = collapse_commits
+    @incremental = incremental
   end
 
   def commit
-    collapse_git_commits if @collapse_commits && collapse_git_commits?
+    if @incremental
+      add
+      incremental_commit
+    else
+      collapse_git_commits if @collapse_commits && collapse_git_commits?
 
-    Shell.system("rake")
+      Shell.system("rake")
 
-    if ok_to_check_in?
-      push
+      if ok_to_check_in?
+        push
+      end
     end
   end
 
@@ -27,10 +33,7 @@ class Git
     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}"
-    Shell.system("git commit -m #{message.inspect}")
+    incremental_commit
     pull_rebase
   end
 
@@ -42,6 +45,13 @@ class Git
     Shell.system "git add -A ."
   end
 
+  def incremental_commit
+    commit_message = CommitMessage.new
+    Shell.system("git config user.name #{commit_message.pair.inspect}")
+    message = "#{commit_message.feature} - #{commit_message.message}"
+    Shell.system("git commit -m #{message.inspect}")
+  end
+
   def reset_soft
     raise "Could not determine branch" unless git_branch
     Shell.system "git reset --soft #{merge_base}"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rake_commit
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors: 
 - Paul Gross
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -05:00
+date: 2011-04-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +33,7 @@ files:
 - lib/prompt_line.rb
 - lib/shell.rb
 - lib/svn.rb
+- bin/rake_commit
 has_rdoc: true
 homepage: http://github.com/pgr0ss/rake_commit
 licenses: []
@@ -47,23 +44,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rake_commit
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A gem which helps with checking in code