obazoud-git-external 0.4.0 → 0.5.1

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/LICENSE.txt

@@ -0,0 +1,39 @@
+Copyright (c) 2012 Olivier Bazoud
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Copyright (c) 2010 Daniel Cestari
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.markdown

@@ -0,0 +1,75 @@
+# git-external
+
+Intends to provide an alternative to git-submodules but without being
+attach to an specific commit
+
+## Requiments
+
+* ruby 1.8.7
+* gem
+* git
+
+## Dependencies
+
+* gem install rubygems
+
+## Usage
+
+Setup a new git repository:
+<pre class="terminal">
+git init
+</pre>
+
+Help git external:
+<pre class="terminal">
+git external
+</pre>
+
+Setup a new "external" repository:
+<pre class="terminal">
+git external add <repository> <path> <branch>
+</pre>
+
+Initialize external repositories:
+<pre class="terminal">
+git external init
+</pre>
+
+Update existing repositories to the latest version:
+<pre class="terminal">
+git external update
+</pre>
+
+Status of your repository:
+<pre class="terminal">
+git external status
+</pre>
+
+Configuration of your repository:
+<pre class="terminal">
+git external list
+</pre>
+
+Execute a command over "external" repository:
+<pre class="terminal">
+git external cmd 'git status'
+git external cmd 'git pull --rebase'
+git external cmd 'git fetch'
+</pre>
+
+Remove an external repository:
+<pre class="terminal">
+git external rm <path>
+</pre>
+
+## Installation from source
+
+<pre class="terminal">
+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
+</pre>
+
+And voilà!
+

data/bin/git-external

@@ -2,6 +2,8 @@
 # encoding: utf-8
 
 require 'rbconfig'
+require 'rubygems'
+require 'optparse'
 
 module OS
   class << self
@@ -54,15 +56,7 @@ else
 end
 
 $configurations = {}
-
-def usage
-  puts "Usage: git external add <repository-url> <path> [<branch>]"
-  puts "   or: git external status"
-  puts "   or: git external init [--] [<path>...]"
-  puts "   or: git external update [--] [<path>...]"
-  puts "   or: git external cmd '<command>'"
-  puts "   or: git external list"
-end
+$options = {}
 
 # Load .gitexternals
 def load_configuration(file)
@@ -254,6 +248,12 @@ def command_list
   print_configuration
 end
 
+def message(message)
+  if $options[:verbose]
+    puts message
+  end
+end
+
 #########
 def normalize_url(url)
   url
@@ -286,18 +286,147 @@ def escape(s)
 end
 #########
 
-load_configuration $externals_file
+def parse(args)
+  args = {}
+  subtext = "
+  Commands are:
+     add     :  setup a new 'external' repository
+     cmd     :  execute a command over 'external' repository
+     init    :  initialize (aka git clone) external repositories
+     list    :  dump configuration of your repository
+     rm      :  remove an external repository
+     status  :  status of your repository
+     update  :  update (aka git pull) existing repositories to the latest version
+
+  See 'git external COMMAND --help' for more information on a specific command."
+
+  global = OptionParser.new do |opts|
+    opts.banner = "
+      Usage: git external [options] [subcommand [options]]
+      #{subtext}
+    "
+    opts.on("-v", "--[no-]verbose", "Run verbosely") do |verbose|
+      $options[:verbose] = verbose
+    end
+    opts.on("--version", "Show version") do |version|
+      $options[:version] = version
+    end
+    opts.on_tail("-h","--help","help") do
+      puts opts
+      exit
+    end
+  end
+
+  subcommands = { 
+    'add' => OptionParser.new do |opts|
+      opts.banner = "Usage: add repository-url path [branch]"
+      opts.separator ""
+      args['add'] = 2
+    end,
+    'cmd' => OptionParser.new do |opts|
+      opts.banner = "Usage: cmd command"
+      opts.separator ""
+      args['cmd'] = 1
+    end,
+    'init' => OptionParser.new do |opts|
+      opts.banner = "Usage: init"
+      opts.separator ""
+      args['init'] = 0
+    end,
+    'list' => OptionParser.new do |opts|
+      opts.banner = "Usage: list"
+      opts.separator ""
+      args['list'] = 0
+    end,
+    'rm' => OptionParser.new do |opts|
+      opts.banner = "Usage: rm path"
+      opts.separator ""
+      args['rm'] = 1
+    end,
+    'status' => OptionParser.new do |opts|
+      opts.banner = "Usage: status"
+      opts.separator ""
+      args['status'] = 0
+    end,
+    'update' => OptionParser.new do |opts|
+      opts.banner = "Usage: update"
+      opts.separator ""
+      args['update'] = 0
+    end
+  }
+
+  if ARGV.empty?
+    puts global
+    exit -1
+  end
+
+  begin
+    global.order!
+  rescue OptionParser::InvalidOption => e
+    puts e.message
+    puts global
+    exit 1
+  end
+  
+  if $options[:version]
+    gemspecFile = File.expand_path File.join(File.dirname(__FILE__), "..", "obazoud-git-external.gemspec")
+    message "- Reading #{gemspecFile}"
+    spec = Gem::Specification::load(gemspecFile)
+    puts "git external #{spec.version}"
+    message "For more information, please visit #{spec.homepage}"
+    exit 0
+  end
 
