git-multirepo 1.0.0.beta27 → 1.0.0.beta29

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

@@ -1,88 +1,105 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/git/repo"
-require "multirepo/commands/checkout-command"
-
-module MultiRepo
-  class InstallCommand < Command
-    self.command = "install"
-    self.summary = "Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks."
-    
-    def self.options
-      [['[--hooks]', 'Only install local git hooks.']].concat(super)
-    end
-    
-    def initialize(argv)
-      @hooks = argv.flag?("hooks")
-      super
-    end
-        
-    def run
-      validate_in_work_tree
-      ensure_multirepo_tracked
-      
-      if @hooks
-        Console.log_step("Installing hooks in main repo and all dependencies...")
-        install_hooks_step
-      else
-        Console.log_step("Cloning dependencies and installing hooks...")
-        install_dependencies_step
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def install_dependencies_step
-      # Read config entries as-is on disk, without prior checkout
-      config_entries = ConfigFile.load
-      Console.log_substep("Installing #{config_entries.count} dependencies...");
-      
-      # Clone or fetch all configured dependencies to make sure nothing is missing locally
-      config_entries.each { |entry| clone_or_fetch(entry) }
-      
-      # Checkout the appropriate branches as specified in the lock file
-      checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
-      checkout_command.dependencies_checkout_step(CheckoutCommand::CheckoutMode::LATEST)
-      
-      install_hooks_step
-    end
-    
-    def install_hooks_step
-      install_hooks
-      Console.log_substep("Installed git hooks in main repo")
-      
-      install_hooks_in_multirepo_enabled_dependencies
-    end
-    
-    def clone_or_fetch(entry)
-      if entry.repo.exists?
-        check_repo_validity(entry)
-        fetch_repo(entry)
-      else
-        clone_repo(entry)
-      end
-    end
-    
-    # Repo operations
-    
-    def fetch_repo(entry)
-      Console.log_substep("Working copy '#{entry.repo.path}' already exists, fetching instead...")
-      raise MultiRepoException, "Could not fetch from remote #{entry.repo.remote('origin').url}" unless entry.repo.fetch
-    end
-    
-    def clone_repo(entry)
-      Console.log_substep("Cloning #{entry.url} into '#{entry.repo.path}'")
-      raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
-    end
-    
-    # Validation
-    
-    def check_repo_validity(entry)
-      unless entry.repo.remote("origin").url == entry.url
-        raise MultiRepoException, "'#{entry.path}' origin URL (#{entry.repo.remote('origin').url}) does not match entry (#{entry.url})!"
-      end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/git/repo"
+require "multirepo/commands/checkout-command"
+
+module MultiRepo
+  class InstallCommand < Command
+    self.command = "install"
+    self.summary = "Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks."
+    
+    def self.options
+      [['[--hooks]', 'Only install local git hooks.']].concat(super)
+    end
+    
+    def initialize(argv)
+      @hooks = argv.flag?("hooks")
+      super
+    end
+        
+    def run
+      validate_in_work_tree
+      ensure_multirepo_tracked
+      
+      if @hooks
+        Console.log_step("Installing hooks in main repo and all dependencies...")
+        install_hooks_step
+      else
+        Console.log_step("Cloning dependencies and installing hooks...")
+        full_install
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def full_install
+      install_dependencies_step
+      install_hooks_step
+      update_gitconfigs_step
+    end
+    
+    def install_dependencies_step
+      # Read config entries as-is on disk, without prior checkout
+      config_entries = ConfigFile.load
+      Console.log_substep("Installing #{config_entries.count} dependencies...");
+      
+      # Clone or fetch all configured dependencies to make sure nothing is missing locally
+      config_entries.each { |entry| clone_or_fetch(entry) }
+      
+      # Checkout the appropriate branches as specified in the lock file
+      checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
+      checkout_command.dependencies_checkout_step(CheckoutCommand::CheckoutMode::LATEST)
+    end
+    
+    def install_hooks_step
+      install_hooks(".")
+      Console.log_substep("Installed git hooks in main repo")
+      
+      multirepo_enabled_dependencies.each do |entry|
+        install_hooks(entry.repo.path)
+        Console.log_substep("Installed hooks in multirepo-enabled dependency '#{entry.repo.path}'")
+      end
+    end
+    
+    def update_gitconfigs_step
+      update_gitconfig(".")
+      Console.log_substep("Updated .git/config file")
+      
+      multirepo_enabled_dependencies.each do |entry|
+        update_gitconfig(entry.repo.path)
+        Console.log_substep("Updated .git/config in multirepo-enabled dependency '#{entry.repo.path}'")
+      end
+    end
+    
+    def clone_or_fetch(entry)
+      if entry.repo.exists?
+        check_repo_validity(entry)
+        fetch_repo(entry)
+      else
+        clone_repo(entry)
+      end
+    end
+    
+    # Repo operations
+    
+    def fetch_repo(entry)
+      Console.log_substep("Working copy '#{entry.repo.path}' already exists, fetching instead...")
+      raise MultiRepoException, "Could not fetch from remote #{entry.repo.remote('origin').url}" unless entry.repo.fetch
+    end
+    
+    def clone_repo(entry)
+      Console.log_substep("Cloning #{entry.url} into '#{entry.repo.path}'")
+      raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
+    end
+    
+    # Validation
+    
+    def check_repo_validity(entry)
+      unless entry.repo.remote("origin").url == entry.url
+        raise MultiRepoException, "'#{entry.path}' origin URL (#{entry.repo.remote('origin').url}) does not match entry (#{entry.url})!"
+      end
+    end
+  end
 end

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

