evilchelu-braid 0.4.0 → 0.4.10

data/test/mirror_test.rb

@@ -0,0 +1,118 @@
+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, @mirror.path).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.send(: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.send(: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_url" do
+  it "should return a valid local cache name" do
+    @mirror = new_from_options("git://remoteurl/path/to/repo.git")
+    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/git___remoteurl_path_to_repo.git"
+
+    @mirror = new_from_options("git@remoteurl/path/to/repo.git")
+    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/git_remoteurl_path_to_repo.git"
+
+    @mirror = new_from_options("remoteurl/path/to/repo/", "type" => "git")
+    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/remoteurl_path_to_repo"
+  end
+end
+
+describe "Braid::Mirror#init_or_fetch_local_cache" do
+  it "should " do
+    @mirror = new_from_options("git@remoteurl/path/to/repo.git")
+    git_cache.expects(:init_or_fetch).with("git@remoteurl/path/to/repo.git", "#{ENV["HOME"]}/.braid/cache/git_remoteurl_path_to_repo.git")
+    @mirror.init_or_fetch_local_cache
+  end
+
+end
+
+

data/test/operations_test.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+describe "Braid::Operations::Git#remote_exists?" do
+  before(:each) do
+    File.expects(:readlines).returns(["[remote \"braid/git/one\"]\n", "[svn-remote \"braid/git/two\"]\n"])
+  end
+
+  it "should return true for existing git remotes" do
+    git.remote_exists?("braid/git/one").should == true
+  end
+
+  it "should return true for existing svn remotes" do
+    git.remote_exists?("braid/git/two").should == true
+  end
+
+  it "should return false for nonexistent remotes" do
+    git.remote_exists?("N/A").should == false
+  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#init_or_fetch" do
+  it "should initialize or fetch a local clone of the given url in the given directory" do
+  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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evilchelu-braid
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.10
 platform: ruby
 authors: 
 - Cristi Balan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-01 00:00:00 -07:00
+date: 2008-09-23 00:00:00 -07:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,27 +31,17 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.6
     version: 
-description: Braid is a simple tool to help track git and svn vendor branches in a git repository
+description: A simple tool for tracking vendor branches in git.
 email: evil@che.lu
 executables: 
 - braid
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- Rakefile
 - bin/braid
-- config/hoe.rb
-- config/requirements.rb
-- lib/braid.rb
+- braid.gemspec
 - lib/braid/command.rb
 - lib/braid/commands/add.rb
 - lib/braid/commands/diff.rb
@@ -59,28 +49,35 @@ files:
 - lib/braid/commands/setup.rb
 - lib/braid/commands/update.rb
 - lib/braid/config.rb
-- lib/braid/exceptions.rb
+- lib/braid/mirror.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
+- lib/braid.rb
+- LICENSE
+- Rakefile
+- README.rdoc
+- test/braid_test.rb
+- test/config_test.rb
+- test/fixtures/shiny/README
+- test/fixtures/skit1/layouts/layout.liquid
+- test/fixtures/skit1/preview.png
+- test/fixtures/skit1.1/layouts/layout.liquid
+- test/fixtures/skit1.2/layouts/layout.liquid
+- 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
 has_rdoc: true
 homepage: http://evil.che.lu/projects/braid
 post_install_message: 
 rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- braid
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -98,9 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: braid
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Braid is a simple tool to help track git and svn vendor branches in a git repository
+summary: A simple tool for tracking vendor branches in git.
 test_files: []
 

data/History.txt

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

data/Manifest.txt

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

@@ -1,53 +0,0 @@
-= 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/config/hoe.rb

@@ -1,68 +0,0 @@
-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')