git-multirepo 1.0.0.beta65 → 1.0.0.beta66

data/lib/multirepo/commands/command.rb

@@ -1,87 +1,87 @@
-require "claide"
-
-require "multirepo/info"
-require "multirepo/multirepo-exception"
-require "multirepo/config"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-
-module MultiRepo
-  class Command < CLAide::Command
-    self.abstract_command = true
-    self.command = "multi"
-    self.version = VERSION
-    self.description = DESCRIPTION
-    
-    def self.report_error(exception)
-      if exception.instance_of?(MultiRepoException)
-        Console.log_error(exception.message)
-        exit 1
-      end
-      fail exception
-    end
-    
-    def initialize(argv)
-      @argv = argv
-      Config.instance.verbose |= argv.flag?("verbose") ? true : false
-      Config.instance.extra_output ||= argv.option("extra-output")
-      Config.instance.git_executable ||= argv.option("git-exe", "git")
-      super
-    end
-    
-    def run
-      help!
-    end
-
-    def validate!
-      super
-      path = Config.instance.git_executable
-      is_git_exe = path =~ /.*(git)|(git.exe)$/
-      file_exists = path == "git" || File.exist?(path)
-      help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
-    end
-    
-    def install_hooks(path)
-      actual_path = path || "."
-      Utils.install_hook("pre-commit", actual_path)
-      Utils.install_hook("post-commit", actual_path)
-    end
-    
-    def uninstall_hooks
-      FileUtils.rm_f(".git/hooks/pre-commit")
-      FileUtils.rm_f(".git/hooks/post-commit")
-    end
-    
-    def update_gitconfig(path)
-      actual_path = path || "."
-      resource_file = Utils.path_for_resource(".gitconfig")
-      target_file = File.join(actual_path, '.git/config')
-      
-      template = File.read(resource_file)
-      first_template_line = template.lines.first
-      
-      Utils.append_if_missing(target_file, Regexp.new(Regexp.quote(first_template_line)), template)
-    end
-    
-    def multirepo_enabled_dependencies
-      ConfigFile.new(".").load_entries.select { |e| Utils.multirepo_enabled?(e.repo.path) }
-    end
-    
-    def ensure_in_work_tree
-      repo = Repo.new(".")
-      fail MultiRepoException, "Not a git repository" unless repo.exists?
-      fail MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
-    end
-    
-    def ensure_multirepo_enabled
-      fail MultiRepoException, "multirepo is not initialized in this repository." unless Utils.multirepo_enabled?(".")
-    end
-
-    def ensure_multirepo_tracked
-      fail MultiRepoException, "Revision is not tracked by multirepo." unless Utils.multirepo_tracked?(".")
-      
-      lock_file_valid = LockFile.new(".").validate!
-      fail MultiRepoException, "Revision is multirepo-enabled but contains a corrupted lock file!" unless lock_file_valid
-    end
-  end
-end
+require "claide"
+
+require "multirepo/info"
+require "multirepo/multirepo-exception"
+require "multirepo/config"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+
+module MultiRepo
+  class Command < CLAide::Command
+    self.abstract_command = true
+    self.command = "multi"
+    self.version = VERSION
+    self.description = DESCRIPTION
+    
+    def self.report_error(exception)
+      if exception.instance_of?(MultiRepoException)
+        Console.log_error(exception.message)
+        exit 1
+      end
+      fail exception
+    end
+    
+    def initialize(argv)
+      @argv = argv
+      Config.instance.verbose |= argv.flag?("verbose") ? true : false
+      Config.instance.extra_output ||= argv.option("extra-output")
+      Config.instance.git_executable ||= argv.option("git-exe", "git")
+      super
+    end
+    
+    def run
+      help!
+    end
+
+    def validate!
+      super
+      path = Config.instance.git_executable
+      is_git_exe = path =~ /.*(git)|(git.exe)$/
+      file_exists = path == "git" || File.exist?(path)
+      help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
+    end
+    
+    def install_hooks(path)
+      actual_path = path || "."
+      Utils.install_hook("pre-commit", actual_path)
+      Utils.install_hook("post-commit", actual_path)
+    end
+    
+    def uninstall_hooks
+      FileUtils.rm_f(".git/hooks/pre-commit")
+      FileUtils.rm_f(".git/hooks/post-commit")
+    end
+    
+    def update_gitconfig(path)
+      actual_path = path || "."
+      resource_file = Utils.path_for_resource(".gitconfig")
+      target_file = File.join(actual_path, '.git/config')
+      
+      template = File.read(resource_file)
+      first_template_line = template.lines.first
+      
+      Utils.append_if_missing(target_file, Regexp.new(Regexp.quote(first_template_line)), template)
+    end
+    
+    def multirepo_enabled_dependencies
+      ConfigFile.new(".").load_entries.select { |e| Utils.multirepo_enabled?(e.repo.path) }
+    end
+    
+    def ensure_in_work_tree
+      repo = Repo.new(".")
+      fail MultiRepoException, "Not a git repository" unless repo.exists?
+      fail MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
+    end
+    
+    def ensure_multirepo_enabled
+      fail MultiRepoException, "multirepo is not initialized in this repository." unless Utils.multirepo_enabled?(".")
+    end
+
+    def ensure_multirepo_tracked
+      fail MultiRepoException, "Revision is not tracked by multirepo." unless Utils.multirepo_tracked?(".")
+      
+      lock_file_valid = LockFile.new(".").validate!
+      fail MultiRepoException, "Revision is multirepo-enabled but contains a corrupted lock file!" unless lock_file_valid
+    end
+  end
+end

