git-multirepo 1.0.0.beta27 → 1.0.0.beta29

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

@@ -1,70 +1,70 @@
-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.'],
-        ['[<ref>]', '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 = 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} ...")
-
-      raise MultiRepoException, "A directory named #{@name} already exists" if Dir.exists?(@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
-      raise 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)
-        raise MultiRepoException, "Couldn't perform checkout of main repo #{@ref}!"
-      end
-      
-      Console.log_substep("Checked out main repo #{@ref}")
-      
-      # Make sure the ref we just checked out is tracked by multirepo
-      unless Utils.is_multirepo_tracked(main_repo_path)
-        raise MultiRepoException, "Ref #{@ref} 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.install_dependencies_step
-      Dir.chdir(original_path)
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    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.'],
+        ['[<ref>]', '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 = 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} ...")
+
+      raise MultiRepoException, "A directory named #{@name} already exists" if Dir.exists?(@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
+      raise 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)
+        raise MultiRepoException, "Couldn't perform checkout of main repo #{@ref}!"
+      end
+      
+      Console.log_substep("Checked out main repo #{@ref}")
+      
+      # Make sure the ref we just checked out is tracked by multirepo
+      unless Utils.is_multirepo_tracked(main_repo_path)
+        raise MultiRepoException, "Ref #{@ref} 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!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

data/lib/multirepo/commands/command.rb

@@ -1,63 +1,63 @@
-require "claide"
-
-require "info"
-require "multirepo/multirepo-exception"
-require "multirepo/config"
-
-module MultiRepo
-  class Command < CLAide::Command
-    self.abstract_command = true
-    self.command = "multi"
-    self.version = VERSION
-    self.description = DESCRIPTION
-    
-    def initialize(argv)
-      Config.instance.verbose = argv.flag?("verbose") ? true : false
-      Config.instance.git_executable = argv.option("git-exe", "git")
-      super
-    end
-
-    def validate!
-      path = Config.instance.git_executable
-      is_git_exe = path =~ /.*(git)|(git.exe)$/
-      file_exists = path == "git" || File.exists?(path)
-      help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
-    end
-    
-    def validate_in_work_tree
-      raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
-    end
-    
-    def install_hooks_in_multirepo_enabled_dependencies
-      # Install the local git hooks in dependency repos
-      # if they are themselves multirepo-enabled
-      ConfigFile.load.each do |entry|
-        if Utils.is_multirepo_enabled(entry.repo.path)
-          install_hooks(entry.repo.path)
-          Console.log_substep("Installed hooks in multirepo-enabled dependency '#{entry.repo.path}'")
-        end
-      end
-    end
-    
-    def install_hooks(path = nil)
-      actual_path = path || "."
-      Utils.install_hook("pre-commit", actual_path)
-      Utils.install_hook("prepare-commit-msg", actual_path)
-      Utils.install_hook("post-merge", actual_path)
-    end
-    
-    def uninstall_hooks
-      File.delete(".git/hooks/pre-commit")
-      File.delete(".git/hooks/prepare-commit-msg")
-      File.delete(".git/hooks/post-merge")
-    end
-    
-    def ensure_multirepo_enabled
-      raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
-    end
-
-    def ensure_multirepo_tracked
-      raise MultiRepoException, "This revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
-    end
-  end
+require "claide"
+
+require "info"
+require "multirepo/multirepo-exception"
+require "multirepo/config"
+
+module MultiRepo
+  class Command < CLAide::Command
+    self.abstract_command = true
+    self.command = "multi"
+    self.version = VERSION
+    self.description = DESCRIPTION
+    
+    def initialize(argv)
+      Config.instance.verbose = argv.flag?("verbose") ? true : false
+      Config.instance.git_executable = argv.option("git-exe", "git")
+      super
+    end
+
+    def validate!
+      path = Config.instance.git_executable
+      is_git_exe = path =~ /.*(git)|(git.exe)$/
+      file_exists = path == "git" || File.exists?(path)
+      help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
+    end
+    
+    def validate_in_work_tree
+      raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
+    end
+    
+    def install_hooks(path)
+      actual_path = path || "."
+      Utils.install_hook("pre-commit", actual_path)
+    end
+    
+    def uninstall_hooks
+      File.delete(".git/hooks/pre-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.load.select { |e| Utils.is_multirepo_enabled(e.repo.path) }
+    end
+    
+    def ensure_multirepo_enabled
+      raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
+    end
+
+    def ensure_multirepo_tracked
+      raise MultiRepoException, "This revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
+    end
+  end
 end

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

@@ -1,24 +1,24 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class FetchCommand < Command
-    self.command = "fetch"
-    self.summary = "Performs a git fetch on all dependencies."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Fetching dependencies...")
-      
-      ConfigFile.load.each do |entry|
-        Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
-        entry.repo.fetch
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class FetchCommand < Command
+    self.command = "fetch"
+    self.summary = "Performs a git fetch on all dependencies."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Fetching dependencies...")
+      
+      ConfigFile.load.each do |entry|
+        Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
+        entry.repo.fetch
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,52 +1,95 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/commands/command"
-
-module MultiRepo
-  class InitCommand < Command
-    self.command = "init"
-    self.summary = "Initialize the current repository as a multirepo project."
-    
-    def run
-      validate_in_work_tree
-      Console.log_step("Initializing new multirepo config...")
-      
-      if ConfigFile.exists?
-        return unless Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
-      end
-      
-      sibling_repos = Utils.sibling_repos
-      
-      if sibling_repos.any?
-        entries = []
-        sibling_repos.each do |repo|
-          origin_desc = repo.remote('origin').url || "[none]"
-          current_branch = repo.current_branch
-          if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: '#{origin_desc}', branch: #{current_branch}]")
-            entries.push(ConfigEntry.new(repo))
-            Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
-          end
-        end
-        
-        ConfigFile.save(entries)
-        ConfigFile.stage
-      else
-        Console.log_info("There are no sibling repositories to add")
-      end
-      
-      install_hooks
-      Console.log_substep("Installed git hooks")
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def check_repo_exists
-      if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
-      if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+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
+      validate_in_work_tree
+      
+      if @only_extras
+        Console.log_step("Initializing extras...")
+        initialize_extras_step
+      else
+        Console.log_step("Initializing multirepo...")
+        full_initialize_step
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def full_initialize_step
+      if ConfigFile.exists?
+        reinitialize = Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
+        raise MultiRepoException, "Initialization aborted" unless reinitialize
+      end
+      
+      Console.log_substep("Creating new multirepo config...")
+      
+      add_sibling_repos_step
+      initialize_extras_step
+    end
+    
+    def add_sibling_repos_step
+      sibling_repos = Utils.sibling_repos
+      
+      if sibling_repos.any?
+        entries = []
+        sibling_repos.each do |repo|
+          origin_desc = repo.remote('origin').url || "[none]"
+          current_branch = repo.current_branch
+          if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: '#{origin_desc}', branch: #{current_branch}]")
+            entries.push(ConfigEntry.new(repo))
+            Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+          end
+        end
+        
+        ConfigFile.save(entries)
+      else
+        Console.log_info("There are no sibling repositories to add")
+      end
+    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
+      Utils.append_if_missing("./.gitattributes", /^.multirepo.lock .*/, ".multirepo.lock merge=ours")
+      Console.log_substep("Updated .gitattributes file")
+    end
+    
+    def update_gitconfig_step
+      update_gitconfig(".")
+      Console.log_substep("Updated .git/config file")
+    end
+    
+    def check_repo_exists
+      if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
+      if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end
+    end
+  end
 end