git-multirepo 1.0.0.beta70 → 1.0.0.beta71

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

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

@@ -1,48 +1,48 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class InspectCommandStats
-    VERSION = "version"
-    TRACKED = "tracked"
-  end
-
-  class InspectCommand < Command
-    self.command = "inspect"
-    self.summary = "Outputs various information about multirepo-enabled repos. For use in scripting and CI scenarios."
-    
-    def self.options
-      [['<stat name>', 'The name of the statistic to output.']].concat(super)
-    end
-    
-    def initialize(argv)
-      stat = argv.shift_argument
-      @stat = stat ? stat.downcase : nil
-      super
-    end
-
-    def validate!
-      super
-      help! "You must provide a valid stat name. Available stats: \n    #{stats.join(', ')}" unless valid_stat?(@stat)
-    end
-
-    def stats
-      InspectCommandStats.constants.map { |s| InspectCommandStats.const_get(s) }
-    end
-
-    def valid_stat?(stat)
-      stats.include?(stat)
-    end
-    
-    def run
-      ensure_in_work_tree
-      
-      case @stat
-      when InspectCommandStats::VERSION
-        puts MetaFile.new(".").load.version
-      when InspectCommandStats::TRACKED
-        puts Utils.multirepo_tracked?(".").to_s
-      end
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class InspectCommandStats
+    VERSION = "version"
+    TRACKED = "tracked"
+  end
+
+  class InspectCommand < Command
+    self.command = "inspect"
+    self.summary = "Outputs various information about multirepo-enabled repos. For use in scripting and CI scenarios."
+    
+    def self.options
+      [['<stat name>', 'The name of the statistic to output.']].concat(super)
+    end
+    
+    def initialize(argv)
+      stat = argv.shift_argument
+      @stat = stat ? stat.downcase : nil
+      super
+    end
+
+    def validate!
+      super
+      help! "You must provide a valid stat name. Available stats: \n    #{stats.join(', ')}" unless valid_stat?(@stat)
+    end
+
+    def stats
+      InspectCommandStats.constants.map { |s| InspectCommandStats.const_get(s) }
+    end
+
+    def valid_stat?(stat)
+      stats.include?(stat)
+    end
+    
+    def run
+      ensure_in_work_tree
+      
+      case @stat
+      when InspectCommandStats::VERSION
+        puts MetaFile.new(".").load.version
+      when InspectCommandStats::TRACKED
+        puts Utils.multirepo_tracked?(".").to_s
+      end
+    end
+  end
+end

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