@@ -1,26 +1,26 @@
-require "os"
-
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class OpenCommand < Command
-    self.command = "open"
-    self.summary = "Opens all dependencies in the current OS's file explorer."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      
-      ConfigFile.load.each do |entry|
-        if OS.osx?
-          `open "#{entry.repo.path}"`
-        elsif OS.windows?
-          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
-        end
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "os"
+
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class OpenCommand < Command
+    self.command = "open"
+    self.summary = "Opens all dependencies in the current OS's file explorer."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      
+      ConfigFile.load.each do |entry|
+        if OS.osx?
+          `open "#{entry.repo.path}"`
+        elsif OS.windows?
+          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
+        end
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,49 +1,49 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class RemoveCommand < Command
-    self.command = "remove"
-    self.summary = "Removes the specified dependency from multirepo."
-    
-    def self.options
-      [
-        ['<path>', 'The relative path to the dependency to remove (e.g. ../MyOldDependency).'],
-        ['[--delete]', 'Delete the dependency on disk in addition to removing it from the multirepo config.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @path = argv.shift_argument
-      @delete = argv.flag?("delete")
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a dependency repository to remove" unless @path
-    end
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      
-      repo = Repo.new(@path)
-      entry = ConfigEntry.new(repo)
-      
-      if ConfigFile.entry_exists?(entry)
-        ConfigFile.remove_entry(entry)
-        Console.log_step("Removed '#{@path}' from the .multirepo file")
-        
-        if @delete
-          FileUtils.rm_rf(@path)
-          Console.log_step("Deleted '#{@path}' from disk")
-        end
-      else
-        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class RemoveCommand < Command
+    self.command = "remove"
+    self.summary = "Removes the specified dependency from multirepo."
+    
+    def self.options
+      [
+        ['<path>', 'The relative path to the dependency to remove (e.g. ../MyOldDependency).'],
+        ['[--delete]', 'Delete the dependency on disk in addition to removing it from the multirepo config.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @path = argv.shift_argument
+      @delete = argv.flag?("delete")
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a dependency repository to remove" unless @path
+    end
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      
+      repo = Repo.new(@path)
+      entry = ConfigEntry.new(repo)
+      
+      if ConfigFile.entry_exists?(entry)
+        ConfigFile.remove_entry(entry)
+        Console.log_step("Removed '#{@path}' from the .multirepo file")
+        
+        if @delete
+          FileUtils.rm_rf(@path)
+          Console.log_step("Deleted '#{@path}' from disk")
+        end
+      else
+        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,20 +1,20 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class UninitCommand < Command
-    self.command = "uninit"
-    self.summary = "Removes all traces of multirepo in the current multirepo repository."
-    
-    def run
-      validate_in_work_tree
-      
-      File.delete(".multirepo")
-      File.delete(".multirepo.lock")
-      uninstall_hooks
-      
-      Console.log_step("All traces of multirepo have been removed from this repository")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class UninitCommand < Command
+    self.command = "uninit"
+    self.summary = "Removes all traces of multirepo in the current multirepo repository."
+    
+    def run
+      validate_in_work_tree
+      
+      File.delete(".multirepo")
+      File.delete(".multirepo.lock")
+      uninstall_hooks
+      
+      Console.log_step("All traces of multirepo have been removed from this repository")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,48 +1,54 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class UpdateCommand < Command
-    self.command = "update"
-    self.summary = "Force-updates the multirepo lock file."
-    
-    def self.options
-      [
-        ['[--force]', 'Update the lock file even if dependencies contain uncommitted changes.'],
-        ['[--commit]', 'Commit the lock file after updating it.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @commit = argv.flag?("commit")
-      @force = argv.flag?("force")
-      super
-    end
-
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Updating...")
-      
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
-      if dependencies_clean
-        LockFile.update
-        Console.log_substep("Updated lock file with latest dependency commits")
-      elsif !dependencies_clean && @force
-        LockFile.update
-        Console.log_warning("Updated lock file with latest dependency commits regardless of uncommitted changes")
-      else
-        raise MultiRepoException, "Can't update because not all dependencies are clean"
-      end
-      
-      if @commit
-        Console.log_substep("Committing updated lock file")
-        LockFile.commit
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class UpdateCommand < Command
+    self.command = "update"
+    self.summary = "Force-updates the multirepo lock file."
+    
+    def self.options
+      [
+        ['[--force]', 'Update the lock file even if dependencies contain uncommitted changes.'],
+        ['[--commit]', 'Commit the lock file after updating it.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @commit = argv.flag?("commit")
+      @force = argv.flag?("force")
+      super
+    end
+
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Updating...")
+      
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
+      if dependencies_clean
+        update_lock_file_step("Updated lock file with latest dependency commits")
+      elsif !dependencies_clean && @force
+        update_lock_file_step("Force-updated lock file with latest dependency commits (ignoring uncommitted changes)")
+      else
+        raise MultiRepoException, "Can't update because not all dependencies are clean"
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def update_lock_file_step(log_message)
+      changed = LockFile.update
+      
+      if changed && @commit
+        Console.log_substep("Committing updated lock file")
+        LockFile.commit("[multirepo] Manually updated lock file")
+      elsif changed
+        Console.log_substep(log_message)
+      else
+        Console.log_info("Lock file is already up-to-date")
+      end
+    end
+  end
 end