braid 0.7.1 → 1.0.0

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = "0.7.1"
+  VERSION = '1.0.0'
 end

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/spec/integration_helper.rb

@@ -0,0 +1,47 @@
+require 'rubygems'
+require 'rspec'
+require 'mocha/api'
+
+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, "spec", "fixtures")
+FileUtils.rm_rf(TMP_PATH)
+FileUtils.mkdir_p(TMP_PATH)
+
+BRAID_BIN = ((defined?(JRUBY_VERSION) || Gem.win_platform?) ? 'ruby ' : '') + File.join(BRAID_PATH, 'bin', 'braid')
+
+def in_dir(dir = TMP_PATH)
+  Dir.chdir(dir)
+  yield
+end
+
+def run_command(command)
+  output = `#{command}`
+  raise "Error executing command: #{command}\nOutput: #{output}" unless $?.success?
+  output
+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_command("git config --global --get user.email || git config --global user.email \"you@example.com\"")
+    run_command("git config --global --get user.name  || git config --global user.name \"Your Name\"")
+    run_command('git init')
+    run_command('git add *')
+    run_command("git commit -m \"initial commit of #{fixture_name}\"")
+  end
+
+  git_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"
@@ -43,7 +14,7 @@ end
 
 describe "Braid::Mirror#diff" do
   before(:each) do
-    @mirror = build_mirror("revision" => 'a' * 40)
+    @mirror = build_mirror('revision' => 'a' * 40, 'url' => 'git://path')
     @mirror.stubs(:base_revision).returns(@mirror.revision) # bypass rev_parse
   end
 
@@ -54,6 +25,7 @@ describe "Braid::Mirror#diff" do
 
   it "should return an empty string when the hashes match" do
     set_hashes('b' * 40, 'b' * 40)
+    git.expects(:fetch)
     git.expects(:diff_tree).never
     @mirror.diff.should == ""
   end
@@ -61,6 +33,7 @@ describe "Braid::Mirror#diff" do
   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(:fetch)
     git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
     @mirror.diff.should == diff
   end
@@ -69,7 +42,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 +73,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}

@@ -3,7 +3,7 @@ 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.stubs(:invoke).with(:config, 'remote.braid/git/one.url').returns("git://path")
     git.remote_url("braid/git/one").should == "git://path"
   end
 end
@@ -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'
 
@@ -13,3 +13,7 @@ def build_mirror(options = {})
 end
 
 include Braid::Operations::VersionControl
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end

metadata

@@ -1,97 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: braid
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Cristi Balan
 - Norbert Crombach
+- Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: main
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 4
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 4.7.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: test-spec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
-        version: 0.10.0
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 9
-        - 11
+      - !ruby/object:Gem::Version
         version: 0.9.11
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.11
 description: A simple tool for tracking vendor branches in git.
-email: evil@che.lu
-executables: 
+email: evil@che.lu norbert.crombach@primetheory.org peter@realityforge.org
+executables:
 - braid
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -111,68 +98,44 @@ 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
-homepage: http://evil.che.lu/projects/braid
+- 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
+homepage: https://github.com/cristibalan/braid
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - braid
-- --main
-require_paths: 
+- "--main"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: braid
-rubygems_version: 1.8.9
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple tool for tracking vendor branches in git.
-test_files: 
-- 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
+test_files: []