rake_commit 0.14.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dde978cb78d5edf140a4bf1ff0e21e57ab0f2095
+  data.tar.gz: 7bfd75289e088c36682f8c5d5b05cdd0c5dd3c7d
+SHA512:
+  metadata.gz: c4752cf9d414aeb1720927e4ae0d74f0e05639764809eea8d7bf85523d462222612f1bfacff4eca473511b196d478c109dbf34df4f0ed60021dd38ca5fb0630f
+  data.tar.gz: da5e2bb5ecddf53a4290e5597d869de7112fe9dc417dead2e95f0387dd17a91df8ece66ca12e905394b7ffa11543eae48524f8ce03ab84f07a71cb40273620b0

data/{README.rdoc → README.md}

@@ -1,11 +1,13 @@
-= rake_commit
+# rake_commit
 
-{<img src="http://travis-ci.org/pgr0ss/rake_commit.png" />}[http://travis-ci.org/pgr0ss/rake_commit]
+[![Gem Version](https://badge.fury.io/rb/rake_commit.png)](http://badge.fury.io/rb/rake_commit)
+[![Build Status](https://travis-ci.org/pgr0ss/rake_commit.png?branch=master)](https://travis-ci.org/pgr0ss/rake_commit)
 
 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
+### git
 
+```
   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
@@ -14,52 +16,82 @@ This gem automates a pretty standard workflow when committing code to git, svn,
   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. Pushes the commit to origin
+```
 
-==== git-svn
+### git-svn
 
+```
   1. Adds new files to git and removes deleted files
   2. Prompts for a commit message
   3. Commits to local git
   4. Pulls changes from SVN
   5. Runs the default rake task (which should run the tests)
   6. Pushes the commit to SVN
+```
 
-==== subversion
+### subversion
 
+```
   1. Prompts for a commit message
   2. Adds new files to subversion
   3. Deletes missing files from subversion
   4. svn update
   5. Runs the default rake task (which should run the tests)
   6. Checks in the code
+```
 
 
 The first version started with the code posted at Jay Field's Blog: http://blog.jayfields.com/2006/12/ruby-rake-commit.html.
 Improvements have been added in from several more projects.
 
-== Installation
+## Installation
 
-  gem install rake_commit
+```bash
+gem install rake_commit
+```
 
-== Usage
+## Usage
 
-  cd /path/to/project
-  rake_commit
+```bash
+cd /path/to/project
+rake_commit
+```
 
-=== Command line arguments
+### Command line arguments
 
-  --help
+```bash
+--help
+```
 
 Print help information.
 
-  --incremental
+```bash
+--incremental
+```
 
 This will prompt as normal and then commit without running tests or pushing. This is useful for make incremental commits while working.
 
-  --no-collapse
+```bash
+--no-collapse
+```
 
 This tells rake_commit not to prompt and make a new commit. This is useful when you've done a merge by hand and want to preserve the commit. It will stil run rake and then push if rake succeeds.
 
-  --without-prompt <prompt>
+```bash
+--without-prompt <prompt>
+```
 
-This will cause rake_commit to skip the named prompt. For example, if you are working by yourself and do not need to prompt for a pair, you can use --without-prompt pair.
+This will cause rake_commit to skip the named prompt. For example, if you are working by yourself and do not need to prompt for an author, you can use `--without-prompt author`.
+
+### Configuration
+
+If the same command line arguments are always used, they can be added to a `.rake_commit` file in the root of the project. For example, this `.rake_commit` file will tell `rake_commit` to only prompt for message:
+
+```
+--without-prompt author
+--without-prompt feature
+```
+
+## License
+
+rake_commit is released under the [MIT license](http://www.opensource.org/licenses/MIT).

data/Rakefile

@@ -1,6 +1,6 @@
 require "rake/testtask"
 
-task :default => :test
+task :default => ['test', 'gem:build']
 
 Rake::TestTask.new do |t|
   t.pattern = "test/**/*_test.rb"

data/lib/rake_commit/commit.rb

@@ -1,10 +1,11 @@
 require 'optparse'
 require 'rexml/document'
+require 'shellwords'
 
 module RakeCommit
   class Commit
     def git?
-      `git symbolic-ref HEAD 2>/dev/null`
+      `git rev-parse`
       $?.success?
     end
 
@@ -22,14 +23,14 @@ module RakeCommit
 
       if File.exists?(".rake_commit")
         defaults = File.read(".rake_commit")
-        options = parse_options(defaults.split(" "), options)
+        options = parse_options(Shellwords.split(defaults), options)
       end
       options = parse_options(ARGV, options)
 
       if git_svn?
         RakeCommit::GitSvn.new(options[:prompt_exclusions]).commit
       elsif git?
-        RakeCommit::Git.new(options[:collapse_commits], options[:incremental], options[:prompt_exclusions]).commit
+        RakeCommit::Git.new(options[:collapse_commits], options[:incremental], options[:prompt_exclusions], options[:precommit]).commit
       else
         RakeCommit::Svn.new(options[:prompt_exclusions]).commit
       end
@@ -51,10 +52,13 @@ module RakeCommit
         opts.on("-w", "--without-prompt PROMPT", "Skips the given prompt (author, feature, message)") do |prompt_exclusion|
           options[:prompt_exclusions] << prompt_exclusion
         end
+        opts.on("-p", "--precommit SCRIPT", "command to run before commiting changes") do |command|
+          options[:precommit] = command
+        end
       end
 
       parser.parse(args)
       options
     end
   end
-end
+end

data/lib/rake_commit/commit_message.rb

@@ -1,16 +1,16 @@
 module RakeCommit
   class CommitMessage
 
-    attr_reader :pair, :feature, :message
+    attr_reader :author, :feature, :message
 
     def initialize(prompt_exclusions = [])
-      @pair = RakeCommit::PromptLine.new("pair", prompt_exclusions).prompt
+      @author = RakeCommit::PromptLine.new("author", prompt_exclusions).prompt
       @feature = RakeCommit::PromptLine.new("feature", prompt_exclusions).prompt
       @message = RakeCommit::PromptLine.new("message", prompt_exclusions).prompt
     end
 
     def joined_message
-      [@pair, @feature, @message].compact.join(' - ')
+      [@author, @feature, @message].compact.join(' - ')
     end
   end
-end
+end

data/lib/rake_commit/git.rb

@@ -1,22 +1,32 @@
+require 'shellwords'
+
 module RakeCommit
   class Git
 
-    def initialize(collapse_commits = true, incremental = false, prompt_exclusions = [])
+    def initialize(collapse_commits = true, incremental = false, prompt_exclusions = [], precommit = nil)
       @collapse_commits = collapse_commits
       @incremental = incremental
       @prompt_exclusions = prompt_exclusions
+      @precommit = precommit
     end
 
     def commit
       if @incremental
         incremental_commit
-      else
-        collapse_git_commits if @collapse_commits && collapse_git_commits?
+      elsif rebase_in_progress?
+        rebase_continue
+        RakeCommit::Shell.system("rake")
+        push
+      elsif @collapse_commits && collapse_git_commits? && collapse_git_commits
         RakeCommit::Shell.system("rake")
         push
       end
     end
 
+    def rebase_in_progress?
+      File.directory?(".git/rebase-merge") || File.directory?(".git/rebase-apply")
+    end
+
     def collapse_git_commits?
       return true unless merge_commits?
       status
@@ -24,14 +34,20 @@ module RakeCommit
       input == "y"
     end
 
+    def rebase_continue
+      RakeCommit::Shell.system("git rebase --continue")
+    end
+
     def collapse_git_commits
+      RakeCommit::Shell.system(@precommit) unless @precommit.nil?
       add
       temp_commit
       reset_soft
       status
       return if nothing_to_commit?
       incremental_commit
-      pull_rebase
+      pull_rebase rescue return false
+      return true
     end
 
     def status
@@ -44,11 +60,11 @@ module RakeCommit
 
     def incremental_commit
       commit_message = RakeCommit::CommitMessage.new(@prompt_exclusions)
-      unless commit_message.pair.nil?
-        RakeCommit::Shell.system("git config user.name #{commit_message.pair.inspect}")
+      unless commit_message.author.nil?
+        RakeCommit::Shell.system("git config user.name #{Shellwords.shellescape(commit_message.author)}")
       end
       message = [commit_message.feature, commit_message.message].compact.join(" - ")
-      RakeCommit::Shell.system("git commit -m #{message.inspect}")
+      RakeCommit::Shell.system("git commit -m #{Shellwords.shellescape(message)}")
     end
 
     def reset_soft

data/lib/rake_commit/git_svn.rb

@@ -1,10 +1,12 @@
 module RakeCommit
   class GitSvn
-    def initialize(prompt_exclusions = [])
+    def initialize(prompt_exclusions = [], precommit = nil)
       @prompt_exclusions = prompt_exclusions
+      @precommit = precommit
     end
 
     def commit
+      RakeCommit::Shell.system(@precommit) unless @precommit.nil?
       git = RakeCommit::Git.new
       git.add
       git.status

data/lib/rake_commit/prompt_line.rb

@@ -3,6 +3,7 @@ require 'tmpdir'
 
 module RakeCommit
   class PromptLine
+    include Readline
 
     def initialize(attribute, prompt_exclusions = [])
       @attribute = attribute
@@ -13,38 +14,51 @@ module RakeCommit
       return nil if @prompt_exclusions.include?(@attribute)
       input = nil
       loop do
-        input = Readline.readline(message).chomp
-        break unless (input.empty? && saved_data.empty?)
+        input = readline(message).chomp
+        break unless (input.empty? && !previous_input)
       end
 
       unless input.empty?
-        save(input)
+        save_history(input)
         return input
       end
 
-      puts "using: #{saved_data}"
-      return saved_data
+      puts "using: #{previous_input}"
+      return previous_input
     end
 
     def message
-      previous = saved_data
       previous_message = "\n"
-      previous_message += "previous #{@attribute}: #{previous}\n" unless previous.empty?
+      previous_message += "previous #{@attribute}: #{previous_input}\n" if previous_input
       puts previous_message
       "#{@attribute}: "
     end
 
-    def save(input)
-      File.open(path(@attribute), "w") {|f| f.write(input) }
+    def save_history(input)
+      File.open(history_file, "a") { |f| f.puts(input) }
     end
 
     private
-    def saved_data
-      @saved_data ||= File.exists?(path(@attribute)) ? File.read(path(@attribute)) : ""
+    def previous_input
+      @previous_input ||= history.last
     end
 
-    def path(attribute)
-      File.expand_path(Dir.tmpdir + "/#{attribute}.data")
+    def history
+      @history ||= load_history
+    end
+
+    def load_history
+      HISTORY.pop until HISTORY.empty?
+      HISTORY.push(*saved_history)
+      HISTORY.to_a
+    end
+
+    def saved_history
+      File.exists?(history_file) ? File.read(history_file).split("\n") : []
+    end
+
+    def history_file
+      @history_file ||= File.expand_path(Dir.tmpdir + "/#{@attribute}.data")
     end
 
   end

data/lib/rake_commit/svn.rb

@@ -3,13 +3,15 @@ require 'fileutils'
 module RakeCommit
   class Svn
 
-    def initialize(prompt_exclusions = [])
+    def initialize(prompt_exclusions = [], precommit = nil)
       @prompt_exclusions = prompt_exclusions
+      @precommit = precommit
     end
 
     def commit
       if files_to_check_in?
         message = RakeCommit::CommitMessage.new(@prompt_exclusions).joined_message
+        RakeCommit::Shell.system(@precommit) unless @precommit.nil?
         add
         delete
         up

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_commit
 version: !ruby/object:Gem::Version
-  version: 0.14.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Gross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies: []
 description: See http://github.com/pgr0ss/rake_commit
 email: pgross@gmail.com
@@ -18,43 +17,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
+- README.md
 - Rakefile
-- lib/rake_commit/commit.rb
-- lib/rake_commit/commit_message.rb
-- lib/rake_commit/cruise_status.rb
-- lib/rake_commit/git.rb
+- lib/rake_commit.rb
 - lib/rake_commit/git_svn.rb
-- lib/rake_commit/prompt_line.rb
 - lib/rake_commit/shell.rb
+- lib/rake_commit/prompt_line.rb
+- lib/rake_commit/cruise_status.rb
+- lib/rake_commit/commit_message.rb
+- lib/rake_commit/commit.rb
+- lib/rake_commit/git.rb
 - lib/rake_commit/svn.rb
-- lib/rake_commit.rb
 - bin/rake_commit
 homepage: http://github.com/pgr0ss/rake_commit
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3950958568738927598
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rake_commit
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem which helps with checking in code
 test_files: []