aharrison24-git-external 0.1.7 → 0.1.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ad49e8845d92de9d47be9d74d95f5ff9d37b492
+  data.tar.gz: 6ae2f7a8d640d61994029016e7348cfe37c8f054
+SHA512:
+  metadata.gz: cab8233555c89431b4d4f2ca37c3bf65976db34e039ec2270ab6d15f719079f9f95930bf41878e80f682732094f92c842a76bf338f0b5474b3c64d965dc9bac4
+  data.tar.gz: 961c736c0c8c7bb4aba7b5a9f43e0a7d6f2577f9729508a971a874a67829b09de17c4e3b8423539e29a8e4c5aa4e6b6ed53e069e556a066e00e0978d987890bd

data/bin/git-external

@@ -10,8 +10,9 @@ def usage
   puts "Usage: git external add <repository-url> <path> [<branch>]"
   puts "   or: git external rm <path>"
   puts "   or: git external status"
-  puts "   or: git external init [--] [<path>...]"
-  puts "   or: git external update [--] [<path>...]"
+  puts "   or: git external init"
+  puts "   or: git external init_single <name>"
+  puts "   or: git external update"
   puts "   or: git external cmd '<command>'"
   puts "   or: git external list"
   puts "   or: git external heads"
@@ -32,7 +33,7 @@ end
 
 def print_configuration
   $configurations.each do |name, config|
-    puts name
+    puts "* #{name}"
     config.each do |key, value|
       puts "\t#{key}: #{value}"
     end
@@ -66,6 +67,30 @@ def uncommitted_changes?(path)
     return ((diffExit == 1) ? true : false)
 end
 
+# Check for untracked files
+def untracked_files?(path)
+  untrackedExit, untracked = execute("cd #{path}; git ls-files --others --exclude-standard")
+  return ((untrackedExit == 1 || untracked.length > 0) ? true : false)
+end
+
+# find how many commits we are ahead/behind our upstream
+def ahead_behind_upstream(path, branch)
+  upstreamExit, upstream = execute("cd #{path}; git rev-list --count --left-right origin/#{branch}...#{branch} 2> /dev/null")
+  return "" if upstreamExit != 0
+  behind, ahead = upstream.first.match(/^(\d*)\t(\d*)$/).captures
+  my_str = ""
+  if Integer(behind) > 0 || Integer(ahead) > 0
+    my_str << "("
+    my_str << "Ahead by #{ahead} commit" if Integer(ahead) == 1
+    my_str << "Ahead by #{ahead} commits" if Integer(ahead) > 1
+    my_str << ", " if Integer(ahead) > 0 && Integer(behind) > 0
+    my_str << "Behind by #{behind} commit" if Integer(behind) == 1
+    my_str << "Behind by #{behind} commits" if Integer(behind) > 1
+    my_str << ")"
+  end
+  my_str
+end
+
 # Check if a branch exists
 def branch_exists(path, branch)
     branches = `cd #{path}; git branch`
@@ -74,40 +99,55 @@ def branch_exists(path, branch)
     return result
 end
 
-def init_external(url, path, branch='master')
+# Check that a git repo exists in the given path
+def repo_exists(path)
   require 'fileutils'
-  if File.directory? "#{path}/.git"
-    puts "- Repository already exists"
-  else
-    FileUtils.makedirs File.dirname(path)
-    url = normalize_url url
-    system "git clone #{url} #{path}"
+  return File.directory? "#{path}/.git"
+end
 
+def update_repo(path, branch='master')
     # Create a local tracking branch if it doesn't exist already
     unless branch_exists(path, branch)
       puts "- Creating local tracking branch: #{branch} -> origin/#{branch}"
-      system "cd #{path}; git branch checkout --track #{branch} origin/#{branch}"
+      system "cd #{path}; git branch #{branch} --track origin/#{branch}"
     end
 
     # Check out the local branch
     puts "- Checkout local branch: #{branch}"
-    system "cd #{path}; git checkout #{branch}"
+    system "cd #{path}; git checkout #{branch}; git pull;"
+end
+
+def init_external(url, path, branch='master')
+  require 'fileutils'
+  if repo_exists(path)
+    puts "\t- Repository already exists"
+  else
+    FileUtils.makedirs File.dirname(path)
+    url = normalize_url url
+    system "git clone #{url} #{path}"
+    update_repo(path, branch)
   end
 end
 
 def update_external(url, path, branch='master')
-  require 'fileutils'
-  if File.directory? "#{path}/.git"
-   `cd #{path}; git remote update; git pull origin #{branch}`
+  if repo_exists(path)
+    puts "- Updating #{path}"
+    if uncommitted_changes?(path)
+      puts "#{path} - uncommitted changes detected, can not update repository"
+    else
+      update_repo(path, branch)
+    end
   end
 end
 
 def get_default_head(path)
-  origin_head = `cd #{path}; git symbolic-ref refs/remotes/origin/HEAD`
-  if origin_head =~ /refs\/remotes\/origin\/(.*)/
-    $1
-  else
-    raise "#{path}: Can't determine default HEAD for origin remote"
+  if repo_exists(path)
+    origin_head = `cd #{path}; git symbolic-ref refs/remotes/origin/HEAD`
+    if origin_head =~ /refs\/remotes\/origin\/(.*)/
+      $1
+    else
+      raise "#{path}: Can't determine default HEAD for origin remote"
+    end
   end
 end
 
@@ -123,44 +163,63 @@ end
 def command_status
   ok = 0
   broken = 0
+  uninitialised = 0
+  puts "=================================================="
+  puts "Status:"
+  puts "=================================================="
   $configurations.each do |name, config|
     branch = config["branch"]
     url = config["url"]
     path = config["path"]
 
