realityforge-braid 0.7.2

data/test/integration/adding_test.rb

@@ -0,0 +1,80 @@
+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/updating_test.rb

@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/../integration_helper'
+
+describe "Updating a mirror without conflicts" 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")
+
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type git #{@skit1}`
+      end
+
+      update_dir_from_fixture("skit1", "skit1.1")
+      in_dir(@skit1) do
+        `git add *`
+        `git commit -m "change default color"`
+      end
+
+      update_dir_from_fixture("skit1", "skit1.2")
+      in_dir(@skit1) do
+        `git add *`
+        `git 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 '[0-9a-f]{7}'/
+    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/integration_helper.rb

@@ -0,0 +1,70 @@
+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
+
+

data/test/mirror_test.rb

@@ -0,0 +1,110 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+describe "Braid::Mirror.new_from_options" do
+  it "should default branch to master" do
+    new_from_options("git://path")
+    @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"
+  end
+end
+
+describe "Braid::Mirror#diff" do
+  before(:each) do
+    @mirror = build_mirror("revision" => 'a' * 40)
+    @mirror.stubs(:base_revision).returns(@mirror.revision) # bypass rev_parse
+  end
+
+  def set_hashes(remote_hash, local_hash)
+    git.expects(:rev_parse).with("#{@mirror.revision}:").returns(remote_hash)
+    git.expects(:tree_hash).with(@mirror.path).returns(local_hash)
+  end
+
+  it "should return an empty string when the hashes match" do
+    set_hashes('b' * 40, 'b' * 40)
+    git.expects(:diff_tree).never
+    @mirror.diff.should == ""
+  end
+
+  it "should generate a diff when the hashes do not match" do
+    set_hashes('b' * 40, 'c' * 40)
+    diff = "diff --git a/path b/path\n"
+    git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
+    @mirror.diff.should == diff
+  end
+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.expects(:inferred_revision).returns('b' * 40)
+    @mirror.base_revision.should == 'b' * 40
+  end
+
+  it "should be the parsed hash for git mirrors" do
+    @mirror = build_mirror("revision" => 'a' * 7)
+    git.expects(:rev_parse).with('a' * 7).returns('a' * 40)
+    @mirror.base_revision.should == 'a' * 40
+  end
+end
+
+describe "Braid::Mirror#inferred_revision" do
+  it "should return the last commit before the most recent update" do
+    @mirror = new_from_options("git://path")
+    git.expects(:rev_list).times(2).returns(
+        "#{'a' * 40}\n",
+        "commit #{'b' * 40}\n#{'t' * 40}\n"
+    )
+    git.expects(:tree_hash).with(@mirror.path, 'a' * 40).returns('t' * 40)
+    @mirror.send(:inferred_revision).should == 'b' * 40
+  end
+end
+
+describe "Braid::Mirror#cached?" do
+  before(:each) do
+    @mirror = new_from_options("git://path")
+  end
+
+  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
+  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
+  end
+end

data/test/operations_test.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+describe "Braid::Operations::Git#remote_url" do
+  it "should use git config" do
+    # FIXME weak test
+    git.expects(:invoke).with(:config, 'remote.braid/git/one.url').returns("git://path")
+    git.remote_url("braid/git/one").should == "git://path"
+  end
+end
+
+describe "Braid::Operations::Git#rev_parse" do
+  it "should return the full hash when a hash is found" do
+    full_revision = 'a' * 40
+    git.expects(:exec).returns([0, full_revision, ""])
+    git.rev_parse('a' * 7).should == full_revision
+  end
+
+  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)
+  end
+end
+
+describe "Braid::Operations::Git#version" do
+  ACTUAL_VERSION = "1.5.5.1.98.gf0ec4"
+
+  before(:each) do
+    git.expects(:exec).returns([0, "git version #{ACTUAL_VERSION}\n", ""])
+  end
+
+  it "should extract from git --version output" do
+    git.version.should == ACTUAL_VERSION
+  end
+end
+
+describe "Braid::Operations::Git#require_version" do
+  REQUIRED_VERSION = "1.5.4.5"
+  PASS_VERSIONS    = %w(1.5.4.6 1.5.5 1.6 1.5.4.5.2 1.5.5.1.98.gf0ec4)
+  FAIL_VERSIONS    = %w(1.5.4.4 1.5.4 1.5.3 1.4.5.6)
+
+  def set_version(str)
+    git.expects(:exec).returns([0, "git version #{str}\n", ""])
+  end
+
+  it "should return true for higher revisions" do
+    PASS_VERSIONS.each do |version|
+      set_version(version)
+      git.require_version(REQUIRED_VERSION).should == true
+    end
+  end
+
+  it "should return false for lower revisions" do
+    FAIL_VERSIONS.each do |version|
+      set_version(version)
+      git.require_version(REQUIRED_VERSION).should == false
+    end
+  end
+end
+
+describe "Braid::Operations::GitCache#path" do
+  it "should use the local cache directory and strip characters" do
+    git_cache.path("git://path").should == File.join(Braid.local_cache_dir, "git___path")
+    git_cache.path("git@domain:repository.git").should == File.join(Braid.local_cache_dir, "git_domain_repository.git")
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'test/spec'
+require 'mocha'
+
+require File.dirname(__FILE__) + '/../lib/braid'
+
+def new_from_options(url, options = {})
+  @mirror = Braid::Mirror.new_from_options(url, options)
+end
+
+def build_mirror(options = {})
+  Braid::Mirror.new("path", options)
+end
+
+include Braid::Operations::VersionControl

metadata

@@ -0,0 +1,155 @@
+--- !ruby/object:Gem::Specification
+name: realityforge-braid
+version: !ruby/object:Gem::Version
+  version: 0.7.2
+  prerelease: 
+platform: ruby
+authors:
+- Cristi Balan
+- Norbert Crombach
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-01-02 00:00:00.000000000 Z
+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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.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
+  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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+description: A simple tool for tracking vendor branches in git.
+email: evil@che.lu
+executables:
+- braid
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/braid
+- braid.gemspec
+- lib/braid.rb
+- lib/braid/command.rb
+- lib/braid/commands/add.rb
+- lib/braid/commands/diff.rb
+- lib/braid/commands/list.rb
+- lib/braid/commands/push.rb
+- lib/braid/commands/remove.rb
+- lib/braid/commands/setup.rb
+- lib/braid/commands/update.rb
+- lib/braid/config.rb
+- 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
+homepage: http://evil.che.lu/projects/braid
+licenses: []
+post_install_message: 
+rdoc_options:
+- --line-numbers
+- --inline-source
+- --title
+- braid
+- --main
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4601304509761184650
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4601304509761184650
+requirements: []
+rubyforge_project: braid
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
+summary: A simple tool for tracking vendor branches in git.
+test_files: []