realityforge-braid 0.7.2 → 0.8.0

data/.gitignore

@@ -10,3 +10,6 @@ nbproject
 pkg
 pkg/*
 rdoc
+/*.iml
+/*.ipr
+/*.iws

data/.ruby-version

@@ -0,0 +1 @@
+1.8.7-p371

data/README.md

@@ -1,12 +1,12 @@
 # Braid
 
-Braid is a simple tool to help track git and svn vendor branches in a git repository.
+Braid is a simple tool to help track git vendor branches in a git repository.
 
 The project homepage is [here](http://github.com/evilchelu/braid/wikis/home).
 
 ## Requirements
 
- * git 1.6+ (and git-svn if you want to mirror svn repositories)
+ * git 1.6+
  * main >= 4.2.0
  * open4 >= 1.0.1 (unless using jruby)
 

data/Rakefile

@@ -2,19 +2,8 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rake'
-require 'rake/testtask'
-
-task :default => :test
-
-def test_task(name, pattern)
-  Rake::TestTask.new(name) do |t|
-    ENV['TESTOPTS'] = '--runner=s'
-
-    t.libs << 'lib'
-    t.pattern = pattern
-    t.verbose = true
-  end
+require 'rspec/core/rake_task'
+desc 'Run all specs'
+RSpec::Core::RakeTask.new :spec  do |task|
+  task.rspec_opts = %w{--backtrace}
 end
-
-test_task(:test, "test/*_test.rb")
-namespace(:test) { test_task(:integration, "test/integration/*_test.rb") }

data/bin/braid

@@ -12,7 +12,7 @@ Home = File.expand_path(ENV['HOME'] || '~')
 # main kicks ass!
 Main {
   description <<-TXT
-    braid is a simple tool to help track git or svn repositories inside a git repository.
+    braid is a simple tool to help track git repositories inside a git repository.
 
     Run 'braid commandname help' for more details.
 
@@ -25,16 +25,9 @@ Main {
       Add a new mirror to be tracked.
 
         * adds metadata about the mirror to .braids
-        * adds the git or git svn remotes to .git/config
+        * adds the git 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
@@ -43,12 +36,8 @@ Main {
     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
+      . braid add http://remote/path local/dir
     TXT
 
     mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
@@ -134,7 +123,7 @@ Main {
 
   mode(:setup) {
     description <<-TXT
-      Set up git and git-svn remotes.
+      Set up git remotes.
     TXT
 
     mixin :optional_path, :option_verbose, :option_force

data/braid.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project  = %q{braid}
 
   s.files              = `git ls-files`.split("\n")
-  s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files         = `git ls-files -- {spec}/*`.split("\n")
   s.executables        = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.default_executable = %q{braid}
   s.require_paths      = ["lib"]
@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<main>, [">= 4.7.3"])
   s.add_dependency(%q<open4>, [">= 1.0.1"]) unless defined?(JRUBY_VERSION)
 
-  s.add_development_dependency(%q<test-spec>, [">= 0.10.0"])
+  s.add_development_dependency(%q<rspec>, ["= 2.12.0"])
   s.add_development_dependency(%q<mocha>, [">= 0.9.11"])
 end

data/lib/braid/command.rb

@@ -89,48 +89,24 @@ module Braid
 
     def display_revision(mirror, revision = nil)
       revision ||= mirror.revision
-      mirror.type == "svn" ? "r#{revision}" : "'#{revision[0, 7]}'"
+      "'#{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
+      return git.rev_parse(mirror.remote) unless new_revision
 
-      unless mirror.type == "svn"
-        new_revision = git.rev_parse(new_revision)
-      else
-        new_revision = svn.clean_revision(new_revision)
-      end
+      new_revision = git.rev_parse(new_revision)
       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
+      git.rev_parse(new_revision)
     end
   end
 end

data/lib/braid/commands/add.rb

@@ -7,9 +7,9 @@ module Braid
         with_reset_on_error do
           mirror           = config.add_from_options(url, options)
 
-          branch_message   = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
+          branch_message   = (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}."
+          msg "Adding 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

data/lib/braid/commands/setup.rb

@@ -28,12 +28,8 @@ module Braid
         end
 
         msg "Setup: Creating remote for '#{mirror.path}'."
-        unless mirror.type == "svn"
-          url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
-          git.remote_add(mirror.remote, url, mirror.branch)
-        else
-          git_svn.init(mirror.remote, mirror.url)
-        end
+        url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
+        git.remote_add(mirror.remote, url, mirror.branch)
       end
     end
   end

data/lib/braid/config.rb

@@ -1,9 +1,4 @@
 require 'yaml'
-
-# psych throws such wonderful errors as: 
-#  `@vendor/rails' is not allowed as an instance variable name (NameError)
-YAML::ENGINE.yamler = 'syck' if RUBY_VERSION >= '1.9.1'
-
 require 'yaml/store'
 
 module Braid
@@ -73,9 +68,7 @@ module Braid
 
     def valid?
       @db.transaction(true) do
-        !@db.roots.any? do |path|
-          @db[path]["url"].nil?
-        end
+        !@db.roots.any? {|path| @db[path]["url"].nil?}
       end
     end
 

data/lib/braid/mirror.rb

@@ -1,6 +1,5 @@
 module Braid
   class Mirror
-    TYPES      = %w(git svn)
     ATTRIBUTES = %w(url remote type branch squashed revision lock)
 
     class UnknownType < BraidError
@@ -8,11 +7,6 @@ module Braid
         "unknown type: #{super}"
       end
     end
-    class CannotGuessType < BraidError
-      def message
-        "cannot guess type: #{super}"
-      end
-    end
     class PathRequired < BraidError
       def message
         "path is required"
@@ -33,12 +27,6 @@ module Braid
 
       branch = options["branch"] || "master"
 
-      if type = options["type"] || extract_type_from_url(url)
-        raise UnknownType, type unless TYPES.include?(type)
-      else
-        raise CannotGuessType, url
-      end
-
       unless path = options["path"] || extract_path_from_url(url)
         raise PathRequired
       end
@@ -47,11 +35,10 @@ module Braid
         path = "vendor/plugins/#{path}"
       end
 
-      remote   = "#{branch}/braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
+      remote   = "#{branch}/braid/#{path}"
       squashed = !options["full"]
-      branch = nil if type == "svn"
 
-      attributes = {"url" => url, "remote" => remote, "type" => type, "branch" => branch, "squashed" => squashed}
+      attributes = {"url" => url, "remote" => remote, "branch" => branch, "squashed" => squashed}
       self.new(path, attributes)
     end
 
@@ -59,11 +46,6 @@ module Braid
       path == comparison.path && attributes == comparison.attributes
     end
 
-    def type
-      # override Object#type
-      attributes["type"]
-    end
-
     def locked?
       !!lock
     end
@@ -90,12 +72,8 @@ module Braid
     end
 
     def fetch
-      unless type == "svn"
-        git_cache.fetch(url) if cached?
-        git.fetch(remote)
-      else
-        git_svn.fetch(remote)
-      end
+      git_cache.fetch(url) if cached?
+      git.fetch(remote)
     end
 
     def cached?
@@ -104,11 +82,7 @@ module Braid
 
     def base_revision
       if revision
-        unless type == "svn"
-          git.rev_parse(revision)
-        else
-          git_svn.commit_hash(remote, revision)
-        end
+        git.rev_parse(revision)
       else
         inferred_revision
       end
@@ -156,18 +130,6 @@ module Braid
       hash
     end
 
-    def self.extract_type_from_url(url)
-      return nil unless url
-      url.sub!(/\/$/, '')
-
-      # check for git:// and svn:// URLs
-      url_scheme = url.split(":").first
-      return url_scheme if TYPES.include?(url_scheme)
-
-      return "svn" if url[-6..-1] == "/trunk"
-      return "git" if url[-4..-1] == ".git"
-    end
-
     def self.extract_path_from_url(url)
       return nil unless url
       name = File.basename(url)

data/lib/braid/operations.rb

@@ -41,7 +41,7 @@ module Braid
       end
     end
 
-    # The command proxy is meant to encapsulate commands such as git, git-svn and svn, that work with subcommands.
+    # The command proxy is meant to encapsulate commands such as git, that work with subcommands.
     class Proxy
       include Singleton
 
@@ -157,6 +157,7 @@ module Braid
           message_file = Tempfile.new("braid_commit")
           message_file.print("Braid: #{message}")
           message_file.flush
+          message_file.close
           cmd << " -F #{message_file.path}"
         end
         cmd << " #{args.join(' ')}" unless args.empty?
@@ -207,14 +208,10 @@ module Braid
         true
       end
 
-      # Checks git and svn remotes.
+      # Checks git remotes.
       def remote_url(remote)
         key = "remote.#{remote}.url"
-        begin
-          invoke(:config, key)
-        rescue ShellExecutionError
-          invoke(:config, "svn-#{key}")
-        end
+        invoke(:config, key)
       rescue ShellExecutionError
         nil
       end
@@ -320,52 +317,6 @@ module Braid
       end
     end
 
-    class GitSvn < Proxy
-      def self.command;
-        "git svn";
-      end
-
-      def commit_hash(remote, revision)
-        out  = invoke(:log, "--show-commit --oneline", "-r #{revision}", remote)
-        part = out.to_s.split("|")[1]
-        part.strip!
-        raise UnknownRevision, "r#{revision}" unless part
-        git.rev_parse(part)
-      end
-
-      def fetch(remote)
-        sh("git svn fetch #{remote} 2>&1 >/dev/null")
-      end
-
-      def init(remote, path)
-        invoke(:init, "-R", remote, "--id=#{remote}", path)
-        true
-      end
-
-      private
-
-      def command(name)
-        "#{self.class.command} #{name}"
-      end
-
-      def git
-        Git.instance
-      end
-    end
-
-    class Svn < Proxy
-      def clean_revision(revision)
-        revision.to_i if revision
-      end
-
-      def head_revision(path)
-        # not using svn info because it's retarded and doesn't show the actual last changed rev for the url
-        # git svn has no clue on how to get the actual HEAD revision number on it's own
-        status, out, err = exec!("svn log -q --limit 1 #{path}")
-        out.split(/\n/).find { |x| x.match /^r\d+/ }.split(" | ")[0][1..-1].to_i
-      end
-    end
-
     class GitCache
       include Singleton
 
@@ -407,14 +358,6 @@ module Braid
         Git.instance
       end
 
-      def git_svn
-        GitSvn.instance
-      end
-
-      def svn
-        Svn.instance
-      end
-
       def git_cache
         GitCache.instance
       end

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/braid.rb

@@ -1,4 +1,3 @@
-$:.unshift dirname = File.dirname(__FILE__)
 require 'braid/version'
 
 module Braid
@@ -37,12 +36,15 @@ module Braid
   end
 end
 
-require dirname + '/core_ext'
+#require 'braid/core_ext'
 require 'braid/operations'
 require 'braid/mirror'
 require 'braid/config'
 require 'braid/command'
-
-Dir[dirname + '/braid/commands/*'].each do |file|
-  require file
-end
+require 'braid/commands/add'
+require 'braid/commands/diff'
+require 'braid/commands/list'
+require 'braid/commands/push'
+require 'braid/commands/remove'
+require 'braid/commands/setup'
+require 'braid/commands/update'

data/{test/config_test.rb → spec/config_spec.rb}

@@ -1,52 +1,49 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-describe_shared "Braid::Config, in general" do
-  db = "tmp.yml"
-
+describe "Braid::Config, when empty" do
   before(:each) do
-    @config = Braid::Config.new(db)
+    @config = Braid::Config.new("tmp.yml")
   end
 
   after(:each) do
-    FileUtils.rm(db) rescue nil
+    FileUtils.rm("tmp.yml") rescue nil
   end
-end
-
-describe "Braid::Config, when empty" do
-  it_should_behave_like "Braid::Config, in general"
 
   it "should not get a mirror by name" do
-    @config.get("path").should.be.nil
-    lambda { @config.get!("path") }.should.raise(Braid::Config::MirrorDoesNotExist)
+    @config.get("path").should be_nil
+    lambda { @config.get!("path") }.should raise_error(Braid::Config::MirrorDoesNotExist)
   end
 
   it "should add a mirror and its params" do
     @mirror = build_mirror
     @config.add(@mirror)
-    @config.get("path").path.should.not.be.nil
+    @config.get("path").path.should_not be_nil
   end
 end
 
 describe "Braid::Config, with one mirror" do
-  it_should_behave_like "Braid::Config, in general"
-
   before(:each) do
+    @config = Braid::Config.new("tmp.yml")
     @mirror = build_mirror
     @config.add(@mirror)
   end
 
+  after(:each) do
+    FileUtils.rm("tmp.yml") rescue nil
+  end
+
   it "should get the mirror by name" do
     @config.get("path").should == @mirror
     @config.get!("path").should == @mirror
   end
 
   it "should raise when trying to overwrite a mirror on add" do
-    lambda { @config.add(@mirror) }.should.raise(Braid::Config::PathAlreadyInUse)
+    lambda { @config.add(@mirror) }.should raise_error(Braid::Config::PathAlreadyInUse)
   end
 
   it "should remove the mirror" do
     @config.remove(@mirror)
-    @config.get("path").should.be.nil
+    @config.get("path").should be_nil
   end
 
   it "should update the mirror with new params" do
@@ -57,6 +54,6 @@ describe "Braid::Config, with one mirror" do
 
   it "should raise when trying to update nonexistent mirror" do
     @mirror.instance_variable_set("@path", "other")
-    lambda { @config.update(@mirror) }.should.raise(Braid::Config::MirrorDoesNotExist)
+    lambda { @config.update(@mirror) }.should raise_error(Braid::Config::MirrorDoesNotExist)
   end
 end

data/spec/integration/adding_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../integration_helper'
+
+describe "Adding a mirror in a clean repository" do
+
+  before do
+    FileUtils.rm_rf(TMP_PATH)
+    FileUtils.mkdir_p(TMP_PATH)
+  end
+
+  describe "from a git repository" do
+    before do
+      @shiny = create_git_repo_from_fixture("shiny")
+      @skit1 = create_git_repo_from_fixture("skit1")
+    end
+
+    it "should add the files and commit" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add #{@skit1}`
+      end
+
+      file_name = "skit1/layouts/layout.liquid"
+      output    = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
+      $?.should be_success
+
+      output = `git log --pretty=oneline`.split("\n")
+      output.length.should == 2
+      output[0].should =~ /Braid: Add mirror 'skit1' at '[0-9a-f]{7}'/
+    end
+
+    it "should create .braids and add the mirror to it" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add #{@skit1}`
+      end
+
+      braids = YAML::load_file("#{@shiny}/.braids")
+      braids["skit1"]["squashed"].should == true
+      braids["skit1"]["url"].should == @skit1
+      braids["skit1"]["revision"].should_not be_nil
+      braids["skit1"]["branch"].should == "master"
+      braids["skit1"]["remote"].should == "master/braid/skit1"
+    end
+  end
+end

data/{test/integration/updating_test.rb → spec/integration/updating_spec.rb}

@@ -13,7 +13,7 @@ describe "Updating a mirror without conflicts" do
       @skit1 = create_git_repo_from_fixture("skit1")
 
       in_dir(@shiny) do
-        `#{BRAID_BIN} add --type git #{@skit1}`
+        `#{BRAID_BIN} add #{@skit1}`
       end
 
       update_dir_from_fixture("skit1", "skit1.1")
@@ -37,7 +37,7 @@ describe "Updating a mirror without conflicts" do
 
       file_name = "layouts/layout.liquid"
       output    = `diff -U 3 #{File.join(FIXTURE_PATH, "skit1.2", file_name)} #{File.join(TMP_PATH, "shiny", "skit1", file_name)}`
-      $?.should.be.success
+      $?.should be_success
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 3
@@ -45,43 +45,4 @@ describe "Updating a mirror without conflicts" do
     end
 
   end
-
-  describe "from a svn repository" do
-    before do
-      @shiny    = create_git_repo_from_fixture("shiny")
-      @skit1    = create_svn_repo_from_fixture("skit1")
-      @skit1_wc = File.join(TMP_PATH, "skit1_wc")
-
-      in_dir(@shiny) do
-        `#{BRAID_BIN} add --type svn #{@skit1}`
-      end
-
-      update_dir_from_fixture("skit1_wc", "skit1.1")
-      in_dir(@skit1_wc) do
-        `svn commit -m "change default color"`
-      end
-
-      update_dir_from_fixture("skit1_wc", "skit1.2")
-      in_dir(@skit1_wc) do
-        `svn commit -m "add a happy note"`
-      end
-
-    end
-
-    it "should add the files and commit" do
-      in_dir(@shiny) do
-        `#{BRAID_BIN} update skit1`
-      end
-
-      file_name = "layouts/layout.liquid"
-      output    = `diff -U 3 #{File.join(FIXTURE_PATH, "skit1.2", file_name)} #{File.join(TMP_PATH, "shiny", "skit1", file_name)}`
-      $?.should.be.success
-
-      output = `git log --pretty=oneline`.split("\n")
-      output.length.should == 3
-      output[0].should =~ /Braid: Update mirror 'skit1' to r3/
-    end
-
-  end
-
 end

data/{test → spec}/integration_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'test/spec'
-require 'mocha'
+require 'rspec'
+require 'mocha/api'
 
 require 'tempfile'
 require 'fileutils'
@@ -8,15 +8,11 @@ require 'pathname'
 
 TMP_PATH     = File.join(Dir.tmpdir, "braid_integration")
 BRAID_PATH   = Pathname.new(File.dirname(__FILE__)).parent.realpath
-FIXTURE_PATH = File.join(BRAID_PATH, "test", "fixtures")
+FIXTURE_PATH = File.join(BRAID_PATH, "spec", "fixtures")
 FileUtils.rm_rf(TMP_PATH)
 FileUtils.mkdir_p(TMP_PATH)
 BRAID_BIN = File.join(BRAID_PATH, "bin", "braid")
 
-#def exec(cmd)
-#  `cd #{TMP} && #{cmd}`
-#end
-
 def in_dir(dir = TMP_PATH)
   Dir.chdir(dir)
   yield
@@ -49,22 +45,3 @@ def create_git_repo_from_fixture(fixture_name)
 
   git_repo
 end
-
-def create_svn_repo_from_fixture(fixture_name)
-  svn_wc   = File.join(TMP_PATH, fixture_name + "_wc")
-  svn_repo = File.join(TMP_PATH, fixture_name)
-  run_cmds(<<-EOD)
-    svnadmin create #{svn_repo}
-    svn co file://#{svn_repo} #{svn_wc}
-  EOD
-  update_dir_from_fixture(fixture_name + "_wc", fixture_name)
-  in_dir(svn_wc) do
-    run_cmds(<<-EOD)
-      svn add *
-      svn commit -m "initial commit of #{fixture_name}"
-    EOD
-  end
-  "file://#{svn_repo}"
-end
-
-

data/{test/mirror_test.rb → spec/mirror_spec.rb}

@@ -6,35 +6,6 @@ describe "Braid::Mirror.new_from_options" do
     @mirror.branch.should == "master"
   end
 
-  it "should default type to git, from protocol" do
-    new_from_options("git://path")
-    @mirror.type.should == "git"
-  end
-
-  it "should default type to git, if path ends in .git" do
-    new_from_options("http://path.git")
-    @mirror.type.should == "git"
-  end
-
-  it "should default type to svn, from protocol" do
-    new_from_options("svn://path")
-    @mirror.type.should == "svn"
-  end
-
-  it "should default type to svn, if path ends in /trunk" do
-    new_from_options("http://path/trunk")
-    @mirror.type.should == "svn"
-  end
-
-  it "should raise if no type can be guessed" do
-    lambda { new_from_options("http://path") }.should.raise(Braid::Mirror::CannotGuessType)
-  end
-
-  it "should default mirror to previous to last path part, if last path part is /trunk" do
-    new_from_options("http://path/trunk")
-    @mirror.path.should == "path"
-  end
-
   it "should default mirror to last path part, ignoring trailing .git" do
     new_from_options("http://path.git")
     @mirror.path.should == "path"
@@ -69,7 +40,7 @@ end
 describe "Braid::Mirror#base_revision" do
   it "should be inferred when no revision is set" do
     @mirror = build_mirror
-    @mirror.revision.should.be.nil
+    @mirror.revision.should be_nil
     @mirror.expects(:inferred_revision).returns('b' * 40)
     @mirror.base_revision.should == 'b' * 40
   end
@@ -100,11 +71,11 @@ describe "Braid::Mirror#cached?" do
 
   it "should be true when the remote path matches the cache path" do
     git.expects(:remote_url).with(@mirror.remote).returns(git_cache.path(@mirror.url))
-    @mirror.should.be.cached
+    @mirror.should be_cached
   end
 
   it "should be false if the remote does not point to the cache" do
     git.expects(:remote_url).with(@mirror.remote).returns(@mirror.url)
-    @mirror.should.not.be.cached
+    @mirror.should_not be_cached
   end
 end

data/{test/operations_test.rb → spec/operations_spec.rb}

@@ -18,7 +18,7 @@ describe "Braid::Operations::Git#rev_parse" do
   it "should raise a revision error when the hash is not found" do
     ambiguous_revision = 'b' * 7
     git.expects(:exec).returns([1, ambiguous_revision, "fatal: ..."])
-    lambda { git.rev_parse(ambiguous_revision) }.should.raise(Braid::Operations::UnknownRevision)
+    lambda { git.rev_parse(ambiguous_revision) }.should raise_error(Braid::Operations::UnknownRevision)
   end
 end
 

data/{test → spec}/test_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'test/spec'
-require 'mocha'
+require 'rspec'
+require 'mocha/api'
 
 require File.dirname(__FILE__) + '/../lib/braid'
 

metadata

@@ -1,89 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: realityforge-braid
-version: !ruby/object:Gem::Version
-  version: 0.7.2
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Cristi Balan
 - Norbert Crombach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-11 00:00:00 +11:00
+default_executable: braid
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: main
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.7.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 4
+        - 7
+        - 3
         version: 4.7.3
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: open4
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: test-spec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 2
+        - 12
+        - 0
+        version: 2.12.0
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
+  type: :development
+  version_requirements: *id004
 description: A simple tool for tracking vendor branches in git.
 email: evil@che.lu
-executables:
+executables: 
 - braid
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -103,53 +113,55 @@ files:
 - lib/braid/mirror.rb
 - lib/braid/operations.rb
 - lib/braid/version.rb
-- lib/core_ext.rb
-- test/braid_test.rb
-- test/config_test.rb
-- test/fixtures/shiny/README
-- test/fixtures/skit1.1/layouts/layout.liquid
-- test/fixtures/skit1.2/layouts/layout.liquid
-- test/fixtures/skit1/layouts/layout.liquid
-- test/fixtures/skit1/preview.png
-- test/integration/adding_test.rb
-- test/integration/updating_test.rb
-- test/integration_helper.rb
-- test/mirror_test.rb
-- test/operations_test.rb
-- test/test_helper.rb
+- spec/config_spec.rb
+- spec/fixtures/shiny/README
+- spec/fixtures/skit1.1/layouts/layout.liquid
+- spec/fixtures/skit1.2/layouts/layout.liquid
+- spec/fixtures/skit1/layouts/layout.liquid
+- spec/fixtures/skit1/preview.png
+- spec/integration/adding_spec.rb
+- spec/integration/updating_spec.rb
+- spec/integration_helper.rb
+- spec/mirror_spec.rb
+- spec/operations_spec.rb
+- spec/test_helper.rb
+has_rdoc: true
 homepage: http://evil.che.lu/projects/braid
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - braid
 - --main
-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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4601304509761184650
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4601304509761184650
+      version: "0"
 requirements: []
+
 rubyforge_project: braid
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple tool for tracking vendor branches in git.
 test_files: []
+

data/lib/core_ext.rb

@@ -1,13 +0,0 @@
-require 'yaml'
-
-class Hash
-  def to_yaml(opts = {})
-    YAML::quick_emit(object_id, opts) do |out|
-      out.map(taguri, to_yaml_style) do |map|
-        sort.each do |k, v|
-          map.add(k, v)
-        end
-      end
-    end
-  end
-end

data/test/braid_test.rb

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-describe "Braid" do
-  it "puts the lotion in the basket" do
-    # dedicated to dblack
-  end
-end

data/test/integration/adding_test.rb

@@ -1,80 +0,0 @@
-require File.dirname(__FILE__) + '/../integration_helper'
-
-describe "Adding a mirror in a clean repository" do
-
-  before do
-    FileUtils.rm_rf(TMP_PATH)
-    FileUtils.mkdir_p(TMP_PATH)
-  end
-
-  describe "from a git repository" do
-    before do
-      @shiny = create_git_repo_from_fixture("shiny")
-      @skit1 = create_git_repo_from_fixture("skit1")
-    end
-
-    it "should add the files and commit" do
-      in_dir(@shiny) do
-        `#{BRAID_BIN} add --type git #{@skit1}`
-      end
-
-      file_name = "skit1/layouts/layout.liquid"
-      output    = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
-      $?.should.be.success
-
-      output = `git log --pretty=oneline`.split("\n")
-      output.length.should == 2
-      output[0].should =~ /Braid: Add mirror 'skit1' at '[0-9a-f]{7}'/
-    end
-
-    it "should create .braids and add the mirror to it" do
-      in_dir(@shiny) do
-        `#{BRAID_BIN} add --type git #{@skit1}`
-      end
-
-      braids = YAML::load_file("#{@shiny}/.braids")
-      braids["skit1"]["squashed"].should == true
-      braids["skit1"]["url"].should == @skit1
-      braids["skit1"]["type"].should == "git"
-      braids["skit1"]["revision"].should.not.be nil
-      braids["skit1"]["branch"].should == "master"
-      braids["skit1"]["remote"].should == "braid/skit1"
-    end
-  end
-
-  describe "from an svn repository" do
-    before do
-      @shiny = create_git_repo_from_fixture("shiny")
-      @skit1 = create_svn_repo_from_fixture("skit1")
-    end
-
-    it "should add the files and commit" do
-      in_dir(@shiny) do
-        `#{BRAID_BIN} add --type svn #{@skit1}`
-      end
-
-      file_name = "skit1/layouts/layout.liquid"
-      output    = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
-      $?.should.be.success
-
-      output = `git log --pretty=oneline`.split("\n")
-      output.length.should == 2
-      output[0].should =~ /Braid: Add mirror 'skit1' at r1/
-    end
-
-    it "should create .braids and add the mirror to it" do
-      in_dir(@shiny) do
-        `#{BRAID_BIN} add --type svn #{@skit1}`
-      end
-
-      braids = YAML::load_file("#{@shiny}/.braids")
-      braids["skit1"]["squashed"].should == true
-      braids["skit1"]["url"].should == @skit1
-      braids["skit1"]["type"].should == "svn"
-      braids["skit1"]["revision"].should == 1
-      braids["skit1"]["remote"].should == "braid/skit1"
-      braids["skit1"]["branch"].should.be == nil
-    end
-  end
-
-end