evilchelu-braid 0.3.5

data/lib/braid/command.rb

@@ -0,0 +1,53 @@
+module Braid
+  class Command
+    include Operations::Mirror
+    include Operations::Helpers
+
+    def self.run(command, *args)
+      klass = Braid::Commands.const_get(command.to_s.capitalize)
+      klass.new.run(*args)
+    rescue => e
+      # FIXME
+    end
+
+    def self.msg(str)
+      puts str
+    end
+
+    def config
+      @config ||= Braid::Config.new
+    end
+
+    private
+      def msg(str)
+        self.class.msg(str)
+      end
+
+      def in_work_branch
+        # make sure there is a git repository
+        begin
+          old_branch = get_current_branch
+        rescue => e
+          msg "Error occured: #{e.message}"
+          raise e
+        end
+
+        create_work_branch
+        work_head = get_work_head
+
+        begin
+          invoke(:git_checkout, WORK_BRANCH)
+          yield
+        rescue => e
+          msg "Error occured: #{e.message}"
+          if get_current_branch == WORK_BRANCH
+            msg "Resetting '#{WORK_BRANCH}' to '#{work_head}'."
+            invoke(:git_reset_hard, work_head)
+          end
+          raise e
+        ensure
+          invoke(:git_checkout, old_branch)
+        end
+      end
+  end
+end

data/lib/braid/commands/add.rb

@@ -0,0 +1,53 @@
+module Braid
+  module Commands
+    class Add < Command
+      def run(remote, options = {})
+        in_work_branch do
+          mirror, params = config.add_from_options(remote, options)
+          local_branch = get_local_branch_name(mirror, params)
+
+          config.update(mirror, { "local_branch" => local_branch })
+          params["local_branch"] = local_branch # TODO check
+
+          msg "Adding #{params["type"]} mirror of '#{params["remote"]}'" + (params["type"] == "git" ? ", branch '#{params["branch"]}'" : "") + "."
+
+          # these commands are explained in the subtree merge guide
+          # http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
+
+          setup_remote(mirror)
+          fetch_remote(params["type"], local_branch)
+
+          validate_revision_option(params, options)
+          target = determine_target_commit(params, options)
+
+          msg "Merging code into '#{mirror}/'."
+
+          unless params["squash"]
+            invoke(:git_merge_ours, target)
+          end
+          invoke(:git_read_tree, target, mirror)
+
+          config.update(mirror, { "revision" => options["revision"] })
+          add_config_file
+
+          revision_message = options["revision"] ? " at #{display_revision(params["type"], options["revision"])}" : ""
+          commit_message = "Add mirror '#{mirror}/'#{revision_message}."
+          invoke(:git_commit, commit_message)
+        end
+      end
+
+      protected
+        def setup_remote(mirror)
+          Braid::Command.run(:setup, mirror)
+        end
+
+      private
+        def get_local_branch_name(mirror, params)
+          res = "braid/#{params["type"]}/#{mirror}"
+          res << "/#{params["branch"]}" if params["type"] == "git"
+          res.gsub!("_", '-') # stupid git svn changes all _ to ., weird
+          res
+        end
+    end
+  end
+end

data/lib/braid/commands/diff.rb

@@ -0,0 +1,10 @@
+module Braid
+  module Commands
+    class Diff < Command
+      def run(mirror)
+        # easiest call, liek, evar.
+        system("git diff #{WORK_BRANCH} HEAD #{mirror}")
+      end
+    end
+  end
+end

data/lib/braid/commands/remove.rb

@@ -0,0 +1,25 @@
+module Braid
+  module Commands
+    class Remove < Command
+      def run(mirror)
+        in_work_branch do
+          params = config.get(mirror)
+          unless params
+            msg "Mirror '#{mirror}/' does not exist."
+            return
+          end
+
+          msg "Removing #{params["type"]} mirror from '#{mirror}/'."
+
+          invoke(:git_rm_r, mirror)
+
+          config.remove(mirror)
+          add_config_file
+
+          commit_message = "Remove mirror '#{mirror}/'."
+          invoke(:git_commit, commit_message)
+        end
+      end
+    end
+  end
+end

data/lib/braid/commands/setup.rb