-    # Figure out the short name of the current branch
-    # This is equivalent to 'git symbolic-ref --short HEAD'
-    # but the --short is only available in pretty recent versions of git
-    headBranch = `cd #{path} && git symbolic-ref HEAD | sed \"s/refs\\/heads\\///g\"`.chomp
-    
-    gitBranchExit, gitBranch = execute("cd #{path} && git config \"branch.#{headBranch}.merge\" | sed \"s/refs\\/heads\\///g\"")
-    gitRemoteExit, gitRemote = execute("cd #{path} && git config \"remote.$(git config \"branch.#{headBranch}.remote\").url\"");
+    if repo_exists(path)
 
-    if uncommitted_changes?(path)
-      changesString = "(Uncommitted Changes) "
-    else
-      changesString = ""
-    end
+      # Figure out the short name of the current branch
+      # This is equivalent to 'git symbolic-ref --short HEAD'
+      # but the --short is only available in pretty recent versions of git
+      headBranch = `cd #{path} && git symbolic-ref HEAD | sed \"s/refs\\/heads\\///g\"`.chomp
+      
+      gitBranchExit, gitBranch = execute("cd #{path} && git config \"branch.#{headBranch}.merge\" | sed \"s/refs\\/heads\\///g\"")
+      gitRemoteExit, gitRemote = execute("cd #{path} && git config \"remote.$(git config \"branch.#{headBranch}.remote\").url\"");
 
-    if gitBranchExit != 0 && gitRemoteExit != 0
-      puts "  ✗ #{path}: exit code #{gitBranchExit}, #{gitRemoteExit}"
-      broken += 1
-    else
-      if branch == gitBranch[0]
-        if url == gitRemote[0]
-          puts "  ✓ #{path} #{changesString}"
-          ok += 1
+      if uncommitted_changes?(path)
+        changesString = "(Uncommitted Changes) "
+      else
+        changesString = ""
+      end
+
+      if untracked_files?(path)
+        untrackedString = "(Untracked Files) "
+      else
+        untrackedString = ""
+      end
+
+      upstream = ahead_behind_upstream(path, branch)
+
+      if gitBranchExit != 0 && gitRemoteExit != 0
+        puts "  ✗ #{path}: exit code #{gitBranchExit}, #{gitRemoteExit}"
+        broken += 1
+      else
+        if branch == gitBranch[0]
+          if url == gitRemote[0]
+            puts "  ✓ #{path} #{upstream} #{changesString} #{untrackedString}"
+            ok += 1
+          else
+            puts "  ✗ #{path} #{upstream} #{changesString} #{untrackedString} -- expected url '#{url}' but was '#{gitRemote[0]}'"
+            broken +=1
+          end
         else
-          puts "  ✗ #{path} #{changesString}-- expected url '#{url}' but was '#{gitRemote[0]}'"
+          puts "  ✗ #{path} #{changesString} #{untrackedString} -- expected branch '#{branch}' but was '#{gitBranch[0]}'"
           broken +=1
         end
-      else
-        puts "  ✗ #{path} #{changesString}-- expected branch '#{branch}' but was '#{gitBranch[0]}'"
-        broken +=1
       end
+    else
+      puts "  ~ #{path} is not initialised"
+      uninitialised +=1
     end
   end
-  puts "#{broken > 0 ? "✗" : "✓"} » #{ok} ok • #{broken} broken"
+  puts "#{broken > 0 ? "✗" : "✓"} » #{ok} ok • #{broken} broken - #{uninitialised} uninitialised "
+  puts "=================================================="
 end
 
 def command_add(url, path, branch='master')
@@ -187,7 +246,9 @@ end
 
 def command_list_default_heads
   $configurations.each do |name, config|
-    puts "#{name}: #{get_default_head(config["path"])}"
+    if repo_exists(config["path"])
+      puts "#{name}: #{get_default_head(config["path"])}"
+    end
   end  
 end
 
@@ -195,19 +256,36 @@ def command_init
   $configurations.each do |name, config|
     puts name
     init_external config["url"], config["path"], config["branch"]
+    puts "=================================================="
+  end
+end
+
+def command_init_single(external_name)
+  $configurations.each do |name, config|
+    if name == external_name
+      puts name
+      init_external config["url"], config["path"], config["branch"]
+    end
   end
 end
 
 def command_update
   $configurations.each do |name, config|
-    update_external config["url"], config["path"], config["branch"]
+    if repo_exists(config["path"])
+      puts "=================================================="
+      update_external config["url"], config["path"], config["branch"]
+    end
   end
+  command_status
 end
 
 def command_cmd(cmd)
   $configurations.each do |name, config|
     path = config['path']
-    system("echo #{path}; cd #{path}; #{cmd}")
+    if repo_exists(path)
+      system("echo #{path}; cd #{path}; #{cmd}")
+      puts "=================================================="
+    end
   end
 end
 
@@ -228,6 +306,7 @@ when "update" then command_update
 when "cmd" then command_cmd ARGV[1]
 when "list" then command_list
 when "heads" then command_list_default_heads
+when "init_single" then command_init_single ARGV[1]
 else usage
 end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aharrison24-git-external
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.9
 platform: ruby
 authors:
-- Daniel Cestari, Olivier Bazoud, Alastair Harrison
+- Daniel Cestari, Olivier Bazoud, Alastair Harrison, Stephen Kyberd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 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
@@ -20,30 +19,28 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  YmluL2dpdC1leHRlcm5hbA==
+- bin/git-external
 homepage: http://github.com/aharrison24/git-external
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Git version of an svn:external, an alternative to Git Submodule
 test_files: []