rake_commit 0.13.0 → 0.14.0

data/bin/rake_commit

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.dirname(__FILE__) + "/../lib/commit")
+require File.expand_path(File.dirname(__FILE__) + "/../lib/rake_commit")
 
-Commit.new.commit
+RakeCommit::Commit.new.commit

data/lib/rake_commit/commit.rb

@@ -0,0 +1,60 @@
+require 'optparse'
+require 'rexml/document'
+
+module RakeCommit
+  class Commit
+    def git?
+      `git symbolic-ref HEAD 2>/dev/null`
+      $?.success?
+    end
+
+    def git_svn?
+      `git svn info 2> /dev/null`
+      $?.success?
+    end
+
+    def commit
+      options = {
+        :collapse_commits => true,
+        :incremental => false,
+        :prompt_exclusions => []
+      }
+
+      if File.exists?(".rake_commit")
+        defaults = File.read(".rake_commit")
+        options = parse_options(defaults.split(" "), 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
+      else
+        RakeCommit::Svn.new(options[:prompt_exclusions]).commit
+      end
+    end
+
+    def parse_options(args, options)
+      parser = OptionParser.new do |opts|
+        opts.banner = "Usage: rake_commit [OPTIONS]"
+        opts.on("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+        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
+          options[:collapse_commits] = false
+        end
+        opts.on("-w", "--without-prompt PROMPT", "Skips the given prompt (author, feature, message)") do |prompt_exclusion|
+          options[:prompt_exclusions] << prompt_exclusion
+        end
+      end
+
+      parser.parse(args)
+      options
+    end
+  end
+end

data/lib/rake_commit/commit_message.rb

@@ -0,0 +1,16 @@
+module RakeCommit
+  class CommitMessage
+
+    attr_reader :pair, :feature, :message
+
+    def initialize(prompt_exclusions = [])
+      @pair = RakeCommit::PromptLine.new("pair", 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(' - ')
+    end
+  end
+end

data/lib/rake_commit/cruise_status.rb

@@ -0,0 +1,27 @@
+require 'rexml/document'
+require "open-uri"
+
+module RakeCommit
+  class CruiseStatus
+
+    def initialize(feed_url)
+      project_feed = open(feed_url).read
+      @doc = REXML::Document.new(project_feed)
+    rescue Exception => e
+      @failures = [e.message]
+      @doc = REXML::Document.new("")
+    end
+
+    def pass?
+      failures.empty?
+    end
+
+    def failures
+      @failures ||= REXML::XPath.match(@doc, "//item/title").select { |element|
+        element.text =~ /failed$/
+      }.map do |element|
+        element.text.gsub( /(.*) build (.+) failed$/, '\1' )
+      end
+    end
+  end
+end

data/lib/rake_commit/git.rb

@@ -0,0 +1,92 @@
+module RakeCommit
+  class Git
+
+    def initialize(collapse_commits = true, incremental = false, prompt_exclusions = [])
+      @collapse_commits = collapse_commits
+      @incremental = incremental
+      @prompt_exclusions = prompt_exclusions
+    end
+
+    def commit
+      if @incremental
+        incremental_commit
+      else
+        collapse_git_commits if @collapse_commits && collapse_git_commits?
+        RakeCommit::Shell.system("rake")
+        push
+      end
+    end
+
+    def collapse_git_commits?
+      return true unless merge_commits?
+      status
+      input = Readline.readline("Do you want to collapse merge commits? (y/n): ").chomp
+      input == "y"
+    end
+
+    def collapse_git_commits
+      add
+      temp_commit
+      reset_soft
+      status
+      return if nothing_to_commit?
+      incremental_commit
+      pull_rebase
+    end
+
+    def status
+      RakeCommit::Shell.system("git status", false)
+    end
+
+    def add
+      RakeCommit::Shell.system "git add -A ."
+    end
+
+    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}")
+      end
+      message = [commit_message.feature, commit_message.message].compact.join(" - ")
+      RakeCommit::Shell.system("git commit -m #{message.inspect}")
+    end
+
+    def reset_soft
+      raise "Could not determine branch" unless git_branch
+      RakeCommit::Shell.system "git reset --soft #{merge_base}"
+    end
+
+    def pull_rebase
+      RakeCommit::Shell.system "git pull --rebase"
+    end
+
+    def push
+      RakeCommit::Shell.system "git push origin #{git_branch}"
+    end
+
+    def temp_commit
+      return if nothing_to_commit?
+      RakeCommit::Shell.system "git commit -m 'rake_commit backup commit'"
+    end
+
+    def nothing_to_commit?
+      status = RakeCommit::Shell.backtick("git status", false)
+      status.empty? || status =~ /nothing to commit/m
+    end
+
+    def git_branch
+      @git_branch ||= begin
+        output = RakeCommit::Shell.backtick("git symbolic-ref HEAD")
+        output.gsub('refs/heads/', '').strip
+      end
+    end
+
+    def merge_commits?
+      RakeCommit::Shell.backtick("git log #{merge_base}..HEAD") != RakeCommit::Shell.backtick("git log --no-merges #{merge_base}..HEAD")
+    end
+
+    def merge_base
+      @merge_base ||= RakeCommit::Shell.backtick("git merge-base #{git_branch} origin/#{git_branch}").strip
+    end
+  end
+end

data/lib/rake_commit/git_svn.rb

@@ -0,0 +1,30 @@
+module RakeCommit
+  class GitSvn
+    def initialize(prompt_exclusions = [])
+      @prompt_exclusions = prompt_exclusions
+    end
+
+    def commit
+      git = RakeCommit::Git.new
+      git.add
+      git.status
+      git_svn_commit_with_message
+      rebase
+      RakeCommit::Shell.system "rake"
+      dcommit
+    end
+
+    def git_svn_commit_with_message
+      message = RakeCommit::CommitMessage.new(@prompt_exclusions).joined_message
+      RakeCommit::Shell.system "git commit -m #{message.inspect}"
+    end
+
+    def rebase
+      RakeCommit::Shell.system "git svn rebase"
+    end
+
+    def dcommit
+      RakeCommit::Shell.system "git svn dcommit"
+    end
+  end
+end

data/lib/rake_commit/prompt_line.rb

@@ -0,0 +1,51 @@
+require 'readline'
+require 'tmpdir'
+
+module RakeCommit
+  class PromptLine
+
+    def initialize(attribute, prompt_exclusions = [])
+      @attribute = attribute
+      @prompt_exclusions = prompt_exclusions
+    end
+
+    def prompt
+      return nil if @prompt_exclusions.include?(@attribute)
+      input = nil
+      loop do
+        input = Readline.readline(message).chomp
+        break unless (input.empty? && saved_data.empty?)
+      end
+
+      unless input.empty?
+        save(input)
+        return input
+      end
+
+      puts "using: #{saved_data}"
+      return saved_data
+    end
+
+    def message
+      previous = saved_data
+      previous_message = "\n"
+      previous_message += "previous #{@attribute}: #{previous}\n" unless previous.empty?
+      puts previous_message
+      "#{@attribute}: "
+    end
+
+    def save(input)
+      File.open(path(@attribute), "w") {|f| f.write(input) }
+    end
+
+    private
+    def saved_data
+      @saved_data ||= File.exists?(path(@attribute)) ? File.read(path(@attribute)) : ""
+    end
+
+    def path(attribute)
+      File.expand_path(Dir.tmpdir + "/#{attribute}.data")
+    end
+
+  end
+end

data/lib/rake_commit/shell.rb

@@ -0,0 +1,16 @@
+require 'English'
+
+module RakeCommit
+  class Shell
+    def self.system(cmd, raise_on_failure = true)
+      successful = Kernel.system(cmd)
+      raise if raise_on_failure && !successful
+    end
+
+    def self.backtick(cmd, raise_on_failure = true)
+      output = `#{cmd}`
+      raise "Command failed: #{cmd.inspect}" if raise_on_failure && !$CHILD_STATUS.success?
+      output
+    end
+  end
+end

data/lib/rake_commit/svn.rb

@@ -0,0 +1,82 @@
+require 'fileutils'
+
+module RakeCommit
+  class Svn
+
+    def initialize(prompt_exclusions = [])
+      @prompt_exclusions = prompt_exclusions
+    end
+
+    def commit
+      if files_to_check_in?
+        message = RakeCommit::CommitMessage.new(@prompt_exclusions).joined_message
+        add
+        delete
+        up
+        RakeCommit::Shell.system "rake"
+        output = RakeCommit::Shell.backtick "#{commit_command(message)}"
+        puts output
+        revision = output.match(/Committed revision (\d+)\./)[1]
+      else
+        puts "Nothing to commit"
+      end
+    end
+
+    def commit_command(message)
+      "svn ci -m #{message.inspect}"
+    end
+
+    def files_to_check_in?
+      RakeCommit::Shell.backtick("svn st --ignore-externals").split("\n").reject {|line| line[0,1] == "X"}.any?
+    end
+
+    def status
+      RakeCommit::Shell.system "svn st"
+    end
+
+    def up
+      output = RakeCommit::Shell.backtick "svn up"
+      puts output
+      output.split("\n").each do |line|
+        raise "SVN conflict detected. Please resolve conflicts before proceeding." if line[0,1] == "C"
+      end
+    end
+
+    def add
+      RakeCommit::Shell.backtick("svn st").split("\n").each do |line|
+        if new_file?(line) && !svn_conflict_file?(line)
+          file = line[7..-1].strip
+          RakeCommit::Shell.system "svn add #{file.inspect}"
+        end
+      end
+    end
+
+    def new_file?(line)
+      line[0,1] == "?"
+    end
+
+    def svn_conflict_file?(line)
+      line =~ /\.r\d+$/ || line =~ /\.mine$/
+    end
+
+    def delete
+      RakeCommit::Shell.backtick("svn st").split("\n").each do |line|
+        if line[0,1] == "!"
+          file = line[7..-1].strip
+          RakeCommit::Shell.backtick "svn up #{file.inspect} && svn rm #{file.inspect}"
+          puts %[removed #{file}]
+        end
+      end
+    end
+
+    def revert_all
+      RakeCommit::Shell.system "svn revert -R ."
+      RakeCommit::Shell.backtick("svn st").split("\n").each do |line|
+        next unless line[0,1] == '?'
+        filename = line[1..-1].strip
+        puts "removed #{filename}"
+        FileUtils.rm_r filename
+      end
+    end
+  end
+end

data/lib/rake_commit.rb

@@ -0,0 +1,6 @@
+module RakeCommit
+end
+
+Dir.glob(File.expand_path(File.dirname(__FILE__) + '/rake_commit/*.rb')) do |file|
+  require file
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_commit
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies: []
 description: See http://github.com/pgr0ss/rake_commit
 email: pgross@gmail.com
@@ -20,16 +20,16 @@ extra_rdoc_files: []
 files:
 - README.rdoc
 - Rakefile
-- lib/commit.rb
-- lib/commit_message.rb
-- lib/cruise_status.rb
-- lib/git.rb
-- lib/git_svn.rb
-- lib/prompt_line.rb
-- lib/shell.rb
-- lib/svn.rb
-- !binary |-
-  YmluL3Jha2VfY29tbWl0
+- 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/git_svn.rb
+- lib/rake_commit/prompt_line.rb
+- lib/rake_commit/shell.rb
+- lib/rake_commit/svn.rb
+- lib/rake_commit.rb
+- bin/rake_commit
 homepage: http://github.com/pgr0ss/rake_commit
 licenses: []
 post_install_message: 
@@ -42,6 +42,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3950958568738927598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -50,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rake_commit
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem which helps with checking in code

data/lib/commit.rb

@@ -1,62 +0,0 @@
-require 'optparse'
-require 'rexml/document'
-
-Dir.glob(File.expand_path(File.dirname(__FILE__) + '/*.rb')) do |file|
-  require file
-end
-
-class Commit
-  def git?
-    `git symbolic-ref HEAD 2>/dev/null`
-    $?.success?
-  end
-
-  def git_svn?
-    `git svn info 2> /dev/null`
-    $?.success?
-  end
-
-  def commit
-    options = {
-      :collapse_commits => true,
-      :incremental => false,
-      :prompt_exclusions => []
-    }
-
-    if File.exists?(".rake_commit")
-      defaults = File.read(".rake_commit")
-      options = parse_options(defaults.split(" "), options)
-    end
-    options = parse_options(ARGV, options)
-
-    if git_svn?
-      GitSvn.new(options[:prompt_exclusions]).commit
-    elsif git?
-      Git.new(options[:collapse_commits], options[:incremental], options[:prompt_exclusions]).commit
-    else
-      Svn.new(options[:prompt_exclusions]).commit
-    end
-  end
-
-  def parse_options(args, options)
-    parser = OptionParser.new do |opts|
-      opts.banner = "Usage: rake_commit [OPTIONS]"
-      opts.on("-h", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-      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
-        options[:collapse_commits] = false
-      end
-      opts.on("-w", "--without-prompt PROMPT", "Skips the given prompt (author, feature, message)") do |prompt_exclusion|
-        options[:prompt_exclusions] << prompt_exclusion
-      end
-    end
-
-    parser.parse(args)
-    options
-  end
-end

data/lib/commit_message.rb

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

data/lib/cruise_status.rb

@@ -1,25 +0,0 @@
-require 'rexml/document'
-require "open-uri"
-
-class CruiseStatus
-
-  def initialize(feed_url)
-    project_feed = open(feed_url).read
-    @doc = REXML::Document.new(project_feed)
-  rescue Exception => e
-    @failures = [e.message]
-    @doc = REXML::Document.new("")
-  end
-
-  def pass?
-    failures.empty?
-  end
-
-  def failures
-    @failures ||= REXML::XPath.match(@doc, "//item/title").select { |element|
-      element.text =~ /failed$/
-    }.map do |element|
-      element.text.gsub( /(.*) build (.+) failed$/, '\1' )
-    end
-  end
-end

data/lib/git.rb

@@ -1,90 +0,0 @@
-class Git
-
-  def initialize(collapse_commits = true, incremental = false, prompt_exclusions = [])
-    @collapse_commits = collapse_commits
-    @incremental = incremental
-    @prompt_exclusions = prompt_exclusions
-  end
-
-  def commit
-    if @incremental
-      incremental_commit
-    else
-      collapse_git_commits if @collapse_commits && collapse_git_commits?
-      Shell.system("rake")
-      push
-    end
-  end
-
-  def collapse_git_commits?
-    return true unless merge_commits?
-    status
-    input = Readline.readline("Do you want to collapse merge commits? (y/n): ").chomp
-    input == "y"
-  end
-
-  def collapse_git_commits
-    add
-    temp_commit
-    reset_soft
-    status
-    return if nothing_to_commit?
-    incremental_commit
-    pull_rebase
-  end
-
-  def status
-    Shell.system("git status", false)
-  end
-
-  def add
-    Shell.system "git add -A ."
-  end
-
-  def incremental_commit
-    commit_message = CommitMessage.new(@prompt_exclusions)
-    unless commit_message.pair.nil?
-      Shell.system("git config user.name #{commit_message.pair.inspect}")
-    end
-    message = [commit_message.feature, commit_message.message].compact.join(" - ")
-    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}"
-  end
-
-  def pull_rebase
-    Shell.system "git pull --rebase"
-  end
-
-  def push
-    Shell.system "git push origin #{git_branch}"
-  end
-
-  def temp_commit
-    return if nothing_to_commit?
-    Shell.system "git commit -m 'rake_commit backup commit'"
-  end
-
-  def nothing_to_commit?
-    status = Shell.backtick("git status", false)
-    status.empty? || status =~ /nothing to commit/m
-  end
-
-  def git_branch
-    @git_branch ||= begin
-      output = Shell.backtick("git symbolic-ref HEAD")
-      output.gsub('refs/heads/', '').strip
-    end
-  end
-
-  def merge_commits?
-    Shell.backtick("git log #{merge_base}..HEAD") != Shell.backtick("git log --no-merges #{merge_base}..HEAD")
-  end
-
-  def merge_base
-    @merge_base ||= Shell.backtick("git merge-base #{git_branch} origin/#{git_branch}").strip
-  end
-end

data/lib/git_svn.rb

@@ -1,28 +0,0 @@
-class GitSvn
-  def initialize(prompt_exclusions = [])
-    @prompt_exclusions = prompt_exclusions
-  end
-
-  def commit
-    git = Git.new
-    git.add
-    git.status
-    git_svn_commit_with_message
-    rebase
-    Shell.system "rake"
-    dcommit
-  end
-
-  def git_svn_commit_with_message
-    message = CommitMessage.new(@prompt_exclusions).joined_message
-    Shell.system "git commit -m #{message.inspect}"
-  end
-
-  def rebase
-    Shell.system "git svn rebase"
-  end
-
-  def dcommit
-    Shell.system "git svn dcommit"
-  end
-end

data/lib/prompt_line.rb

@@ -1,49 +0,0 @@
-require 'readline'
-require 'tmpdir'
-
-class PromptLine
-
-  def initialize(attribute, prompt_exclusions = [])
-    @attribute = attribute
-    @prompt_exclusions = prompt_exclusions
-  end
-
-  def prompt
-    return nil if @prompt_exclusions.include?(@attribute)
-    input = nil
-    loop do
-      input = Readline.readline(message).chomp
-      break unless (input.empty? && saved_data.empty?)
-    end
-
-    unless input.empty?
-      save(input)
-      return input
-    end
-
-    puts "using: #{saved_data}"
-    return saved_data
-  end
-
-  def message
-    previous = saved_data
-    previous_message = "\n"
-    previous_message += "previous #{@attribute}: #{previous}\n" unless previous.empty?
-    puts previous_message
-    "#{@attribute}: "
-  end
-
-  def save(input)
-    File.open(path(@attribute), "w") {|f| f.write(input) }
-  end
-
-  private
-  def saved_data
-    @saved_data ||= File.exists?(path(@attribute)) ? File.read(path(@attribute)) : ""
-  end
-
-  def path(attribute)
-    File.expand_path(Dir.tmpdir + "/#{attribute}.data")
-  end
-
-end

data/lib/shell.rb

@@ -1,14 +0,0 @@
-require 'English'
-
-class Shell
-  def self.system(cmd, raise_on_failure = true)
-    successful = Kernel.system(cmd)
-    raise if raise_on_failure && !successful
-  end
-
-  def self.backtick(cmd, raise_on_failure = true)
-    output = `#{cmd}`
-    raise "Command failed: #{cmd.inspect}" if raise_on_failure && !$CHILD_STATUS.success?
-    output
-  end
-end

data/lib/svn.rb

@@ -1,80 +0,0 @@
-require 'fileutils'
-
-class Svn
-
-  def initialize(prompt_exclusions = [])
-    @prompt_exclusions = prompt_exclusions
-  end
-
-  def commit
-    if files_to_check_in?
-      message = CommitMessage.new(@prompt_exclusions).joined_message
-      add
-      delete
-      up
-      Shell.system "rake"
-      output = Shell.backtick "#{commit_command(message)}"
-      puts output
-      revision = output.match(/Committed revision (\d+)\./)[1]
-    else
-      puts "Nothing to commit"
-    end
-  end
-
-  def commit_command(message)
-    "svn ci -m #{message.inspect}"
-  end
-
-  def files_to_check_in?
-    Shell.backtick("svn st --ignore-externals").split("\n").reject {|line| line[0,1] == "X"}.any?
-  end
-
-  def status
-    Shell.system "svn st"
-  end
-
-  def up
-    output = Shell.backtick "svn up"
-    puts output
-    output.split("\n").each do |line|
-      raise "SVN conflict detected. Please resolve conflicts before proceeding." if line[0,1] == "C"
-    end
-  end
-
-  def add
-    Shell.backtick("svn st").split("\n").each do |line|
-      if new_file?(line) && !svn_conflict_file?(line)
-        file = line[7..-1].strip
-        Shell.system "svn add #{file.inspect}"
-      end
-    end
-  end
-
-  def new_file?(line)
-    line[0,1] == "?"
-  end
-
-  def svn_conflict_file?(line)
-    line =~ /\.r\d+$/ || line =~ /\.mine$/
-  end
-
-  def delete
-    Shell.backtick("svn st").split("\n").each do |line|
-      if line[0,1] == "!"
-        file = line[7..-1].strip
-        Shell.backtick "svn up #{file.inspect} && svn rm #{file.inspect}"
-        puts %[removed #{file}]
-      end
-    end
-  end
-
-  def revert_all
-    Shell.system "svn revert -R ."
-    Shell.backtick("svn st").split("\n").each do |line|
-      next unless line[0,1] == '?'
-      filename = line[1..-1].strip
-      puts "removed #{filename}"
-      FileUtils.rm_r filename
-    end
-  end
-end