git-multirepo 1.0.0.beta49 → 1.0.0.beta50

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

@@ -1,57 +1,57 @@
-require "os"
-
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class OpenCommand < Command
-    self.command = "open"
-    self.summary = "Opens repositories in the OS's file explorer."
-
-    def self.options
-      [
-        ['[--all]', 'Open the main repository and all dependencies.'],
-        ['[--main]', 'Open the main repository.'],
-        ['[--deps]', 'Open dependencies.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @all = argv.flag?("all")
-      @main_only = argv.flag?("main")
-      @deps_only = argv.flag?("deps")
-      super
-    end
-
-    def validate!
-      super
-      unless validate_only_one_flag(@all, @main_only, @deps_only)
-        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
-      end
-    end
-    
-    def run
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      if @main_only
-        open_main
-      elsif @deps_only
-        open_dependencies
-      else
-        open_dependencies
-        open_main
-      end
-    end
-
-    def open_main
-      Utils.reveal_in_default_file_browser(".")
-    end
-
-    def open_dependencies
-      ConfigFile.new(".").load_entries.each do |entry|
-        Utils.reveal_in_default_file_browser(entry.repo.path)
-      end
-    end
-  end
-end
+require "os"
+
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class OpenCommand < Command
+    self.command = "open"
+    self.summary = "Opens repositories in the OS's file explorer."
+
+    def self.options
+      [
+        ['[--all]', 'Open the main repository and all dependencies.'],
+        ['[--main]', 'Open the main repository.'],
+        ['[--deps]', 'Open dependencies.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @all = argv.flag?("all")
+      @main_only = argv.flag?("main")
+      @deps_only = argv.flag?("deps")
+      super
+    end
+
+    def validate!
+      super
+      unless validate_only_one_flag(@all, @main_only, @deps_only)
+        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
+      end
+    end
+    
+    def run
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      if @main_only
+        open_main
+      elsif @deps_only
+        open_dependencies
+      else
+        open_dependencies
+        open_main
+      end
+    end
+
+    def open_main
+      Utils.reveal_in_default_file_browser(".")
+    end
+
+    def open_dependencies
+      ConfigFile.new(".").load_entries.each do |entry|
+        Utils.reveal_in_default_file_browser(entry.repo.path)
+      end
+    end
+  end
+end

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,94 +1,106 @@
-require "multirepo/utility/console"
-require "multirepo/logic/performer"
-require "multirepo/files/tracking-files"
-
-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.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @all = argv.flag?("all")
-      @main_only = argv.flag?("main")
-      @deps_only = argv.flag?("deps")
-      @commit = argv.flag?("commit")
-      @force = argv.flag?("force")
-      super
-    end
-
-    def validate!
-      super
-      unless validate_only_one_flag(@all, @main_only, @deps_only)
-        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
-      end
-    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
-      else
-        fail MultiRepoException, "Can't update because not all dependencies are clean"
-      end
-      
-      Console.log_step("Done!")
-    end
-    
-    def update_tracking_files_step
-      if @main_only
-        Console.log_step("Updating main repo...")
-        update_main
-      elsif @deps_only
-        Console.log_step("Updating dependencies...")
-        update_dependencies
-      else
-        Console.log_step("Updating main repo and dependencies...")
-        update_dependencies
-        update_main
-      end
-    end
-
-    def update_dependencies
-      Performer.dependencies.each do |dependency|
-        path = dependency.config_entry.path
-        name = dependency.config_entry.name
-        update_tracking_files(path, name) if Utils.multirepo_enabled?(path)
-      end
-    end
-
-    def update_main
-      update_tracking_files(".", "main repo")
-    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
-      
-      if @commit
-        committed = tracking_files.commit("[multirepo] Updated tracking files manually")
-        Console.log_info("Committed tracking files") if committed
-      end
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/logic/performer"
+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.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @all = argv.flag?("all")
+      @main_only = argv.flag?("main")
+      @deps_only = argv.flag?("deps")
+      @commit = argv.flag?("commit")
+      @force = argv.flag?("force")
+      super
+    end
+
+    def validate!
+      super
+      unless validate_only_one_flag(@all, @main_only, @deps_only)
+        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
+      end
+    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
+      else
+        fail MultiRepoException, "Can't update because not all dependencies are clean"
+      end
+      
+      Console.log_step("Done!")
+    end
+    
+    def update_tracking_files_step
+      main_changed = false
+      if @main_only
+        Console.log_step("Updating main repo...")
+        main_changed = update_main
+      elsif @deps_only
+        Console.log_step("Updating dependencies...")
+        update_dependencies
+      else
+        Console.log_step("Updating main repo and dependencies...")
+        update_dependencies
+        main_changed = update_main
+      end
+
+      show_diff(".") if main_changed && Console.ask("Show diff?")
+    end
+
+    def update_dependencies
+      any_changed = false
+      Performer.dependencies.each do |dependency|
+        path = dependency.config_entry.path
+        name = dependency.config_entry.name
+        any_changed |= update_tracking_files(path, name) if Utils.multirepo_enabled?(path)
+      end
+      return any_changed
+    end
+
+    def update_main
+      return update_tracking_files(".", "main repo")
+    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
+      
+      if @commit
+        committed = tracking_files.commit("[multirepo] Updated tracking files manually")
+        Console.log_info("Committed tracking files") if committed
+      end
+
+      return changed
+    end
+
+    def show_diff(path)
+      GitRunner.run_as_system(path, "diff .multirepo.lock")
+    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
-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