git-multirepo 1.0.0.beta59 → 1.0.0.beta60

data/git-multirepo.gemspec

@@ -1,31 +1,32 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "multirepo/info"
-
-Gem::Specification.new do |spec|
-  spec.name          = MultiRepo::NAME
-  spec.version       = MultiRepo::VERSION
-  spec.authors       = ["Michaël Fortin"]
-  spec.email         = ["fortinmike@irradiated.net"]
-  spec.summary       = "Track multiple Git repositories side-by-side"
-  spec.description   = MultiRepo::DESCRIPTION
-  spec.homepage      = "https://github.com/fortinmike/git-multirepo"
-  spec.license       = "MIT"
-  
-  spec.required_ruby_version = '~> 2.0'
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
-
-  spec.add_runtime_dependency "claide", "~> 0.8", ">= 0.8.0"
-  spec.add_runtime_dependency "colored", "~> 1.2"
-  spec.add_runtime_dependency "os", "~> 0.9.6"
-  spec.add_runtime_dependency "terminal-table", "~> 1.4.5"
-  spec.add_runtime_dependency "ruby-graphviz", "~> 1.2.1"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "multirepo/info"
+
+Gem::Specification.new do |spec|
+  spec.name          = MultiRepo::NAME
+  spec.version       = MultiRepo::VERSION
+  spec.authors       = ["Michaël Fortin"]
+  spec.email         = ["fortinmike@irradiated.net"]
+  spec.summary       = "Track multiple Git repositories side-by-side"
+  spec.description   = MultiRepo::DESCRIPTION
+  spec.homepage      = "https://github.com/fortinmike/git-multirepo"
+  spec.license       = "MIT"
+  
+  spec.required_ruby_version = '~> 2.0'
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
+
+  spec.add_runtime_dependency "claide", "~> 0.8", ">= 0.8.0"
+  spec.add_runtime_dependency "colored", "~> 1.2"
+  spec.add_runtime_dependency "os", "~> 0.9.6"
+  spec.add_runtime_dependency "terminal-table", "~> 1.4.5"
+  spec.add_runtime_dependency "ruby-graphviz", "~> 1.2.1"
+  spec.add_runtime_dependency "naturally", "~> 2.1"
+end

data/lib/git-multirepo.rb

@@ -1,3 +1,3 @@
-require "multirepo/utility/console"
-require "multirepo/hooks/pre-commit-hook"
-require "multirepo/hooks/post-commit-hook"
+require "multirepo/utility/console"
+require "multirepo/hooks/pre-commit-hook"
+require "multirepo/hooks/post-commit-hook"

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

