git-multirepo 1.0.0.beta21 → 1.0.0.beta24

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

@@ -1,20 +1,20 @@
-require "multirepo/files/lock-file"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PostMergeHook
-    def self.run
-      Config.instance.running_git_hook = true
-      
-      Console.log_step("multirepo: Performing post-merge operations...")
-      
-      LockFile.update
-      Console.log_info("multirepo: Updated the lock file with current HEAD revisions for all dependencies")
-      
-      LockFile.commit("Automatic post-merge multirepo lock file update")
-      Console.log_info("multirepo: Committed the updated lock file")
-      
-      exit 0 # Success!
-    end
-  end
+require "multirepo/files/lock-file"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PostMergeHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      Console.log_step("Performing post-merge operations...")
+      
+      LockFile.update
+      Console.log_info("Updated the lock file with current HEAD revisions for all dependencies")
+      
+      LockFile.commit("Automatic post-merge multirepo lock file update")
+      Console.log_info("Committed the updated lock file")
+      
+      exit 0 # Success!
+    end
+  end
 end

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

@@ -1,26 +1,26 @@
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PreCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-      
-      Console.log_step("multirepo: Performing pre-commit operations...")
-      
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
-      
-      if !dependencies_clean
-        Console.log_error("multirepo: You must commit changes to your dependencies before you can commit this repo")
-        exit 1
-      end
-      
-      LockFile.update
-      Console.log_info("multirepo: Updated and staged lock file with current HEAD revisions for all dependencies")
-      
-      exit 0 # Success!
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+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)
+      
+      if !dependencies_clean
+        Console.log_error("You must commit changes to your dependencies before you can commit this repo")
+        exit 1
+      end
+      
+      LockFile.update
+      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
+      
+      exit 0 # Success!
+    end
+  end
 end

data/lib/multirepo/hooks/prepare-commit-msg-hook.rb

@@ -1,28 +1,28 @@
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PrepareCommitMsgHook
-    def self.run(argv)
-      Config.instance.running_git_hook = true
-      
-      pre_merge if argv[1] == "merge"
-      
-      exit 0 # Success!
-    end
-    
-    def self.pre_merge
-      Console.log_step("multirepo: Performing pre-merge operations...")
-      ensure_dependencies_clean
-    end
-    
-    def self.ensure_dependencies_clean
-      unless Utils.ensure_dependencies_clean(ConfigFile.load)
-        Console.log_error("multirepo: You must commit changes to your dependencies before you can commit this repo")
-        exit 1
-      end
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PrepareCommitMsgHook
+    def self.run(argv)
+      Config.instance.running_git_hook = true
+      
+      pre_merge if argv[1] == "merge"
+      
+      exit 0 # Success!
+    end
+    
+    def self.pre_merge
+      Console.log_step("Performing pre-merge operations...")
+      ensure_dependencies_clean
+    end
+    
+    def self.ensure_dependencies_clean
+      unless Utils.ensure_dependencies_clean(ConfigFile.load)
+        Console.log_error("You must commit changes to your dependencies before you can commit this repo")
+        exit 1
+      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_arrow
-      puts $stdout.isatty ? message.bold.green : message
-    end
-    
-    def self.log_substep(message)
-      print_arrow
-      puts $stdout.isatty ? message.blue : message
-    end
-    
-    def self.log_info(message)
-      print_arrow
-      puts $stdout.isatty ? message.white : message
-    end
-    
-    def self.log_warning(message)
-      print_arrow
-      puts $stdout.isatty ? message.yellow : message
-    end
-    
-    def self.log_error(message)
-      print_arrow
-      puts $stdout.isatty ? message.red : message
-    end
-    
-    def self.ask_yes_no(message)
-      answered = false
-      while !answered
-        print_arrow
-        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_arrow
-      print $stdout.isatty ? "> ".white : ""
-    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,33 +1,33 @@
-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)
-      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
+      NEVER_OUTPUT = 0
+      ALWAYS_OUTPUT = 1
+      OUTPUT_ON_ERROR = 2
+    end
+    
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run(cmd, verbosity)
+      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
 end

data/lib/multirepo/utility/utils.rb

@@ -1,52 +1,52 @@
-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")) &&
-      File.exists?(File.join(path, ".multirepo.lock"))
-    end
-    
-    def self.install_hook(name, path)
-      FileUtils.cp(path_for_resource(name), File.join(path, ".git/hooks"))
-    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 = e.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
-  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")) &&
+      File.exists?(File.join(path, ".multirepo.lock"))
+    end
+    
+    def self.install_hook(name, path)
+      FileUtils.cp(path_for_resource(name), File.join(path, ".git/hooks"))
+    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
+  end
 end

data/resources/post-merge

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "git-multirepo"
-
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "git-multirepo"
+
 MultiRepo::PostMergeHook.run