git-multirepo 1.0.0.beta42 → 1.0.0.beta43

data/lib/multirepo/logic/performer.rb

@@ -1,57 +1,57 @@
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-
-require_relative "dependency"
-
-module MultiRepo
-  class Performer
-    def self.perform_main_repo_checkout(main_repo, ref_name, message = nil)
-      # Make sure the main repo is clean before attempting a checkout
-      unless main_repo.clean?
-        raise MultiRepoException, "Can't checkout #{ref_name} because the main repo contains uncommitted changes"
-      end
-      
-      # Checkout the specified ref
-      unless main_repo.checkout(ref_name)
-        raise MultiRepoException, "Couldn't perform checkout of main repo #{ref_name}!"
-      end
-      
-      Console.log_substep(message || "Checked out main repo #{ref_name}")
-      
-      # After checkout, make sure we're working with a multirepo-enabled ref
-      unless Utils.is_multirepo_tracked(".")
-        raise MultiRepoException, "Revision #{ref_name} is not tracked by multirepo!"
-      end
-    end
-    
-    def self.dependencies
-      config_entries = ConfigFile.new(".").load_entries
-      lock_entries = LockFile.new(".").load_entries
-      
-      dependencies = build_dependencies(config_entries, lock_entries)
-      dependency_ordered_nodes = Node.new(".").ordered_descendants
-      
-      return dependency_ordered_nodes.map do |node|
-        pair = dependencies.find { |d| d.config_entry.path == node.path }
-      end
-    end
-    
-    private
-    
-    def self.build_dependencies(config_entries, lock_entries)
-      lock_entries.map do |lock_entry|
-        config_entry = config_entry_for_lock_entry(config_entries, lock_entry)
-        
-        dependency = Dependency.new
-        dependency.config_entry = config_entry
-        dependency.lock_entry = lock_entry
-        
-        next dependency
-      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 "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+
+require_relative "dependency"
+
+module MultiRepo
+  class Performer
+    def self.perform_main_repo_checkout(main_repo, ref_name, message = nil)
+      # Make sure the main repo is clean before attempting a checkout
+      unless main_repo.clean?
+        raise MultiRepoException, "Can't checkout #{ref_name} because the main repo contains uncommitted changes"
+      end
+      
+      # Checkout the specified ref
+      unless main_repo.checkout(ref_name)
+        raise MultiRepoException, "Couldn't perform checkout of main repo #{ref_name}!"
+      end
+      
+      Console.log_substep(message || "Checked out main repo #{ref_name}")
+      
+      # After checkout, make sure we're working with a multirepo-enabled ref
+      unless Utils.is_multirepo_tracked(".")
+        raise MultiRepoException, "Revision #{ref_name} is not tracked by multirepo!"
+      end
+    end
+    
+    def self.dependencies
+      config_entries = ConfigFile.new(".").load_entries
+      lock_entries = LockFile.new(".").load_entries
+      
+      dependencies = build_dependencies(config_entries, lock_entries)
+      dependency_ordered_nodes = Node.new(".").ordered_descendants
+      
+      return dependency_ordered_nodes.map do |node|
+        pair = dependencies.find { |d| d.config_entry.path == node.path }
+      end
+    end
+    
+    private
+    
+    def self.build_dependencies(config_entries, lock_entries)
+      lock_entries.map do |lock_entry|
+        config_entry = config_entry_for_lock_entry(config_entries, lock_entry)
+        
+        dependency = Dependency.new
+        dependency.config_entry = config_entry
+        dependency.lock_entry = lock_entry
+        
+        next dependency
+      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_name, lock_entry)
-      case mode
-      when RevisionSelectionMode::AS_LOCK; lock_entry.head
-      when RevisionSelectionMode::LATEST; lock_entry.branch
-      when RevisionSelectionMode::EXACT; ref_name
-      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_name, lock_entry)
+      case mode
+      when RevisionSelectionMode::AS_LOCK; lock_entry.head
+      when RevisionSelectionMode::LATEST; lock_entry.branch
+      when RevisionSelectionMode::EXACT; ref_name
+      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

data/lib/multirepo/utility/utils.rb

@@ -1,95 +1,95 @@
-require "multirepo/multirepo-exception"
-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.dependencies_clean?(config_entries)
-      clean = true
-      missing = false
-      config_entries.each do |e|
-        # Ensure the dependency exists
-        unless e.repo.exists?
-          Console.log_error("Dependency '#{e.path}' does not exist on disk")
-          missing |= true
-          next
-        end
-        
-        # Ensure it contains no uncommitted changes
-        dependency_clean = e.repo.clean?
-        clean &= dependency_clean
-        Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless dependency_clean
-      end
-      
-      raise MultiRepoException, "Some dependencies are not present on this machine." +
-                                " Run \"multi install\" to clone missing dependencies." if missing
-      
-      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.reveal_in_default_file_browser(unix_path)
-      if OS.osx?
-        system %{open "#{unix_path}"}
-      elsif OS.windows?
-        system %{explorer "#{Utils.convert_to_windows_path(unix_path)}"}
-      end
-    end
-    
-    def self.open_in_default_app(unix_path)
-      if OS.osx?
-        system %{open "#{unix_path}"}
-      elsif OS.windows?
-        system %{cmd /c "start C:\\#{Utils.convert_to_windows_path(unix_path)}"}
-      end
-    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 "multirepo/multirepo-exception"
+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.dependencies_clean?(config_entries)
+      clean = true
+      missing = false
+      config_entries.each do |e|
+        # Ensure the dependency exists
+        unless e.repo.exists?
+          Console.log_error("Dependency '#{e.path}' does not exist on disk")
+          missing |= true
+          next
+        end
+        
+        # Ensure it contains no uncommitted changes
+        dependency_clean = e.repo.clean?
+        clean &= dependency_clean
+        Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless dependency_clean
+      end
+      
+      raise MultiRepoException, "Some dependencies are not present on this machine." +
+                                " Run \"multi install\" to clone missing dependencies." if missing
+      
+      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.reveal_in_default_file_browser(unix_path)
+      if OS.osx?
+        system %{open "#{unix_path}"}
+      elsif OS.windows?
+        system %{explorer "#{Utils.convert_to_windows_path(unix_path)}"}
+      end
+    end
+    
+    def self.open_in_default_app(unix_path)
+      if OS.osx?
+        system %{open "#{unix_path}"}
+      elsif OS.windows?
+        system %{cmd /c "start C:\\#{Utils.convert_to_windows_path(unix_path)}"}
+      end
+    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