git-multirepo 1.0.0.beta39 → 1.0.0.beta40

data/lib/multirepo/commands/command.rb

@@ -1,76 +1,76 @@
-require "claide"
-
-require "info"
-require "multirepo/multirepo-exception"
-require "multirepo/config"
-
-module MultiRepo
-  class Command < CLAide::Command
-    self.abstract_command = true
-    self.command = "multi"
-    self.version = VERSION
-    self.description = DESCRIPTION
-    
-    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! "Unknown argument(s): #{@argv.remainder.join(', ')}" unless @argv.empty?
-    end
-
-    def validate!
-      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, "This revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
-    end
-  end
+require "claide"
+
+require "info"
+require "multirepo/multirepo-exception"
+require "multirepo/config"
+
+module MultiRepo
+  class Command < CLAide::Command
+    self.abstract_command = true
+    self.command = "multi"
+    self.version = VERSION
+    self.description = DESCRIPTION
+    
+    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! "Unknown argument(s): #{@argv.remainder.join(', ')}" unless @argv.empty?
+    end
+
+    def validate!
+      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, "This revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
+    end
+  end
 end

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

@@ -0,0 +1,76 @@
+require "multirepo/utility/console"
+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
+      @main_only = argv.flag?("main")
+      @deps_only = argv.flag?("deps")
+      argv.flag?("all") # Eat the default flag!
+      super
+    end
+
+    def validate!
+      super
+      unless validate_only_one_flag(@main_only, @deps_only, @all)
+        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
+      end
+    end
+    
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      if @main_only
+        message = "Perform operation on the #{'main repo'.bold}:\n  git #{@operation}"
+        op = lambda { perform_operation_on_main(@operation) }
+      elsif @deps_only
+        message = "Perform operation on #{'dependencies'.bold}:\n  git #{@operation}"
+        op = lambda { perform_operation_on_dependencies(@operation) }
+      else
+        message = "Perform operation on #{'dependencies'.bold} and the #{'main repo'.bold}:\n  git #{@operation}"
+        op = lambda {
+          perform_operation_on_dependencies(@operation) # Ordered dependencies first
+          perform_operation_on_main(@operation) # Main last
+        }
+      end
+      
+      raise MultiRepoException, "Operation cancelled" unless Console.ask_yes_no(message)
+      
+      op.call
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+
+    def perform_operation_on_main(operation)
+      perform_operation(".", operation)
+    end
+
+    def perform_operation_on_dependencies(operation)
+      Performer.perform_on_dependencies do |config_entry, lock_entry|
+        perform_operation(config_entry.repo.path, operation)
+      end
+    end
+
+    def perform_operation(path, operation)
+      Console.log_step("Performing operation on '#{path}'")
+      Console.log_info("git #{operation}")
+      GitRunner.run_in_working_dir(path, operation, Runner::Verbosity::OUTPUT_ALWAYS)
+    end
+  end
+end

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

@@ -1,31 +1,31 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class FetchCommand < Command
-    self.command = "fetch"
-    self.summary = "Performs a git fetch on all dependencies."
-    
-    def run
-      super
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Fetching main repo...")
-      
-      main_repo = Repo.new(".")
-      Console.log_substep("Fetching from #{main_repo.remote('origin').url}...")
-      main_repo.fetch
-      
-      Console.log_step("Fetching dependencies...")
-      
-      ConfigFile.new(".").load_entries.each do |entry|
-        Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
-        entry.repo.fetch
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class FetchCommand < Command
+    self.command = "fetch"
+    self.summary = "Performs a git fetch on all dependencies."
+    
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Fetching main repo...")
+      
+      main_repo = Repo.new(".")
+      Console.log_substep("Fetching from #{main_repo.remote('origin').url}...")
+      main_repo.fetch
+      
+      Console.log_step("Fetching dependencies...")
+      
+      ConfigFile.new(".").load_entries.each do |entry|
+        Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
+        entry.repo.fetch
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,46 +1,46 @@
-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
-      super
-      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}")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    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_nodes(child_node.name)
-        graph.add_edges(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
+      super
+      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}")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    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

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

