braid 0.6.2 → 0.7.0

data/.gitignore

@@ -0,0 +1,12 @@
+*.gem
+*.rbc
+*.sw?
+.DS_Store
+.bundle
+.idea
+Gemfile.lock
+coverage
+nbproject
+pkg
+pkg/*
+rdoc

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.textile

@@ -7,24 +7,19 @@ The project homepage is at "http://github.com/evilchelu/braid/wikis/home":http:/
 h2. Requirements
 
 * git 1.6+ (and git-svn if you want to mirror svn repositories)
-* main >= 2.8.0
-* open4 >= 0.9.6
+* main >= 4.2.0
+* open4 >= 1.0.1 (unless using jruby)
 
 h2. Installing using rubygems - official releases
 
   gem install braid
 
-h2. Installing using rubygems - development releases
-
-  gem sources -a http://gems.github.com
-  gem install evilchelu-braid
-
 h2. Installing from source
 
   git clone git://github.com/evilchelu/braid.git
   cd braid
-  gem build braid.gemspec
-  sudo gem install braid-x.y.z.gem
+  bundle install
+  rake install # possibly requiring sudo
 
 h2. Quick usage - ruby project
 
@@ -116,5 +111,5 @@ h2. Contributors (alphabetically)
 * Ferdinand Svehla
 * Michael Klishin
 * Roman Heinrich
+* Travis Tilley
 * Tyler Rick
-

data/Rakefile

@@ -1,3 +1,6 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake'
 require 'rake/testtask'
 

data/bin/braid

@@ -55,7 +55,7 @@ Main {
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
+      Braid::Command.run(:add, url, {"type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full})
     }
   }
 
@@ -79,7 +79,7 @@ Main {
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:update, path, { "revision" => revision, "head" => head })
+      Braid::Command.run(:update, path, {"revision" => revision, "head" => head})
     }
   }
 
@@ -99,8 +99,8 @@ Main {
     mixin :argument_path, :option_verbose, :option_keep_remote
 
     run {
-      options = {
-        :keep => keep
+      options       = {
+          :keep => keep
       }
       Braid.verbose = verbose
       Braid::Command.run(:remove, path, options)
@@ -153,6 +153,14 @@ Main {
     }
   }
 
+  mode(:list) {
+    description 'Show all tracked mirrors (and if updates are available).'
+
+    run {
+      Braid::Command.run(:list)
+    }
+  }
+
   mixin(:argument_path) {
     argument(:path) {
       attr
@@ -225,7 +233,7 @@ Main {
 
   mixin(:option_verbose) {
     option(:verbose, :v) {
-      optional 
+      optional
       desc 'log shell commands'
       attr
     }

data/braid.gemspec

@@ -1,25 +1,33 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'braid/version'
+
 Gem::Specification.new do |s|
-  s.name = %q{braid}
-  s.version = "0.6.2"
+  s.name               = %q{braid}
+  s.version            = Braid::VERSION
+  s.platform           = Gem::Platform::RUBY
+
+  s.authors            = ["Cristi Balan", "Norbert Crombach"]
+  s.email              = %q{evil@che.lu}
+
+  s.homepage           = %q{http://evil.che.lu/projects/braid}
+  s.summary            = %q{A simple tool for tracking vendor branches in git.}
+  s.description        = %q{A simple tool for tracking vendor branches in git.}
 
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.rubyforge_project  = %q{braid}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Cristi Balan", "Norbert Crombach"]
-  s.date = %q{2010-07-19}
+  s.files              = `git ls-files`.split("\n")
+  s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables        = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.default_executable = %q{braid}
-  s.description = %q{A simple tool for tracking vendor branches in git.}
-  s.email = %q{evil@che.lu}
-  s.executables = ["braid"]
-  s.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"]
-  s.has_rdoc = false
-  s.homepage = %q{http://evil.che.lu/projects/braid}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{braid}
-  s.rubygems_version = %q{1.1.0}
-  s.summary = %q{A simple tool for tracking vendor branches in git.}
+  s.require_paths      = ["lib"]
+
+  s.has_rdoc           = false
+  s.rdoc_options       = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
 
   s.add_dependency(%q<main>, [">= 4.2.0"])
-  s.add_dependency(%q<open4>, [">= 1.0.1"])
+  s.add_dependency(%q<open4>, [">= 1.0.1"]) unless defined?(JRUBY_VERSION)
+
+  s.add_development_dependency(%q<test-spec>, [">= 0.10.0"])
+  s.add_development_dependency(%q<mocha>, [">= 0.9.11"])
 end

data/lib/braid.rb

@@ -1,16 +1,25 @@
 $:.unshift dirname = File.dirname(__FILE__)
+require 'braid/version'
 
 module Braid
-  VERSION = "0.6.2"
-
-  CONFIG_FILE = ".braids"
+  CONFIG_FILE          = ".braids"
   REQUIRED_GIT_VERSION = "1.6"
 
-  def self.verbose; @verbose || false; end
-  def self.verbose=(new_value); @verbose = !!new_value; end
+  def self.verbose
+    @verbose || false
+  end
+
+  def self.verbose=(new_value)
+    @verbose = !!new_value
+  end
+
+  def self.use_local_cache
+    [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"])
+  end
 
-  def self.use_local_cache; [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"]); end
-  def self.local_cache_dir; File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache"); end
+  def self.local_cache_dir
+    File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache")
+  end
 
   class BraidError < StandardError
     def message
@@ -25,6 +34,7 @@ require 'braid/operations'
 require 'braid/mirror'
 require 'braid/config'
 require 'braid/command'
+
 Dir[dirname + '/braid/commands/*'].each do |file|
   require file
 end

data/lib/braid/command.rb

@@ -14,10 +14,10 @@ module Braid
 
     rescue BraidError => error
       case error
-      when Operations::ShellExecutionError
-        msg "Shell error: #{error.message}"
-      else
-        msg "Error: #{error.message}"
+        when Operations::ShellExecutionError
+          msg "Shell error: #{error.message}"
+        else
+          msg "Error: #{error.message}"
       end
       exit(1)
     end
@@ -39,93 +39,94 @@ module Braid
     end
 
     private
-      def setup_remote(mirror)
-        Command.run(:setup, mirror.path)
-      end
 
-      def use_local_cache?
-        Braid.use_local_cache
-      end
+    def setup_remote(mirror)
+      Command.run(:setup, mirror.path)
+    end
 
-      def self.verify_git_version!
-        git.require_version!(REQUIRED_GIT_VERSION)
-      end
+    def use_local_cache?
+      Braid.use_local_cache
+    end
 
-      def bail_on_local_changes!
-        git.ensure_clean!
-      end
+    def self.verify_git_version!
+      git.require_version!(REQUIRED_GIT_VERSION)
+    end
 
-      def with_reset_on_error
-        work_head = git.head
+    def bail_on_local_changes!
+      git.ensure_clean!
+    end
 
-        begin
-          yield
-        rescue => error
-          msg "Resetting to '#{work_head[0, 7]}'."
-          git.reset_hard(work_head)
-          raise error
-        end
-      end
+    def with_reset_on_error
+      work_head = git.head
 
-      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
+      begin
+        yield
+      rescue => error
+        msg "Resetting to '#{work_head[0, 7]}'."
+        git.reset_hard(work_head)
+        raise error
       end
+    end
 
-      def add_config_file
-        git.add(CONFIG_FILE)
+    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 display_revision(mirror, revision = nil)
-        revision ||= mirror.revision
-        mirror.type == "svn" ? "r#{revision}" : "'#{revision[0, 7]}'"
-      end
+    def add_config_file
+      git.add(CONFIG_FILE)
+    end
 
-      def validate_new_revision(mirror, new_revision)
-        unless new_revision
-          unless mirror.type == "svn"
-            return git.rev_parse(mirror.remote)
-          else
-            return svn.head_revision(mirror.url)
-          end
-        end
+    def display_revision(mirror, revision = nil)
+      revision ||= mirror.revision
+      mirror.type == "svn" ? "r#{revision}" : "'#{revision[0, 7]}'"
+    end
 
+    def validate_new_revision(mirror, new_revision)
+      unless new_revision
         unless mirror.type == "svn"
-          new_revision = git.rev_parse(new_revision)
+          return git.rev_parse(mirror.remote)
         else
-          new_revision = svn.clean_revision(new_revision)
+          return svn.head_revision(mirror.url)
         end
-        old_revision = mirror.revision
+      end
 
-        if new_revision == old_revision
-          raise InvalidRevision, "mirror is already at requested revision"
-        end
+      unless mirror.type == "svn"
+        new_revision = git.rev_parse(new_revision)
+      else
+        new_revision = svn.clean_revision(new_revision)
+      end
+      old_revision = mirror.revision
 
-        if mirror.type == "svn"
-          if old_revision && new_revision < old_revision
-            raise InvalidRevision, "local revision is higher than request revision"
-          end
+      if new_revision == old_revision
+        raise InvalidRevision, "mirror is already at requested revision"
+      end
 
-          if svn.head_revision(mirror.url) < new_revision
-            raise InvalidRevision, "requested revision is higher than remote revision"
-          end
+      if mirror.type == "svn"
+        if old_revision && new_revision < old_revision
+          raise InvalidRevision, "local revision is higher than request revision"
         end
 
-        new_revision
+        if svn.head_revision(mirror.url) < new_revision
+          raise InvalidRevision, "requested revision is higher than remote revision"
+        end
       end
 
-      def determine_target_revision(mirror, new_revision)
-        unless mirror.type == "svn"
-          git.rev_parse(new_revision)
-        else
-          git_svn.commit_hash(mirror.remote, new_revision)
-        end
+      new_revision
+    end
+
+    def determine_target_revision(mirror, new_revision)
+      unless mirror.type == "svn"
+        git.rev_parse(new_revision)
+      else
+        git_svn.commit_hash(mirror.remote, new_revision)
       end
+    end
   end
 end

data/lib/braid/commands/add.rb

@@ -5,9 +5,9 @@ module Braid
         bail_on_local_changes!
 
         with_reset_on_error do
-          mirror = config.add_from_options(url, options)
+          mirror           = config.add_from_options(url, options)
 
-          branch_message = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
+          branch_message   = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
           revision_message = options["revision"] ? " at #{display_revision(mirror, options["revision"])}" : ""
           msg "Adding #{mirror.type} mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
 
@@ -17,7 +17,7 @@ module Braid
           setup_remote(mirror)
           mirror.fetch
 
-          new_revision = validate_new_revision(mirror, options["revision"])
+          new_revision    = validate_new_revision(mirror, options["revision"])
           target_revision = determine_target_revision(mirror, new_revision)
 
           unless mirror.squashed?

data/lib/braid/commands/list.rb

@@ -0,0 +1,32 @@
+module Braid
+  module Commands
+    class List < Command
+      def run(path = nil, options = {})
+        with_reset_on_error do
+          path ? list_one(path, options) : list_all(options)
+        end
+      end
+
+      protected
+      def list_all(options = {})
+        options.reject! { |k, v| %w(revision head).include?(k) }
+        print "\n"
+        msg "Listing all mirrors.\n=======================================================\n"
+        config.mirrors.each_with_index do |path, i|
+          mirror = config.get!(path)
+          print " #{i + 1}) #{path.to_s}"
+          print " [LOCKED]" if mirror.locked?
+          setup_remote(mirror)
+          msg "Fetching new commits for '#{mirror.path}'." if verbose?
+          mirror.fetch
+          new_revision    = validate_new_revision(mirror, options["revision"])
+          target_revision = determine_target_revision(mirror, new_revision)
+          print " !!! UPDATE AVAILABLE !!!" if new_revision.to_s != mirror.base_revision.to_s
+          print "\n"
+        end
+        print "\n"
+      end
+
+    end
+  end
+end

data/lib/braid/commands/push.rb

@@ -5,7 +5,7 @@ module Braid
   module Commands
     class Push < Command
       def run(path, options = {})
-        mirror = config.get!(path)
+        mirror        = config.get!(path)
 
         #mirror.fetch