rake_commit 0.12.0 → 0.13.0

data/lib/commit.rb

@@ -1,4 +1,4 @@
-require 'getoptlong'
+require 'optparse'
 require 'rexml/document'
 
 Dir.glob(File.expand_path(File.dirname(__FILE__) + '/*.rb')) do |file|
@@ -17,47 +17,46 @@ class Commit
   end
 
   def commit
-    collapse_commits = true
-    incremental = false
-    prompt_exclusions = []
-
-    opts = GetoptLong.new(
-      [ '--help', '-h', GetoptLong::NO_ARGUMENT],
-      [ '--incremental', '-i', GetoptLong::NO_ARGUMENT],
-      [ '--no-collapse', '-n', GetoptLong::NO_ARGUMENT],
-      [ '--without-prompt', '-w', GetoptLong::REQUIRED_ARGUMENT]
-    )
-    opts.each do |opt, arg|
-      case opt
-      when '--help'
-        usage
-        return
-      when '--incremental'
-        incremental = true
-      when '--no-collapse'
-        collapse_commits = false
-      when '--without-prompt'
-        prompt_exclusions << arg
-      end
+    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(prompt_exclusions).commit
+      GitSvn.new(options[:prompt_exclusions]).commit
     elsif git?
-      Git.new(collapse_commits, incremental, prompt_exclusions).commit
+      Git.new(options[:collapse_commits], options[:incremental], options[:prompt_exclusions]).commit
     else
-      Svn.new(prompt_exclusions).commit
+      Svn.new(options[:prompt_exclusions]).commit
     end
   end
 
-  def usage
-    puts <<-END
-Usage: rake_commit [OPTION]
+  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
 
-  --help, -h: show help
-  --incremental, -i: do not push commit to origin (git only)
-  --no-collapse, -n: do not collapse merge commits
-  --without-prompt <prompt>, -w <prompt>: skip prompt when building commit (for example, pair)
-    END
+    parser.parse(args)
+    options
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_commit
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies: []
 description: See http://github.com/pgr0ss/rake_commit
 email: pgross@gmail.com
@@ -28,7 +28,8 @@ files:
 - lib/prompt_line.rb
 - lib/shell.rb
 - lib/svn.rb
-- bin/rake_commit
+- !binary |-
+  YmluL3Jha2VfY29tbWl0
 homepage: http://github.com/pgr0ss/rake_commit
 licenses: []
 post_install_message: 
@@ -49,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rake_commit
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A gem which helps with checking in code