-command=ARGV[0]
-
-case command
-when "status" then command_status
-when "add" then command_add ARGV[1], ARGV[2], ARGV[3] || "origin/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
-else usage
+  command = ARGV.shift
+  
+  if command.nil?
+    puts global
+    puts subtext
+    exit 1
+  end
+
+  if subcommands[command].nil?
+    puts "Invalid subcommand"
+    puts global
+    exit 1
+  end
+
+  begin
+    subcommands[command].order!
+  rescue OptionParser::InvalidOption => e
+    puts e.message
+    puts global
+    exit 1
+  end
+
+  if ($options[:verbose])
+    puts "Command: #{command} "
+    p $options
+    puts "ARGV:"
+    p ARGV
+    subcommands.inspect
+  end
+
+  if ARGV.length < args[command]
+    puts "Wrong argument, expected #{args[command]} but was #{ARGV.length}"
+    puts subcommands[command]
+  else
+    begin
+      if ARGV.empty?
+        send "command_#{command}"
+      else
+        send "command_#{command}", *ARGV
+      end
+    rescue ArgumentError => e
+      puts e.message
+      puts global
+      exit 1
+  end
+  end
 end
 
+#########
+
+load_configuration $externals_file
+
+parse(ARGV)

data/obazoud-git-external.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = 'obazoud-git-external'
+  s.version = '0.5.1'
+  s.platform = Gem::Platform::RUBY
+  s.authors = ['Daniel Cestari', 'Olivier Bazoud', 'Alastair Harrison']
+  s.email = ["olivier.bazoud@gmail.com"]
+  s.homepage = "http://github.com/obazoud/git-external"
+  s.summary = "Git version of an svn:external, an alternative to Git Submodule"
+  s.description = "Extension for git which adds a command providing similar functionality to git submodules but without attaching each module to a single version"
+
+  s.files = `git ls-files`.split("\n")
+  s.executables = `git ls-files`.split("\n").map{|f| f[/^bin\/(.*)/, 1]}.compact
+
+  s.required_ruby_version = '~> 1.8.7'
+
+end
+

data/unittest.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+set -e
+set -x
+
+rm -rf .git .git* projects
+
+git init
+
+git external
+
+git external list
+
+git external add git://github.com/obazoud/statusdashboard.git projects/statusdashboard origin/master
+cat .gitignore
+cat .gitexternals
+git external add git://github.com/obazoud/statusdashboard-client.git projects/statusdashboard-client origin/master
+cat .gitignore
+cat .gitexternals
+git external add git://github.com/obazoud/statusdashboard-chrome.git projects/statusdashboard-chrome origin/master
+cat .gitignore
+cat .gitexternals
+
+git external list
+
+git external init
+git external update
+git external status
+
+git external cmd 'git fetch'
+
+git external rm projects/statusdashboard
+cat .gitignore
+cat .gitexternals
+git external rm projects/statusdashboard-client
+cat .gitignore
+cat .gitexternals
+git external rm projects/statusdashboard-chrome
+cat .gitignore
+cat .gitexternals
+
+git external list
+
+#rm -rf .git .git*

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obazoud-git-external
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 9
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 0
-  version: 0.4.0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Daniel Cestari
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 Z
+date: 2012-11-13 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
@@ -30,7 +30,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- LICENSE.txt
+- README.markdown
 - bin/git-external
+- obazoud-git-external.gemspec
+- unittest.sh
 homepage: http://github.com/obazoud/git-external
 licenses: []