git-multirepo 1.0.0.beta39 → 1.0.0.beta40

data/lib/multirepo/logic/merge-descriptor.rb

@@ -1,13 +1,13 @@
-module MultiRepo
-  class MergeDescriptor
-    attr_accessor :name
-    attr_accessor :path
-    attr_accessor :revision
-    
-    def initialize(name, path, revision)
-      @name = name
-      @path = path
-      @revision = revision
-    end
-  end
+module MultiRepo
+  class MergeDescriptor
+    attr_accessor :name
+    attr_accessor :path
+    attr_accessor :revision
+    
+    def initialize(name, path, revision)
+      @name = name
+      @path = path
+      @revision = revision
+    end
+  end
 end

data/lib/multirepo/logic/node.rb

@@ -1,45 +1,45 @@
-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 name
-      Pathname.new(File.expand_path(@path)).basename.to_s
-    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
+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 name
+      Pathname.new(File.expand_path(@path)).basename.to_s
+    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

@@ -1,63 +1,63 @@
-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
-    
-    def self.dependencies
-      
-    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
+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
+    
+    def self.dependencies
+      
+    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

@@ -1,35 +1,35 @@
-module MultiRepo
-  class RevisionSelectionMode
-    AS_LOCK = 0
-    LATEST = 1
-    EXACT = 2
-    
-    def self.name_for_mode(mode)
-      case mode
-      when AS_LOCK; "as-lock"
-      when LATEST; "latest"
-      when EXACT; "exact"
-      end
-    end
-  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
+module MultiRepo
+  class RevisionSelectionMode
+    AS_LOCK = 0
+    LATEST = 1
+    EXACT = 2
+    
+    def self.name_for_mode(mode)
+      case mode
+      when AS_LOCK; "as-lock"
+      when LATEST; "latest"
+      when EXACT; "exact"
+      end
+    end
+  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
-      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
+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