git-multirepo 1.0.0.beta60 → 1.0.0.beta61

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

@@ -1,48 +1,48 @@
-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
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      repo = Repo.new(@path)
-      entry = ConfigEntry.new(repo)
-      
-      config_file = ConfigFile.new(".")
-      if config_file.entry_exists?(entry)
-        config_file.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
-        fail MultiRepoException, "'#{@path}' isn't tracked by multirepo"
-      end
-    end
-  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
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      repo = Repo.new(@path)
+      entry = ConfigEntry.new(repo)
+      
+      config_file = ConfigFile.new(".")
+      if config_file.entry_exists?(entry)
+        config_file.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
+        fail MultiRepoException, "'#{@path}' isn't tracked by multirepo"
+      end
+    end
+  end
+end

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

@@ -1,18 +1,18 @@
-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
-      ensure_in_work_tree
-      
-      FileUtils.rm_f(".multirepo")
-      TrackingFiles.new(".").delete
-      uninstall_hooks
-      
-      Console.log_step("All traces of multirepo have been removed from this repository")
-    end
-  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
+      ensure_in_work_tree
+      
+      FileUtils.rm_f(".multirepo")
+      TrackingFiles.new(".").delete
+      uninstall_hooks
+      
+      Console.log_step("All traces of multirepo have been removed from this repository")
+    end
+  end
+end

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