@@ -1,170 +1,170 @@
-require "terminal-table"
-
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/output/extra-output"
-require "multirepo/git/repo"
-require "multirepo/logic/performer"
-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.'],
-        ['[--ci]', 'Perform a continuous-integration-aware install (such as on a CI build server or agent).']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @hooks = argv.flag?("hooks")
-      @ci = argv.flag?("ci")
-      super
-    end
-    
-    def validate!
-      super
-      unless Utils.only_one_true?(@hooks, @ci)
-        help! "You can't provide more than one operation modifier (--hooks, --ci, etc.)"
-      end
-    end
-        
-    def run
-      ensure_in_work_tree unless @ci
-      ensure_multirepo_tracked
-      
-      if @hooks
-        Console.log_step("Installing hooks in main repo and all dependencies...")
-        install_hooks_step
-      else
-        Console.log_step("Installing dependencies...")
-        log_ci_info if @ci
-        full_install
-      end
-      
-      Console.log_step("Done!")
-    end
-    
-    def full_install
-      install_dependencies_step
-      install_hooks_step unless @ci
-      update_gitconfigs_step unless @ci
-    end
-    
-    def install_dependencies_step
-      # Read config entries as-is on disk, without prior checkout
-      config_entries = ConfigFile.new(".").load_entries
-      Console.log_substep("Installing #{config_entries.count} dependencies...")
-      
-      # Clone or fetch all configured dependencies to make sure nothing is missing locally
-      Performer.depth_ordered_dependencies.each { |d| clone_or_fetch(d) }
-      
-      # Checkout the appropriate branches as specified in the lock file
-      ExtraOutput.progress("Checking out appropriate dependency revisions") if @ci
-      checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
-      mode = @ci ? RevisionSelection::AS_LOCK : RevisionSelection::LATEST
-      checkout_command.dependencies_checkout_step(mode)
-    end
-    
-    def install_hooks_step
-      perform_in_main_repo_and_dependencies("Installed git hooks") { |repo| install_hooks(repo) }
-    end
-    
-    def update_gitconfigs_step
-      perform_in_main_repo_and_dependencies("Updated .git/config file") { |repo| update_gitconfig(repo) }
-    end
-    
-    def perform_in_main_repo_and_dependencies(message_prefix, &operation)
-      operation.call(".")
-      Console.log_substep("#{message_prefix} in main repo")
-      
-      multirepo_enabled_dependencies.each do |config_entry|
-        operation.call(config_entry.repo.path)
-        Console.log_substep("#{message_prefix} in multirepo-enabled dependency '#{config_entry.repo.path}'")
-      end
-    end
-    
-    # Repo operations
-    
-    def clone_or_fetch(dependency)
-      if dependency.config_entry.repo.exists?
-        check_repo_validity(dependency)
-        
-        Console.log_substep("Working copy '#{dependency.config_entry.repo.path}' already exists, fetching...") 
-        ExtraOutput.progress("Fetching #{dependency.config_entry.repo.basename}") if @ci
-        fetch_repo(dependency)
-      else
-        Console.log_substep("Cloning #{dependency.config_entry.url} into '#{dependency.config_entry.repo.path}'")
-        ExtraOutput.progress("Cloning into #{dependency.config_entry.repo.basename}") if @ci
-        clone_repo(dependency)
-      end
-    end
-    
-    def fetch_repo(dependency)
-      unless dependency.config_entry.repo.fetch
-        ExtraOutput.error("Failed to fetch #{dependency.config_entry.repo.basename}") if @ci
-        fail MultiRepoException, "Could not fetch from remote #{dependency.config_entry.repo.remote('origin').url}"
-      end
-    end
-    
-    def clone_repo(dependency)
-      options = { :branch => dependency.lock_entry.branch, :quiet => @ci }
-      unless dependency.config_entry.repo.clone(dependency.config_entry.url, options)
-        ExtraOutput.error("Failed to clone #{dependency.config_entry.repo.basename}") if @ci
-        fail MultiRepoException, "Could not clone remote #{dependency.config_entry.url} with branch #{dependency.lock_entry.branch}"
-      end
-    end
-    
-    # Validation
-    
-    def check_repo_validity(dependency)
-      unless dependency.config_entry.repo.remote("origin").url == dependency.config_entry.url
-        ExtraOutput.error("Repo #{dependency.config_entry.path} origin URL does not match config") if @ci
-        fail MultiRepoException, "'#{dependency.config_entry.path}' origin URL (#{dependency.config_entry.repo.remote('origin').url}) does not match entry (#{dependency.config_entry.url})!"
-      end
-    end
-    
-    # Logging
-    
-    def log_ci_info
-      Console.log_info("Performing continuous-integration-aware install")
-      Console.log_info("Using git-multirepo #{MultiRepo::VERSION}")
-      
-      main_repo = Repo.new(".")
-      
-      log_merge_commit_warning(main_repo)
-      log_merge_table(main_repo)
-    end
-    
-    def log_merge_commit_warning(main_repo)
-      if main_repo.head.merge_commit?
-        Console.log_warning("[MERGE COMMIT] The checked-out main repo revision is a merge commit.")
-        Console.log_warning("[MERGE COMMIT] Lock file might not represent a valid project state.")
-      end
-    end
-    
-    def log_merge_table(main_repo)
-      meta_file = MetaFile.new(".").load
-      main_repo_branch = main_repo.current_branch
-      
-      puts Terminal::Table.new do |t|
-        t.title = "Revision Info"
-        t.add_row ["Tracked Using", "git-multirepo #{meta_file.version}"]
-        t.add_separator
-        t.add_row ["Main Repo", commit_info(main_repo.head.commit_id, (main_repo_branch.name rescue nil))]
-        t.add_separator
-        LockFile.new(".").load_entries.each do |lock_entry|
-          branch_name = lock_entry.branch
-          t.add_row [lock_entry.name, commit_info(lock_entry.head, branch_name)]
-        end
-      end
-    end
-
-    def commit_info(commit_id, branch_name)
-      commit_id + (branch_name ? " (on branch #{branch_name})" : "")
-    end
-  end
-end
+require "terminal-table"
+
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/output/extra-output"
+require "multirepo/git/repo"
+require "multirepo/logic/performer"
+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.'],
+        ['[--ci]', 'Perform a continuous-integration-aware install (such as on a CI build server or agent).']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @hooks = argv.flag?("hooks")
+      @ci = argv.flag?("ci")
+      super
+    end
+    
+    def validate!
+      super
+      unless Utils.only_one_true?(@hooks, @ci)
+        help! "You can't provide more than one operation modifier (--hooks, --ci, etc.)"
+      end
+    end
+        
+    def run
+      ensure_in_work_tree unless @ci
+      ensure_multirepo_tracked
+      
+      if @hooks
+        Console.log_step("Installing hooks in main repo and all dependencies...")
+        install_hooks_step
+      else
+        Console.log_step("Installing dependencies...")
+        log_ci_info if @ci
+        full_install
+      end
+      
+      Console.log_step("Done!")
+    end
+    
+    def full_install
+      install_dependencies_step
+      install_hooks_step unless @ci
+      update_gitconfigs_step unless @ci
+    end
+    
+    def install_dependencies_step
+      # Read config entries as-is on disk, without prior checkout
+      config_entries = ConfigFile.new(".").load_entries
+      Console.log_substep("Installing #{config_entries.count} dependencies...")
+      
+      # Clone or fetch all configured dependencies to make sure nothing is missing locally
+      Performer.depth_ordered_dependencies.each { |d| clone_or_fetch(d) }
+      
+      # Checkout the appropriate branches as specified in the lock file
+      ExtraOutput.progress("Checking out appropriate dependency revisions") if @ci
+      checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
+      mode = @ci ? RevisionSelection::AS_LOCK : RevisionSelection::LATEST
+      checkout_command.dependencies_checkout_step(mode)
+    end
+    
+    def install_hooks_step
+      perform_in_main_repo_and_dependencies("Installed git hooks") { |repo| install_hooks(repo) }
+    end
+    
+    def update_gitconfigs_step
+      perform_in_main_repo_and_dependencies("Updated .git/config file") { |repo| update_gitconfig(repo) }
+    end
+    
+    def perform_in_main_repo_and_dependencies(message_prefix, &operation)
+      operation.call(".")
+      Console.log_substep("#{message_prefix} in main repo")
+      
+      multirepo_enabled_dependencies.each do |config_entry|
+        operation.call(config_entry.repo.path)
+        Console.log_substep("#{message_prefix} in multirepo-enabled dependency '#{config_entry.repo.path}'")
+      end
+    end
+    
+    # Repo operations
+    
+    def clone_or_fetch(dependency)
+      if dependency.config_entry.repo.exists?
+        check_repo_validity(dependency)
+        
+        Console.log_substep("Working copy '#{dependency.config_entry.repo.path}' already exists, fetching...") 
+        ExtraOutput.progress("Fetching #{dependency.config_entry.repo.basename}") if @ci
+        fetch_repo(dependency)
+      else
+        Console.log_substep("Cloning #{dependency.config_entry.url} into '#{dependency.config_entry.repo.path}'")
+        ExtraOutput.progress("Cloning into #{dependency.config_entry.repo.basename}") if @ci
+        clone_repo(dependency)
+      end
+    end
+    
+    def fetch_repo(dependency)
+      unless dependency.config_entry.repo.fetch
+        ExtraOutput.error("Failed to fetch #{dependency.config_entry.repo.basename}") if @ci
+        fail MultiRepoException, "Could not fetch from remote #{dependency.config_entry.repo.remote('origin').url}"
+      end
+    end
+    
+    def clone_repo(dependency)
+      options = { :branch => dependency.lock_entry.branch, :quiet => @ci }
+      unless dependency.config_entry.repo.clone(dependency.config_entry.url, options)
+        ExtraOutput.error("Failed to clone #{dependency.config_entry.repo.basename}") if @ci
+        fail MultiRepoException, "Could not clone remote #{dependency.config_entry.url} with branch #{dependency.lock_entry.branch}"
+      end
+    end
+    
+    # Validation
+    
+    def check_repo_validity(dependency)
+      unless dependency.config_entry.repo.remote("origin").url == dependency.config_entry.url
+        ExtraOutput.error("Repo #{dependency.config_entry.path} origin URL does not match config") if @ci
+        fail MultiRepoException, "'#{dependency.config_entry.path}' origin URL (#{dependency.config_entry.repo.remote('origin').url}) does not match entry (#{dependency.config_entry.url})!"
+      end
+    end
+    
+    # Logging
+    
+    def log_ci_info
+      Console.log_info("Performing continuous-integration-aware install")
+      Console.log_info("Using git-multirepo #{MultiRepo::VERSION}")
+      
+      main_repo = Repo.new(".")
+      
+      log_merge_commit_warning(main_repo)
+      log_merge_table(main_repo)
+    end
+    
+    def log_merge_commit_warning(main_repo)
+      if main_repo.head.merge_commit?
+        Console.log_warning("[MERGE COMMIT] The checked-out main repo revision is a merge commit.")
+        Console.log_warning("[MERGE COMMIT] Lock file might not represent a valid project state.")
+      end
+    end
+    
+    def log_merge_table(main_repo)
+      meta_file = MetaFile.new(".").load
+      main_repo_branch = main_repo.current_branch
+      
+      puts Terminal::Table.new do |t|
+        t.title = "Revision Info"
+        t.add_row ["Tracked Using", "git-multirepo #{meta_file.version}"]
+        t.add_separator
+        t.add_row ["Main Repo", commit_info(main_repo.head.commit_id, (main_repo_branch.name rescue nil))]
+        t.add_separator
+        LockFile.new(".").load_entries.each do |lock_entry|
+          branch_name = lock_entry.branch
+          t.add_row [lock_entry.name, commit_info(lock_entry.head, branch_name)]
+        end
+      end
+    end
+
+    def commit_info(commit_id, branch_name)
+      commit_id + (branch_name ? " (on branch #{branch_name})" : "")
+    end
+  end
+end