misaka-braid 0.4.0.1

data/History.txt

@@ -0,0 +1,4 @@
+== 0.1.0 2007-08-23
+
+* 1 major enhancement:
+  * Initial release

data/License.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2007 Cristi Balan
+
+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/Manifest.txt

@@ -0,0 +1,32 @@
+History.txt
+License.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/braid
+config/hoe.rb
+config/requirements.rb
+lib/braid.rb
+lib/braid/command.rb
+lib/braid/commands/add.rb
+lib/braid/commands/diff.rb
+lib/braid/commands/remove.rb
+lib/braid/commands/setup.rb
+lib/braid/commands/update.rb
+lib/braid/config.rb
+lib/braid/exceptions.rb
+lib/braid/operations.rb
+lib/braid/version.rb
+braid.gemspec
+script/destroy
+script/generate
+setup.rb
+spec/braid_spec.rb
+spec/config_spec.rb
+spec/operations_spec.rb
+spec/spec.opts
+spec/spec_helper.rb
+tasks/deployment.rake
+tasks/environment.rake
+tasks/rspec.rake
+tasks/website.rake

data/README.txt

@@ -0,0 +1,53 @@
+= Braid
+
+http://evil.che.lu/projects/braid/
+
+== Description
+
+Braid is a simple tool to help track git and svn vendor branches in a git
+repository.
+
+In purpose, it's similar to piston, but it's especially built on top of git
+commands. This allows better integration with git and easier management of
+merges.
+
+Braid is "hosted on github":http://github.com/evilchelu/braid.
+
+*NOTE:* You will need at least git 1.5.4.5+ to run braid. You'll also need the
+open4 and main gems.
+
+== Install with rubygems
+
+  gem sources -a http://gems.github.com/  # only need to do this once
+  gem install evilchelu-braid
+
+== Install from the git repository
+
+Get a clone of the git repository using:
+
+  git clone git://github.com/evilchelu/braid.git
+  cd braid
+  rake install_gem
+  braid --help # see usage
+
+=== Usage
+
+  braid help
+  braid help COMMANDNAME
+
+For more usage examples, documentation, feature requests and bug reporting,
+check out the "braid wiki":http://github.com/evilchelu/braid/wikis.
+
+=== Contributing
+
+If you want to send a patch in, please fork the project on github, commit your
+changes and send a pull request.
+
+=== Mad props
+
+Braid used to be quite lame before "Norbert Crombach":http://primetheory.org/
+("github":http://github.com/norbert) resuscitated it by contribuing a bunch of
+code.
+
+He rocks! Go buy him a beer. 
+

data/Rakefile

@@ -0,0 +1,4 @@
+require 'config/requirements'
+require 'config/hoe' # setup Hoe + all gem configuration
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }

data/bin/braid

