gx 1.0.1 → 1.1.0

data/History.txt

@@ -1,3 +1,17 @@
+=== 1.1.0 / 2001-04-02
+
+* 1 mega enhancement
+
+  * Spinner to indicate fetchitude status
+
+* 1 sharktopus enhancement
+
+  * -c to use 'hub compare' rather than the normal diffstat
+
+* 1 bodacious enhancement
+
+ * defunkt now a regular contributor
+
 === 1.0.0 / 2011-03-22
 
 * 1 major enhancement

data/Manifest.txt

@@ -1,4 +1,3 @@
-.autotest
 History.txt
 Manifest.txt
 README.txt
@@ -7,4 +6,3 @@ bin/gx-publish
 bin/gx-update
 lib/gx.rb
 lib/gx/enhance.rb
-test/test_gx.rb

data/bin/gx-update

@@ -21,6 +21,10 @@ op = OptionParser.new do |o|
     opts.verbose = true
   end
 
+  o.on "-c", "--compare", "Use hub's compare instead of diffstats" do
+    opts.compare = true
+  end
+
   o.on "--debug", "Show all git commands run" do
     Grit.debug = true
   end
@@ -87,12 +91,31 @@ co[N]flict   Set the contents of the file to contain the merged between the
 
   def fetch
     print "Fetching new commits: "
-    out = @repo.git.fetch :timeout => false
+    out = nil
+    spinner do
+      out = @repo.git.fetch :timeout => false
+    end
     puts "done."
 
     # TODO parse +out+ for details to show the user.
   end
 
+  # from http://ruby.about.com/od/tasks/f/spinner.htm
+  def spinner(&block)
+    chars = %w{ | / - \\ }
+
+    t = Thread.new(&block)
+    while t.alive?
+      print chars[0]
+      sleep 0.1
+      print "\b"
+
+      chars.push chars.shift
+    end
+
+    t.join
+  end
+
   def includes_conflict_markers?(path)
     /^<<<<<<< HEAD/.match(File.read(path))
   end
@@ -361,7 +384,11 @@ co[N]flict   Set the contents of the file to contain the merged between the
     puts
 
     unless @opts.quiet
-      system "git diff --stat #{@common}..#{@origin}"
+      if @opts.compare
+        system "hub compare #{@common[0,7]}...#{@origin[0,7]}"
+      else
+        system "git diff --stat #{@common}..#{@origin}"
+      end
     end
 
   end

data/lib/gx.rb

@@ -1,3 +1,3 @@
 class Gx
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gx
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -07:00
+date: 2011-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
-- .autotest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -75,8 +74,6 @@ files:
 - bin/gx-update
 - lib/gx.rb
 - lib/gx/enhance.rb
-- test/test_gx.rb
-- .gemtest
 has_rdoc: true
 homepage: http://github.com/evanphx/gx
 licenses: []
@@ -112,5 +109,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "Gx is 2 git related tools: gx-update and gx-publish"
-test_files: 
-- test/test_gx.rb
+test_files: []
+

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/test/test_gx.rb

@@ -1,8 +0,0 @@
-require "test/unit"
-require "gx"
-
-class TestGx < Test::Unit::TestCase
-  def test_sanity
-    flunk "write tests or I will kneecap you"
-  end
-end