Package up the tools for public usage

Author: Evan Phoenix

History.txt

@@ -0,0 +1,6 @@
+=== 1.0.0 / 2011-03-22
+
+* 1 major enhancement
+
+  * Birthday!
+

INSTALL

@@ -0,0 +1,10 @@
+.autotest
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/gx-publish
+bin/gx-update
+lib/gx.rb
+lib/gx/enhance.rb
+test/test_gx.rb

Manifest.txt

@@ -0,0 +1,66 @@
+= gx
+
+* http://github.com/evanphx/gx
+
+== DESCRIPTION:
+
+Gx is 2 git related tools: gx-update and gx-publish.
+
+gx-update is a replacement for 'git pull' that includes an integrated
+conflict resolver.
+
+== FEATURES/PROBLEMS:
+
+* Birthday!
+
+== SYNOPSIS:
+
+  gx-update
+
+== REQUIREMENTS:
+
+* git
+* grit
+* ruby
+
+== INSTALL:
+
+* Edit your ~/.gitconfig and add:
+    update = !gx-update
+
+  to your [alias] section.
+
+
+== DEVELOPERS:
+
+After checking out the source, run:
+
+  $ rake newb
+
+This task will install any missing dependencies, run the tests/specs,
+and generate the RDoc.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2011 FIX
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.txt

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+
+# Hoe.plugin :compiler
+# Hoe.plugin :gem_prelude_sucks
+# Hoe.plugin :inline
+# Hoe.plugin :inline
+# Hoe.plugin :racc
+# Hoe.plugin :rubyforge
+
+Hoe.spec "gx" do
+  # HEY! If you fill these out in ~/.hoe_template/Rakefile.erb then
+  # you'll never have to touch them again!
+  # (delete this comment too, of course)
+
+  developer "Evan Phoenix", "[email protected]"
+
+  # self.rubyforge_name = 'gxx' # if different than 'gx'
+end
+
+# vim: syntax=ruby

Rakefile

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
-$:.unshift Pathname.new(__FILE__).realpath.dirname.to_s
 
-require 'enhance'
+require 'gx/enhance'
 require 'optparse'
 require 'ostruct'
 require 'fileutils'
@@ -35,6 +34,9 @@
 
 repo = Grit::Repo.current
 
+# Boost the timeout
+Grit::Git.git_timeout = 120
+
 current = repo.resolve_rev "HEAD"
 branch = repo.git.symbolic_ref({:q => true}, "HEAD").strip
 
@@ -81,7 +83,7 @@
 
 print "Publishing local commits to #{url}... "
 
-out = repo.git.push({:v => true}, push_repo, push_branch)
+out = repo.git.push({:v => true}, push_repo, "#{branch_name}:#{push_branch}")
 if $?.exitstatus != 0
   puts "error!"
   puts "Sorry, I'm not sure what happened. Here is what git said:"

git-publish.rb bin/gx-publishgit-publish.rb renamed to bin/gx-publish

@@ -4,9 +4,7 @@
 # * Handle a conflict in a remote commit that is in a renamed file.
 
 require 'pathname'
-$:.unshift Pathname.new(__FILE__).realpath.dirname.to_s
-
-require 'enhance'
+require 'gx/enhance'
 require 'optparse'
 require 'ostruct'
 require 'fileutils'
@@ -36,6 +34,9 @@
 
 STDOUT.sync = true
 
+# Boost the timeout
+Grit::Git.git_timeout = 240
+
 class Update
     HELP = <<-TXT
 You're currently inside the conflict resolver. The following commands

git-update.rb bin/gx-updategit-update.rb renamed to bin/gx-update

@@ -0,0 +1,3 @@
+class Gx
+  VERSION = '1.0.0'
+end