francois-gip 0.1.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 François Beausoleil
+
+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.rdoc

@@ -0,0 +1,22 @@
+= Gip into place: Piston without the SVN cruft
+
+This is an implementation of Tom Dysinger's http://dysinger.net/2008/04/29/replacing-braid-or-piston-for-git-with-40-lines-of-rake/ as a full command-line client.  I'm standing on the shoulders of giants...
+
+Gip is a thin layer above git-read-tree.  If you want more information, you can look at http://assets.en.oreilly.com/1/event/24/Smacking%20Git%20Around%20-%20Advanced%20Git%20Tricks%20Presentation.pdf, pages 254-297.
+
+== Fair Warning
+
+Since Gip copies the upstream repositories directly in your repository, please be advised that your repository will *grow* quickly.  For each remote you add, you will receive all commits from that repository.  That also means the full history for that project.  And when I mean all, I do mean it.  If you vendor Rails, you are forewarned:  you will add nearly 20 MiB to your own repository.  This is a trade-off between Piston (which only imports the latest HEAD) and having subtrees available for easily propagating changes upstream.
+
+== Usage
+
+  $ gip import git://github.com/mislav/will_paginate.git vendor/plugins/mislav-will_paginate
+	$ gip update vendor/plugins/mislav-will_paginate
+
+Gip stores it's metadata in a .gipinfo file.
+
+Gip automatically commits whenever possible: after import, after update.  If after an update a conflict occurs, the commit will be aborted and you are given the chance to resolve the conflicts.  You have the full power of Git at your disposal.
+
+== Copyright
+
+Copyright (c) 2009 François Beausoleil. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "gip"
+    gem.summary = %Q{Gip into place: Piston without the SVN cruft}
+    gem.email = "francois@teksol.info"
+    gem.homepage = "http://github.com/francois/gip"
+    gem.authors = ["François Beausoleil"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+rescue LoadError
+  task :features do
+    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  end
+end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "gip #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/bin/gip

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require "gip"
+Gip.start

data/features/import.feature

@@ -0,0 +1,12 @@
+Feature: Importing a repository
+  In order to have control over his deployments
+  A developer will import a remote repository
+  So that his vendor code is protected from inadvertent upstream changes
+
+  Scenario: Importing into an existing repository
+    Given a project
+    And a vendor project named 'libcalc'
+    When I run 'gip import __libcalc__ vendor/libcalc'
+    Then I should see "Imported __libcalc__ into vendor/libcalc"
+    And the file '.gipinfo' should contain 'vendor/libcalc,__libcalc__'
+    And the working copy should be clean

data/features/step_definitions/gip_steps.rb

@@ -0,0 +1,12 @@
+Given /^a project$/ do
+  @project_dir = Pathname.new(Dir.tmpdir) + "gip/#{Process.pid}/project-dir"
+  FileUtils::Verbose.rm_rf(@project_dir)
+  @project_dir.mkpath
+  Dir.chdir(@project_dir) do
+    sh "touch README", :verbose => true
+    sh "git init", :verbose => true
+    sh "git add --all", :verbose => true
+    sh "git commit --message 'Initial commit'", :verbose => true
+    sh "ls -A", :verbose => true
+  end
+end

data/features/support/command_line.rb

@@ -0,0 +1,11 @@
+def sh(command_line, options={})
+  verbose = $DEBUG || options[:verbose]
+  puts "CWD:#{Dir.pwd}"      if verbose
+  p command_line             if verbose
+  result = `#{command_line}`
+  p $?                       if verbose
+  puts "===="                if verbose
+  puts result                if verbose
+  puts "===="                if verbose
+  result
+end

data/features/support/env.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require "gip"
+require "pathname"
+require "fileutils"
+
+require "test/unit/assertions"
+
+World(Test::Unit::Assertions)

data/gip.gemspec

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{gip}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Fran\303\247ois Beausoleil"]
+  s.date = %q{2009-06-26}
+  s.default_executable = %q{gip}
+  s.email = %q{francois@teksol.info}
+  s.executables = ["gip"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/gip",
+     "features/import.feature",
+     "features/step_definitions/gip_steps.rb",
+     "features/support/command_line.rb",
+     "features/support/env.rb",
+     "gip.gemspec",
+     "lib/gip.rb",
+     "test/gip_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/francois/gip}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{Gip into place: Piston without the SVN cruft}
+  s.test_files = [
+    "test/gip_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/gip.rb

@@ -0,0 +1,186 @@
+require "thor"
+require "uri"
+require "csv"
+
+class Gip < Thor
+  map %w(--version -v) => :version, %w(--help -h) => :help
+
+  def version
+    print "Gip v"
+    puts File.read(File.dirname(__FILE__) + "/../VERSION")
+  end
+
+  desc  "import REPOSITORY_URL [path]", <<DESC
+Imports the repository at path in the current tree.
+
+If path is absent, the repository's base name will be used.
+--remote specifies the name of the remote. If unspecified, the repository's base name will be used.
+--commit specifies which commit to import.  If unspecified, 'REMOTE/master' will be used.  You can use any <tree-ish> that Git will recognize (SHA-1, branch name, tag name).  The remote's name will always be prefixed to this value.
+
+In all cases, a .gipinfo file will be created/updated with the correct remotes specified.  The .gipinfo file is a CSV file with 2 columns: remote name,repository URL.
+DESC
+  method_options :commit => :optional, :remote => :optional, :verbose => 0
+  def import(repository_url, path=nil)
+    uri  = URI.parse(repository_url)
+    path = File.basename(uri.path).sub(File.extname(uri.path), "") unless path
+    name = options[:remote]
+    name = File.basename(uri.path).sub(File.extname(uri.path), "") unless name
+
+    remote = Remote.new(name, repository_url, path)
+    commit = extract_commit(remote)
+    puts "Importing #{remote.url} into #{remote.path} at #{commit}"
+
+    create_remote remote.name, remote.url
+    git :fetch, remote.name
+    git :"read-tree", "--prefix=#{remote.path}/", "-u", commit
+    gipinfo(remote)
+    git :add, ".gipinfo"
+    git :commit, "-m", "Vendored #{repository_url} at #{commit}", :verbose => true
+  end
+
+  desc "Creates or updates remotes in this repository", <<DESC
+Given the remotes described in a .gipinfo, creates or updates Git remotes in this repository.
+DESC
+  method_options :verbose => 0
+  def remotify
+    read_gipinfo.each do |remote|
+      create_remote(remote.name, remote.url)
+      git :fetch, remote.name
+    end
+  end
+
+  desc "Freshens the tree at PATH", <<DESC
+Given a previously imported tree at PATH, updates it to the latest HEAD, or whatever --commit specifies.
+
+--commit defaults to 'master', and will always be prefixed with the remote's name.
+DESC
+  method_options :verbose => 0, :commit => :optional
+  def update(path=nil)
+    read_gipinfo.each do |remote|
+      next unless remote.path == path
+      commit = extract_commit(remote)
+      puts "Freshening #{remote.path} from #{remote.url} to #{commit}"
+
+      create_remote remote.name, remote.url
+      git :fetch, remote.name
+      git :merge, "-s", :subtree, "#{remote.name}/#{commit}", :verbose => true
+    end
+  end
+
+  private
+  def extract_commit(remote)
+    commit = options[:commit]
+    commit = "master" unless commit
+    commit = "#{remote.name}/#{commit}"
+  end
+
+  def create_remote(remote_name, repository_url)
+    git :remote, :add, remote_name, repository_url
+  rescue CommandError => e
+    # 128 means remote already exists
+    raise unless e.exitstatus == 128
+  end
+
+  def gipinfo(remote)
+    info = read_gipinfo
+    info << remote
+    write_gipinfo(info)
+  end
+
+  def read_gipinfo
+    if File.file?(".gipinfo")
+      CSV.read(".gipinfo").inject(Array.new) do |memo, (name, url, path)|
+        next memo if name =~ /^\s*#/
+        memo << Remote.new(name, url, path)
+      end
+    else
+      Array.new
+    end
+  end
+
+  def write_gipinfo(remotes)
+    CSV.open(".gipinfo", "w") do |io|
+      io << ["# This is the GIP gipinfo file.  See http://github.com/francois/gip for details.  Gip is a RubyGem:  sudo gem install francois-gip."]
+      io << ["# This file maps a series of remote names to repository URLs.  This file is here to ease the work of your team."]
+      io << ["# Run 'gip remotify' to generate the appropriate remotes in your repository."]
+
+      remotes.each do |remote|
+        io << remote.to_a
+      end
+    end
+  end
+
+  def git(*args)
+    run_cmd :git, *args
+  end
+
+  def run_cmd(executable, *args)
+    opts = args.last.is_a?(Hash) ? args.pop : Hash.new
+
+    args.collect! {|arg| arg.to_s =~ /\s|\*|\?|"|\n|\r/ ? %Q('#{arg}') : arg}
+    args.collect! {|arg| arg ? arg : '""'}
+    cmd = %Q|#{executable} #{args.join(' ')}|
+    p cmd if options[:verbose] > 0
+
+    original_language = ENV["LANGUAGE"]
+    begin
+      ENV["LANGUAGE"] = "C"
+      value = run_real(cmd)
+      p value    if options[:verbose] > 1 && !value.to_s.strip.empty?
+      puts value if opts[:verbose]
+      return value
+    ensure
+      ENV["LANGUAGE"] = original_language
+    end
+  end
+
+  begin
+    raise LoadError, "Not implemented on Win32 machines" if RUBY_PLATFORM =~ /mswin32/
+    require "open4"
+
+    def run_real(cmd)
+      begin
+        pid, stdin, stdout, stderr = Open4::popen4(cmd)
+        _, cmdstatus = Process.waitpid2(pid)
+        raise CommandError.new("#{cmd.inspect} exited with status: #{cmdstatus.exitstatus}\n#{stderr.read}", cmdstatus) unless cmdstatus.success? || cmdstatus.exitstatus == 1
+        return stdout.read
+      rescue Errno::ENOENT
+        raise BadCommand, cmd.inspect
+      end
+    end
+
+  rescue LoadError
+    # On platforms where open4 is unavailable, we fallback to running using
+    # the backtick method of Kernel.
+    def run_real(cmd)
+      out = `#{cmd}`
+      raise BadCommand, cmd.inspect if $?.exitstatus == 127
+      raise CommandError.new("#{cmd.inspect} exited with status: #{$?.exitstatus}", $?) unless $?.success? || $?.exitstatus == 1
+      out
+    end
+  end
+
+  class BadCommand < StandardError; end
+  class CommandError < StandardError
+    def initialize(message, status)
+      super(message)
+      @status = status
+    end
+
+    def exitstatus
+      @status.exitstatus
+    end
+  end
+
+  class Remote
+    attr_accessor :name, :url, :path
+
+    def initialize(name, url, path)
+      @name, @url, @path = name, url, path
+    end
+
+    def to_a
+      [@name, @url, @path]
+    end
+  end
+end

data/test/gip_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class GipTest < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'gip'
+
+class Test::Unit::TestCase
+end

metadata

@@ -0,0 +1,69 @@
+--- !ruby/object:Gem::Specification 
+name: francois-gip
+version: !ruby/object:Gem::Version 
+  version: 0.1.0
+platform: ruby
+authors: 
+- "Fran\xC3\xA7ois Beausoleil"
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-06-26 00:00:00 -07:00
+default_executable: gip
+dependencies: []
+
+description: 
+email: francois@teksol.info
+executables: 
+- gip
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- .document
+- .gitignore
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- bin/gip
+- features/import.feature
+- features/step_definitions/gip_steps.rb
+- features/support/command_line.rb
+- features/support/env.rb
+- gip.gemspec
+- lib/gip.rb
+- test/gip_test.rb
+- test/test_helper.rb
+has_rdoc: true
+homepage: http://github.com/francois/gip
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 3
+summary: "Gip into place: Piston without the SVN cruft"
+test_files: 
+- test/gip_test.rb
+- test/test_helper.rb