git-multirepo 1.0.0.beta34 → 1.0.0.beta37

data/lib/multirepo/hooks/post-commit-hook.rb

@@ -1,23 +1,23 @@
-require "multirepo/files/config-file"
-require "multirepo/files/tracking-files"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PostCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-      
-      Console.log_step("Performing post-commit operations...")
-      
-      # Works around bug #91565510 (https://www.pivotaltracker.com/story/show/91565510)
-      TrackingFiles.stage
-      Console.log_info("Cleaned-up staging area")
-      
-      exit 0 # Success!
-    rescue StandardError => e
-      Console.log_error("Post-commit hook failed to execute! #{e.message}")
-      exit 1 # Something went wrong!
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/tracking-files"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PostCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      Console.log_step("Performing post-commit operations...")
+      
+      # Works around bug #91565510 (https://www.pivotaltracker.com/story/show/91565510)
+      TrackingFiles.stage
+      Console.log_info("Cleaned-up staging area")
+      
+      exit 0 # Success!
+    rescue StandardError => e
+      Console.log_error("Post-commit hook failed to execute! #{e.message}")
+      exit 1 # Something went wrong!
+    end
+  end
 end

data/lib/multirepo/hooks/pre-commit-hook.rb

@@ -1,30 +1,30 @@
-require "multirepo/files/config-file"
-require "multirepo/files/tracking-files"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PreCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-      
-      Console.log_step("Performing pre-commit operations...")
-      
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load_entries)
-      
-      if !dependencies_clean
-        Console.log_error("You must commit changes to your dependencies before you can commit this repo")
-        exit 1
-      end
-      
-      TrackingFiles.update
-      TrackingFiles.stage
-      Console.log_info("Updated and staged tracking files")
-      
-      exit 0 # Success!
-    rescue StandardError => e
-      Console.log_error("Pre-commit hook failed to execute! #{e.message}")
-      exit 1 # Something went wrong!
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/tracking-files"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PreCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      Console.log_step("Performing pre-commit operations...")
+      
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.new(".").load_entries)
+      
+      if !dependencies_clean
+        Console.log_error("You must commit changes to your dependencies before you can commit this repo")
+        exit 1
+      end
+      
+      TrackingFiles.update
+      TrackingFiles.stage
+      Console.log_info("Updated and staged tracking files")
+      
+      exit 0 # Success!
+    rescue StandardError => e
+      Console.log_error("Pre-commit hook failed to execute! #{e.message}")
+      exit 1 # Something went wrong!
+    end
+  end
 end

data/lib/multirepo/logic/node.rb

@@ -0,0 +1,41 @@
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class Node
+    attr_accessor :path
+    attr_accessor :depth
+    
+    def initialize(path, depth = 0)
+      @path = path
+      @depth = depth
+    end
+    
+    def children
+      return [] unless Utils.is_multirepo_enabled(@path)
+      config_entries = ConfigFile.new(@path).load_entries
+      return config_entries.map { |e| Node.new(e.path, @depth + 1) }
+    end
+    
+    def ordered_descendants_including_self
+      return ordered_descendants.push(self)
+    end
+    
+    def ordered_descendants
+      descendants = find_descendants_recursive(self)
+      
+      unique_paths = descendants.map{ |d| d.path }.uniq
+      unique_nodes = unique_paths.collect do |path|
+        nodes_for_path = descendants.select { |d| d.path == path }
+        next nodes_for_path.sort{ |n| n.depth }.first
+      end
+      
+      return unique_nodes.sort_by{ |d| d.depth }.reverse
+    end
+    
+    def find_descendants_recursive(node)
+      descendants = node.children
+      descendants.each { |d| descendants.push(*find_descendants_recursive(d)) }
+      return descendants
+    end
+  end
+end

data/lib/multirepo/logic/performer.rb

@@ -0,0 +1,59 @@
+require "ostruct"
+
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+
+module MultiRepo
+  class Performer
+    def self.perform_main_repo_checkout(main_repo, ref)
+      # Make sure the main repo is clean before attempting a checkout
+      unless main_repo.clean?
+        raise MultiRepoException, "Can't checkout #{ref} because the main repo contains uncommitted changes"
+      end
+      
+      # Checkout the specified ref
+      unless main_repo.checkout(ref)
+        raise MultiRepoException, "Couldn't perform checkout of main repo #{ref}!"
+      end
+      
+      Console.log_substep("Checked out main repo #{ref}")
+      
+      # After checkout, make sure we're working with a multirepo-enabled ref
+      unless Utils.is_multirepo_tracked(".")
+        raise MultiRepoException, "Revision #{ref} is not tracked by multirepo!"
+      end
+    end
+    
+    def self.perform_on_dependencies(&operation)
+      config_entries = ConfigFile.new(".").load_entries
+      lock_entries = LockFile.new(".").load_entries
+      
+      config_lock_pairs = build_config_lock_pairs(config_entries, lock_entries)
+      dependency_ordered_nodes = Node.new(".").ordered_descendants
+      
+      ordered_pairs = dependency_ordered_nodes.map do |node|
+        pair = config_lock_pairs.find { |pair| pair.config_entry.path == node.path }
+      end
+      
+      ordered_pairs.each { |pair| operation.call(pair.config_entry, pair.lock_entry) }
+    end
+    
+    private
+    
+    def self.build_config_lock_pairs(config_entries, lock_entries)
+      lock_entries.map do |lock_entry|
+        config_entry = config_entry_for_lock_entry(config_entries, lock_entry)
+        
+        pair = OpenStruct.new
+        pair.config_entry = config_entry
+        pair.lock_entry = lock_entry
+        
+        next pair
+      end
+    end
+    
+    def self.config_entry_for_lock_entry(config_entries, lock_entry)
+      config_entries.find { |config_entry| config_entry.id == lock_entry.id }
+    end
+  end
+end

data/lib/multirepo/logic/revision-selector.rb

@@ -0,0 +1,27 @@
+module MultiRepo
+  class RevisionSelectionMode
+    AS_LOCK = 0
+    LATEST = 1
+    EXACT = 2
+  end
+  
+  class RevisionSelector
+    def self.mode_for_args(checkout_latest, checkout_exact)
+      if checkout_latest then
+        RevisionSelectionMode::LATEST
+      elsif checkout_exact then
+        RevisionSelectionMode::EXACT
+      else
+        RevisionSelectionMode::AS_LOCK
+      end
+    end
+    
+    def self.revision_for_mode(mode, ref, lock_entry)
+      case mode
+      when RevisionSelectionMode::AS_LOCK; lock_entry.head
+      when RevisionSelectionMode::LATEST; lock_entry.branch
+      when RevisionSelectionMode::EXACT; ref
+      end
+    end
+  end
+end

data/lib/multirepo/multirepo-exception.rb

@@ -1,6 +1,6 @@
-require "claide/informative_error"
-
-module MultiRepo
-  class MultiRepoException < StandardError
-  end
+require "claide/informative_error"
+
+module MultiRepo
+  class MultiRepoException < StandardError
+  end
 end

data/lib/multirepo/utility/console.rb

