braid 0.7.1 → 1.0.0

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

data/test/integration_helper.rb

@@ -1,70 +0,0 @@
-require 'rubygems'
-require 'test/spec'
-require 'mocha'
-
-require 'tempfile'
-require 'fileutils'
-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")
-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
-end
-
-def run_cmds(ary)
-  ary.each do |cmd|
-    cmd = cmd.strip!
-    out = `#{cmd}`
-  end
-end
-
-def update_dir_from_fixture(dir, fixture = dir)
-  to_dir = File.join(TMP_PATH, dir)
-  FileUtils.mkdir_p(to_dir)
-  FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + "/.", to_dir)
-end
-
-def create_git_repo_from_fixture(fixture_name)
-  git_repo = File.join(TMP_PATH, fixture_name)
-  update_dir_from_fixture(fixture_name)
-
-  in_dir(git_repo) do
-    run_cmds(<<-EOD)
-      git init
-      git add *
-      git commit -m "initial commit of #{fixture_name}"
-    EOD
-  end
-
-  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
-
-