braid 0.6.2 → 0.7.0

data/lib/braid/commands/setup.rb

@@ -6,29 +6,30 @@ module Braid
       end
 
       protected
-        def setup_all
-          msg "Setting up all mirrors."
-          config.mirrors.each do |path|
-            setup_one(path)
-          end
+      
+      def setup_all
+        msg "Setting up all mirrors."
+        config.mirrors.each do |path|
+          setup_one(path)
         end
+      end
 
-        def setup_one(path)
-          mirror = config.get!(path)
+      def setup_one(path)
+        mirror = config.get!(path)
 
-          if git.remote_url(mirror.remote)
-            msg "Setup: Mirror '#{mirror.path}' already has a remote. Reusing it." if verbose?
-            return
-          end
+        if git.remote_url(mirror.remote)
+          msg "Setup: Mirror '#{mirror.path}' already has a remote. Reusing it." if verbose?
+          return
+        end
 
-          msg "Setup: Creating remote for '#{mirror.path}'."
-          unless mirror.type == "svn"
-            url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
-            git.remote_add(mirror.remote, url, mirror.branch)
-          else
-            git_svn.init(mirror.remote, mirror.url)
-          end
+        msg "Setup: Creating remote for '#{mirror.path}'."
+        unless mirror.type == "svn"
+          url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
+          git.remote_add(mirror.remote, url, mirror.branch)
+        else
+          git_svn.init(mirror.remote, mirror.url)
         end
+      end
     end
   end
 end

data/lib/braid/commands/update.rb

@@ -10,92 +10,93 @@ module Braid
       end
 
       protected
-        def update_all(options = {})
-          options.reject! { |k,v| %w(revision head).include?(k) }
-          msg "Updating all mirrors."
-          config.mirrors.each do |path|
-            update_one(path, options)
-          end
+
+      def update_all(options = {})
+        options.reject! { |k, v| %w(revision head).include?(k) }
+        msg "Updating all mirrors."
+        config.mirrors.each do |path|
+          update_one(path, options)
         end
+      end
 
-        def update_one(path, options = {})
-          mirror = config.get!(path)
+      def update_one(path, options = {})
+        mirror           = config.get!(path)
 
-          revision_message = options["revision"] ? " to #{display_revision(mirror, options["revision"])}" : ""
-          msg "Updating mirror '#{mirror.path}'#{revision_message}."
+        revision_message = options["revision"] ? " to #{display_revision(mirror, options["revision"])}" : ""
+        msg "Updating mirror '#{mirror.path}'#{revision_message}."
 
-          # check options for lock modification
-          if mirror.locked?
-            if options["head"]
-              msg "Unlocking mirror '#{mirror.path}'." if verbose?
-              mirror.lock = nil
-            elsif !options["revision"]
-              msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force."
-              return
-            end
+        # check options for lock modification
+        if mirror.locked?
+          if options["head"]
+            msg "Unlocking mirror '#{mirror.path}'." if verbose?
+            mirror.lock = nil
+          elsif !options["revision"]
+            msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force."
+            return
           end
+        end
 
-          setup_remote(mirror)
-          msg "Fetching new commits for '#{mirror.path}'." if verbose?
-          mirror.fetch
+        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)
+        new_revision    = validate_new_revision(mirror, options["revision"])
+        target_revision = determine_target_revision(mirror, new_revision)
 
-          if mirror.merged?(target_revision)
-            msg "Mirror '#{mirror.path}' is already up to date."
-            return
-          end
+        if mirror.merged?(target_revision)
+          msg "Mirror '#{mirror.path}' is already up to date."
+          return
+        end
 
-          if mirror.squashed?
-            diff = mirror.diff
-            base_revision = mirror.base_revision
-          end
+        if mirror.squashed?
+          diff          = mirror.diff
+          base_revision = mirror.base_revision
+        end
+
+        mirror.revision = new_revision
+        mirror.lock = new_revision if options["revision"]
 
-          mirror.revision = new_revision
-          mirror.lock = new_revision if options["revision"]
-
-          msg "Merging in mirror '#{mirror.path}'." if verbose?
-          begin
-            if mirror.squashed?
-              local_hash = git.rev_parse("HEAD")
-              if !diff.empty?
-                base_hash = generate_tree_hash(mirror, base_revision)
-              else
-                base_hash = local_hash
-              end
-              remote_hash = generate_tree_hash(mirror, target_revision)
-              ENV["GITHEAD_#{local_hash}"] = "HEAD"
-              ENV["GITHEAD_#{remote_hash}"] = target_revision
-              git.merge_recursive(base_hash, local_hash, remote_hash)
+        msg "Merging in mirror '#{mirror.path}'." if verbose?
+        begin
+          if mirror.squashed?
+            local_hash = git.rev_parse("HEAD")
+            if !diff.empty?
+              base_hash = generate_tree_hash(mirror, base_revision)
             else