@@ -1,112 +1,112 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/logic/performer"
-require "multirepo/logic/repo-selection"
-require "multirepo/files/tracking-files"
-require "multirepo/git/git-runner"
-
-module MultiRepo
-  class UpdateCommand < Command
-    self.command = "update"
-    self.summary = "Force-updates the multirepo tracking files."
-    
-    def self.options
-      [
-        ['[--all]', 'Update the main repository and all dependencies.'],
-        ['[--main]', 'Update the main repository.'],
-        ['[--deps]', 'Update dependencies.'],
-        ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
-        ['[--commit]', 'Commit the tracking files after updating them.'],
-        ['[--no-diff]', 'Don\'t show lock file diff(s) after updating.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @repo_selection = RepoSelection.new(argv)
-      @commit = argv.flag?("commit")
-      @force = argv.flag?("force")
-      @diff = argv.flag?("diff", true)
-      super
-    end
-
-    def validate!
-      super
-      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
-    end
-
-    def run
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
-      if dependencies_clean || @force
-        update_tracking_files_step(@repo_selection.value)
-      else
-        fail MultiRepoException, "Can't update because not all dependencies are clean"
-      end
-      
-      Console.log_step("Done!")
-    end
-    
-    def update_tracking_files_step(repo_selection_value)
-      case repo_selection_value
-      when RepoSelection::MAIN
-        Console.log_step("Updating main repo...")
-        update_main
-      when RepoSelection::DEPS
-        Console.log_step("Updating dependencies...")
-        update_dependencies
-      when RepoSelection::ALL
-        Console.log_step("Updating main repo and dependencies...")
-        update_dependencies
-        update_main
-      end
-    end
-
-    def update_dependencies
-      any_changed = false
-      Performer.depth_ordered_dependencies.each do |dependency|
-        path = dependency.config_entry.path
-        name = dependency.config_entry.name
-        any_changed |= update_one(path, name) if Utils.multirepo_enabled?(path)
-      end
-      return any_changed
-    end
-
-    def update_main
-      update_one(".", "main repo")
-    end
-
-    def update_one(path, name)
-      updated = update_tracking_files(path, name)
-      show_diff(path) if updated && @diff
-      commit_tracking_files(path) if @commit
-      return updated
-    end
-    
-    def update_tracking_files(path, name)
-      Console.log_substep("Updating tracking files in #{name}")
-      
-      tracking_files = TrackingFiles.new(path)
-      changed = tracking_files.update
-      
-      if changed
-        Console.log_info("Updated tracking files")
-      else
-        Console.log_info("Tracking files are already up-to-date")
-      end
-      
-      return changed
-    end
-
-    def commit_tracking_files(path)
-      tracking_files = TrackingFiles.new(path)
-      committed = tracking_files.commit("[multirepo] Updated tracking files manually")
-      Console.log_info("Committed tracking files") if committed
-    end
-
-    def show_diff(path)
-      GitRunner.run_as_system(path, "diff .multirepo.lock")
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/logic/performer"
+require "multirepo/logic/repo-selection"
+require "multirepo/files/tracking-files"
+require "multirepo/git/git-runner"
+
+module MultiRepo
+  class UpdateCommand < Command
+    self.command = "update"
+    self.summary = "Force-updates the multirepo tracking files."
+    
+    def self.options
+      [
+        ['[--all]', 'Update the main repository and all dependencies.'],
+        ['[--main]', 'Update the main repository.'],
+        ['[--deps]', 'Update dependencies.'],
+        ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
+        ['[--commit]', 'Commit the tracking files after updating them.'],
+        ['[--no-diff]', 'Don\'t show lock file diff(s) after updating.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @repo_selection = RepoSelection.new(argv)
+      @commit = argv.flag?("commit")
+      @force = argv.flag?("force")
+      @diff = argv.flag?("diff", true)
+      super
+    end
+
+    def validate!
+      super
+      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
+    end
+
+    def run
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
+      if dependencies_clean || @force
+        update_tracking_files_step(@repo_selection.value)
+      else
+        fail MultiRepoException, "Can't update because not all dependencies are clean"
+      end
+      
+      Console.log_step("Done!")
+    end
+    
+    def update_tracking_files_step(repo_selection_value)
+      case repo_selection_value
+      when RepoSelection::MAIN
+        Console.log_step("Updating main repo...")
+        update_main
+      when RepoSelection::DEPS
+        Console.log_step("Updating dependencies...")
+        update_dependencies
+      when RepoSelection::ALL
+        Console.log_step("Updating main repo and dependencies...")
+        update_dependencies
+        update_main
+      end
+    end
+
+    def update_dependencies
+      any_changed = false
+      Performer.depth_ordered_dependencies.each do |dependency|
+        path = dependency.config_entry.path
+        name = dependency.config_entry.name
+        any_changed |= update_one(path, name) if Utils.multirepo_enabled?(path)
+      end
+      return any_changed
+    end
+
+    def update_main
+      update_one(".", "main repo")
+    end
+
+    def update_one(path, name)
+      updated = update_tracking_files(path, name)
+      show_diff(path) if updated && @diff
+      commit_tracking_files(path) if @commit
+      return updated
+    end
+    
+    def update_tracking_files(path, name)
+      Console.log_substep("Updating tracking files in #{name}")
+      
+      tracking_files = TrackingFiles.new(path)
+      changed = tracking_files.update
+      
+      if changed
+        Console.log_info("Updated tracking files")
+      else
+        Console.log_info("Tracking files are already up-to-date")
+      end
+      
+      return changed
+    end
+
+    def commit_tracking_files(path)
+      tracking_files = TrackingFiles.new(path)
+      committed = tracking_files.commit("[multirepo] Updated tracking files manually")
+      Console.log_info("Committed tracking files") if committed
+    end
+
+    def show_diff(path)
+      GitRunner.run_as_system(path, "diff .multirepo.lock")
+    end
+  end
+end

data/lib/multirepo/config.rb

@@ -1,19 +1,19 @@
-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
-    
-    attr_accessor :extra_output
-    @extra_output = nil
-  end
-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
+    
+    attr_accessor :extra_output
+    @extra_output = nil
+  end
+end

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

@@ -1,39 +1,39 @@
-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 initialize(repo)
-      @id = SecureRandom.uuid
-      @path = repo.path
-      @url = repo.exists? ? repo.remote('origin').url : nil
-    end
-    
-    def ==(other)
-      other_path = Pathname.new(other.path)
-      self_path = Pathname.new(path)
-      other_path.exist? && self_path.exist? && other_path.realpath == self_path.realpath
-    end
-    
-    def repo
-      Repo.new(path)
-    end
-    
-    def name
-      repo.basename
-    end
-  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 initialize(repo)
+      @id = SecureRandom.uuid
+      @path = repo.path
+      @url = repo.exists? ? repo.remote('origin').url : nil
+    end
+    
+    def ==(other)
+      other_path = Pathname.new(other.path)
+      self_path = Pathname.new(path)
+      other_path.exist? && self_path.exist? && other_path.realpath == self_path.realpath
+    end
+    
+    def repo
+      Repo.new(path)
+    end
+    
+    def name
+      repo.basename
+    end
+  end
+end

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

@@ -1,48 +1,52 @@
-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.exist?(file)
-    end
-    
-    def load_entries
-      fail MultiRepoException, "Can't read config file (no permission)" if !File.stat(file).readable?
-      Psych.load(File.read(file))
-    end
-    
-    def save_entries(entries)
-      fail MultiRepoException, "Can't write config file (no permission)" if !File.stat(file).writable?
-      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
+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.exist?(file)
+    end
+    
+    def load_entries
+      ensure_access(file, "Can't read config file (permissions)") { |stat| stat.readable? }
+      Psych.load(File.read(file))
+    end
+    
+    def save_entries(entries)
+      ensure_access(file, "Can't write config file (permissions)") { |stat| stat.writable? }
+      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
+
+    def ensure_access(file, error_message, &check)
+      fail MultiRepoException, error_message if File.exists?(file) && !check.call(File.stat(file))
+    end
+  end
+end

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

@@ -1,29 +1,29 @@
-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.name
-      @id = config_entry.id
-      
-      head = config_entry.repo.head
-      @head = head.commit_id
-      
-      current_branch = config_entry.repo.current_branch
-      @branch = current_branch ? current_branch.name : nil
-    end
-  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.name
+      @id = config_entry.id
+      
+      head = config_entry.repo.head
+      @head = head.commit_id
+      
+      current_branch = config_entry.repo.current_branch
+      @branch = current_branch ? current_branch.name : nil
+    end
+  end
+end