git-up 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/git-up.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-up}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aanand Prasad"]
-  s.date = %q{2010-05-18}
+  s.date = %q{2010-06-16}
   s.default_executable = %q{git-up}
   s.email = %q{aanand.prasad@gmail.com}
   s.executables = ["git-up"]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aanand/git-up}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{git command to fetch and rebase all branches}
   s.test_files = [
     "test/helper.rb",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<colored>, [">= 1.2"])
       s.add_runtime_dependency(%q<grit>, [">= 0"])

data/lib/git-up.rb

@@ -3,12 +3,13 @@ require 'grit'
 
 class GitUp
   def initialize(args)
-    @repo   = Grit::Repo.new(File.expand_path("."))
-    @head   = @repo.head
   end
 
   def run
+    get_repo
+
     system "git fetch"
+    raise GitError, "`git fetch` failed" unless $? == 0
 
     with_stash do
       returning_to_current_branch do
@@ -43,9 +44,18 @@ class GitUp
       end
     end
   rescue GitError => e
-    puts e.message.red
-    puts "Here's what Git said:".red
-    puts e.output
+    puts e.message
+    exit 1
+  end
+
+  def get_repo
+    git_dir = `git rev-parse --git-dir`
+
+    if $? == 0
+      @repo = Grit::Repo.new(File.dirname(git_dir))
+    else
+      raise GitError, "We don't seem to be in a git repository."
+    end
   end
 
   def remote_for_branch(branch)
@@ -120,11 +130,19 @@ class GitUp
   end
 
   class GitError < StandardError
-    attr_reader :output
+    def initialize(message, output=nil)
+      @msg = "#{message.red}"
+
+      if output
+        @msg << "\n"
+        @msg << "Here's what Git said:".red
+        @msg << "\n"
+        @msg << output
+      end
+    end
 
-    def initialize(message, output)
-      super(message)
-      @output = output
+    def message
+      @msg
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-up
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Aanand Prasad
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -04:00
+date: 2010-06-16 00:00:00 -04:00
 default_executable: git-up
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: colored
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -46,9 +51,11 @@ dependencies:
   name: grit
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -85,23 +92,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches