braid 0.6.2 → 0.7.0

data/lib/braid/version.rb

@@ -0,0 +1,3 @@
+module Braid
+  VERSION = "0.7.0"
+end

data/lib/core_ext.rb

@@ -4,7 +4,7 @@ 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|
+        sort.each do |k, v|
           map.add(k, v)
         end
       end

data/test/config_test.rb

@@ -52,7 +52,7 @@ describe "Braid::Config, with one mirror" do
   it "should update the mirror with new params" do
     @mirror.branch = "other"
     @config.update(@mirror)
-    @config.get("path").attributes.should == { "branch" => "other" }
+    @config.get("path").attributes.should == {"branch" => "other"}
   end
 
   it "should raise when trying to update nonexistent mirror" do

data/test/integration/adding_test.rb

@@ -19,7 +19,7 @@ describe "Adding a mirror in a clean repository" do
       end
 
       file_name = "skit1/layouts/layout.liquid"
-      output = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
+      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")
@@ -54,7 +54,7 @@ describe "Adding a mirror in a clean repository" do
       end
 
       file_name = "skit1/layouts/layout.liquid"
-      output = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
+      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")

data/test/integration/updating_test.rb

@@ -36,7 +36,7 @@ describe "Updating a mirror without conflicts" do
       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)}`
+      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")
@@ -48,8 +48,8 @@ describe "Updating a mirror without conflicts" do
 
   describe "from a svn repository" do
     before do
-      @shiny = create_git_repo_from_fixture("shiny")
-      @skit1 = create_svn_repo_from_fixture("skit1")
+      @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
@@ -74,7 +74,7 @@ describe "Updating a mirror without conflicts" do
       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)}`
+      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")

data/test/integration_helper.rb

@@ -6,8 +6,8 @@ require 'tempfile'
 require 'fileutils'
 require 'pathname'
 
-TMP_PATH = File.join(Dir.tmpdir, "braid_integration")
-BRAID_PATH = Pathname.new(File.dirname(__FILE__)).parent.realpath
+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)
@@ -51,7 +51,7 @@ def create_git_repo_from_fixture(fixture_name)
 end
 
 def create_svn_repo_from_fixture(fixture_name)
-  svn_wc = File.join(TMP_PATH, fixture_name + "_wc")
+  svn_wc   = File.join(TMP_PATH, fixture_name + "_wc")
   svn_repo = File.join(TMP_PATH, fixture_name)
   run_cmds(<<-EOD)
     svnadmin create #{svn_repo}

data/test/mirror_test.rb

@@ -85,8 +85,8 @@ 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"
+        "#{'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

data/test/operations_test.rb

@@ -36,8 +36,8 @@ 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)
+  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", ""])

metadata

@@ -1,132 +1,138 @@
 --- !ruby/object:Gem::Specification 
 name: braid
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
-- Cristi Balan
-- Norbert Crombach
+  - Cristi Balan
+  - Norbert Crombach
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: braid
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: main
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 4
-        - 2
-        - 0
-        version: 4.2.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    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: main
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 4.2.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: test-spec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.10.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.11
+    type: :development
+    version_requirements: *id003
 description: A simple tool for tracking vendor branches in git.
 email: evil@che.lu
 executables: 
-- braid
+  - braid
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- bin/braid
-- braid.gemspec
-- lib/braid/command.rb
-- lib/braid/commands/add.rb
-- lib/braid/commands/diff.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.rb
-- lib/core_ext.rb
-- LICENSE
-- Rakefile
-- README.textile
-- 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
+  - .gitignore
+  - Gemfile
+  - LICENSE
+  - README.textile
+  - 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
 has_rdoc: true
 homepage: http://evil.che.lu/projects/braid
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- braid
-- --main
+  - --line-numbers
+  - --inline-source
+  - --title
+  - braid
+  - --main
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: braid
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A simple tool for tracking vendor branches in git.
-test_files: []
-
+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