-              git.merge_subtree(target_revision)
+              base_hash = local_hash
             end
-          rescue Operations::MergeError => error
-            msg "Caught merge error. Breaking."
+            remote_hash                   = generate_tree_hash(mirror, target_revision)
+            ENV["GITHEAD_#{local_hash}"]  = "HEAD"
+            ENV["GITHEAD_#{remote_hash}"] = target_revision
+            git.merge_recursive(base_hash, local_hash, remote_hash)
+          else
+            git.merge_subtree(target_revision)
           end
+        rescue Operations::MergeError => error
+          msg "Caught merge error. Breaking."
+        end
 
-          config.update(mirror)
-          add_config_file
+        config.update(mirror)
+        add_config_file
 
-          commit_message = "Update mirror '#{mirror.path}' to #{display_revision(mirror)}"
-          if error
-            File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
-            return
-          end
-
-          git.commit(commit_message)
-          msg "Updated mirror to #{display_revision(mirror)}."
+        commit_message = "Update mirror '#{mirror.path}' to #{display_revision(mirror)}"
+        if error
+          File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
+          return
         end
 
-        def generate_tree_hash(mirror, revision)
-          git.rm_r(mirror.path)
-          git.read_tree_prefix(revision, mirror.path)
-          success = git.commit("Temporary commit for mirror '#{mirror.path}'")
-          hash = git.rev_parse("HEAD")
-          git.reset_hard("HEAD^") if success
-          hash
-        end
+        git.commit(commit_message)
+        msg "Updated mirror to #{display_revision(mirror)}."
+      end
+
+      def generate_tree_hash(mirror, revision)
+        git.rm_r(mirror.path)
+        git.read_tree_prefix(revision, mirror.path)
+        success = git.commit("Temporary commit for mirror '#{mirror.path}'")
+        hash    = git.rev_parse("HEAD")
+        git.reset_hard("HEAD^") if success
+        hash
+      end
     end
   end
 end

data/lib/braid/config.rb

@@ -79,10 +79,10 @@ module Braid
         @db.roots.each do |path|
           attributes = @db[path]
           if attributes["local_branch"]