@@ -1,52 +1,52 @@
-require "colored"
-
-module MultiRepo
-  class Console
-    def self.log_step(message)
-      print_prefix
-      puts $stdout.isatty ? message.bold.green : message
-    end
-    
-    def self.log_substep(message)
-      print_prefix
-      puts $stdout.isatty ? message.blue : message
-    end
-    
-    def self.log_info(message)
-      print_prefix
-      puts $stdout.isatty ? message.white : message
-    end
-    
-    def self.log_warning(message)
-      print_prefix
-      puts $stdout.isatty ? message.yellow : message
-    end
-    
-    def self.log_error(message)
-      print_prefix
-      puts $stdout.isatty ? message.red : message
-    end
-    
-    def self.ask_yes_no(message)
-      answered = false
-      while !answered
-        print_prefix
-        print message
-        print " (y/n) "
-        
-        case $stdin.gets.strip.downcase
-        when "y", "yes"
-          answered = true
-          return true
-        when "n", "no"
-          answered = true
-          return false
-        end
-      end
-    end
-    
-    def self.print_prefix
-      print $stdout.isatty ? "> ".white : "[multirepo] "
-    end
-  end
+require "colored"
+
+module MultiRepo
+  class Console
+    def self.log_step(message)
+      print_prefix
+      puts $stdout.isatty ? message.bold.green : message
+    end
+    
+    def self.log_substep(message)
+      print_prefix
+      puts $stdout.isatty ? message.blue : message
+    end
+    
+    def self.log_info(message)
+      print_prefix
+      puts $stdout.isatty ? message.white : message
+    end
+    
+    def self.log_warning(message)
+      print_prefix
+      puts $stdout.isatty ? message.yellow : message
+    end
+    
+    def self.log_error(message)
+      print_prefix
+      puts $stdout.isatty ? message.red : message
+    end
+    
+    def self.ask_yes_no(message)
+      answered = false
+      while !answered
+        print_prefix
+        print message
+        print " (y/n) "
+        
+        case $stdin.gets.strip.downcase
+        when "y", "yes"
+          answered = true
+          return true
+        when "n", "no"
+          answered = true
+          return false
+        end
+      end
+    end
+    
+    def self.print_prefix
+      print $stdout.isatty ? "> ".white : "[multirepo] "
+    end
+  end
 end

data/lib/multirepo/utility/runner.rb

@@ -1,35 +1,35 @@
-require "open3"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class Runner
-    class Verbosity
-      NEVER_OUTPUT = 0
-      ALWAYS_OUTPUT = 1
-      OUTPUT_ON_ERROR = 2
-    end
-    
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.run(cmd, verbosity)
-      Console.log_info("Command: #{cmd}") if Config.instance.verbose
-      
-      lines = []
-      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
-        stdout_and_stderr.each do |line|
-          Console.log_info("-------> #{line.rstrip}") if verbosity == Verbosity::ALWAYS_OUTPUT || Config.instance.verbose
-          lines << line
-        end
-        @last_command_succeeded = thread.value.success?
-      end
-      
-      output = lines.join("").rstrip
-      
-      Console.log_error(output) if !@last_command_succeeded && verbosity == Verbosity::OUTPUT_ON_ERROR
-      
-      return output
-    end
-  end
+require "open3"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class Runner
+    class Verbosity
+      OUTPUT_NEVER = 0
+      OUTPUT_ALWAYS = 1
+      OUTPUT_ON_ERROR = 2
+    end
+    
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run(cmd, verbosity)
+      Console.log_info("Command: #{cmd}") if Config.instance.verbose
+      
+      lines = []
+      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
+        stdout_and_stderr.each do |line|
+          Console.log_info("#{line.rstrip}") if verbosity == Verbosity::OUTPUT_ALWAYS || Config.instance.verbose
+          lines << line
+        end
+        @last_command_succeeded = thread.value.success?
+      end
+      
+      output = lines.join("").rstrip
+      
+      Console.log_error(output) if !@last_command_succeeded && verbosity == Verbosity::OUTPUT_ON_ERROR
+      
+      return output
+    end
+  end
 end

data/lib/multirepo/utility/utils.rb

