obazoud-git-external 0.7.0 → 0.8.0

data/README.markdown

@@ -68,7 +68,7 @@ git external rm <path>
 git clone git://github.com/obazoud/git-external.git
 cd git-external
 git checkout develop
-gem build obazoud-git-external.gemspec && gem install --local obazoud-git-external-0.7.0.gem
+gem build obazoud-git-external.gemspec && gem install --local obazoud-git-external-0.8.0.gem
 </pre>
 
 And voilà!

data/bin/git-external

@@ -92,6 +92,21 @@ def untracked_files?(path)
   return ((untrackedExit == 1 || untracked.length > 0) ? true : false)
 end
 
+# find how many commits we are ahead/behind our upstream
+def ahead_behind_upstream(path)
+  upstreamExit, upstream = execute('git rev-list', ['--count', '--left-right', '@{upstream}...HEAD'], path, '2> /dev/null')
+  return "" if upstreamExit != 0
+  behind, ahead = upstream.match(/^(\d*)\t(\d*)$/).captures
+  my_str = ""
+  if Integer(behind) > 0 && Integer(ahead) > 0
+    my_str << "(u"
+    my_str << "+#{ahead}" if Integer(ahead) > 0
+    my_str << "-#{behind}" if Integer(behind) > 0
+    my_str << ")"
+  end
+  my_str
+end
+
 # Check if a branch exists
 def branch_exists(path, branch)
     branchesExit, branches = execute('git branch', [], path)
@@ -179,6 +194,8 @@ def command_status
       untrackedString = ""
     end
 
+    upstream = ahead_behind_upstream(path)
+
     remoteBranch = remote + "/" + gitBranch
     
     if gitBranchExit != 0 && gitBranchExit != 1 && gitRemoteExit != 0 && gitRemoteExit != 1
@@ -187,14 +204,14 @@ def command_status
     else
       if branch == remoteBranch
         if url == gitRemote
-          puts "  ✓ #{path} #{changesString} #{untrackedString}"
+          puts "  ✓ #{path} #{upstream} #{changesString} #{untrackedString}"
           ok += 1
         else
-          puts "  ✗ #{path} #{changesString} #{untrackedString} -- expected url '#{url}' but was '#{gitRemote}'"
+          puts "  ✗ #{path} #{upstream} #{changesString} #{untrackedString} -- expected url '#{url}' but was '#{gitRemote}'"
           broken +=1
         end
       else
-        puts " ✗ #{path} #{changesString} #{untrackedString} -- expected branch '#{branch}' but was '#{remoteBranch}'"
+        puts " ✗ #{path} #{upstream} #{changesString} #{untrackedString} -- expected branch '#{branch}' but was '#{remoteBranch}'"
         broken +=1
       end
     end

data/obazoud-git-external.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = 'obazoud-git-external'
-  s.version = '0.7.0'
+  s.version = '0.8.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Daniel Cestari', 'Olivier Bazoud', 'Alastair Harrison']
   s.email = ["olivier.bazoud@gmail.com"]

metadata

@@ -1,27 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: obazoud-git-external
-version: !ruby/object:Gem::Version
-  version: 0.7.0
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Daniel Cestari
 - Olivier Bazoud
 - Alastair Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+
+date: 2012-11-23 00:00:00 Z
 dependencies: []
-description: Extension for git which adds a command providing similar functionality
-  to git submodules but without attaching each module to a single version
-email:
+
+description: Extension for git which adds a command providing similar functionality to git submodules but without attaching each module to a single version
+email: 
 - olivier.bazoud@gmail.com
-executables:
+executables: 
 - git-external
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - LICENSE.txt
 - README.markdown
@@ -30,26 +38,36 @@ files:
 - unittest.sh
 homepage: http://github.com/obazoud/git-external
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Git version of an svn:external, an alternative to Git Submodule
 test_files: []
+