git-external 0.1.1 → 0.2.0

data/bin/git-external

@@ -1,109 +1,18 @@
 #!/usr/bin/env ruby
 
-$root_dir = `git rev-parse --show-toplevel`.chomp
-$externals_file = "#{$root_dir}/.gitexternals"
-$ignore_file = "#{$root_dir}/.gitignore"
-$configurations = {}
+require 'git_external'
 
-def usage
-  puts "Usage: git external add <repository-url> <path>"
-  puts "   or: git external init [--] [<path>...]"
-  puts "   or: git external update [--] [<path>...]"
-end
-
-def load_configuration
-  if File.file? $externals_file
-    lines = `git config -l -f #{$externals_file}`.split(/\n/)
-    $configurations = {}
-    lines.each do |line|
-      if line =~ /^external\.([^\.]+)\.([^=]+)=(.*)$/
-        $configurations[$1.chomp] ||= {}
-        $configurations[$1.chomp][$2.chomp] = $3.chomp
-      end
-    end
-  end
-end
-
-def print_configuration
-  $configurations.each do |name, config|
-    puts name
-    config.each do |key, value|
-      puts "\t#{key}: #{value}"
-    end
-  end
-end
-
-def normalize_url(url)
-  if url =~ /^\./
-    origin_url = `git config --get remote.origin.url`.chomp
-
-    unless origin_url =~ /^\w+:\/\//
-      if origin_url =~ /^([^:\/]+):([^:]+)/
-        origin_url = "ssh://#{$1}/#{$2}"
-      end
-    end
-
-    require 'uri'
-    uri = URI.parse URI.encode origin_url
-    uri.path = File.expand_path(url, uri.path)
-    uri.to_s
-  else
-    url
-  end
-end
-
-def init_external(url, path)
-  require 'ftools'
-  unless File.directory? "#{path}/.git"
-    File.makedirs File.dirname(path)
-    url = normalize_url url
-    system "git clone #{url} #{path}"
-  end
-end
-
-def update_external(url, path)
-  require 'ftools'
-  if File.directory? "#{path}/.git"
-    `cd #{path}; git pull origin master`
-  end
-end
-
-def command_add(url, path)
-  `git config -f #{$externals_file} --add external.#{path}.path #{path}`
-  `git config -f #{$externals_file} --add external.#{path}.url #{url}`
-  `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}`
-  `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
-end
-
-def command_init
-  $configurations.each do |name, config|
-    puts name
-    init_external config["url"], config["path"]
-  end
-end
-
-def command_update
-  $configurations.each do |name, config|
-    update_external config["url"], config["path"]
-  end
-end
-
-load_configuration
+git_external = GitExternal.new
+git_external.load_configuration
 
 command=ARGV[0]
 
 case command
-when "add" then command_add ARGV[1], ARGV[2]
-when "rm" then command_rm ARGV[1]
-when "init" then command_init
-when "update" then command_update
-else usage
+when "add"    then git_external.command_add ARGV[1], ARGV[2], ARGV[3] || "master"
+when "rm"     then git_external.command_rm ARGV[1]
+when "init"   then git_external.command_init
+when "update" then git_external.command_update
+when "cmd"    then git_external.command_cmd ARGV[1]
+else git_external.usage
 end
 

data/lib/git_external.rb

@@ -0,0 +1,116 @@
+require 'fileutils'
+
+class GitExternal
+
+  def initialize
+    @root_dir       = `git rev-parse --show-toplevel`.chomp
+    @externals_file = "#{@root_dir}/.gitexternals"
+    @ignore_file    = "#{@root_dir}/.gitignore"
+    @configurations = {}
+  end
+
+  def usage
+    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>'"
+  end
+
+  def load_configuration
+    if File.file? @externals_file
+      lines = `git config -l -f #{@externals_file}`.split(/\n/)
+      @configurations = parse_configuration lines
+    end
+  end
+
+  def parse_configuration(lines)
+    config = {}
+    lines.each do |line|
+      if line =~ /^external\.([^\.]+)\.([^=]+)=(.*)$/
+        config[$1.chomp] ||= {}
+        config[$1.chomp][$2.chomp] = $3.chomp
+      end
+    end
+
+    config
+  end
+
+  def print_configuration
+    @configurations.each do |name, config|
+      puts name
+      config.each do |key, value|
+        puts "\t#{key}: #{value}"
+      end
+    end
+  end
+
+  def normalize_url(url)
+    if url =~ /^\./
+      origin_url = `git config --get remote.origin.url`.chomp
+
+      unless origin_url =~ /^\w+:\/\//
+        if origin_url =~ /^([^:\/]+):([^:]+)/
+          origin_url = "ssh://#{$1}/#{$2}"
+        end
+      end
+
+      require 'uri'
+      uri = URI.parse URI.encode origin_url
+      uri.path = File.expand_path(url, uri.path)
+      uri.to_s
+    else
+      url
+    end
+  end
+
+  def init_external(url, path, branch='master')
+    unless File.directory? "#{path}/.git"
+      FileUtils.makedirs File.dirname(path)
+      url = normalize_url url
+      system "git clone #{url} #{path}"
+      system "cd #{path}; git checkout --track -b #{branch} origin/#{branch}" unless branch == 'master'
+    end
+  end
+
+  def update_external(url, path, branch='master')
+    if File.directory? "#{path}/.git"
+     `cd #{path}; git pull origin #{branch}`
+    end
+  end
+
+  def command_add(url, path, branch='master')
+    `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} --unset external.#{path}.branch`
+    `git config -f #{@externals_file} --remove-section external.#{path}`
+    `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
+  end
+
+  def command_init
+    @configurations.each do |name, config|
+      puts name
+      init_external config["url"], config["path"], config["branch"]
+    end
+  end
+
+  def command_update
+    @configurations.each do |name, config|
+      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
+end

metadata

@@ -1,68 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-external
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Daniel Cestari
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-27 00:00:00 -04:30
-default_executable: 
+date: 2012-10-28 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
-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:
 - dcestari@gmail.com
-executables: 
+executables:
 - git-external
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/git_external.rb
 - bin/git-external
-has_rdoc: true
 homepage: http://github.com/dcestari/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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Git version of an svn:external, an alternative to Git Submodule
 test_files: []
-
+has_rdoc: