honkster-braid 0.6.2

data/bin/braid

@@ -0,0 +1,243 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'braid'
+
+require 'rubygems'
+require 'main'
+
+Home = File.expand_path(ENV['HOME'] || '~')
+
+# mostly blantantly stolen from ara's punch script
+# main kicks ass!
+Main {
+  description <<-TXT
+    braid is a simple tool to help track git or svn repositories inside a git repository.
+
+    Run 'braid commandname help' for more details.
+
+    All operations will be executed in the braid/track branch.
+    You can then merge back or cherry-pick changes.
+  TXT
+
+  mode(:add) {
+    description <<-TXT
+      Add a new mirror to be tracked.
+
+        * adds metadata about the mirror to .braids
+        * adds the git or git svn remotes to .git/config
+        * fetches and merges remote code into given directory
+
+      --type defaults:
+
+        * svn://path          # => svn
+        * git://path          # => git
+        * http://path/trunk   # => svn
+        * http://path.git     # => git
+
+      Name defaults:
+
+        * remote/path         # => path
+        * remote/path/trunk   # => path
+        * remote/path.git     # => path
+    TXT
+
+    examples <<-TXT
+      . braid add svn://remote/path
+      . braid add svn://remote/path local/dir
+      . braid add git://remote/path local/dir
+      . braid add http://remote/path.git local/dir
+      . braid add http://remote/path --type git local/dir
+      . braid add svn://remote/path --branch notmaster
+    TXT
+
+    mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
+
+    run {
+      Braid.verbose = verbose
+      Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
+    }
+  }
+
+  mode(:update) {
+    description <<-TXT
+      Update a braid mirror.
+
+        * get new changes from remote
+        * always creates a merge commit
+        * updates metadata in .braids when revisions are changed
+
+      Defaults to updating all unlocked mirrors if none is specified.
+    TXT
+
+    examples <<-TXT
+      . braid update
+      . braid update local/dir
+    TXT
+
+    mixin :optional_path, :option_revision, :option_head, :option_verbose
+
+    run {
+      Braid.verbose = verbose
+      Braid::Command.run(:update, path, { "revision" => revision, "head" => head })
+    }
+  }
+
+  mode(:remove) {
+    description <<-TXT
+      Remove a mirror.
+
+        * removes metadata from .braids
+        * removes the local directory and commits the removal
+        * removes the git remote by default, --keep can be used to supress that
+    TXT
+
+    examples <<-TXT
+      . braid remove local/dir
+    TXT
+
+    mixin :argument_path, :option_verbose, :option_keep_remote
+
+    run {
+      options = {
+        :keep => keep
+      }
+      Braid.verbose = verbose
+      Braid::Command.run(:remove, path, options)
+    }
+  }
+
+  mode(:diff) {
+    description <<-TXT
+      Show diff of local changes to mirror.
+    TXT
+
+    mixin :argument_path, :option_verbose
+
+    run {
+      Braid::Command.run(:diff, path)
+    }
+  }
+
+  mode(:push) {
+    description <<-TXT
+      Push local mirror changes to remote.
+    TXT
+
+    mixin :argument_path, :option_verbose
+
+    run {
+      Braid.verbose = verbose
+      Braid::Command.run(:push, path)
+    }
+  }
+
+  mode(:setup) {
+    description <<-TXT
+      Set up git and git-svn remotes.
+    TXT
+
+    mixin :optional_path, :option_verbose
+
+    run {
+      Braid.verbose = verbose
+      Braid::Command.run(:setup, path)
+    }
+  }
+
+  mode(:version) {
+    description 'Show braid version.'
+
+    run {
+      puts "braid #{Braid::VERSION}"
+    }
+  }
+
+  mixin(:argument_path) {
+    argument(:path) {
+      attr
+    }
+  }
+
+  mixin(:optional_path) {
+    argument(:path) {
+      optional
+      attr
+    }
+  }
+
+  mixin(:argument_url) {
+    argument(:url) {
+      attr
+    }
+  }
+
+  mixin(:option_type) {
+    option(:type, :t) {
+      optional
+      argument :required
+      desc 'mirror type'
+      attr
+    }
+  }
+
+  mixin(:option_branch) {
+    option(:branch, :b) {
+      optional
+      argument :required
+      desc 'remote branch name'
+      attr
+    }
+  }
+
+  mixin(:option_rails_plugin) {
+    option(:rails_plugin, :p) {
+      optional
+      desc 'added mirror is a Rails plugin'
+      attr
+    }
+  }
+
+  mixin(:option_revision) {
+    option(:revision, :r) {
+      optional
+      argument :required
+      desc 'revision to track'
+      attr
+    }
+  }
+
+  mixin(:option_head) {
+    option(:head) {
+      optional
+      desc 'mirror head'
+      attr
+    }
+  }
+
+  mixin(:option_full) {
+    option(:full) {
+      optional
+      desc 'include mirror history' # FIXME
+      attr
+    }
+  }
+
+  mixin(:option_verbose) {
+    option(:verbose, :v) {
+      optional 
+      desc 'log shell commands'
+      attr
+    }
+  }
+
+  mixin(:option_keep_remote) {
+    option(:keep) {
+      optional
+      desc 'do not remove the remote'
+      attr
+    }
+  }
+
+  run { help! }
+}

