git-multirepo 1.0.0.beta9 → 1.0.0.beta10

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

@@ -1,21 +1,21 @@
-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
-      super
-      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
+      super
+      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
 end

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

@@ -1,34 +1,44 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class UpdateCommand < Command
-    self.command = "update"
-    self.summary = "Force-updates the multirepo lock file."
-    
-    def initialize(argv)
-      @commit = argv.flag?("commit")
-      super
-    end
-
-    def run
-      super
-      ensure_multirepo_initialized
-      
-      Console.log_step("Updating...")
-      
-      LockFile.update
-      Console.log_substep("Updated lock file")
-      
-      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 initialize(argv)
+      @commit = argv.flag?("commit")
+      @force = argv.flag?("force")
+      super
+    end
+
+    def run
+      super
+      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
 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}", false)
-    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}", false)
+    end
+  end
 end

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

@@ -1,26 +1,26 @@
-require "multirepo/utility/console"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class LockEntry
-    attr_accessor :config_entry
-    attr_accessor :name
-    attr_accessor :id
-    attr_accessor :head
-    attr_accessor :branch
-    
-    def encode_with(coder)
-      coder["name"] = @name
-      coder["id"] = @id
-      coder["head"] = @head
-      coder["branch"] = @branch
-    end
-    
-    def initialize(config_entry)
-      @name = config_entry.repo.basename
-      @id = config_entry.id
-      @head = config_entry.repo.head_hash
-      @branch = config_entry.repo.current_branch
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class LockEntry
+    attr_accessor :config_entry
+    attr_accessor :name
+    attr_accessor :id
+    attr_accessor :head
+    attr_accessor :branch
+    
+    def encode_with(coder)
+      coder["name"] = @name
+      coder["id"] = @id
+      coder["head"] = @head
+      coder["branch"] = @branch
+    end
+    
+    def initialize(config_entry)
+      @name = config_entry.repo.basename
+      @id = config_entry.id
+      @head = config_entry.repo.head_hash
+      @branch = config_entry.repo.current_branch
+    end
+  end
 end

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

@@ -1,39 +1,39 @@
-require "pathname"
-require "psych"
-
-require "multirepo/git/git"
-require_relative "lock-entry"
-require_relative "config-file"
-
-module MultiRepo
-  class LockFile
-    FILE = Pathname.new(".multirepo.lock")
-    
-    def self.exists?
-      FILE.exist?
-    end
-    
-    def self.load
-      Psych.load(FILE.read)
-    end
-    
-    def self.update
-      config_entries = ConfigFile.load
-      lock_entries = config_entries.map { |c| LockEntry.new(c) }
-      
-      File.write(FILE.to_s, Psych.dump(lock_entries))
-      
-      Git.run_in_current_dir("add -A #{FILE.to_s}", false)
-    end
-
-    def self.commit
-      Git.run_in_current_dir("commit -m \"Updated multirepo lock file with the latest version of all dependencies\" -o -- #{FILE.to_s}", false)
-    end
-    
-    def self.validate_components(line, components)
-      unless components.count == 2
-        raise MultiRepoException, "Wrong entry format in .multirepo.lock file: #{line}"
-      end
-    end
-  end
+require "pathname"
+require "psych"
+
+require "multirepo/git/git"
+require_relative "lock-entry"
+require_relative "config-file"
+
+module MultiRepo
+  class LockFile
+    FILE = Pathname.new(".multirepo.lock")
+    
+    def self.exists?
+      FILE.exist?
+    end
+    
+    def self.load
+      Psych.load(FILE.read)
+    end
+    
+    def self.update
+      config_entries = ConfigFile.load
+      lock_entries = config_entries.map { |c| LockEntry.new(c) }
+      
+      File.write(FILE.to_s, Psych.dump(lock_entries))
+      
+      Git.run_in_current_dir("add -A #{FILE.to_s}", false)
+    end
+
+    def self.commit
+      Git.run_in_current_dir("commit -m \"Updated multirepo lock file with the latest version of all dependencies\" -o -- #{FILE.to_s}", false)
+    end
+    
+    def self.validate_components(line, components)
+      unless components.count == 2
+        raise MultiRepoException, "Wrong entry format in .multirepo.lock file: #{line}"
+      end
+    end
+  end
 end

data/lib/multirepo/git/branch.rb

@@ -1,28 +1,28 @@
-require_relative "git"
-
-module MultiRepo
-  class Branch
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-
-    def exists?
-      lines = Git.run_in_working_dir(@repo.path, "branch", false).split("\n")
-      branch_names = lines.map { |line| line.tr("* ", "")}
-      branch_names.include?(@name)
-    end
-
-    def create(remote_tracking = false)
-      Git.run_in_working_dir(@repo.path, "branch #{@name}", false)
-      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", false) if remote_tracking
-    end
-    
-    def checkout
-      Git.run_in_working_dir(@repo.path, "checkout #{@name}", false)
-      Git.last_command_succeeded
-    end
-  end
+require_relative "git"
+
+module MultiRepo
+  class Branch
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+
+    def exists?
+      lines = Git.run_in_working_dir(@repo.path, "branch", false).split("\n")
+      branch_names = lines.map { |line| line.tr("* ", "")}
+      branch_names.include?(@name)
+    end
+
+    def create(remote_tracking = false)
+      Git.run_in_working_dir(@repo.path, "branch #{@name}", false)
+      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", false) if remote_tracking
+    end
+    
+    def checkout
+      Git.run_in_working_dir(@repo.path, "checkout #{@name}", false)
+      Git.last_command_succeeded
+    end
+  end
 end