data/lib/multirepo/commands/commands.rb

@@ -1,14 +1,14 @@
-require_relative "command"
-require_relative "add-command"
-require_relative "branch-command"
-require_relative "checkout-command"
-require_relative "clone-command"
-require_relative "do-command"
-require_relative "init-command"
-require_relative "inspect-command"
-require_relative "install-command"
-require_relative "merge-command"
-require_relative "open-command"
-require_relative "remove-command"
-require_relative "uninit-command"
-require_relative "update-command"
+require_relative "command"
+require_relative "add-command"
+require_relative "branch-command"
+require_relative "checkout-command"
+require_relative "clone-command"
+require_relative "do-command"
+require_relative "init-command"
+require_relative "inspect-command"
+require_relative "install-command"
+require_relative "merge-command"
+require_relative "open-command"
+require_relative "remove-command"
+require_relative "uninit-command"
+require_relative "update-command"

data/lib/multirepo/commands/do-command.rb

@@ -1,101 +1,101 @@
-require_relative "command"
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/files/config-file"
-require "multirepo/git/repo"
-require "multirepo/git/git-runner"
-require "multirepo/logic/performer"
-require "multirepo/logic/repo-selection"
-
-module MultiRepo
-  class DoCommand < Command
-    self.command = "do"
-    self.summary = "Perform an arbitrary Git operation in the main repository, dependency repositories or all repositories."
-
-    def self.options
-      [
-        ['"<operation>"', 'The git command to perform, between quotes, omitting the executable name (ex: "reset --hard HEAD")'],
-        ['[--main]', 'Perform the operation in the main repository only.'],
-        ['[--deps]', 'Perform the operation in dependencies only.'],
-        ['[--all]', 'Perform the operation in the main repository and all dependencies.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @operation = argv.shift_argument
-      @repo_selection = RepoSelection.new(argv)
-      super
-    end
-
-    def validate!
-      super
-      help! "You must provide a git operation to perform" unless @operation
-      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
-    end
-    
-    def run
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-
-      @operation = @operation.sub(/^git /, "")
-      
-      success = true
-      case @repo_selection.value
-      when RepoSelection::MAIN
-        confirm_main_repo_operation
-        success &= perform_operation_on_main(@operation)
-      when RepoSelection::DEPS
-        confirm_dependencies_operation
-        success &= perform_operation_on_dependencies(@operation)
-      when RepoSelection::ALL
-        confirm_main_repo_operation
-        confirm_dependencies_operation
-        success &= perform_operation_on_dependencies(@operation) # Ordered dependencies first
-        success &= perform_operation_on_main(@operation) # Main last
-      end
-      
-      Console.log_warning("Some operations finished with non-zero exit status. Please review the above.") unless success
-    end
-    
-    def perform_operation_on_main(operation)
-      perform_operation(".", operation)
-    end
-
-    def perform_operation_on_dependencies(operation)
-      success = true
-      Performer.depth_ordered_dependencies.each do |dependency|
-        success &= perform_operation(dependency.config_entry.repo.path, operation)
-      end
-      return success
-    end
-
-    def perform_operation(path, operation)
-      Console.log_step("Performing operation on '#{path}'")
-      GitRunner.run_as_system(path, operation)
-      GitRunner.last_command_succeeded
-    end
-    
-    def confirm_main_repo_operation
-      unless main_repo_clean?
-        Console.log_warning("Main repo contains uncommitted changes")
-        fail MultiRepoException, "Aborted" unless Console.ask("Proceed anyway?")
-      end
-    end
-    
-    def confirm_dependencies_operation
-      unless dependencies_clean?
-        Console.log_warning("Some dependencies contain uncommitted changes")
-        fail MultiRepoException, "Aborted" unless Console.ask("Proceed anyway?")
-      end
-    end
-    
-    def main_repo_clean?
-      Repo.new(".").clean?
-    end
-    
-    def dependencies_clean?
-      config_entries = ConfigFile.new(".").load_entries
-      return Utils.dependencies_clean?(config_entries)
-    end
-  end
-end
+require_relative "command"
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/files/config-file"
+require "multirepo/git/repo"
+require "multirepo/git/git-runner"
+require "multirepo/logic/performer"
+require "multirepo/logic/repo-selection"
+
+module MultiRepo
+  class DoCommand < Command
+    self.command = "do"
+    self.summary = "Perform an arbitrary Git operation in the main repository, dependency repositories or all repositories."
+
+    def self.options
+      [
+        ['"<operation>"', 'The git command to perform, between quotes, omitting the executable name (ex: "reset --hard HEAD")'],
+        ['[--main]', 'Perform the operation in the main repository only.'],
+        ['[--deps]', 'Perform the operation in dependencies only.'],
+        ['[--all]', 'Perform the operation in the main repository and all dependencies.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @operation = argv.shift_argument
+      @repo_selection = RepoSelection.new(argv)
+      super
+    end
+
+    def validate!
+      super
+      help! "You must provide a git operation to perform" unless @operation
+      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
+    end
+    
+    def run
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+
+      @operation = @operation.sub(/^git /, "")
+      
+      success = true
+      case @repo_selection.value
+      when RepoSelection::MAIN
+        confirm_main_repo_operation
+        success &= perform_operation_on_main(@operation)
+      when RepoSelection::DEPS
+        confirm_dependencies_operation
+        success &= perform_operation_on_dependencies(@operation)
+      when RepoSelection::ALL
+        confirm_main_repo_operation
+        confirm_dependencies_operation
+        success &= perform_operation_on_dependencies(@operation) # Ordered dependencies first
+        success &= perform_operation_on_main(@operation) # Main last
+      end
+      
+      Console.log_warning("Some operations finished with non-zero exit status. Please review the above.") unless success
+    end
+    
+    def perform_operation_on_main(operation)
+      perform_operation(".", operation)
+    end
+
+    def perform_operation_on_dependencies(operation)
+      success = true
+      Performer.depth_ordered_dependencies.each do |dependency|
+        success &= perform_operation(dependency.config_entry.repo.path, operation)
+      end
+      return success
+    end
+
+    def perform_operation(path, operation)
+      Console.log_step("Performing operation on '#{path}'")
+      GitRunner.run_as_system(path, operation)
+      GitRunner.last_command_succeeded
+    end
+    
+    def confirm_main_repo_operation
+      unless main_repo_clean?
+        Console.log_warning("Main repo contains uncommitted changes")
+        fail MultiRepoException, "Aborted" unless Console.ask("Proceed anyway?")
+      end
+    end
+    
+    def confirm_dependencies_operation
+      unless dependencies_clean?
+        Console.log_warning("Some dependencies contain uncommitted changes")
+        fail MultiRepoException, "Aborted" unless Console.ask("Proceed anyway?")
+      end
+    end
+    
+    def main_repo_clean?
+      Repo.new(".").clean?
+    end
+    
+    def dependencies_clean?
+      config_entries = ConfigFile.new(".").load_entries
+      return Utils.dependencies_clean?(config_entries)
+    end
+  end
+end

data/lib/multirepo/commands/init-command.rb

@@ -1,121 +1,121 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/files/tracking-files"
-require "multirepo/commands/command"
-
-module MultiRepo
-  class InitCommand < Command
-    self.command = "init"
-    self.summary = "Initialize the current repository as a multirepo project."
-    
-    def self.options
-      [['[--extras]', 'Keep the current .multirepo config file as-is and initialize everything else.']].concat(super)
-    end
-    
-    def initialize(argv)
-      @only_extras = argv.flag?("extras")
-      super
-    end
-    
-    def run
-      ensure_in_work_tree
-      
-      if @only_extras
-        ensure_multirepo_enabled
-        Console.log_step("Initializing extras...")
-        initialize_extras_step
-      else
-        Console.log_step("Initializing multirepo...")
-        full_initialize_step
-      end
-      
-      Console.log_step("Done!")
-    end
-    
-    def full_initialize_step
-      if ConfigFile.new(".").exists?
-        reinitialize = Console.ask(".multirepo file already exists. Reinitialize?")
-        fail MultiRepoException, "Initialization aborted" unless reinitialize
-      end
-      
-      unless add_sibling_repos_step
-        fail MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
-      end
-
-      initialize_extras_step
-    end
-    
-    def add_sibling_repos_step
-      sibling_repos = Utils.sibling_repos
-      return false unless sibling_repos.any?
-
-      Console.log_substep("Creating new multirepo config...")
-      
-      valid_repos = find_valid_repos(sibling_repos)
-      entries = create_entries(valid_repos)
-      
-      fail MultiRepoException, "No sibling repositories were added as dependencies; init aborted" unless entries.any?
-      
-      ConfigFile.new(".").save_entries(entries)
-      return true
-    end
-    
-    def initialize_extras_step
-      install_hooks_step
-      update_gitattributes_step
-      update_gitconfig_step
-    end
-    
-    def install_hooks_step
-      install_hooks(".")
-      Console.log_substep("Installed git hooks")
-    end
-    
-    def update_gitattributes_step
-      TrackingFiles.new(".").files.each do |f|
-        filename = f.filename
-        regex_escaped_filename = Regexp.quote(filename)
-        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
-      end
-      Console.log_substep("Updated .gitattributes file")
-    end
-    
-    def update_gitconfig_step
-      update_gitconfig(".")
-      Console.log_substep("Updated .git/config file")
-    end
-    
-    def find_valid_repos(repos)
-      repos.select do |repo|
-        next true if repo.head_born?
-        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
-      end
-    end
-    
-    def create_entries(repos)
-      entries = []
-      repos.each do |repo|
-        origin_url = repo.remote('origin').url
-        current_branch_name = repo.current_branch.name
-        
-        next unless Console.ask("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || 'NONE'}, branch: #{current_branch_name}]")
-        
-        unless origin_url
-          Console.log_warning("Repo 'origin' remote url is not set; skipping")
-          next
-        end
-        
-        entries.push(ConfigEntry.new(repo))
-        Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
-      end
-      return entries
-    end
-    
-    def check_repo_exists
-      fail MultiRepoException, "There is no folder at path '#{@repo.path}'" unless Dir.exist?(@repo.path)
-      fail MultiRepoException, "'#{@repo.path}' is not a repository" unless @repo.exists?
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/files/tracking-files"
+require "multirepo/commands/command"
+
+module MultiRepo
+  class InitCommand < Command
+    self.command = "init"
+    self.summary = "Initialize the current repository as a multirepo project."
+    
+    def self.options
+      [['[--extras]', 'Keep the current .multirepo config file as-is and initialize everything else.']].concat(super)
+    end
+    
+    def initialize(argv)
+      @only_extras = argv.flag?("extras")
+      super
+    end
+    
+    def run
+      ensure_in_work_tree
+      
+      if @only_extras
+        ensure_multirepo_enabled
+        Console.log_step("Initializing extras...")
+        initialize_extras_step
+      else
+        Console.log_step("Initializing multirepo...")
+        full_initialize_step
+      end
+      
+      Console.log_step("Done!")
+    end
+    
+    def full_initialize_step
+      if ConfigFile.new(".").exists?
+        reinitialize = Console.ask(".multirepo file already exists. Reinitialize?")
+        fail MultiRepoException, "Initialization aborted" unless reinitialize
+      end
+      
+      unless add_sibling_repos_step
+        fail MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
+      end
+
+      initialize_extras_step
+    end
+    
+    def add_sibling_repos_step
+      sibling_repos = Utils.sibling_repos
+      return false unless sibling_repos.any?
+
+      Console.log_substep("Creating new multirepo config...")
+      
+      valid_repos = find_valid_repos(sibling_repos)
+      entries = create_entries(valid_repos)
+      
+      fail MultiRepoException, "No sibling repositories were added as dependencies; init aborted" unless entries.any?
+      
+      ConfigFile.new(".").save_entries(entries)
+      return true
+    end
+    
+    def initialize_extras_step
+      install_hooks_step
+      update_gitattributes_step
+      update_gitconfig_step
+    end
+    
+    def install_hooks_step
+      install_hooks(".")
+      Console.log_substep("Installed git hooks")
+    end
+    
+    def update_gitattributes_step
+      TrackingFiles.new(".").files.each do |f|
+        filename = f.filename
+        regex_escaped_filename = Regexp.quote(filename)
+        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
+      end
+      Console.log_substep("Updated .gitattributes file")
+    end
+    
+    def update_gitconfig_step
+      update_gitconfig(".")
+      Console.log_substep("Updated .git/config file")
+    end
+    
+    def find_valid_repos(repos)
+      repos.select do |repo|
+        next true if repo.head_born?
+        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
+      end
+    end
+    
+    def create_entries(repos)
+      entries = []
+      repos.each do |repo|
+        origin_url = repo.remote('origin').url
+        current_branch_name = repo.current_branch.name
+        
+        next unless Console.ask("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || 'NONE'}, branch: #{current_branch_name}]")
+        
+        unless origin_url
+          Console.log_warning("Repo 'origin' remote url is not set; skipping")
+          next
+        end
+        
+        entries.push(ConfigEntry.new(repo))
+        Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+      end
+      return entries
+    end
+    
+    def check_repo_exists
+      fail MultiRepoException, "There is no folder at path '#{@repo.path}'" unless Dir.exist?(@repo.path)
+      fail MultiRepoException, "'#{@repo.path}' is not a repository" unless @repo.exists?
+    end
+  end
+end