rake_commit 0.7.0 → 0.8.0

data/lib/commit.rb

@@ -1,3 +1,4 @@
+require 'getoptlong'
 require 'rexml/document'
 
 Dir.glob(File.expand_path(File.dirname(__FILE__) + '/*.rb')) do |file|
@@ -16,14 +17,39 @@ class Commit
   end
 
   def commit
+    collapse_commits = true
+
+    opts = GetoptLong.new(
+      [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+      [ '--no-collapse', '-n', GetoptLong::NO_ARGUMENT ]
+    )
+    opts.each do |opt, arg|
+      case opt
+      when '--help'
+        usage
+        return
+      when '--no-collapse'
+        collapse_commits = false
+      end
+    end
+
     if git_svn?
       GitSvn.new.commit
     elsif git?
-      Git.new.commit
+      Git.new(collapse_commits).commit
     else
       Svn.new.commit
     end
   end
+
+  def usage
+    puts <<-END
+Usage: rake_commit [OPTION]
+
+  --help, -h: show help
+  --no-collapse, -n: do not collapse merge commits
+    END
+  end
 end
 
 
@@ -33,13 +59,6 @@ def ok_to_check_in?
   cruise_status.pass? ? true : are_you_sure?( "Build FAILURES: #{cruise_status.failures.join(', ')}" )
 end
 
-def git_commit_with_message
-  commit_message = CommitMessage.new
-  sh_with_output("git config user.name #{commit_message.pair.inspect}")
-  message = "#{commit_message.feature} - #{commit_message.message}"
-  sh_with_output("git commit -m #{message.inspect}")
-end
-
 def are_you_sure?(message)
   puts "\n", message
   input = ""
@@ -48,11 +67,3 @@ def are_you_sure?(message)
   end
   return input.strip.downcase[0,1] == "y"
 end
-
-def sh_with_output(command)
-  puts command
-  output = `#{command}`
-  puts output
-  raise unless $?.success?
-  output
-end

data/lib/git.rb

@@ -1,6 +1,11 @@
 class Git
+
+  def initialize(collapse_commits = true)
+    @collapse_commits = collapse_commits
+  end
+
   def commit
-    collapse_git_commits if collapse_git_commits?
+    collapse_git_commits if @collapse_commits && collapse_git_commits?
 
     Shell.system("rake")
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Paul Gross
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -05:00
+date: 2010-06-10 00:00:00 -05:00
 default_executable: 
 dependencies: []