git-multirepo 1.0.0.beta70 → 1.0.0.beta71

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

@@ -1,68 +1,68 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/git/repo"
-require_relative "install-command"
-
-module MultiRepo
-  class CloneCommand < Command
-    self.command = "clone"
-    self.summary = "Clones the specified repository in a subfolder, then installs it."
-    
-    def self.options
-      [
-        ['<url>', 'The repository to clone.'],
-        ['<name>', 'The name of the containing folder that will be created.'],
-        ['[<refname>]', 'The branch, tag or commit id to checkout. Checkout will use "master" if unspecified.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @url = argv.shift_argument
-      @name = argv.shift_argument
-      @ref_name = argv.shift_argument || "master"
-      super
-    end
-
-    def validate!
-      super
-      help! "You must specify a repository to clone" unless @url
-      help! "You must specify a containing folder name" unless @name
-    end
-
-    def run
-      Console.log_step("Cloning #{@url} ...")
-
-      fail MultiRepoException, "A directory named #{@name} already exists" if Dir.exist?(@name)
-
-      main_repo_path = "#{@name}/#{@name}"
-      main_repo = Repo.new(main_repo_path)
-      
-      # Recursively create the directory where we'll clone the main repo
-      FileUtils.mkpath(main_repo_path)
-      
-      # Clone the specified remote in the just-created directory
-      fail MultiRepoException, "Could not clone repo from #{@url}" unless main_repo.clone(@url)
-      
-      # Checkout the specified main repo ref so that install reads the proper config file
-      unless main_repo.checkout(@ref_name)
-        fail MultiRepoException, "Couldn't perform checkout of main repo #{@ref_name}!"
-      end
-      
-      Console.log_substep("Checked out main repo #{@ref_name}")
-      
-      # Make sure the ref we just checked out is tracked by multirepo
-      unless Utils.multirepo_tracked?(main_repo_path)
-        fail MultiRepoException, "Ref #{@ref_name} is not tracked by multirepo"
-      end
-      
-      # Install
-      original_path = Dir.pwd
-      Dir.chdir(main_repo_path)
-      install_command = InstallCommand.new(CLAide::ARGV.new([]))
-      install_command.full_install
-      Dir.chdir(original_path)
-      
-      Console.log_step("Done!")
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/git/repo"
+require_relative "install-command"
+
+module MultiRepo
+  class CloneCommand < Command
+    self.command = "clone"
+    self.summary = "Clones the specified repository in a subfolder, then installs it."
+    
+    def self.options
+      [
+        ['<url>', 'The repository to clone.'],
+        ['<name>', 'The name of the containing folder that will be created.'],
+        ['[<refname>]', 'The branch, tag or commit id to checkout. Checkout will use "master" if unspecified.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @url = argv.shift_argument
+      @name = argv.shift_argument
+      @ref_name = argv.shift_argument || "master"
+      super
+    end
+
+    def validate!
+      super
+      help! "You must specify a repository to clone" unless @url
+      help! "You must specify a containing folder name" unless @name
+    end
+
+    def run
+      Console.log_step("Cloning #{@url} ...")
+
+      fail MultiRepoException, "A directory named #{@name} already exists" if Dir.exist?(@name)
+
+      main_repo_path = "#{@name}"
+      main_repo = Repo.new(main_repo_path)
+      
+      # Recursively create the directory where we'll clone the main repo
+      FileUtils.mkpath(main_repo_path)
+      
+      # Clone the specified remote in the just-created directory
+      fail MultiRepoException, "Could not clone repo from #{@url}" unless main_repo.clone(@url)
+      
+      # Checkout the specified main repo ref so that install reads the proper config file
+      unless main_repo.checkout(@ref_name)
+        fail MultiRepoException, "Couldn't perform checkout of main repo #{@ref_name}!"
+      end
+      
+      Console.log_substep("Checked out main repo #{@ref_name}")
+      
+      # Make sure the ref we just checked out is tracked by multirepo
+      unless Utils.multirepo_tracked?(main_repo_path)
+        fail MultiRepoException, "Ref #{@ref_name} is not tracked by multirepo"
+      end
+      
+      # Install
+      original_path = Dir.pwd
+      Dir.chdir(main_repo_path)
+      install_command = InstallCommand.new(CLAide::ARGV.new([]))
+      install_command.full_install
+      Dir.chdir(original_path)
+      
+      Console.log_step("Done!")
+    end
+  end
+end

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