@@ -1,67 +1,66 @@
-require "fileutils"
-
-module MultiRepo
-  class Utils
-    def self.path_for_resource(resource_name)
-      gem_path = Gem::Specification.find_by_name("git-multirepo").gem_dir
-      File.join(gem_path, "resources/#{resource_name}")
-    end
-    
-    def self.is_multirepo_enabled(path)
-      File.exists?(File.join(path, ".multirepo"))
-    end
-
-    def self.is_multirepo_tracked(path)
-      is_multirepo_enabled(path) && File.exists?(File.join(path, ".multirepo.lock"))
-    end
-    
-    def self.install_hook(name, path)
-      destination_path = File.join(path, ".git/hooks")
-      destination_file = File.join(destination_path, name)
-      FileUtils.cp(path_for_resource(name), destination_file)
-      FileUtils.chmod(0755, destination_file) # -rwxr-xr-x
-    end
-    
-    def self.sibling_repos
-      sibling_directories = Dir['../*/']
-      sibling_repos = sibling_directories.map{ |d| Repo.new(d) }.select{ |r| r.exists? }
-      sibling_repos.delete_if{ |r| Pathname.new(r.path).realpath == Pathname.new(".").realpath }
-    end
-    
-    def self.ensure_dependencies_clean(config_entries)
-      clean = true
-      config_entries.each do |e|
-        next unless e.repo.exists?
-        dependency_clean = e.repo.is_clean?
-        clean &= dependency_clean
-        Console.log_info("Dependency '#{e.repo.path}' is clean") if dependency_clean
-        Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless dependency_clean
-      end
-      return clean
-    end
-    
-    def self.ensure_working_copies_clean(repos)
-      clean = true
-      repos.each do |repo|
-        dependency_clean = repo.is_clean?
-        clean &= dependency_clean
-        Console.log_warning("Repo '#{repo.path}' contains uncommitted changes") unless dependency_clean
-      end
-      return clean
-    end
-
-    def self.convert_to_windows_path(unix_path)
-      components = Pathname.new(unix_path).each_filename.to_a
-      components.join(File::ALT_SEPARATOR)
-    end
-    
-    def self.append_if_missing(path, pattern, string_to_append)
-      unless File.exists?(path)
-        File.open(path, 'w') { |f| f.puts(string_to_append) }
-      else
-        string_located = File.readlines(path).grep(pattern).any?
-        File.open(path, 'a') { |f| f.puts(string_to_append) } unless string_located
-      end
-    end
-  end
+require "fileutils"
+
+module MultiRepo
+  class Utils
+    def self.path_for_resource(resource_name)
+      gem_path = Gem::Specification.find_by_name("git-multirepo").gem_dir
+      File.join(gem_path, "resources/#{resource_name}")
+    end
+    
+    def self.is_multirepo_enabled(path)
+      File.exists?(File.join(path, ".multirepo"))
+    end
+
+    def self.is_multirepo_tracked(path)
+      is_multirepo_enabled(path) && File.exists?(File.join(path, ".multirepo.lock"))
+    end
+    
+    def self.install_hook(name, path)
+      destination_path = File.join(path, ".git/hooks")
+      destination_file = File.join(destination_path, name)
+      FileUtils.cp(path_for_resource(name), destination_file)
+      FileUtils.chmod(0755, destination_file) # -rwxr-xr-x
+    end
+    
+    def self.sibling_repos
+      sibling_directories = Dir['../*/']
+      sibling_repos = sibling_directories.map{ |d| Repo.new(d) }.select{ |r| r.exists? }
+      sibling_repos.delete_if{ |r| Pathname.new(r.path).realpath == Pathname.new(".").realpath }
+    end
+    
+    def self.ensure_dependencies_clean(config_entries)
+      clean = true
+      config_entries.each do |e|
+        next unless e.repo.exists?
+        dependency_clean = e.repo.clean?
+        clean &= dependency_clean
+        Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless dependency_clean
+      end
+      return clean
+    end
+    
+    def self.ensure_working_copies_clean(repos)
+      clean = true
+      repos.each do |repo|
+        dependency_clean = repo.clean?
+        clean &= dependency_clean
+        Console.log_warning("Repo '#{repo.path}' contains uncommitted changes") unless dependency_clean
+      end
+      return clean
+    end
+
+    def self.convert_to_windows_path(unix_path)
+      components = Pathname.new(unix_path).each_filename.to_a
+      components.join(File::ALT_SEPARATOR)
+    end
+    
+    def self.append_if_missing(path, pattern, string_to_append)
+      unless File.exists?(path)
+        File.open(path, 'w') { |f| f.puts(string_to_append) }
+      else
+        string_located = File.readlines(path).grep(pattern).any?
+        File.open(path, 'a') { |f| f.puts(string_to_append) } unless string_located
+      end
+    end
+  end
 end