gx 1.3.1 → 1.3.2

data/README.txt

@@ -4,14 +4,17 @@
 
 == DESCRIPTION:
 
-Gx is 2 git related tools: gx-update and gx-publish.
+Gx is 3 git related tools: gx-update, gx-publish, and gx-pull-check
 
 gx-update is a replacement for 'git pull' that includes an integrated
 conflict resolver.
 
+gx-pull-check integrates with github to provide the ability to test a
+pull requests against your tests.
+
 == FEATURES/PROBLEMS:
 
-* Birthday!
+* git fu for you.
 
 == SYNOPSIS:
 

data/bin/gx-pull-check

@@ -16,26 +16,6 @@ current_branch = head.name
 url = ARGV.shift
 cmd = ARGV.shift || "rake"
 
-if current_branch == "gx-pull-check" and url == "done"
-  puts "Cleaning up pull-check..."
-  current_branch = File.read(".git/pull-check-origin").strip
-
-  repo.git.checkout({}, current_branch)
-  repo.git.branch({:D => true}, "gx-pull-check")
-
-  File.unlink ".git/pull-check-origin"
-
-  exit 0
-elsif current_branch == "gx-pull-check"
-  puts "Currently handling a pull check already, please finish it first."
-  exit 1
-end
-
-unless url
-  puts "Usage: gx-pull-check URL [command to test]"
-  exit 1
-end
-
 puts "Performing pull check on '#{url}'"
 
 url += ".patch"
@@ -50,10 +30,6 @@ if $?.exitstatus != 0
   exit 1
 end
 
-File.open ".git/pull-check-origin", "w" do |f|
-  f.puts current_branch
-end
-
 puts "Step 2: Apply the pull request..."
 repo.git.branch({}, "gx-pull-check")
 repo.git.checkout({}, "gx-pull-check")
@@ -82,6 +58,4 @@ puts "Everything ran fine, feel free to merge the pull request!"
 repo.git.checkout({}, current_branch)
 repo.git.branch({:D => true}, "gx-pull-check")
 
-File.unlink ".git/pull-check-origin"
-
 File.unlink patch

data/lib/gx.rb

@@ -1,3 +1,3 @@
 class Gx
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gx
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -33,25 +33,43 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 16
+        version: "2.16"
+  type: :development
+  version_requirements: *id003
 description: |-
-  Gx is 2 git related tools: gx-update and gx-publish.
+  Gx is 3 git related tools: gx-update, gx-publish, and gx-pull-check
   
   gx-update is a replacement for 'git pull' that includes an integrated
   conflict resolver.
+  
+  gx-pull-check integrates with github to provide the ability to test a
+  pull requests against your tests.
 email: 
 - evan@fallingsnow.net
 executables: 
@@ -104,9 +122,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gx
-rubygems_version: 1.8.15
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
-summary: "Gx is 2 git related tools: gx-update and gx-publish"
+summary: "Gx is 3 git related tools: gx-update, gx-publish, and gx-pull-check  gx-update is a replacement for 'git pull' that includes an integrated conflict resolver"
 test_files: []