@@ -0,0 +1,40 @@
+module Braid
+  module Commands
+    class Setup < Command
+      def run(mirror)
+        in_work_branch do
+          mirror ? setup_one(mirror) : setup_all
+        end
+      end
+
+      protected
+        def setup_all
+          msg "Setting up all mirrors."
+          config.mirrors.each do |mirror|
+            setup_one(mirror)
+          end
+        end
+
+        def setup_one(mirror)
+          params = config.get(mirror)
+          unless params
+            msg "Mirror '#{mirror}/' does not exist. Skipping."
+            return
+          end
+
+          if find_remote(params["local_branch"])
+            msg "Mirror '#{mirror}/' already has a remote. Skipping."
+            return
+          end
+
+          msg "Setting up remote for '#{mirror}/'."
+          case params["type"]
+          when "git"
+            invoke(:git_remote_add, params["local_branch"], params["remote"], params["branch"])
+          when "svn"
+            invoke(:git_svn_init, params["local_branch"], params["remote"])
+          end
+        end
+    end
+  end
+end

data/lib/braid/commands/update.rb

@@ -0,0 +1,77 @@
+module Braid
+  module Commands
+    class Update < Command
+      def run(mirror, options = {})
+        in_work_branch do
+          mirror ? update_one(mirror, options) : update_all
+        end
+      end
+
+      protected
+        def update_all
+          msg "Updating all mirrors."
+          config.mirrors.each do |mirror|
+            update_one(mirror)
+          end
+        end
+
+        def update_one(mirror, options = {})
+          params = config.get(mirror)
+          unless params
+            msg "Mirror '#{mirror}/' does not exist. Skipping."
+            return
+          end
+          local_branch = params["local_branch"]
+
+          if check_for_lock(params, options)
+            msg "Mirror '#{mirror}/' is locked to #{display_revision(params["type"], params["revision"])}. Skipping."
+            return
+          end
+
+          # unlock
+          if params["revision"] && options["head"]
+            msg "Unlocking mirror '#{mirror}/'."
+            options["revision"] = nil 
+          end
+
+          begin
+            fetch_remote(params["type"], local_branch)
+
+            validate_revision_option(params, options)
+            target = determine_target_commit(params, options)
+
+            check_merge_status(target)
+          rescue Braid::Commands::MirrorAlreadyUpToDate
+            msg "Mirror '#{mirror}/' is already up to date. Skipping."
+            update_revision(mirror, options["revision"])
+            return
+          end
+
+          msg "Updating #{params["type"]} mirror '#{mirror}/'."
+
+          if params["squash"]
+            invoke(:git_rm_r, mirror)
+            invoke(:git_read_tree, target, mirror)
+          else
+            invoke(:git_merge_subtree, target)
+          end
+
+          update_revision(mirror, options["revision"])
+          add_config_file
+
+          revision_message = " to " + (options["revision"] ? display_revision(params["type"], options["revision"]) : "HEAD")
+          commit_message = "Update mirror '#{mirror}/'#{revision_message}."
+          invoke(:git_commit, commit_message)
+        end
+
+      private
+        def check_for_lock(params, options)
+          params["revision"] && !options["revision"] && !options["head"]
+        end
+
+        def update_revision(mirror, revision)
+          config.update(mirror, { "revision" => revision })
+        end
+    end
+  end
+end

data/lib/braid/config.rb

