git-multirepo 1.0.0.beta45 → 1.0.0.beta46

data/lib/multirepo/commands/command.rb

@@ -1,90 +1,90 @@
-require "claide"
-
-require "info"
-require "multirepo/multirepo-exception"
-require "multirepo/config"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-
-module MultiRepo
-  class Command < CLAide::Command
-    self.abstract_command = true
-    self.command = "multi"
-    self.version = VERSION
-    self.description = DESCRIPTION
-    
-    def self.report_error(exception)
-      if exception.instance_of?(MultiRepoException)
-        Console.log_error(exception.message)
-        exit 1
-      end
-      raise exception
-    end
-    
-    def initialize(argv)
-      @argv = argv
-      Config.instance.verbose = argv.flag?("verbose") ? true : false
-      Config.instance.git_executable = argv.option("git-exe", "git")
-      super
-    end
-    
-    def run
-      help!
-    end
-
-    def validate!
-      super
-      path = Config.instance.git_executable
-      is_git_exe = path =~ /.*(git)|(git.exe)$/
-      file_exists = path == "git" || File.exists?(path)
-      help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
-    end
-    
-    def install_hooks(path)
-      actual_path = path || "."
-      Utils.install_hook("pre-commit", actual_path)
-      Utils.install_hook("post-commit", actual_path)
-    end
-    
-    def uninstall_hooks
-      FileUtils.rm_f(".git/hooks/pre-commit")
-      FileUtils.rm_f(".git/hooks/post-commit")
-    end
-    
-    def update_gitconfig(path)
-      actual_path = path || "."
-      resource_file = Utils.path_for_resource(".gitconfig")
-      target_file = File.join(actual_path, '.git/config')
-      
-      template = File.read(resource_file)
-      first_template_line = template.lines.first
-      
-      Utils.append_if_missing(target_file, Regexp.new(Regexp.quote(first_template_line)), template)
-    end
-    
-    def multirepo_enabled_dependencies
-      ConfigFile.new(".").load_entries.select { |e| Utils.is_multirepo_enabled(e.repo.path) }
-    end
-
-    def validate_only_one_flag(*flags)
-      flags.reduce(0) { |count, flag| count += 1 if flag; count } <= 1
-    end
-    
-    def ensure_in_work_tree
-      repo = Repo.new(".")
-      raise MultiRepoException, "Not a git repository" unless repo.exists?
-      raise MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
-    end
-    
-    def ensure_multirepo_enabled
-      raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
-    end
-
-    def ensure_multirepo_tracked
-      raise MultiRepoException, "Revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
-      
-      lock_file_valid = LockFile.new(".").validate!
-      raise MultiRepoException, "Revision is multirepo-enabled but contains a corrupted lock file!" unless lock_file_valid
-    end
-  end
+require "claide"
+
+require "info"
+require "multirepo/multirepo-exception"
+require "multirepo/config"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+
+module MultiRepo
+  class Command < CLAide::Command
+    self.abstract_command = true
+    self.command = "multi"
+    self.version = VERSION
+    self.description = DESCRIPTION
+    
+    def self.report_error(exception)
+      if exception.instance_of?(MultiRepoException)
+        Console.log_error(exception.message)
+        exit 1
+      end
+      raise exception
+    end
+    
+    def initialize(argv)
+      @argv = argv
+      Config.instance.verbose = argv.flag?("verbose") ? true : false
+      Config.instance.git_executable = argv.option("git-exe", "git")
+      super
+    end
+    
+    def run
+      help!
+    end
+
+    def validate!
+      super
+      path = Config.instance.git_executable
+      is_git_exe = path =~ /.*(git)|(git.exe)$/
+      file_exists = path == "git" || File.exists?(path)
+      help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
+    end
+    
+    def install_hooks(path)
+      actual_path = path || "."
+      Utils.install_hook("pre-commit", actual_path)
+      Utils.install_hook("post-commit", actual_path)
+    end
+    
+    def uninstall_hooks
+      FileUtils.rm_f(".git/hooks/pre-commit")
+      FileUtils.rm_f(".git/hooks/post-commit")
+    end
+    
+    def update_gitconfig(path)
+      actual_path = path || "."
+      resource_file = Utils.path_for_resource(".gitconfig")
+      target_file = File.join(actual_path, '.git/config')
+      
+      template = File.read(resource_file)
+      first_template_line = template.lines.first
+      
+      Utils.append_if_missing(target_file, Regexp.new(Regexp.quote(first_template_line)), template)
+    end
+    
+    def multirepo_enabled_dependencies
+      ConfigFile.new(".").load_entries.select { |e| Utils.is_multirepo_enabled(e.repo.path) }
+    end
+
+    def validate_only_one_flag(*flags)
+      flags.reduce(0) { |count, flag| count += 1 if flag; count } <= 1
+    end
+    
+    def ensure_in_work_tree
+      repo = Repo.new(".")
+      raise MultiRepoException, "Not a git repository" unless repo.exists?
+      raise MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
+    end
+    
+    def ensure_multirepo_enabled
+      raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
+    end
+
+    def ensure_multirepo_tracked
+      raise MultiRepoException, "Revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
+      
+      lock_file_valid = LockFile.new(".").validate!
+      raise MultiRepoException, "Revision is multirepo-enabled but contains a corrupted lock file!" unless lock_file_valid
+    end
+  end
 end

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