@@ -1,120 +1,120 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/files/tracking-files"
-require "multirepo/commands/command"
-
-module MultiRepo
-  class InitCommand < Command
-    self.command = "init"
-    self.summary = "Initialize the current repository as a multirepo project."
-    
-    def self.options
-      [['[--extras]', 'Keep the current .multirepo config file as-is and initialize everything else.']].concat(super)
-    end
-    
-    def initialize(argv)
-      @only_extras = argv.flag?("extras")
-      super
-    end
-    
-    def run
-      super
-      ensure_in_work_tree
-      
-      if @only_extras
-        ensure_multirepo_enabled
-        Console.log_step("Initializing extras...")
-        initialize_extras_step
-      else
-        Console.log_step("Initializing multirepo...")
-        full_initialize_step
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def full_initialize_step
-      if ConfigFile.new(".").exists?
-        reinitialize = Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
-        raise MultiRepoException, "Initialization aborted" unless reinitialize
-      end
-      
-      unless add_sibling_repos_step
-        raise MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
-      end
-
-      initialize_extras_step
-    end
-    
-    def add_sibling_repos_step
-      sibling_repos = Utils.sibling_repos
-      return false unless sibling_repos.any?
-
-      Console.log_substep("Creating new multirepo config...")
-      
-      valid_repos = find_valid_repos(sibling_repos)
-      entries = create_entries(valid_repos)
-      
-      raise MultiRepoException, "No sibling repositories were added as dependencies; aborting." unless entries.any?
-      
-      ConfigFile.new(".").save_entries(entries)
-      return true
-    end
-    
-    def initialize_extras_step
-      install_hooks_step
-      update_gitattributes_step
-      update_gitconfig_step
-    end
-    
-    def install_hooks_step
-      install_hooks(".")
-      Console.log_substep("Installed git hooks")
-    end
-    
-    def update_gitattributes_step
-      TrackingFiles.new(".").files.each do |f|
-        filename = f.filename
-        regex_escaped_filename = Regexp.quote(filename)
-        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
-      end
-      Console.log_substep("Updated .gitattributes file")
-    end
-    
-    def update_gitconfig_step
-      update_gitconfig(".")
-      Console.log_substep("Updated .git/config file")
-    end
-    
-    def find_valid_repos(repos)
-      repos.select do |repo|
-        next true if repo.head_born?
-        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
-      end
-    end
-    
-    def create_entries(repos)
-      entries = []
-      repos.each do |repo|
-        origin_url = repo.remote('origin').url
-        current_branch = repo.current_branch
-        
-        if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || "NONE"}, branch: #{current_branch}]")
-          raise MultiRepoException, "Repo 'origin' remote url is not set; aborting." unless origin_url
-          entries.push(ConfigEntry.new(repo))
-          Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
-        end
-      end
-      return entries
-    end
-    
-    def check_repo_exists
-      if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
-      if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/files/tracking-files"
+require "multirepo/commands/command"
+
+module MultiRepo
+  class InitCommand < Command
+    self.command = "init"
+    self.summary = "Initialize the current repository as a multirepo project."
+    
+    def self.options
+      [['[--extras]', 'Keep the current .multirepo config file as-is and initialize everything else.']].concat(super)
+    end
+    
+    def initialize(argv)
+      @only_extras = argv.flag?("extras")
+      super
+    end
+    
+    def run
+      super
+      ensure_in_work_tree
+      
+      if @only_extras
+        ensure_multirepo_enabled
+        Console.log_step("Initializing extras...")
+        initialize_extras_step
+      else
+        Console.log_step("Initializing multirepo...")
+        full_initialize_step
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def full_initialize_step
+      if ConfigFile.new(".").exists?
+        reinitialize = Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
+        raise MultiRepoException, "Initialization aborted" unless reinitialize
+      end
+      
+      unless add_sibling_repos_step
+        raise MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
+      end
+
+      initialize_extras_step
+    end
+    
+    def add_sibling_repos_step
+      sibling_repos = Utils.sibling_repos
+      return false unless sibling_repos.any?
+
+      Console.log_substep("Creating new multirepo config...")
+      
+      valid_repos = find_valid_repos(sibling_repos)
+      entries = create_entries(valid_repos)
+      
+      raise MultiRepoException, "No sibling repositories were added as dependencies; aborting." unless entries.any?
+      
+      ConfigFile.new(".").save_entries(entries)
+      return true
+    end
+    
+    def initialize_extras_step
+      install_hooks_step
+      update_gitattributes_step
+      update_gitconfig_step
+    end
+    
+    def install_hooks_step
+      install_hooks(".")
+      Console.log_substep("Installed git hooks")
+    end
+    
+    def update_gitattributes_step
+      TrackingFiles.new(".").files.each do |f|
+        filename = f.filename
+        regex_escaped_filename = Regexp.quote(filename)
+        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
+      end
+      Console.log_substep("Updated .gitattributes file")
+    end
+    
+    def update_gitconfig_step
+      update_gitconfig(".")
+      Console.log_substep("Updated .git/config file")
+    end
+    
+    def find_valid_repos(repos)
+      repos.select do |repo|
+        next true if repo.head_born?
+        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
+      end
+    end
+    
+    def create_entries(repos)
+      entries = []
+      repos.each do |repo|
+        origin_url = repo.remote('origin').url
+        current_branch = repo.current_branch
+        
+        if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || "NONE"}, branch: #{current_branch}]")
+          raise MultiRepoException, "Repo 'origin' remote url is not set; aborting." unless origin_url
+          entries.push(ConfigEntry.new(repo))
+          Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+        end
+      end
+      return entries
+    end
+    
+    def check_repo_exists
+      if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
+      if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end
+    end
+  end
 end