obazoud-git-external 0.1.5 → 0.2.0

data/bin/git-external

@@ -56,6 +56,12 @@ def normalize_url(url)
   end
 end
 
+# Check for uncommitted changes
+def uncommitted_changes?(path)
+    diffExit, diff = execute("cd #{path}; git diff-index --quiet HEAD")
+    return ((diffExit == 1) ? true : false)
+end
+
 # Check if a branch exists
 def branch_exists(path, branch)
     branches = `cd #{path}; git branch`
@@ -87,8 +93,13 @@ end
 
 def update_external(url, path, branch='master')
   require 'fileutils'
+  puts "- Updating #{path}"
   if File.directory? "#{path}/.git"
-   `cd #{path}; git pull origin #{branch}`
+    if uncommitted_changes?(path)
+      puts "#{path} - uncommitted changes detected, can not update repository"
+    else
+     `cd #{path}; git pull origin #{branch}`
+    end
   end
 end
 
@@ -112,20 +123,26 @@ def command_status
     gitBranchExit, gitBranch = execute("cd #{path} && git config \"branch.$(git symbolic-ref HEAD --short).merge\" | sed \"s/refs\\/heads\\///g\"")
     gitRemoteExit, gitRemote = execute("cd #{path} && git config \"remote.$(git config \"branch.$(git symbolic-ref HEAD --short).remote\").url\"");
 
+    if uncommitted_changes?(path)
+      changesString = "(Uncommitted Changes) "
+    else
+      changesString = ""
+    end
+
     if gitBranchExit != 0 && gitRemoteExit != 0
       puts "  ✗ #{path}: exit code #{gitBranchExit}, #{gitRemoteExit}"
       broken += 1
     else
       if branch == gitBranch[0]
         if url == gitRemote[0]
-          puts "  ✓ #{path}"
+          puts "  ✓ #{path} #{changesString}"
           ok += 1
         else
-          puts "  ✗ #{path} -- expected url '#{url}' but was '#{gitRemote[0]}'"
+          puts "  ✗ #{path} #{changesString} -- expected url '#{url}' but was '#{gitRemote[0]}'"
           broken +=1
         end
       else
-        puts "  ✗ #{path} -- expected branch '#{branch}' but was '#{gitBranch[0]}'"
+        puts "  ✗ #{path} #{changesString} -- expected branch '#{branch}' but was '#{gitBranch[0]}'"
         broken +=1
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obazoud-git-external
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Cestari