@@ -1,101 +1,103 @@
-require_relative "command"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-require "multirepo/git/repo"
-require "multirepo/git/git-runner"
-require "multirepo/logic/performer"
-
-module MultiRepo
-  class DoCommand < Command
-    self.command = "do"
-    self.summary = "Perform an arbitrary Git operation in the main repository, dependency repositories or all repositories."
-
-    def self.options
-      [
-        ['"<operation>"', 'The git command to perform, between quotes, omitting the executable name (ex: "reset --hard HEAD")'],
-        ['[--main]', 'Perform the operation in the main repository only.'],
-        ['[--deps]', 'Perform the operation in dependencies only.'],
-        ['[--all]', 'Perform the operation in the main repository and all dependencies.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @operation = argv.shift_argument.sub(/^git /, "")
-      @all = argv.flag?("all")
-      @main_only = argv.flag?("main")
-      @deps_only = argv.flag?("deps")
-      super
-    end
-
-    def validate!
-      super
-      help! "You must provide a git operation to perform" unless @operation
-      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
-      
-      success = true
-      if @main_only
-        confirm_main_repo_operation
-        success &= perform_operation_on_main(@operation)
-      elsif @deps_only
-        confirm_dependencies_operation
-        success &= perform_operation_on_dependencies(@operation)
-      else
-        confirm_main_repo_operation
-        confirm_dependencies_operation
-        success &= perform_operation_on_dependencies(@operation) # Ordered dependencies first
-        success &= perform_operation_on_main(@operation) # Main last
-      end
-      
-      Console.log_warning("Some operations finished with non-zero exit status. Please review the above.") unless success
-    end
-    
-    def perform_operation_on_main(operation)
-      perform_operation(".", operation)
-    end
-
-    def perform_operation_on_dependencies(operation)
-      success = true
-      Performer.dependencies.each do |dependency|
-        success &= perform_operation(dependency.config_entry.repo.path, operation)
-      end
-      return success
-    end
-
-    def perform_operation(path, operation)
-      Console.log_step("Performing operation on '#{path}'")
-      GitRunner.run_in_working_dir(path, operation, Runner::Verbosity::OUTPUT_ALWAYS)
-      GitRunner.last_command_succeeded
-    end
-    
-    def confirm_main_repo_operation
-      unless main_repo_clean?
-        Console.log_warning("Main repo contains uncommitted changes")
-        raise MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
-      end
-    end
-    
-    def confirm_dependencies_operation
-      unless dependencies_clean?
-        Console.log_warning("Some dependencies contain uncommitted changes")
-        raise MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
-      end
-    end
-    
-    def main_repo_clean?
-      Repo.new(".").clean?
-    end
-    
-    def dependencies_clean?
-      config_entries = ConfigFile.new(".").load_entries
-      return Utils.dependencies_clean?(config_entries)
-    end
-  end
+require_relative "command"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+require "multirepo/git/repo"
+require "multirepo/git/git-runner"
+require "multirepo/logic/performer"
+
+module MultiRepo
+  class DoCommand < Command
+    self.command = "do"
+    self.summary = "Perform an arbitrary Git operation in the main repository, dependency repositories or all repositories."
+
+    def self.options
+      [
+        ['"<operation>"', 'The git command to perform, between quotes, omitting the executable name (ex: "reset --hard HEAD")'],
+        ['[--main]', 'Perform the operation in the main repository only.'],
+        ['[--deps]', 'Perform the operation in dependencies only.'],
+        ['[--all]', 'Perform the operation in the main repository and all dependencies.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @operation = argv.shift_argument
+      @all = argv.flag?("all")
+      @main_only = argv.flag?("main")
+      @deps_only = argv.flag?("deps")
+      super
+    end
+
+    def validate!
+      super
+      help! "You must provide a git operation to perform" unless @operation
+      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
+
+      @operation = @operation.sub(/^git /, "")
+      
+      success = true
+      if @main_only
+        confirm_main_repo_operation
+        success &= perform_operation_on_main(@operation)
+      elsif @deps_only
+        confirm_dependencies_operation
+        success &= perform_operation_on_dependencies(@operation)
+      else
+        confirm_main_repo_operation
+        confirm_dependencies_operation
+        success &= perform_operation_on_dependencies(@operation) # Ordered dependencies first
+        success &= perform_operation_on_main(@operation) # Main last
+      end
+      
+      Console.log_warning("Some operations finished with non-zero exit status. Please review the above.") unless success
+    end
+    
+    def perform_operation_on_main(operation)
+      perform_operation(".", operation)
+    end
+
+    def perform_operation_on_dependencies(operation)
+      success = true
+      Performer.dependencies.each do |dependency|
+        success &= perform_operation(dependency.config_entry.repo.path, operation)
+      end
+      return success
+    end
+
+    def perform_operation(path, operation)
+      Console.log_step("Performing operation on '#{path}'")
+      GitRunner.run_in_working_dir(path, operation, Runner::Verbosity::OUTPUT_ALWAYS)
+      GitRunner.last_command_succeeded
+    end
+    
+    def confirm_main_repo_operation
+      unless main_repo_clean?
+        Console.log_warning("Main repo contains uncommitted changes")
+        raise MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
+      end
+    end
+    
+    def confirm_dependencies_operation
+      unless dependencies_clean?
+        Console.log_warning("Some dependencies contain uncommitted changes")
+        raise MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
+      end
+    end
+    
+    def main_repo_clean?
+      Repo.new(".").clean?
+    end
+    
+    def dependencies_clean?
+      config_entries = ConfigFile.new(".").load_entries
+      return Utils.dependencies_clean?(config_entries)
+    end
+  end
 end

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

@@ -1,43 +1,43 @@
-require "os"
-require "graphviz"
-
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-require "multirepo/logic/node"
-
-module MultiRepo
-  class GraphCommand < Command
-    self.command = "graph"
-    self.summary = "Graphs the dependency tree from the current repository."
-    
-    def run
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      root = Node.new(".")
-      graph = GraphViz.new(:G, :type => :digraph)
-      build_graph_recursive(graph, root)
-      
-      path = File.expand_path("~/Desktop/#{root.name}-graph.png")
-      
-      begin
-        graph.output(:png => path)
-        Utils.open_in_default_app(path)
-      rescue StandardError => e
-        Console.log_error(e.message)
-        raise MultiRepoException, "Could not generate graph image because an error occurred during graph generation"
-      end
-      
-      Console.log_step("Generated graph image #{path}")
-    end
-    
-    def build_graph_recursive(graph, node)
-      parent_graph_node = graph.add_nodes(node.name)
-      node.children.each do |child_node|
-        child_graph_node = graph.add_node(child_node.name)
-        graph.add_edge(parent_graph_node, child_graph_node)
-        build_graph_recursive(graph, child_node)
-      end
-    end
-  end
+require "os"
+require "graphviz"
+
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+require "multirepo/logic/node"
+
+module MultiRepo
+  class GraphCommand < Command
+    self.command = "graph"
+    self.summary = "Graphs the dependency tree from the current repository."
+    
+    def run
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      root = Node.new(".")
+      graph = GraphViz.new(:G, :type => :digraph)
+      build_graph_recursive(graph, root)
+      
+      path = File.expand_path("~/Desktop/#{root.name}-graph.png")
+      
+      begin
+        graph.output(:png => path)
+        Utils.open_in_default_app(path)
+      rescue StandardError => e
+        Console.log_error(e.message)
+        raise MultiRepoException, "Could not generate graph image because an error occurred during graph generation"
+      end
+      
+      Console.log_step("Generated graph image #{path}")
+    end
+    
+    def build_graph_recursive(graph, node)
+      parent_graph_node = graph.add_nodes(node.name)
+      node.children.each do |child_node|
+        child_graph_node = graph.add_node(child_node.name)
+        graph.add_edge(parent_graph_node, child_graph_node)
+        build_graph_recursive(graph, child_node)
+      end
+    end
+  end
 end