rake_commit 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ddb2402f70ae866708f5eed4cc19beb7a6a7e98
-  data.tar.gz: b83a0373ca89ac622e59e8411baa87d935e0ebba
+  metadata.gz: 1b9f0d0536a6adc348294e3f4688fa2e99a6457f
+  data.tar.gz: dcf39345cbf7250a4334b1ceee434f6cbabe50a6
 SHA512:
-  metadata.gz: 932d087a1e0fb3539ff32f9e128fedd62449498efe1335015a92de350c7ca1d0d54f1e7c9a688dc1a81c30bddf63475913891e43c8045c73be2db83a6e0a73e3
-  data.tar.gz: a3fbfbadffbd1d67a80be4dcdf1c7a28ea344cbac85d1ca4c3d773fbb6549a30c4023b2bf175561cf2a24699f53ad7963e62f6df78cda1c8072ceb7274f61048
+  metadata.gz: c785b500149d04b184feac3458d6fd684b35bd157f4e0432213e48dcc1358fee7fe4d786b89107c697b705b92f63e237759ee4d91913d7ba158f1ca1cb256a64
+  data.tar.gz: 03fd8ef87657c12ef3ef413afc8ae454eac7c5731319095663548b0585717ee3442912e4028eb37ac3553d1714046e2f51c96532430ec0cbcd4e957c40f8ca2a

data/lib/rake_commit/commit.rb

@@ -30,7 +30,7 @@ module RakeCommit
       if git_svn?
         RakeCommit::GitSvn.new(options[:prompt_exclusions]).commit
       elsif git?
-        RakeCommit::Git.new(options[:collapse_commits], options[:incremental], options[:prompt_exclusions], options[:precommit]).commit
+        RakeCommit::Git.new(options[:collapse_commits], options[:rebase_only], options[:incremental], options[:prompt_exclusions], options[:precommit]).commit
       else
         RakeCommit::Svn.new(options[:prompt_exclusions]).commit
       end
@@ -46,9 +46,13 @@ module RakeCommit
         opts.on("-i", "--incremental", "Prompt for a local commit") do
           options[:incremental] = true
         end
-        opts.on("-n", "--no-collapse", "Run the build and push without collapsing commits") do
+        opts.on("-n", "--no-collapse", "Run the build and push without pulling or collapsing commits") do
           options[:collapse_commits] = false
         end
+        opts.on("-r", "--rebase-only", "Pull and rebase (without collapsing existing commits), then build and push") do
+          options[:collapse_commits] = false
+          options[:rebase_only] = true
+        end
         opts.on("-w", "--without-prompt PROMPT", "Skips the given prompt (author, feature, message)") do |prompt_exclusion|
           options[:prompt_exclusions] << prompt_exclusion
         end

data/lib/rake_commit/git.rb

@@ -3,8 +3,9 @@ require 'shellwords'
 module RakeCommit
   class Git
 
-    def initialize(collapse_commits = true, incremental = false, prompt_exclusions = [], precommit = nil)
+    def initialize(collapse_commits = true, rebase_only = false, incremental = false, prompt_exclusions = [], precommit = nil)
       @collapse_commits = collapse_commits
+      @rebase_only = rebase_only
       @incremental = incremental
       @prompt_exclusions = prompt_exclusions
       @precommit = precommit
@@ -20,6 +21,10 @@ module RakeCommit
       else
         if collapse_git_commits?
           return unless collapse_git_commits
+        elsif rebase_only?
+          add
+          incremental_commit unless nothing_to_commit?
+          pull_rebase rescue return false
         end
         RakeCommit::Shell.system("rake")
         push
@@ -38,6 +43,10 @@ module RakeCommit
       input == "y"
     end
 
+    def rebase_only?
+      !!@rebase_only
+    end
+
     def rebase_continue
       RakeCommit::Shell.system("git rebase --continue")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_commit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Gross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies: []
 description: See http://github.com/pgr0ss/rake_commit
 email: pgross@gmail.com
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rake_commit
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem which helps with checking in code