@@ -0,0 +1,148 @@
+require 'yaml'
+require 'yaml/store'
+
+module Braid
+  class Config
+    attr_accessor :db
+    
+    def initialize(config_file = nil)
+      config_file ||= CONFIG_FILE
+      @db = YAML::Store.new(config_file)
+    end
+
+    def add_from_options(remote, options)
+      mirror, params = self.class.options_to_mirror(remote, options)
+
+      raise Braid::Config::RemoteIsRequired unless params["remote"]
+      raise Braid::Config::MirrorTypeIsRequired unless params["type"]
+      raise Braid::Config::BranchIsRequired unless params["type"] == "svn" || params["branch"]
+      raise Braid::Config::MirrorNameIsRequired unless mirror
+      raise Braid::Config::UnknownMirrorType unless MIRROR_TYPES.include?(params["type"])
+
+      params.delete("rails_plugin")
+      params.delete("branch") if params["type"] == "svn"
+      add(mirror, params)
+      [mirror, get(mirror)]
+    end
+
+    def mirrors
+      @db.transaction(true) do
+        @db.roots
+      end
+    end
+
+    def add(mirror, params)
+      mirror = remove_trailing_slash(mirror)
+      @db.transaction do
+        raise Braid::Config::MirrorNameAlreadyInUse if @db[mirror]
+        @db[mirror] = params.merge("remote" => remove_trailing_slash(params["remote"]))
+      end
+    end
+
+    def get(mirror)
+      mirror = remove_trailing_slash(mirror)
+      @db.transaction(true) do
+        @db[mirror]
+      end
+    end
+
+    def get!(mirror)
+      params = get(mirror)
+      raise Braid::Config::MirrorDoesNotExist unless params
+      params
+    end
+
+    def get_by_remote(remote)
+      remote = remove_trailing_slash(remote)
+      mirror = nil
+      @db.transaction(true) do
+        mirror = @db.roots.detect { |mirror| @db[mirror]["remote"] == remote }
+      end
+      [mirror, get(mirror)]
+    end
+
+    def remove(mirror)
+      mirror = remove_trailing_slash(mirror)
+      @db.transaction do
+        @db.delete(mirror)
+      end
+    end
+
+    def update(mirror, params)
+      mirror = remove_trailing_slash(mirror)
+      @db.transaction do
+        raise Braid::Config::MirrorDoesNotExist unless @db[mirror]
+        tmp = @db[mirror].merge(params)
+        @db[mirror] = tmp.merge("remote" => remove_trailing_slash(tmp["remote"]))
+      end
+    end
+
+    def replace(mirror, params)
+      mirror = remove_trailing_slash(mirror)
+      @db.transaction do
+        raise Braid::Config::MirrorDoesNotExist unless @db[mirror]
+        params["remote"] = remove_trailing_slash(params["remote"]) if params["remote"]
+        @db[mirror] = params
+      end
+    end
+
+    def self.options_to_mirror(remote, options = {})
+      remote = remove_trailing_slash(remote)
+      branch = options["branch"] || "master"
+
+      if options["type"]
+        type = options["type"]
+      else
+        type = extract_type_from_path(remote)
+        raise Braid::Config::CannotGuessMirrorType unless type
+      end
+
+      mirror = options["mirror"] || extract_mirror_from_path(remote)
+
+      if options["rails_plugin"]
+        mirror = "vendor/plugins/#{mirror}"
+      end
+
+      squash = !options["full"]
+
+      [remove_trailing_slash(mirror), { "type" => type, "remote" => remote, "branch" => branch, "squash" => squash }]
+    end
+
+    private
+      def remove_trailing_slash(path)
+        self.class.send(:remove_trailing_slash, path)
+      end
+
+      def self.remove_trailing_slash(path)
+        # bluh.
+        path.sub(/\/$/, '')
+      end
+
+      def self.extract_type_from_path(path)
+        return nil unless path
+        path = remove_trailing_slash(path)
+
+        # check for git:// and svn:// URLs
+        path_scheme = path.split(":").first
+        return path_scheme if %w[git svn].include?(path_scheme)
+
+        return "svn" if path[-6..-1] == "/trunk"
+        return "git" if path[-4..-1] == ".git"
+      end
+
+      def self.extract_mirror_from_path(path)
+        return nil unless path
+        name = File.basename(path)
+
+        if File.extname(name) == ".git"
+          # strip .git
+          name[0..-5]
+        elsif name == "trunk"
+          # use parent
+          File.basename(File.dirname(path))
+        else
+          name
+        end
+      end
+  end
+end

data/lib/braid/exceptions.rb

@@ -0,0 +1,31 @@
+module Braid
+  class Exception < StandardError
+  end
+
+  module Commands
+    class ShellExecutionError < Braid::Exception; end
+    class LocalRevisionIsHigherThanRequestedRevision < Braid::Exception; end
+    class MirrorAlreadyUpToDate < Braid::Exception; end
+    class RequestedRevisionIsHigherThanRemoteRevision < Braid::Exception; end
+  end
+
+  class Config
+    class UnknownMirrorType < Braid::Exception; end
+    class MirrorNameAlreadyInUse < Braid::Exception; end
+    class MirrorDoesNotExist < Braid::Exception; end
+    class CannotGuessMirrorType < Braid::Exception; end
+
+    class RemoteIsRequired < Braid::Exception; end
+    class MirrorTypeIsRequired < Braid::Exception; end
+    class BranchIsRequired < Braid::Exception; end
+    class MirrorNameIsRequired < Braid::Exception; end
+  end
+
+  class Git
+    class UnknownRevision < Braid::Exception; end
+  end
+
+  class Svn
+    class UnknownRevision < Braid::Exception; end
+  end
+end