realityforge-braid 0.8.0 → 0.9.0

data/.ruby-version

@@ -1 +1 @@
-1.8.7-p371
+1.9.3-p362

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+jdk:
+  - openjdk6
+  - openjdk7
+  - oraclejdk7
+matrix:
+  exclude:
+- rvm: 1.9.3
+  jdk: openjdk7
+- rvm: 1.9.2
+  jdk: oraclejdk7

data/README.md

@@ -1,8 +1,10 @@
 # Braid
 
+[![Build Status](https://secure.travis-ci.org/realityforge/braid.png?branch=master)](http://travis-ci.org/realityforge/braid)
+
 Braid is a simple tool to help track git vendor branches in a git repository.
 
-The project homepage is [here](http://github.com/evilchelu/braid/wikis/home).
+The project homepage is [here](http://github.com/realityforge/braid/wikis/home).
 
 ## Requirements
 

data/Rakefile

@@ -7,3 +7,6 @@ desc 'Run all specs'
 RSpec::Core::RakeTask.new :spec  do |task|
   task.rspec_opts = %w{--backtrace}
 end
+
+desc "Test and package the gem"
+task :default => [:spec, :build]

data/lib/braid/command.rb

@@ -31,7 +31,7 @@ module Braid
     end
 
     def config
-      @config ||= load_and_migrate_config
+      @config ||= Config.new
     end
 
     def verbose?
@@ -72,17 +72,6 @@ module Braid
       end
     end
 
-    def load_and_migrate_config
-      config = Config.new
-      unless config.valid?
-        msg "Configuration is outdated. Migrating."
-        bail_on_local_changes!
-        config.migrate!
-        git.commit("Upgrade .braids", "-- .braids")
-      end
-      config
-    end
-
     def add_config_file
       git.add(CONFIG_FILE)
     end

data/lib/braid/config.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'json'
 require 'yaml/store'
 
 module Braid
@@ -15,7 +16,18 @@ module Braid
     end
 
     def initialize(config_file = CONFIG_FILE)
-      @db = YAML::Store.new(config_file)
+      @config_file = config_file
+      begin
+        store = YAML::Store.new(@config_file)
+        @db = {}
+        store.transaction(true) do
+          store.roots.each do |path|
+            @db[path] = store[path]
+          end
+        end
+      rescue
+        @db = JSON.parse(@config_file)
+      end
     end
 
     def add_from_options(url, options)
@@ -26,17 +38,13 @@ module Braid
     end
 
     def mirrors
-      @db.transaction(true) do
-        @db.roots
-      end
+      @db.keys
     end
 
     def get(path)
-      @db.transaction(true) do
-        if attributes = @db[path.to_s.sub(/\/$/, '')]
-          Mirror.new(path, attributes)
-        end
-      end
+      key = path.to_s.sub(/\/$/, '')
+      attributes = @db[key]
+      return attributes ? Mirror.new(path, attributes) : nil
     end
 
     def get!(path)
@@ -46,50 +54,28 @@ module Braid
     end
 
     def add(mirror)
-      @db.transaction do
-        raise PathAlreadyInUse, mirror.path if @db[mirror.path]
-        write_mirror(mirror)
-      end
+      raise PathAlreadyInUse, mirror.path if get(mirror.path)
+      write_mirror(mirror)
     end
 
     def remove(mirror)
-      @db.transaction do
-        @db.delete(mirror.path)
-      end
+      @db.delete(mirror.path)
     end
 
     def update(mirror)
-      @db.transaction do
-        raise MirrorDoesNotExist, mirror.path unless @db[mirror.path]
-        @db.delete(mirror.path)
-        write_mirror(mirror)
-      end
-    end
-
-    def valid?
-      @db.transaction(true) do
-        !@db.roots.any? {|path| @db[path]["url"].nil?}
-      end
-    end
-
-    def migrate!
-      @db.transaction do
-        @db.roots.each do |path|
-          attributes = @db[path]
-          if attributes["local_branch"]
-            attributes["url"]      = attributes.delete("remote")
-            attributes["remote"]   = attributes.delete("local_branch")
-            attributes["squashed"] = attributes.delete("squash")
-            attributes["lock"]     = attributes["revision"] # so far this has always been true
-          end
-          @db[path] = clean_attributes(attributes)
-        end
-      end
+      raise MirrorDoesNotExist, mirror.path unless get(mirror.path)
+      @db.delete(mirror.path)
+      write_mirror(mirror)
     end
 
     private
     def write_mirror(mirror)
       @db[mirror.path] = clean_attributes(mirror.attributes)
+      new_db = {}
+      @db.keys.sort.each do |key|
+        new_db[key] = @db[key]
+      end
+      File.open(@config_file, "wb") { |f| f.write JSON.pretty_generate(new_db) }
     end
 
     def clean_attributes(hash)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/integration_helper.rb

@@ -18,11 +18,10 @@ def in_dir(dir = TMP_PATH)
   yield
 end
 
-def run_cmds(ary)
-  ary.each do |cmd|
-    cmd = cmd.strip!
-    out = `#{cmd}`
-  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)
@@ -36,11 +35,9 @@ def create_git_repo_from_fixture(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
+    run_command('git init')
+    run_command('git add *')
+    run_command("git commit -m \"initial commit of #{fixture_name}\"")
   end
 
   git_repo

data/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

data/spec/test_helper.rb

@@ -13,3 +13,7 @@ def build_mirror(options = {})
 end
 
 include Braid::Operations::VersionControl
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end

metadata

@@ -1,99 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: realityforge-braid
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.9.0
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
 platform: ruby
-authors: 
+authors:
 - Cristi Balan
 - Norbert Crombach
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-11 00:00:00 +11:00
-default_executable: braid
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: main
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 4
-        - 7
-        - 3
+    requirements:
+    - - ! '>='
+      - !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 
+  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 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 12
-        - 0
+    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 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 9
-        - 11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.11
   type: :development
-  version_requirements: *id004
+  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: 
+executables:
 - braid
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -125,43 +117,33 @@ files:
 - spec/mirror_spec.rb
 - spec/operations_spec.rb
 - spec/test_helper.rb
-has_rdoc: true
 homepage: http://evil.che.lu/projects/braid
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - braid
 - --main
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !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"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: braid
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple tool for tracking vendor branches in git.
 test_files: []
-