git-multirepo 1.0.0.beta34 → 1.0.0.beta37

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_in_work_tree
-      
-      FileUtils.rm_f(".multirepo")
-      TrackingFiles.delete
-      uninstall_hooks
-      
-      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_in_work_tree
+      
+      FileUtils.rm_f(".multirepo")
+      TrackingFiles.delete
+      uninstall_hooks
+      
+      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,60 +1,60 @@
-require "multirepo/utility/console"
-require "multirepo/files/tracking-files"
-
-module MultiRepo
-  class UpdateCommand < Command
-    self.command = "update"
-    self.summary = "Force-updates the multirepo tracking files."
-    
-    def self.options
-      [
-        ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
-        ['[--commit]', 'Commit the tracking files after updating them.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @commit = argv.flag?("commit")
-      @force = argv.flag?("force")
-      super
-    end
-
-    def run
-      super
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Updating...")
-      
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load_entries)
-      if dependencies_clean
-        update_lock_file_step("Updated tracking files")
-      elsif !dependencies_clean && @force
-        update_lock_file_step("Force-updated tracking files (ignoring uncommitted changes)")
-      else
-        raise MultiRepoException, "Can't update because not all dependencies are clean"
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def update_lock_file_step(log_message)
-      changed = TrackingFiles.update
-      
-      if changed
-        Console.log_substep("Updated tracking files")
-      else
-        Console.log_substep("Tracking files are already up-to-date")
-      end
-      
-      if @commit
-        committed = TrackingFiles.commit("[multirepo] Updated tracking files manually")
-        Console.log_substep("Committed tracking files") if committed
-      elsif changed
-        Console.log_substep(log_message)
-      end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/tracking-files"
+
+module MultiRepo
+  class UpdateCommand < Command
+    self.command = "update"
+    self.summary = "Force-updates the multirepo tracking files."
+    
+    def self.options
+      [
+        ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
+        ['[--commit]', 'Commit the tracking files after updating them.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @commit = argv.flag?("commit")
+      @force = argv.flag?("force")
+      super
+    end
+
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Updating...")
+      
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.new(".").load_entries)
+      if dependencies_clean
+        update_lock_file_step("Updated tracking files")
+      elsif !dependencies_clean && @force
+        update_lock_file_step("Force-updated tracking files (ignoring uncommitted changes)")
+      else
+        raise MultiRepoException, "Can't update because not all dependencies are clean"
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def update_lock_file_step(log_message)
+      changed = TrackingFiles.update
+      
+      if changed
+        Console.log_substep("Updated tracking files")
+      else
+        Console.log_substep("Tracking files are already up-to-date")
+      end
+      
+      if @commit
+        committed = TrackingFiles.commit("[multirepo] Updated tracking files manually")
+        Console.log_substep("Committed tracking files") if committed
+      elsif changed
+        Console.log_substep(log_message)
+      end
+    end
+  end
 end

data/lib/multirepo/config.rb

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

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

@@ -1,35 +1,35 @@
-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 :repo
-    
-    def encode_with(coder)
-      coder["id"] = @id
-      coder["path"] = @path
-      coder["url"] = @url
-    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
-    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 :repo
+    
+    def encode_with(coder)
+      coder["id"] = @id
+      coder["path"] = @path
+      coder["url"] = @url
+    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
+    end
+    
+    def repo
+      Repo.new(path)
+    end
+  end
 end

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

@@ -1,35 +1,46 @@
-require "fileutils"
-require "pathname"
-
-require_relative "config-entry"
-
-module MultiRepo
-  class ConfigFile
-    FILE = Pathname.new(".multirepo")
-    FILENAME = FILE.to_s
-    
-    def self.exists?
-      FILE.exist?
-    end
-    
-    def self.load_entries
-      Psych.load(FILE.read)
-    end
-    
-    def self.save_entries(entries)
-      File.write(FILENAME, Psych.dump(entries))
-    end
-    
-    def self.entry_exists?(entry)
-      load_entries.any? { |e| e == entry }
-    end
-    
-    def self.add_entry(entry)
-      save_entries(load_entries.push(entry))
-    end
-    
-    def self.remove_entry(entry)
-      save_entries(load_entries.delete_if { |e| e == entry })
-    end
-  end
+require "fileutils"
+require "pathname"
+
+require_relative "config-entry"
+
+module MultiRepo
+  class ConfigFile
+    FILENAME = ".multirepo"
+    
+    def initialize(path)
+      @path = path
+    end
+    
+    def file
+      File.join(@path, FILENAME)
+    end
+    
+    def filename
+      FILENAME
+    end
+    
+    def exists?
+      File.exists?(file)
+    end
+    
+    def load_entries
+      Psych.load(File.read(file))
+    end
+    
+    def save_entries(entries)
+      File.write(file, Psych.dump(entries))
+    end
+    
+    def entry_exists?(entry)
+      load_entries.any? { |e| e == entry }
+    end
+    
+    def add_entry(entry)
+      save_entries(load_entries.push(entry))
+    end
+    
+    def remove_entry(entry)
+      save_entries(load_entries.delete_if { |e| e == entry })
+    end
+  end
 end

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

@@ -1,26 +1,25 @@
-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 :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,29 +1,40 @@
-require "pathname"
-require "psych"
-
-require "multirepo/git/git"
-require_relative "tracking-file"
-require_relative "lock-entry"
-require_relative "config-file"
-
-module MultiRepo
-  class LockFile < TrackingFile
-    FILE = Pathname.new(".multirepo.lock")
-    FILENAME = FILE.to_s
-    
-    def self.exists?
-      FILE.exist?
-    end
-    
-    def self.load_entries
-      Psych.load(FILE.read)
-    end
-    
-    def self.update
-      config_entries = ConfigFile.load_entries
-      lock_entries = config_entries.map { |c| LockEntry.new(c) }
-      content = Psych.dump(lock_entries)
-      return update_internal(FILENAME, content)
-    end
-  end
+require "pathname"
+require "psych"
+
+require "multirepo/git/git"
+require_relative "tracking-file"
+require_relative "lock-entry"
+require_relative "config-file"
+
+module MultiRepo
+  class LockFile < TrackingFile
+    FILENAME = ".multirepo.lock"
+    
+    def initialize(path)
+      @path = path
+    end
+    
+    def file
+      File.join(@path, FILENAME)
+    end
+    
+    def filename
+      FILENAME
+    end
+    
+    def exists?
+      File.exists?(file)
+    end
+    
+    def load_entries
+      Psych.load(File.read(file))
+    end
+    
+    def update
+      config_entries = ConfigFile.new(@path).load_entries
+      lock_entries = config_entries.map { |c| LockEntry.new(c) }
+      content = Psych.dump(lock_entries)
+      return update_internal(file, content)
+    end
+  end
 end