-            attributes["url"] = attributes.delete("remote")
-            attributes["remote"] = attributes.delete("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
+            attributes["lock"]     = attributes["revision"] # so far this has always been true
           end
           @db[path] = clean_attributes(attributes)
         end
@@ -90,12 +90,12 @@ module Braid
     end
 
     private
-      def write_mirror(mirror)
-        @db[mirror.path] = clean_attributes(mirror.attributes)
-      end
+    def write_mirror(mirror)
+      @db[mirror.path] = clean_attributes(mirror.attributes)
+    end
 
-      def clean_attributes(hash)
-        hash.reject { |k,v| v.nil? }
-      end
+    def clean_attributes(hash)
+      hash.reject { |k, v| v.nil? }
+    end
   end
 end

data/lib/braid/mirror.rb

@@ -1,6 +1,6 @@
 module Braid
   class Mirror
-    TYPES = %w(git svn)
+    TYPES      = %w(git svn)
     ATTRIBUTES = %w(url remote type branch squashed revision lock)
 
     class UnknownType < BraidError
@@ -24,12 +24,12 @@ module Braid
     attr_reader :path, :attributes
 
     def initialize(path, attributes = {})
-      @path = path.sub(/\/$/, '')
+      @path       = path.sub(/\/$/, '')
       @attributes = attributes
     end
 
     def self.new_from_options(url, options = {})
-      url = url.sub(/\/$/, '')
+      url    = url.sub(/\/$/, '')
 
       branch = options["branch"] || "master"
 
@@ -47,11 +47,11 @@ module Braid
         path = "vendor/plugins/#{path}"
       end
 
-      remote = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
+      remote   = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
       squashed = !options["full"]
       branch = nil if type == "svn"
 
-      attributes = { "url" => url, "remote" => remote, "type" => type, "branch" => branch, "squashed" => squashed }
+      attributes = {"url" => url, "remote" => remote, "type" => type, "branch" => branch, "squashed" => squashed}
       self.new(path, attributes)
     end
 
@@ -85,7 +85,7 @@ module Braid
 
     def diff
       remote_hash = git.rev_parse("#{base_revision}:")
-      local_hash = git.tree_hash(path)
+      local_hash  = git.tree_hash(path)
       remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : ""
     end
 
@@ -119,59 +119,60 @@ module Braid
     end
 
     private
-      def method_missing(name, *args)
-        if ATTRIBUTES.find { |attribute| name.to_s =~ /^(#{attribute})(=)?$/ }
-          unless $2
-            attributes[$1]
-          else
-            attributes[$1] = args[0]
-          end
+
+    def method_missing(name, *args)
+      if ATTRIBUTES.find { |attribute| name.to_s =~ /^(#{attribute})(=)?$/ }
+        unless $2
+          attributes[$1]
         else
-          raise NameError, "unknown attribute `#{name}'"
+          attributes[$1] = args[0]
         end
+      else
+        raise NameError, "unknown attribute `#{name}'"
       end
+    end
 
-      def inferred_revision
-        local_commits = git.rev_list("HEAD", "-- #{path}").split("\n")
-        remote_hashes = git.rev_list("--pretty=format:\"%T\"", remote).split("commit ").map do |chunk|
-          chunk.split("\n", 2).map { |value| value.strip }
-        end
-        hash = nil
-        local_commits.each do |local_commit|
-          local_tree = git.tree_hash(path, local_commit)
-          if match = remote_hashes.find { |_, remote_tree| local_tree == remote_tree }
-            hash = match[0]
-            break
-          end
+    def inferred_revision
+      local_commits = git.rev_list("HEAD", "-- #{path}").split("\n")
+      remote_hashes = git.rev_list("--pretty=format:\"%T\"", remote).split("commit ").map do |chunk|
+        chunk.split("\n", 2).map { |value| value.strip }
+      end
+      hash          = nil
+      local_commits.each do |local_commit|
+        local_tree = git.tree_hash(path, local_commit)
+        if match = remote_hashes.find { |_, remote_tree| local_tree == remote_tree }
+          hash = match[0]
+          break
         end
-        hash
       end
+      hash
+    end
 
-      def self.extract_type_from_url(url)
-        return nil unless url
-        url.sub!(/\/$/, '')
+    def self.extract_type_from_url(url)
+      return nil unless url
+      url.sub!(/\/$/, '')
 
-        # check for git:// and svn:// URLs
-        url_scheme = url.split(":").first
-        return url_scheme if TYPES.include?(url_scheme)
+      # check for git:// and svn:// URLs
+      url_scheme = url.split(":").first
+      return url_scheme if TYPES.include?(url_scheme)
 
-        return "svn" if url[-6..-1] == "/trunk"
-        return "git" if url[-4..-1] == ".git"
-      end
+      return "svn" if url[-6..-1] == "/trunk"
+      return "git" if url[-4..-1] == ".git"
+    end
 
-      def self.extract_path_from_url(url)
-        return nil unless url
-        name = File.basename(url)
+    def self.extract_path_from_url(url)
+      return nil unless url
+      name = File.basename(url)
 
-        if File.extname(name) == ".git"
-          # strip .git
-          name[0..-5]
-        elsif name == "trunk"
-          # use parent
-          File.basename(File.dirname(url))
-        else
-          name
-        end
+      if File.extname(name) == ".git"
+        # strip .git
+        name[0..-5]
+      elsif name == "trunk"
+        # use parent
+        File.basename(File.dirname(url))
+      else
+        name
       end
+    end
   end
 end

data/lib/braid/operations.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 require 'rubygems'
-require 'open4'
+require defined?(JRUBY_VERSION) ? 'open3' : 'open4'
 require 'tempfile'
 
 module Braid
@@ -16,8 +16,8 @@ module Braid
     end
     class VersionTooLow < BraidError
       def initialize(command, version, required)
-        @command = command
-        @version = version.to_s.split("\n").first
+        @command  = command
+        @version  = version.to_s.split("\n").first
         @required = required
       end
 
@@ -45,8 +45,11 @@ module Braid
     class Proxy
       include Singleton
 
-      def self.command; name.split('::').last.downcase; end # hax!
+      def self.command;
+        name.split('::').last.downcase;
+      end
 
+      # hax!
       def version
         status, out, err = exec!("#{self.class.command} --version")
         out.sub(/^.* version/, "").strip
@@ -54,7 +57,7 @@ module Braid
 
       def require_version(required)
         required = required.split(".")
-        actual = version.split(".")
+        actual   = version.split(".")
 
         actual.each_with_index do |actual_piece, idx|
           required_piece = required[idx]
@@ -79,62 +82,72 @@ module Braid
       end
 
       private
-        def command(name)
-          # stub
-          name
-        end
 
-        def invoke(arg, *args)
-          exec!("#{command(arg)} #{args.join(' ')}".strip)[1].strip # return stdout
-        end
+      def command(name)
+        # stub
+        name
+      end
 
-        def method_missing(name, *args)
-          invoke(name, *args)
-        end
+      def invoke(arg, *args)
+        exec!("#{command(arg)} #{args.join(' ')}".strip)[1].strip # return stdout
+      end
+
+      def method_missing(name, *args)
+        invoke(name, *args)
+      end
+
+      def exec(cmd)
+        cmd.strip!
 
-        def exec(cmd)
-          cmd.strip!
+        previous_lang = ENV['LANG']
+        ENV['LANG']   = 'C'
 
-          previous_lang = ENV['LANG']
-          ENV['LANG'] = 'C'
+        out, err = nil
+        log(cmd)
 
-          out, err = nil
-          log(cmd)
+        if defined?(JRUBY_VERSION)
+          Open3.popen3(cmd) do |stdin, stdout, stderr|
+            out = stdout.read
+            err = stderr.read
+          end
+          status = $?.exitstatus
+        else
           status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
             out = stdout.read
             err = stderr.read
           end.exitstatus
-          [status, out, err]
-
-        ensure
-          ENV['LANG'] = previous_lang
         end
 
-        def exec!(cmd)
-          status, out, err = exec(cmd)
-          raise ShellExecutionError, err unless status == 0
-          [status, out, err]
-        end
+        [status, out, err]
+      ensure
+        ENV['LANG'] = previous_lang
+      end
 
-        def sh(cmd, message = nil)
-          message ||= "could not fetch" if cmd =~ /fetch/
-          log(cmd)
-          `#{cmd}`
-          raise ShellExecutionError, message unless $?.exitstatus == 0
-          true
-        end
+      def exec!(cmd)
+        status, out, err = exec(cmd)
+        raise ShellExecutionError, err unless status == 0
+        [status, out, err]
+      end
 
-        def msg(str)
-          puts "Braid: #{str}"
-        end
+      def sh(cmd, message = nil)
+        message ||= "could not fetch" if cmd =~ /fetch/
+        log(cmd)
+        `#{cmd}`
+        raise ShellExecutionError, message unless $?.exitstatus == 0
+        true
+      end
 
-        def log(cmd)
-          msg "Executing `#{cmd}`" if verbose?
-        end
+      def msg(str)
+        puts "Braid: #{str}"
+      end
 
-        def verbose?
-          Braid.verbose
-        end
+      def log(cmd)
+        msg "Executing `#{cmd}`" if verbose?
+      end
+
+      def verbose?
+        Braid.verbose
+      end
     end
 
     class Git < Proxy
@@ -275,12 +288,22 @@ module Braid
 
       def apply(diff, *args)
         err = nil
-        status = Open4.popen4("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |pid, stdin, stdout, stderr|
-          stdin.puts(diff)
-          stdin.close
 
-          err = stderr.read
-        end.exitstatus
+        if defined?(JRUBY_VERSION)
+          Open3.popen3("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |stdin, stdout, stderr|
+            stdin.puts(diff)
+            stdin.close
+            err = stderr.read
+          end
+          status = $?.exitstatus
+        else
+          status = Open4.popen4("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |pid, stdin, stdout, stderr|
+            stdin.puts(diff)
+            stdin.close
+            err = stderr.read
+          end.exitstatus
+        end
+
         raise ShellExecutionError, err unless status == 0
         true
       end
@@ -291,17 +314,21 @@ module Braid
       end
 
       private
-        def command(name)
-          "#{self.class.command} #{name.to_s.gsub('_', '-')}"
-        end
+
+      def command(name)
+        "#{self.class.command} #{name.to_s.gsub('_', '-')}"
+      end
     end
 
     class GitSvn < Proxy
-      def self.command; "git svn"; end
+      def self.command;
+        "git svn";
+      end
 
       def commit_hash(remote, revision)
-        out = invoke(:log, "--show-commit --oneline", "-r #{revision}", remote)
-        part = out.to_s.split(" | ")[1]
+        out  = invoke(:log, "--show-commit --oneline", "-r #{revision}", remote)
+        part = out.to_s.split("|")[1]
+        part.strip!
         raise UnknownRevision, "r#{revision}" unless part
         git.rev_parse(part)
       end
@@ -316,13 +343,14 @@ module Braid
       end
 
       private
-        def command(name)
-          "#{self.class.command} #{name}"
-        end
 
-        def git
-          Git.instance
-        end
+      def command(name)
+        "#{self.class.command} #{name}"
+      end
+
+      def git
+        Git.instance
+      end
     end
 
     class Svn < Proxy
@@ -364,13 +392,14 @@ module Braid
       end
 
       private
-        def local_cache_dir
-          Braid.local_cache_dir
-        end
 
-        def git
-          Git.instance
-        end
+      def local_cache_dir
+        Braid.local_cache_dir
+      end
+
+      def git
+        Git.instance
+      end
     end
 
     module VersionControl