@@ -1,51 +1,51 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class AddCommand < Command
-    self.command = "add"
-    self.summary = "Track an additional dependency with multirepo."
-    
-    def self.options
-      [['<path>', 'The relative path to the new dependency (e.g. ../MyNewDependency)']].concat(super)
-    end
-    
-    def initialize(argv)
-      @path = argv.shift_argument
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a repository to add as a dependency" unless @path
-    end
-    
-    def run
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      ensure_repo_valid
-      
-      config_file = ConfigFile.new(".")
-      entry = ConfigEntry.new(Repo.new(@path))
-      
-      if config_file.entry_exists?(entry)
-        Console.log_info("There is already an entry for '#{@path}' in the .multirepo file")
-      else
-        config_file.add_entry(entry)
-        Console.log_step("Added '#{@path}' to the .multirepo file")
-      end
-    end
-    
-    def ensure_repo_valid
-      fail MultiRepoException, "The provided path is not a direct sibling of the main repository" unless validate_is_sibling_repo(@path)
-      fail MultiRepoException, "There is no folder at path '#{@path}'" unless Dir.exist?(@path)
-      fail MultiRepoException, "'#{@path}' is not a repository" unless Repo.new(@path).exists?
-    end
-    
-    def validate_is_sibling_repo(path)
-      parent_dir = File.expand_path("..")
-      path = File.expand_path("..", path)
-      return parent_dir == path
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class AddCommand < Command
+    self.command = "add"
+    self.summary = "Track an additional dependency with multirepo."
+    
+    def self.options
+      [['<path>', 'The relative path to the new dependency (e.g. ../MyNewDependency)']].concat(super)
+    end
+    
+    def initialize(argv)
+      @path = argv.shift_argument
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a repository to add as a dependency" unless @path
+    end
+    
+    def run
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      ensure_repo_valid
+      
+      config_file = ConfigFile.new(".")
+      entry = ConfigEntry.new(Repo.new(@path))
+      
+      if config_file.entry_exists?(entry)
+        Console.log_info("There is already an entry for '#{@path}' in the .multirepo file")
+      else
+        config_file.add_entry(entry)
+        Console.log_step("Added '#{@path}' to the .multirepo file")
+      end
+    end
+    
+    def ensure_repo_valid
+      fail MultiRepoException, "The provided path is not a direct sibling of the main repository" unless validate_is_sibling_repo(@path)
+      fail MultiRepoException, "There is no folder at path '#{@path}'" unless Dir.exist?(@path)
+      fail MultiRepoException, "'#{@path}' is not a repository" unless Repo.new(@path).exists?
+    end
+    
+    def validate_is_sibling_repo(path)
+      parent_dir = File.expand_path("..")
+      path = File.expand_path("..", path)
+      return parent_dir == path
+    end
+  end
+end

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