data/braid.gemspec

@@ -0,0 +1,25 @@
+Gem::Specification.new do |s|
+  s.name = %Q{#{ENV["GEM_PREFIX"] ? ENV["GEM_PREFIX"] : ""}braid}
+  s.version = "0.6.2"
+
+  s.specification_version = 2 if s.respond_to? :specification_version=
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Cristi Balan", "Norbert Crombach"]
+  s.date = %q{2008-10-29}
+  s.default_executable = %q{braid}
+  s.description = %q{A simple tool for tracking vendor branches in git.}
+  s.email = %q{evil@che.lu}
+  s.executables = ["braid"]
+  s.files = Dir["bin/*"] + ["braid.gemspec"] + Dir["lib/**/*.rb"] + Dir["test/**/*.rb"]
+  s.has_rdoc = false
+  s.homepage = %q{http://evil.che.lu/projects/braid}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{braid}
+  s.rubygems_version = %q{1.1.0}
+  s.summary = %q{A simple tool for tracking vendor branches in git.}
+
+  s.add_dependency(%q<main>, [">= 3.0.0"])
+  s.add_dependency(%q<open4>, [">= 0.9.6"])
+end

data/lib/braid.rb

@@ -0,0 +1,30 @@
+$:.unshift dirname = File.dirname(__FILE__)
+
+module Braid
+  VERSION = "0.6.1"
+
+  CONFIG_FILE = ".braids"
+  REQUIRED_GIT_VERSION = "1.6"
+
+  def self.verbose; @verbose || false; end
+  def self.verbose=(new_value); @verbose = !!new_value; end
+
+  def self.use_local_cache; [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"]); end
+  def self.local_cache_dir; File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache"); end
+
+  class BraidError < StandardError
+    def message
+      value = super
+      value if value != self.class.name
+    end
+  end
+end
+
+require dirname + '/core_ext'
+require 'braid/operations'
+require 'braid/mirror'
+require 'braid/config'
+require 'braid/command'
+Dir[dirname + '/braid/commands/*'].each do |file|
+  require file
+end

data/lib/braid/command.rb

@@ -0,0 +1,131 @@
+module Braid
+  class Command
+    class InvalidRevision < BraidError
+    end
+
+    extend Operations::VersionControl
+    include Operations::VersionControl
+
+    def self.run(command, *args)
+      verify_git_version!
+
+      klass = Commands.const_get(command.to_s.capitalize)
+      klass.new.run(*args)
+
+    rescue BraidError => error
+      case error
+      when Operations::ShellExecutionError
+        msg "Shell error: #{error.message}"
+      else
+        msg "Error: #{error.message}"
+      end
+      exit(1)
+    end
+
+    def self.msg(str)
+      puts "Braid: #{str}"
+    end
+
+    def msg(str)
+      self.class.msg(str)
+    end
+
+    def config
+      @config ||= load_and_migrate_config
+    end
+
+    def verbose?
+      Braid.verbose
+    end
+
+    private
+      def setup_remote(mirror)
+        Command.run(:setup, mirror.path)
+      end
+
+      def use_local_cache?
+        Braid.use_local_cache
+      end
+
+      def self.verify_git_version!
+        git.require_version!(REQUIRED_GIT_VERSION)
+      end
+
+      def bail_on_local_changes!
+        git.ensure_clean!
+      end
+
+      def with_reset_on_error
+        work_head = git.head
+
+        begin
+          yield
+        rescue => error
+          msg "Resetting to '#{work_head[0, 7]}'."
+          git.reset_hard(work_head)
+          raise error
+        end
+      end
+
+      def load_and_migrate_config
+        config = Config.new
+        unless config.valid?
+          msg "Configuration is outdated. Migrating."
+          bail_on_local_changes!
+          config.migrate!
+          git.commit("Upgrade .braids", "-- .braids")
+        end
+        config
+      end
+
+      def add_config_file
+        git.add(CONFIG_FILE)
+      end
+
+      def display_revision(mirror, revision = nil)
+        revision ||= mirror.revision
+        mirror.type == "svn" ? "r#{revision}" : "'#{revision[0, 7]}'"
+      end
+
+      def validate_new_revision(mirror, new_revision)
+        unless new_revision
+          unless mirror.type == "svn"
+            return git.rev_parse(mirror.remote)
+          else
+            return svn.head_revision(mirror.url)
+          end
+        end
+
+        unless mirror.type == "svn"
+          new_revision = git.rev_parse(new_revision)
+        else
+          new_revision = svn.clean_revision(new_revision)
+        end
+        old_revision = mirror.revision
+
+        if new_revision == old_revision
+          raise InvalidRevision, "mirror is already at requested revision"
+        end
+
+        if mirror.type == "svn"
+          if old_revision && new_revision < old_revision
+            raise InvalidRevision, "local revision is higher than request revision"
+          end
+
+          if svn.head_revision(mirror.url) < new_revision
+            raise InvalidRevision, "requested revision is higher than remote revision"
+          end
+        end
+
+        new_revision
+      end
+
+      def determine_target_revision(mirror, new_revision)
+        unless mirror.type == "svn"
+          git.rev_parse(new_revision)
+        else
+          git_svn.commit_hash(mirror.remote, new_revision)
+        end
+      end
+  end
+end

data/lib/braid/commands/add.rb

@@ -0,0 +1,40 @@
+module Braid
+  module Commands
+    class Add < Command
+      def run(url, options = {})
+        bail_on_local_changes!
+
+        with_reset_on_error do
+          mirror = config.add_from_options(url, options)
+
+          branch_message = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
+          revision_message = options["revision"] ? " at #{display_revision(mirror, options["revision"])}" : ""
+          msg "Adding #{mirror.type} mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
+
+          # these commands are explained in the subtree merge guide
+          # http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
+
+          setup_remote(mirror)
+          mirror.fetch
+
+          new_revision = validate_new_revision(mirror, options["revision"])
+          target_revision = determine_target_revision(mirror, new_revision)
+
+          unless mirror.squashed?
+            git.merge_ours(target_revision)
+          end
+          git.read_tree_prefix(target_revision, mirror.path)
+
+          mirror.revision = new_revision
+          mirror.lock = new_revision if options["revision"]
+          config.update(mirror)
+          add_config_file
+
+          git.commit("Add mirror '#{mirror.path}' at #{display_revision(mirror)}")
+          msg "Added mirror at #{display_revision(mirror)}."
+        end
+      end
+
+    end
+  end
+end