aharrison24-git-external 0.1.1 → 0.1.2

data/bin/git-external

@@ -6,9 +6,10 @@ $ignore_file = "#{$root_dir}/.gitignore"
 $configurations = {}
 
 def usage
-  puts "Usage: git external add <repository-url> <path>"
+  puts "Usage: git external add <repository-url> <path> [<branch>]"
   puts "   or: git external init [--] [<path>...]"
   puts "   or: git external update [--] [<path>...]"
+  puts "   or: git external cmd '<command>'"
   puts "   or: git external list"
 end
 
@@ -38,8 +39,10 @@ def normalize_url(url)
   if url =~ /^\./
     origin_url = `git config --get remote.origin.url`.chomp
 
+    # If url has no protocol...
     unless origin_url =~ /^\w+:\/\//
       if origin_url =~ /^([^:\/]+):([^:]+)/
+        # ... then assume it's ssh
         origin_url = "ssh://#{$1}/#{$2}"
       end
     end
@@ -53,48 +56,96 @@ def normalize_url(url)
   end
 end
 
-def init_external(url, path)
+# Check if a branch exists
+def branch_exists(path, branch)
+    branches = `cd #{path}; git branch`
+    regex = Regexp.new('[\\n\\s\\*]+' + Regexp.escape(branch.to_s) + '\\n')
+    result = ((branches =~ regex) ? true : false)
+    return result
+end
+
+def init_external(url, path, branch='master')
   require 'fileutils'
-  unless File.directory? "#{path}/.git"
+  if File.directory? "#{path}/.git"
+    puts "- Repository already exists"
+  else
     FileUtils.makedirs File.dirname(path)
     url = normalize_url url
     system "git clone #{url} #{path}"
+
+    # 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}"
+    end
+
+    # Check out the local branch
+    puts "- Checkout local branch: #{branch}"
+    system "cd #{path}; git checkout #{branch}"
   end
 end
 
-def update_external(url, path)
+def update_external(url, path, branch='master')
   require 'fileutils'
   if File.directory? "#{path}/.git"
-    `cd #{path}; git pull origin master`
+   `cd #{path}; git pull origin #{branch}`
+  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"
   end
 end
 
-def command_add(url, path)
+def command_add(url, path, branch='master')
+  command_rm(path)
   `git config -f #{$externals_file} --add external.#{path}.path #{path}`
   `git config -f #{$externals_file} --add external.#{path}.url #{url}`
+  `git config -f #{$externals_file} --add external.#{path}.branch #{branch}`
   `echo "#{path}" >> #{$ignore_file}`
 end
 
 def command_rm(path)
-  `git config -f #{$externals_file} --unset external.#{path}.path`
-  `git config -f #{$externals_file} --unset external.#{path}.url`
-  `git config -f #{$externals_file} --remove-section external.#{path}`
+  if File.file? $externals_file
+    `git config -f #{$externals_file} --unset external.#{path}.path`
+    `git config -f #{$externals_file} --unset external.#{path}.url`
+    `git config -f #{$externals_file} --unset external.#{path}.branch`
+    `git config -f #{$externals_file} --remove-section external.#{path} > /dev/null 2>&1`
+    File.delete $externals_file if `wc -l #{$externals_file}`.chomp.to_i == 0
+  end
+  if File.file? $ignore_file
+    # Remove entry from .gitignore file
+    `perl -pi -e 's/\\Q#{path.gsub(/\//, '\/')}\\E\n//g' #{$ignore_file}`
+  end
+end
 
-  # Remove entry from .gitignore file
-  `perl -pi -e 's/\\Q#{path.gsub(/\//, '\/')}\\E\n//g' #{$ignore_file}`
-  File.delete $externals_file if `wc -l #{$externals_file}`.chomp.to_i == 0
+def command_list_default_heads
+  $configurations.each do |name, config|
+    puts "#{name}: #{get_default_head(config["path"])}"
+  end  
 end
 
 def command_init
   $configurations.each do |name, config|
     puts name
-    init_external config["url"], config["path"]
+    init_external config["url"], config["path"], config["branch"]
   end
 end
 
 def command_update
   $configurations.each do |name, config|
-    update_external config["url"], config["path"]
+    update_external config["url"], config["path"], config["branch"]
+  end
+end
+
+def command_cmd(cmd)
+  $configurations.each do |name, config|
+    path = config['path']
+    system("echo #{path}; cd #{path}; #{cmd}")
   end
 end
 
@@ -107,11 +158,13 @@ load_configuration
 command=ARGV[0]
 
 case command
-when "add" then command_add ARGV[1], ARGV[2]
+when "add" then command_add ARGV[1], ARGV[2], ARGV[3] || "master"
 when "rm" then command_rm ARGV[1]
 when "init" then command_init
 when "update" then command_update
+when "cmd" then command_cmd ARGV[1]
 when "list" then command_list
+when "heads" then command_list_default_heads
 else usage
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aharrison24-git-external
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
-- Daniel Cestari
+- Daniel Cestari, Alastair Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-06-08 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