@@ -1,82 +1,88 @@
-require "multirepo/utility/console"
-require "multirepo/git/git"
-require "multirepo/files/config-file"
-require "multirepo/files/tracking-files"
-require "multirepo/logic/performer"
-
-module MultiRepo
-  class BranchCommand < Command
-    self.command = "branch"
-    self.summary = "Create and/or checkout a new branch for all repos."
-    
-    def self.options
-      [
-        ['<branch name>', 'The name of the branch to create and checkout.'],
-        ['[--force]', 'Force creating the branch even if there are uncommmitted changes.'],
-        ['[--no-push]', 'Do not push the branch on creation.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @branch_name = argv.shift_argument
-      @force = argv.flag?("force")
-      @remote_tracking = argv.flag?("push", true)
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a branch name" unless @branch_name
-      help! "Please provide a valid branch name" unless Git.valid_branch_name?(@branch_name)
-    end
-    
-    def run
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Branching...")
-      
-      main_repo = Repo.new(".")
-      
-      # Ensure the main repo is clean
-      fail MultiRepoException, "Main repo is not clean; multi branch aborted" unless main_repo.clean?
-      
-      # Ensure dependencies are clean
-      config_entries = ConfigFile.new(".").load_entries
-      unless Utils.dependencies_clean?(config_entries)
-        fail MultiRepoException, "Dependencies are not clean; multi branch aborted"
-      end
-      
-      # Branch dependencies
-      Performer.dependencies.each do |dependency|
-        perform_branch(dependency.config_entry.repo)
-      end
-      
-      # Branch the main repo
-      perform_branch(main_repo)
-      
-      Console.log_step("Done!")
-    end
-    
-    def perform_branch(repo)
-      Console.log_substep("Branching '#{repo.path}' ...")
-      Console.log_info("Creating and checking out branch #{@branch_name} ...")
-      
-      branch = repo.branch(@branch_name)
-      branch.create unless branch.exists?
-      branch.checkout
-      
-      if Utils.multirepo_enabled?(repo.path)
-        Console.log_info("Updating and committing tracking files")
-        tracking_files = TrackingFiles.new(repo.path)
-        tracking_files.update
-        tracking_files.commit("[multirepo] Post-branch tracking files update")
-      end
-      
-      return unless @remote_tracking
-      
-      Console.log_info("Pushing #{@branch_name} to origin/#{@branch_name}")
-      repo.branch(@branch_name).push
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/git/git"
+require "multirepo/files/config-file"
+require "multirepo/files/tracking-files"
+require "multirepo/logic/performer"
+
+module MultiRepo
+  class BranchCommand < Command
+    self.command = "branch"
+    self.summary = "Create and/or checkout a new branch for all repos."
+    
+    def self.options
+      [
+        ['<branch name>', 'The name of the branch to create and checkout.'],
+        ['[--force]', 'Force creating the branch even if there are uncommmitted changes.'],
+        ['[--no-push]', 'Do not push the branch on creation.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @branch_name = argv.shift_argument
+      @force = argv.flag?("force")
+      @push = argv.flag?("push", true)
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a branch name" unless @branch_name
+      help! "Please provide a valid branch name" unless Git.valid_branch_name?(@branch_name)
+    end
+    
+    def run
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Branching...")
+      
+      main_repo = Repo.new(".")
+      
+      unless @force
+        # Ensure the main repo is clean
+        fail MultiRepoException, "Main repo is not clean; multi branch aborted" unless main_repo.clean?
+        
+        # Ensure dependencies are clean
+        config_entries = ConfigFile.new(".").load_entries
+        unless Utils.dependencies_clean?(config_entries)
+          fail MultiRepoException, "Dependencies are not clean; multi branch aborted"
+        end
+      end
+
+      # Branch dependencies
+      Performer.depth_ordered_dependencies.each do |dependency|
+        perform_branch(dependency.config_entry.repo)
+      end
+      
+      # Branch the main repo
+      perform_branch(main_repo)
+      
+      Console.log_step("Done!")
+    end
+    
+    def perform_branch(repo)
+      Console.log_substep("Branching '#{repo.path}' ...")
+      Console.log_info("Creating and checking out branch #{@branch_name} ...")
+      
+      branch = repo.branch(@branch_name)
+      branch.create unless branch.exists?
+      branch.checkout
+      
+      if Utils.multirepo_enabled?(repo.path)
+        Console.log_info("Updating and committing tracking files")
+        tracking_files = TrackingFiles.new(repo.path)
+        tracking_files.update
+        tracking_files.commit("[multirepo] Post-branch tracking files update")
+      end
+      
+      return unless @push
+      
+      if @force
+        Console.log_warning("Skipping #{@branch_name} branch push because we're force-branching")
+      else
+        Console.log_info("Pushing #{@branch_name} to origin/#{@branch_name}")
+        repo.branch(@branch_name).push
+      end
+    end
+  end
+end

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

@@ -1,127 +1,127 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/output/extra-output"
-require "multirepo/logic/revision-selector"
-require "multirepo/logic/performer"
-
-module MultiRepo
-  class CheckoutCommand < Command
-    self.command = "checkout"
-    self.summary = "Checks out the specified commit or branch of the main repo and checks out matching versions of all dependencies."
-    
-    def self.options
-      [
-        ['<refname>', 'The main repo tag, branch or commit id to checkout.'],
-        ['[--latest]', 'Checkout the HEAD of each dependency branch (as recorded in the lock file) instead of the exact required commits.'],
-        ['[--exact]', 'Checkout the exact specified ref for each repo, regardless of what\'s stored in the lock file.'],
-        ['[--force]', 'Force checkout even if there are uncommmitted changes.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @ref_name = argv.shift_argument
-      @checkout_latest = argv.flag?("latest")
-      @checkout_exact = argv.flag?("exact")
-      @force = argv.flag?("force")
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a branch or commit id to checkout" unless @ref_name
-      unless Utils.only_one_true?(@checkout_latest, @checkout_exact)
-        help! "You can't provide more than one operation modifier (--latest, --exact, etc.)"
-      end
-    end
-    
-    def run
-      ensure_in_work_tree
-      
-      # Find out the checkout mode based on command-line options
-      mode = RevisionSelector.mode_for_args(@checkout_latest, @checkout_exact)
-      
-      strategy_name = RevisionSelection.name_for_mode(mode)
-      Console.log_step("Checking out #{@ref_name} and its dependencies using the '#{strategy_name}' strategy...")
-      
-      main_repo = Repo.new(".")
-      
-      unless proceed_if_merge_commit?(main_repo, @ref_name, mode)
-        fail MultiRepoException, "Aborting checkout"
-      end
-      
-      checkout_core(main_repo, mode)
-            
-      Console.log_step("Done!")
-    end
-    
-    def checkout_core(main_repo, mode)
-      initial_revision = main_repo.current_revision
-      begin
-        # Checkout first because the current ref might not be multirepo-enabled
-        checkout_main_repo_step(main_repo)
-        # Only then can we check for dependencies and make sure they are clean
-        ensure_dependencies_clean_step if !@force
-      rescue MultiRepoException => e
-        Console.log_warning("Restoring working copy to #{initial_revision}")
-        main_repo.checkout(initial_revision)
-        raise e
-      end
-      dependencies_checkout_step(mode, @ref_name)
-    end
-    
-    def checkout_main_repo_step(main_repo)
-      Performer.perform_main_repo_checkout(main_repo, @ref_name, @force)
-    end
-    
-    def ensure_dependencies_clean_step
-      unless Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
-        fail MultiRepoException, "Dependencies are not clean!"
-      end
-    end
-    
-    def dependencies_checkout_step(mode, ref_name = nil)
-      Performer.dependencies.each do |dependency|
-        # Find out the required dependency revision based on the checkout mode
-        revision = RevisionSelector.revision_for_mode(mode, ref_name, dependency.lock_entry)
-        perform_dependency_checkout(dependency.config_entry, revision)
-      end
-    end
-    
-    def proceed_if_merge_commit?(main_repo, ref_name, mode)
-      return true unless main_repo.ref(ref_name).merge_commit?
-      
-      case mode
-      when RevisionSelection::AS_LOCK
-        Console.log_error("The specified ref is a merge commit and an \"as-lock\" checkout was requested.")
-        Console.log_error("The resulting checkout would most probably not result in a valid project state.")
-        return false
-      when RevisionSelection::LATEST
-        Console.log_warning("The specified ref is a merge commit and a \"latest\" checkout was requested.")
-        Console.log_warning("The work branches recorded in the branch from which the merge was performed will be checked out.")
-      end
-      
-      return true
-    end
-    
-    def perform_dependency_checkout(config_entry, revision)
-      dependency_name = config_entry.repo.basename
-      
-      # Make sure the repo exists on disk, and clone it if it doesn't
-      # (in case the checked-out revision had an additional dependency)
-      unless config_entry.repo.exists?
-        Console.log_substep("Cloning missing dependency '#{config_entry.path}' from #{config_entry.url}")
-        ExtraOutput.progress("Cloning missing dependency #{config_entry.path}")
-        config_entry.repo.clone(config_entry.url)
-      end
-      
-      # Checkout!
-      ExtraOutput.progress("Checking out #{dependency_name} #{revision}")
-      if config_entry.repo.checkout(revision)
-        Console.log_substep("Checked out #{dependency_name} '#{revision}'")
-      else
-        ExtraOutput.error("Couldn|'t check out dependency #{dependency_name}")
-        fail MultiRepoException, "Couldn't check out the appropriate version of dependency #{dependency_name}"
-      end
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/output/extra-output"
+require "multirepo/logic/revision-selector"
+require "multirepo/logic/performer"
+
+module MultiRepo
+  class CheckoutCommand < Command
+    self.command = "checkout"
+    self.summary = "Checks out the specified commit or branch of the main repo and checks out matching versions of all dependencies."
+    
+    def self.options
+      [
+        ['<refname>', 'The main repo tag, branch or commit id to checkout.'],
+        ['[--latest]', 'Checkout the HEAD of each dependency branch (as recorded in the lock file) instead of the exact required commits.'],
+        ['[--exact]', 'Checkout the exact specified ref for each repo, regardless of what\'s stored in the lock file.'],
+        ['[--force]', 'Force checkout even if there are uncommmitted changes.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @ref_name = argv.shift_argument
+      @checkout_latest = argv.flag?("latest")
+      @checkout_exact = argv.flag?("exact")
+      @force = argv.flag?("force")
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a branch or commit id to checkout" unless @ref_name
+      unless Utils.only_one_true?(@checkout_latest, @checkout_exact)
+        help! "You can't provide more than one operation modifier (--latest, --exact, etc.)"
+      end
+    end
+    
+    def run
+      ensure_in_work_tree
+      
+      # Find out the checkout mode based on command-line options
+      mode = RevisionSelector.mode_for_args(@checkout_latest, @checkout_exact)
+      
+      strategy_name = RevisionSelection.name_for_mode(mode)
+      Console.log_step("Checking out #{@ref_name} and its dependencies using the '#{strategy_name}' strategy...")
+      
+      main_repo = Repo.new(".")
+      
+      unless proceed_if_merge_commit?(main_repo, @ref_name, mode)
+        fail MultiRepoException, "Aborting checkout"
+      end
+      
+      checkout_core(main_repo, mode)
+            
+      Console.log_step("Done!")
+    end
+    
+    def checkout_core(main_repo, mode)
+      initial_revision = main_repo.current_revision
+      begin
+        # Checkout first because the current ref might not be multirepo-enabled
+        checkout_main_repo_step(main_repo)
+        # Only then can we check for dependencies and make sure they are clean
+        ensure_dependencies_clean_step if !@force
+      rescue MultiRepoException => e
+        Console.log_warning("Restoring working copy to #{initial_revision}")
+        main_repo.checkout(initial_revision)
+        raise e
+      end
+      dependencies_checkout_step(mode, @ref_name)
+    end
+    
+    def checkout_main_repo_step(main_repo)
+      Performer.perform_main_repo_checkout(main_repo, @ref_name, @force)
+    end
+    
+    def ensure_dependencies_clean_step
+      unless Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
+        fail MultiRepoException, "Dependencies are not clean!"
+      end
+    end
+    
+    def dependencies_checkout_step(mode, ref_name = nil)
+      Performer.depth_ordered_dependencies.each do |dependency|
+        # Find out the required dependency revision based on the checkout mode
+        revision = RevisionSelector.revision_for_mode(mode, ref_name, dependency.lock_entry)
+        perform_dependency_checkout(dependency.config_entry, revision)
+      end
+    end
+    
+    def proceed_if_merge_commit?(main_repo, ref_name, mode)
+      return true unless main_repo.ref(ref_name).merge_commit?
+      
+      case mode
+      when RevisionSelection::AS_LOCK
+        Console.log_error("The specified ref is a merge commit and an \"as-lock\" checkout was requested.")
+        Console.log_error("The resulting checkout would most probably not result in a valid project state.")
+        return false
+      when RevisionSelection::LATEST
+        Console.log_warning("The specified ref is a merge commit and a \"latest\" checkout was requested.")
+        Console.log_warning("The work branches recorded in the branch from which the merge was performed will be checked out.")
+      end
+      
+      return true
+    end
+    
+    def perform_dependency_checkout(config_entry, revision)
+      dependency_name = config_entry.repo.basename
+      
+      # Make sure the repo exists on disk, and clone it if it doesn't
+      # (in case the checked-out revision had an additional dependency)
+      unless config_entry.repo.exists?
+        Console.log_substep("Cloning missing dependency '#{config_entry.path}' from #{config_entry.url}")
+        ExtraOutput.progress("Cloning missing dependency #{config_entry.path}")
+        config_entry.repo.clone(config_entry.url)
+      end
+      
+      # Checkout!
+      ExtraOutput.progress("Checking out #{dependency_name} #{revision}")
+      if config_entry.repo.checkout(revision)
+        Console.log_substep("Checked out #{dependency_name} '#{revision}'")
+      else
+        ExtraOutput.error("Couldn|'t check out dependency #{dependency_name}")
+        fail MultiRepoException, "Couldn't check out the appropriate version of dependency #{dependency_name}"
+      end
+    end
+  end
+end