git-multirepo 1.0.0.beta16 → 1.0.0.beta17

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

@@ -1,26 +1,26 @@
-require "os"
-
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class OpenCommand < Command
-    self.command = "open"
-    self.summary = "Opens all dependencies in the current OS's file explorer."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      ConfigFile.load.each do |entry|
-        if OS.osx?
-          `open "#{entry.repo.path}"`
-        elsif OS.windows?
-          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
-        end
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "os"
+
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class OpenCommand < Command
+    self.command = "open"
+    self.summary = "Opens all dependencies in the current OS's file explorer."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      ConfigFile.load.each do |entry|
+        if OS.osx?
+          `open "#{entry.repo.path}"`
+        elsif OS.windows?
+          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
+        end
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,49 +1,49 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class RemoveCommand < Command
-    self.command = "remove"
-    self.summary = "Removes the specified dependency from multirepo."
-    
-    def self.options
-      [
-        ['[path]', 'The relative path to the dependency to remove (e.g. ../MyOldDependency).'],
-        ['--delete', 'Delete the dependency on disk in addition to removing it from the multirepo config.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @path = argv.shift_argument
-      @delete = argv.flag?("delete")
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a dependency repository to remove" unless @path
-    end
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      repo = Repo.new(@path)
-      entry = ConfigEntry.new(repo)
-      
-      if ConfigFile.entry_exists?(entry)
-        ConfigFile.remove_entry(entry)
-        Console.log_step("Removed '#{@path}' from the .multirepo file")
-        
-        if @delete
-          FileUtils.rm_rf(@path)
-          Console.log_step("Deleted '#{@path}' from disk")
-        end
-      else
-        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class RemoveCommand < Command
+    self.command = "remove"
+    self.summary = "Removes the specified dependency from multirepo."
+    
+    def self.options
+      [
+        ['[path]', 'The relative path to the dependency to remove (e.g. ../MyOldDependency).'],
+        ['--delete', 'Delete the dependency on disk in addition to removing it from the multirepo config.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @path = argv.shift_argument
+      @delete = argv.flag?("delete")
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a dependency repository to remove" unless @path
+    end
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      repo = Repo.new(@path)
+      entry = ConfigEntry.new(repo)
+      
+      if ConfigFile.entry_exists?(entry)
+        ConfigFile.remove_entry(entry)
+        Console.log_step("Removed '#{@path}' from the .multirepo file")
+        
+        if @delete
+          FileUtils.rm_rf(@path)
+          Console.log_step("Deleted '#{@path}' from disk")
+        end
+      else
+        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,21 +1,22 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class UninitCommand < Command
-    self.command = "uninit"
-    self.summary = "Removes all traces of multirepo in the current multirepo repository."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      File.delete(".multirepo")
-      File.delete(".multirepo.lock")
-      File.delete(".git/hooks/pre-commit")
-      
-      Console.log_step("All traces of multirepo have been removed from this repository")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class UninitCommand < Command
+    self.command = "uninit"
+    self.summary = "Removes all traces of multirepo in the current multirepo repository."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      File.delete(".multirepo")
+      File.delete(".multirepo.lock")
+      File.delete(".git/hooks/pre-commit")
+      File.delete(".git/hooks/post-merge")
+      
+      Console.log_step("All traces of multirepo have been removed from this repository")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,51 +1,51 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class UpdateCommand < Command
-    self.command = "update"
-    self.summary = "Force-updates the multirepo lock file."
-    
-    def self.options
-      [
-        ['--force', 'Update the lock file even if dependencies contain uncommitted changes.'],
-        ['--commit', 'Commit the lock file after updating it.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @commit = argv.flag?("commit")
-      @force = argv.flag?("force")
-      super
-    end
-
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      Console.log_step("Updating...")
-      
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
-      
-      if dependencies_clean
-        LockFile.update
-        Console.log_substep("Updated lock file with latest dependency commits")
-      elsif !dependencies_clean && @force
-        LockFile.update
-        Console.log_warning("Updated lock file with latest dependency commits regardless of uncommitted changes")
-      else
-        raise MultiRepoException, "Can't update because not all dependencies are clean"
-      end
-      
-      self.install_pre_commit_hook
-
-      if @commit
-        Console.log_substep("Committing updated lock file")
-        LockFile.commit
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class UpdateCommand < Command
+    self.command = "update"
+    self.summary = "Force-updates the multirepo lock file."
+    
+    def self.options
+      [
+        ['--force', 'Update the lock file even if dependencies contain uncommitted changes.'],
+        ['--commit', 'Commit the lock file after updating it.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @commit = argv.flag?("commit")
+      @force = argv.flag?("force")
+      super
+    end
+
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      Console.log_step("Updating...")
+      
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
+      
+      if dependencies_clean
+        LockFile.update
+        Console.log_substep("Updated lock file with latest dependency commits")
+      elsif !dependencies_clean && @force
+        LockFile.update
+        Console.log_warning("Updated lock file with latest dependency commits regardless of uncommitted changes")
+      else
+        raise MultiRepoException, "Can't update because not all dependencies are clean"
+      end
+      
+      install_hooks
+
+      if @commit
+        Console.log_substep("Committing updated lock file")
+        LockFile.commit
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

data/lib/multirepo/config.rb

@@ -1,13 +1,13 @@
-require "singleton"
-
-module MultiRepo
-  class Config
-    include Singleton
-    
-    attr_accessor :verbose
-    @verbose = false
-    
-    attr_accessor :running_git_hook
-    @running_git_hook = false
-  end
+require "singleton"
+
+module MultiRepo
+  class Config
+    include Singleton
+    
+    attr_accessor :verbose
+    @verbose = false
+    
+    attr_accessor :running_git_hook
+    @running_git_hook = false
+  end
 end

data/lib/multirepo/files/config-entry.rb

@@ -1,38 +1,38 @@
-require "securerandom"
-
-require "multirepo/utility/console"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class ConfigEntry
-    attr_accessor :id
-    attr_accessor :path
-    attr_accessor :url
-    attr_accessor :branch
-    attr_accessor :repo
-    
-    def encode_with(coder)
-      coder["id"] = @id
-      coder["path"] = @path
-      coder["url"] = @url
-      coder["branch"] = @branch
-    end
-    
-    def ==(entry)
-      entry_path = Pathname.new(entry.path)
-      self_path = Pathname.new(self.path)
-      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
-    end
-    
-    def initialize(repo)
-      @id = SecureRandom.uuid
-      @path = repo.path
-      @url = repo.exists? ? repo.remote('origin').url : nil
-      @branch = repo.exists? ? repo.current_branch : nil
-    end
-    
-    def repo
-      Repo.new(path)
-    end
-  end
+require "securerandom"
+
+require "multirepo/utility/console"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class ConfigEntry
+    attr_accessor :id
+    attr_accessor :path
+    attr_accessor :url
+    attr_accessor :branch
+    attr_accessor :repo
+    
+    def encode_with(coder)
+      coder["id"] = @id
+      coder["path"] = @path
+      coder["url"] = @url
+      coder["branch"] = @branch
+    end
+    
+    def ==(entry)
+      entry_path = Pathname.new(entry.path)
+      self_path = Pathname.new(self.path)
+      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
+    end
+    
+    def initialize(repo)
+      @id = SecureRandom.uuid
+      @path = repo.path
+      @url = repo.exists? ? repo.remote('origin').url : nil
+      @branch = repo.exists? ? repo.current_branch : nil
+    end
+    
+    def repo
+      Repo.new(path)
+    end
+  end
 end

data/lib/multirepo/files/config-file.rb

@@ -1,38 +1,38 @@
-require "fileutils"
-require "pathname"
-
-require_relative "config-entry"
-
-module MultiRepo
-  class ConfigFile
-    FILE = Pathname.new(".multirepo")
-    
-    def self.exists?
-      FILE.exist?
-    end
-    
-    def self.load
-      Psych.load(FILE.read)
-    end
-    
-    def self.save(entries)
-      File.write(FILE.to_s, Psych.dump(entries))
-    end
-    
-    def self.entry_exists?(entry)
-      load.any? { |e| e == entry }
-    end
-    
-    def self.add_entry(entry)
-      save(load.push(entry))
-    end
-    
-    def self.remove_entry(entry)
-      save(load.delete_if { |e| e == entry })
-    end
-
-    def self.stage
-      Git.run_in_current_dir("add -A -f #{FILE.to_s}", Runner::Verbosity::NEVER_OUTPUT)
-    end
-  end
+require "fileutils"
+require "pathname"
+
+require_relative "config-entry"
+
+module MultiRepo
+  class ConfigFile
+    FILE = Pathname.new(".multirepo")
+    
+    def self.exists?
+      FILE.exist?
+    end
+    
+    def self.load
+      Psych.load(FILE.read)
+    end
+    
+    def self.save(entries)
+      File.write(FILE.to_s, Psych.dump(entries))
+    end
+    
+    def self.entry_exists?(entry)
+      load.any? { |e| e == entry }
+    end
+    
+    def self.add_entry(entry)
+      save(load.push(entry))
+    end
+    
+    def self.remove_entry(entry)
+      save(load.delete_if { |e| e == entry })
+    end
+
+    def self.stage
+      Git.run_in_current_dir("add -A -f #{FILE.to_s}", Runner::Verbosity::NEVER_OUTPUT)
+    end
+  end
 end