obazoud-git-external 0.5.1 → 0.6.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 obazoud-git-external-0.5.1.gem
+gem build obazoud-git-external.gemspec && gem install --local obazoud-git-external-0.6.0.gem
 </pre>
 
 And voilà!

data/bin/git-external

@@ -86,6 +86,12 @@ def uncommitted_changes?(path)
   return ((diffExit == 1) ? true : false)
 end
 
+# Check for untracked files
+def untracked_files?(path)
+  untrackedExit, untracked = execute('git ls-files', ['--others', '--exclude-standard'], path)
+  return ((untrackedExit == 1 || untracked.length > 0) ? true : false)
+end
+
 # Check if a branch exists
 def branch_exists(path, branch)
     branchesExit, branches = execute('git branch', [], path)
@@ -167,6 +173,12 @@ def command_status
       changesString = ""
     end
 
+    if untracked_files?(path)
+      untrackedString = "(Untracked Files) "
+    else
+      untrackedString = ""
+    end
+
     remoteBranch = remote + "/" + gitBranch
     
     if gitBranchExit != 0 && gitBranchExit != 1 && gitRemoteExit != 0 && gitRemoteExit != 1
@@ -175,14 +187,14 @@ def command_status
     else
       if branch == remoteBranch
         if url == gitRemote
-          puts "  ✓ #{path} #{changesString}"
+          puts "  ✓ #{path} #{changesString} #{untrackedString}"
           ok += 1
         else
-          puts "  ✗ #{path} #{changesString} -- expected url '#{url}' but was '#{gitRemote}'"
+          puts "  ✗ #{path} #{changesString} #{untrackedString} -- expected url '#{url}' but was '#{gitRemote}'"
           broken +=1
         end
       else
-        puts " ✗ #{path} #{changesString} -- expected branch '#{branch}' but was '#{remoteBranch}'"
+        puts " ✗ #{path} #{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.5.1'
+  s.version = '0.6.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Daniel Cestari', 'Olivier Bazoud', 'Alastair Harrison']
   s.email = ["olivier.bazoud@gmail.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obazoud-git-external
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Daniel Cestari
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-13 00:00:00 Z
+date: 2012-11-16 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