@@ -0,0 +1,218 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+
+begin
+  require 'rubygems'
+rescue LoadError
+end
+require 'main'
+
+require 'braid'
+
+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 help commandname' 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_remote, :option_type, :optional_mirror, :option_branch, :option_rails_plugin, :option_revision, :option_full
+
+    run {
+      Braid::Command.run(:add, remote, { "type" => type, "mirror" => mirror, "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_mirror, :option_revision, :option_head
+
+    run {
+      Braid::Command.run(:update, mirror, { "revision" => revision, "head" => head })
+    }
+  }
+
+  mode(:remove) {
+    description <<-TXT
+      Remove a mirror.
+
+        * removes metadata from .braids
+        * removes the local directory and commits the removal
+        * does NOT remove the git and git svn remotes in case you still need them around
+    TXT
+
+    examples <<-TXT
+      . braid remove local/dir
+    TXT
+
+    mixin :argument_mirror
+
+    run {
+      Braid::Command.run(:remove, mirror)
+    }
+  }
+
+  mode(:setup) {
+    description <<-TXT
+      Set up git and git-svn remotes.
+    TXT
+
+    examples <<-TXT
+      . braid setup local/dir
+    TXT
+
+    mixin :optional_mirror
+
+    run {
+      Braid::Command.run(:setup, mirror)
+    }
+  }
+
+  mode(:diff) {
+    description <<-TXT
+      Show diff between '#{Braid::WORK_BRANCH}' and HEAD.
+    TXT
+
+    examples <<-TXT
+      . braid diff local/dir
+    TXT
+
+    mixin :argument_mirror
+
+    run {
+      Braid::Command.run(:diff, mirror)
+    }
+  }
+
+  mode(:version) {
+    description 'Show braid version.'
+
+    run {
+      puts "braid #{Braid::VERSION::STRING}"
+    }
+  }
+
+  mixin(:argument_mirror) {
+    argument(:mirror) {
+      attr
+    }
+  }
+
+  mixin(:optional_mirror) {
+    argument(:mirror) {
+      optional
+      attr
+    }
+  }
+
+  mixin(:argument_remote) {
+    argument(:remote) {
+      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
+    }
+  }
+
+  run { help! }
+}

data/braid.gemspec

@@ -0,0 +1,26 @@
+Gem::Specification.new do |s|
+  s.name = %q{braid}
+  s.version = "0.4.0.1"
+
+  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-05-01}
+  s.default_executable = %q{braid}
+  s.description = %q{Braid is a simple tool to help track git and svn vendor branches in a git repository}
+  s.email = %q{evil@che.lu}
+  s.executables = ["braid"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/braid", "config/hoe.rb", "config/requirements.rb", "lib/braid.rb", "lib/braid/command.rb", "lib/braid/commands/add.rb", "lib/braid/commands/diff.rb", "lib/braid/commands/remove.rb", "lib/braid/commands/setup.rb", "lib/braid/commands/update.rb", "lib/braid/config.rb", "lib/braid/exceptions.rb", "lib/braid/operations.rb", "lib/braid/version.rb", "braid.gemspec", "script/destroy", "script/generate", "setup.rb", "spec/braid_spec.rb", "spec/config_spec.rb", "spec/operations_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake", "tasks/website.rake"]
+  s.has_rdoc = true
+  s.homepage = %q{http://evil.che.lu/projects/braid}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{braid}
+  s.rubygems_version = %q{1.1.0}
+  s.summary = %q{Braid is a simple tool to help track git and svn vendor branches in a git repository}
+
+  s.add_dependency(%q<main>, [">= 2.8.0"])
+  s.add_dependency(%q<open4>, [">= 0.9.6"])
+end

data/config/hoe.rb

@@ -0,0 +1,68 @@
+require 'braid/version'
+
+AUTHOR = ["Cristi Balan", "Norbert Crombach"]
+EMAIL = "evil@che.lu"
+DESCRIPTION = "Braid is a simple tool to help track git and svn vendor branches in a git repository"
+GEM_NAME = 'braid' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'braid' # The unix name for your project
+HOMEPATH = "http://evil.che.lu/projects/braid"
+DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+
+@config_file = "~/.rubyforge/user-config.yml"
+@config = nil
+RUBYFORGE_USERNAME = "unknown"
+def rubyforge_username
+  unless @config
+    begin
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    rescue
+      puts <<-EOS
+ERROR: No rubyforge config file found: #{@config_file}"
+Run 'rubyforge setup' to prepare your env for access to Rubyforge
+ - See http://newgem.rubyforge.org/rubyforge.html for more details
+      EOS
+      exit
+    end
+  end
+  RUBYFORGE_USERNAME.replace @config["username"]
+end
+
+
+REV = nil
+VERS = Braid::VERSION::STRING + (REV ? ".#{REV}" : "")
+RDOC_OPTS = ['--quiet', '--title', 'braid documentation',
+    "--opname", "index.html",
+    "--line-numbers", 
+    "--main", "README",
+    "--inline-source"]
+
+class Hoe
+  def extra_deps 
+    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
+    @extra_deps
+  end 
+end
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author = AUTHOR 
+  p.description = DESCRIPTION
+  p.email = EMAIL
+  p.summary = DESCRIPTION
+  p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  p.test_globs = ["test/**/test_*.rb"]
+  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+  
+  # == Optional
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
+  p.extra_deps = [ ['main', '>=2.8.0'], ['open4', '>=0.9.6'] ]
+  
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+  
+end
+
+CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
+PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')

data/config/requirements.rb

@@ -0,0 +1,17 @@
+require 'fileutils'
+include FileUtils
+
+require 'rubygems'
+%w[rake hoe newgem rubigen main open4].each do |req_gem|
+  begin
+    require req_gem
+  rescue LoadError
+    puts "This Rakefile requires the '#{req_gem}' RubyGem."
+    puts "Installation: gem install #{req_gem} -y"
+    exit
+  end
+end
+
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
+
+require 'braid'

data/lib/braid/command.rb

@@ -0,0 +1,74 @@
+module Braid
+  class Command
+    include Operations::Mirror
+    include Operations::Helpers
+
+    class << self
+      include Operations::Helpers
+      include Operations::Git
+
+      def run(command, *args)
+        raise Braid::Git::GitVersionTooLow    unless verify_version("git",     REQUIRED_GIT_VERSION)
+        raise Braid::Git::GitSvnVersionTooLow unless verify_version("git svn", REQUIRED_GIT_SVN_VERSION)
+
+        klass = Braid::Commands.const_get(command.to_s.capitalize)
+        klass.new.run(*args)
+
+      rescue Braid::Git::LocalChangesPresent => e
+        msg "Local changes are present. You have to commit or stash them before running braid commands."
+        msg "Exiting."
+
+      rescue Braid::Git::GitVersionTooLow => e
+        msg "This version of braid requires at least git #{REQUIRED_GIT_VERSION}. You have #{extract_version("git")}."
+        msg "Exiting."
+
+      rescue Braid::Git::GitSvnVersionTooLow => e
+        msg "This version of braid requires at least git svn #{REQUIRED_GIT_SVN_VERSION}. You have #{extract_version("git svn")}."
+        msg "Exiting."
+
+      rescue => e
+        puts "braid error: " + e.message
+      end
+
+      def msg(str)
+        puts str
+      end
+    end
+
+    def config
+      @config ||= Braid::Config.new
+    end
+
+    private
+      def msg(str)
+        self.class.msg(str)
+      end
+
+      def in_work_branch
+        # make sure there is a git repository
+        begin
+          old_branch = get_current_branch
+        rescue => e
+          msg "Error occured: #{e.message}"
+          raise e
+        end
+
+        create_work_branch
+        work_head = get_work_head
+
+        begin
+          invoke(:git_checkout, WORK_BRANCH)
+          yield
+        rescue => e
+          msg "Error occured: #{e.message}"
+          if get_current_branch == WORK_BRANCH
+            msg "Resetting '#{WORK_BRANCH}' to '#{work_head}'."
+            invoke(:git_reset_hard, work_head)
+          end
+          raise e
+        ensure
+          invoke(:git_checkout, old_branch)
+        end
+      end
+  end
+end

data/lib/braid/commands/add.rb

@@ -0,0 +1,55 @@
+module Braid
+  module Commands
+    class Add < Command
+      def run(remote, options = {})
+        raise Braid::Git::LocalChangesPresent if invoke(:local_changes?)
+
+        in_work_branch do
+          mirror, params = config.add_from_options(remote, options)
+          local_branch = get_local_branch_name(mirror, params)
+
+          config.update(mirror, { "local_branch" => local_branch })
+          params["local_branch"] = local_branch # TODO check
+
+          msg "Adding #{params["type"]} mirror of '#{params["remote"]}'" + (params["type"] == "git" ? ", branch '#{params["branch"]}'" : "") + "."
+
+          # 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)
+          fetch_remote(params["type"], local_branch)
+
+          validate_revision_option(params, options)
+          target = determine_target_commit(params, options)
+
+          msg "Merging code into '#{mirror}/'."
+
+          unless params["squash"]
+            invoke(:git_merge_ours, target)
+          end
+          invoke(:git_read_tree, target, mirror)
+
+          config.update(mirror, { "revision" => options["revision"] })
+          add_config_file
+
+          revision_message = options["revision"] ? " at #{display_revision(params["type"], options["revision"])}" : ""
+          commit_message = "Add mirror '#{mirror}/'#{revision_message}."
+          invoke(:git_commit, commit_message)
+        end
+      end
+
+      protected
+        def setup_remote(mirror)
+          Braid::Command.run(:setup, mirror)
+        end
+
+      private
+        def get_local_branch_name(mirror, params)
+          res = "braid/#{params["type"]}/#{mirror}"
+          res << "/#{params["branch"]}" if params["type"] == "git"
+          res.gsub!("_", '-') # stupid git svn changes all _ to ., weird
+          res
+        end
+    end
+  end
+end

data/lib/braid/commands/diff.rb

@@ -0,0 +1,10 @@
+module Braid
+  module Commands
+    class Diff < Command
+      def run(mirror)
+        # easiest call, liek, evar.
+        system("git diff #{WORK_BRANCH} HEAD #{mirror}")
+      end
+    end
+  end
+end

data/lib/braid/commands/remove.rb

@@ -0,0 +1,27 @@
+module Braid
+  module Commands
+    class Remove < Command
+      def run(mirror)
+        raise Braid::Git::LocalChangesPresent if invoke(:local_changes?)
+
+        in_work_branch do
+          params = config.get(mirror)
+          unless params
+            msg "Mirror '#{mirror}/' does not exist."
+            return
+          end
+
+          msg "Removing #{params["type"]} mirror from '#{mirror}/'."
+
+          invoke(:git_rm_r, mirror)
+
+          config.remove(mirror)
+          add_config_file
+
+          commit_message = "Remove mirror '#{mirror}/'."
+          invoke(:git_commit, commit_message)
+        end
+      end
+    end
+  end
+end

data/lib/braid/commands/setup.rb

@@ -0,0 +1,38 @@
+module Braid
+  module Commands
+    class Setup < Command
+      def run(mirror)
+        mirror ? setup_one(mirror) : setup_all
+      end
+
+      protected
+        def setup_all
+          msg "Setting up all mirrors."
+          config.mirrors.each do |mirror|
+            setup_one(mirror)
+          end
+        end
+
+        def setup_one(mirror)
+          params = config.get(mirror)
+          unless params
+            msg "Mirror '#{mirror}/' does not exist. Skipping."
+            return
+          end
+
+          if find_remote(params["local_branch"])
+            msg "Mirror '#{mirror}/' already has a remote. Skipping."
+            return
+          end
+
+          msg "Setting up remote for '#{mirror}/'."
+          case params["type"]
+          when "git"
+            invoke(:git_remote_add, params["local_branch"], params["remote"], params["branch"])
+          when "svn"
+            invoke(:git_svn_init, params["local_branch"], params["remote"])
+          end
+        end
+    end
+  end
+end