git-multirepo 1.0.0.beta38 → 1.0.0.beta39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422c984238cb4049bcededa9a63ac57ca1d13445
-  data.tar.gz: f9e95a0941a9160fc5b714d76bd5c3664c35ba67
+  metadata.gz: 94c594ab8e4c0338d3e5e70bb31d4315c1b7fbf0
+  data.tar.gz: 0a9b1e7b957e605d17a053abc01c262f7c3c56fb
 SHA512:
-  metadata.gz: 73835b202c7a7d5e0104cca153488d57bc3173f30efcb04cea4f0a277f4c522215de0e50dcbeab6cd4216987f794268b6e8fd852d4b62bdbdefd6793ad6878ff
-  data.tar.gz: 7590706f24a5ca82f2275dbeb361fe251223ccdb6797f959a9fbeb941c0f0b7d852958ca2e01586bdac2be10ccd33a2c4627c732b9e7aadc5ccdebf86b405be9
+  metadata.gz: 4179388b91395ade82973ab214327ea34560c3a39d06db5eb4bc6e9461309f39f9ab47611bfb82bfd88f27336a758120c24ea520c6e3b3be3a687ea8ce6b7715
+  data.tar.gz: 7ab8047c6256c0001a317d19e398bb0d4093e57f6bd9b7d9bf89339bc39603539ab70513d5c032f049b58219d922fe18c289246809d4182ec96b79954c2d977d

data/.multirepo.meta

@@ -1,2 +1,2 @@
 --- !ruby/object:MultiRepo::MetaFile
-version: 1.0.0.beta37
+version: 1.0.0.beta38

data/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: .
   specs:
-    git-multirepo (1.0.0.beta25)
+    git-multirepo (1.0.0.beta38)
       claide (~> 0.8, >= 0.8.0)
       colored (~> 1.2)
       os (~> 0.9.6)
+      ruby-graphviz (~> 1.2.1)
+      terminal-table (~> 1.4.5)
 
 GEM
   remote: https://rubygems.org/
@@ -26,6 +28,8 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    ruby-graphviz (1.2.2)
+    terminal-table (1.4.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -123,9 +123,10 @@ Here is a quick rundown of commands available to you in git-multirepo:
 | clean | Performs a 'git clean -df' on the main repo and all dependencies. |
 | clone | Clones the specified repository in a subfolder, then installs it. |
 | fetch | Performs a git fetch on all dependencies. |
+| graph | Graphs the dependency tree from the current repository. |
 | install | Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks. |
 | merge | Performs a git merge on all dependencies and the main repo, in the proper order. |
-| open | Opens all dependencies in the current OS's file explorer. |
+| open | Opens repositories in the OS's file explorer. |
 | remove | Removes the specified dependency from multirepo. |
 | update | Force-updates the multirepo tracking files. |
 | uninit | Removes all traces of multirepo in the current multirepo repository. |

data/git-multirepo.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "colored", "~> 1.2"
   spec.add_runtime_dependency "os", "~> 0.9.6"
   spec.add_runtime_dependency "terminal-table", "~> 1.4.5"
+  spec.add_runtime_dependency "ruby-graphviz", "~> 1.2.1"
 end

data/lib/commands.rb

@@ -5,6 +5,7 @@ require_relative "multirepo/commands/checkout-command"
 require_relative "multirepo/commands/clean-command"
 require_relative "multirepo/commands/clone-command"
 require_relative "multirepo/commands/fetch-command"
+require_relative "multirepo/commands/graph-command"
 require_relative "multirepo/commands/init-command"
 require_relative "multirepo/commands/install-command"
 require_relative "multirepo/commands/merge-command"

data/lib/info.rb

@@ -1,5 +1,5 @@
 module MultiRepo
   NAME = "git-multirepo"
-  VERSION = "1.0.0.beta38"
+  VERSION = "1.0.0.beta39"
   DESCRIPTION = "Track multiple Git repositories side-by-side."
 end

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

@@ -1,6 +1,7 @@
 require "multirepo/utility/console"
 require "multirepo/files/config-file"
 require "multirepo/files/tracking-files"
+require "multirepo/logic/performer"
 
 module MultiRepo
   class BranchCommand < Command
@@ -11,14 +12,14 @@ module MultiRepo
       [
         ['<branch name>', 'The name of the branch to create and checkout.'],
         ['[--force]', 'Force creating the branch even if the repos contain uncommmitted changes.'],
-        ['[--no-track]', 'Do not configure as a remote-tracking branch on creation.']
+        ['[--no-push]', 'Do not push the branch on creation.']
       ].concat(super)
     end
     
     def initialize(argv)
       @branch_name = argv.shift_argument
       @force = argv.flag?("force")
-      @remote_tracking = argv.flag?("track", true)
+      @remote_tracking = argv.flag?("push", true)
       super
     end
     
@@ -35,32 +36,48 @@ module MultiRepo
       Console.log_step("Branching...")
       
       main_repo = Repo.new(".")
-      config_file = ConfigFile.new(".")
-      repos = config_file.load_entries.map{ |entry| entry.repo }.push(main_repo)
       
-      if !Utils.ensure_working_copies_clean(repos) && !@force
-        raise MultiRepoException, "Can't branch because not all repos are clean"
+      # Ensure the main repo is clean
+      raise MultiRepoException, "Main repo is not clean; multi branch aborted" unless main_repo.clean?
+      
+      # Ensure dependencies are clean
+      config_entries = ConfigFile.new(".").load_entries
+      unless Utils.ensure_dependencies_clean(config_entries)
+        raise MultiRepoException, "Dependencies are not clean; multi branch aborted"
       end
       
-      repos.each do |repo|
-        if @remote_tracking
-          Console.log_substep("Branching, checking out and pushing '#{repo.path}' #{@branch_name} ...")
-        else
-          Console.log_substep("Branching and checking out '#{repo.path}' #{@branch_name} (not pushed) ...")
-        end
-
-        branch = repo.branch(@branch_name)
-        branch.create(@remote_tracking) unless branch.exists?
-        branch.checkout
+      # Branch dependencies
+      Performer.perform_on_dependencies do |config_entry, lock_entry|
+        perform_branch(config_entry.repo)
       end
-
-      Console.log_substep("Updating and committing tracking files")
-      TrackingFiles.update
-      TrackingFiles.commit("[multirepo] Post-branch tracking files update")
-
+      
+      # Branch the main repo
+      perform_branch(main_repo)
+      
       Console.log_step("Done!")
     rescue MultiRepoException => e
       Console.log_error(e.message)
     end
+    
+    def perform_branch(repo)
+      Console.log_substep("Branching '#{repo.path}' ...")
+      Console.log_info("Creating and checking out branch #{@branch_name} ...")
+      
+      branch = repo.branch(@branch_name)
+      branch.create unless branch.exists?
+      branch.checkout
+      
+      if Utils.is_multirepo_enabled(repo.path)
+        Console.log_info("Updating and committing tracking files")
+        tracking_files = TrackingFiles.new(repo.path)
+        tracking_files.update
+        tracking_files.commit("[multirepo] Post-branch tracking files update")
+      end
+      
+      if @remote_tracking
+        Console.log_info("Pushing #{@branch_name} to origin/#{@branch_name}")
+        repo.branch(@branch_name).push
+      end
+    end
   end
 end

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

@@ -25,7 +25,9 @@ module MultiRepo
     def validate!
       super
       help! "You must specify a branch or commit id to checkout" unless @ref
-      help! "You can't provide more than one operation modifier (--latest, --exact, etc.)" if @checkout_latest && @checkout_exact
+      unless validate_only_one_flag(@checkout_latest, @checkout_exact)
+        help! "You can't provide more than one operation modifier (--latest, --exact, etc.)"
+      end
     end
     
     def run

data/lib/multirepo/commands/command.rb

@@ -54,6 +54,10 @@ module MultiRepo
     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(".")

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

@@ -0,0 +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
+end

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

@@ -77,7 +77,7 @@ module MultiRepo
     end
     
     def update_gitattributes_step
-      TrackingFiles::FILES.each do |f|
+      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")

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

@@ -29,7 +29,9 @@ module MultiRepo
     def validate!
       super
       help! "You must specify a ref to merge" unless @ref
-      help! "You can't provide more than one operation modifier (--latest, --exact, etc.)" if @checkout_latest && @checkout_exact
+      unless validate_only_one_flag(@checkout_latest, @checkout_exact)
+        help! "You can't provide more than one operation modifier (--latest, --exact, etc.)"
+      end
     end
     
     def run

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

@@ -6,22 +6,53 @@ require "multirepo/utility/utils"
 module MultiRepo
   class OpenCommand < Command
     self.command = "open"
-    self.summary = "Opens all dependencies in the current OS's file explorer."
+    self.summary = "Opens repositories in the OS's file explorer."
+
+    def self.options
+      [
+        ['[--main]', 'Open the main repository.'],
+        ['[--all]', 'Open the main repository and all dependencies.'],
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @main_only = argv.flag?("main")
+      @all = argv.flag?("all")
+      super
+    end
+
+    def validate!
+      super
+      unless validate_only_one_flag(@main_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
       
-      ConfigFile.new(".").load_entries.each do |entry|
-        if OS.osx?
-          `open "#{entry.repo.path}"`
-        elsif OS.windows?
-          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
-        end
+      if @main_only
+        open_main
+      elsif @all
+        open_dependencies
+        open_main
+      else
+        open_dependencies
       end
     rescue MultiRepoException => e
       Console.log_error(e.message)
     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/uninit-command.rb

@@ -10,7 +10,7 @@ module MultiRepo
       ensure_in_work_tree
       
       FileUtils.rm_f(".multirepo")
-      TrackingFiles.delete
+      TrackingFiles.new(".").delete
       uninstall_hooks
       
       Console.log_step("All traces of multirepo have been removed from this repository")

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

@@ -41,7 +41,8 @@ module MultiRepo
     end
     
     def update_lock_file_step(log_message)
-      changed = TrackingFiles.update
+      tracking_files = TrackingFiles.new(".")
+      changed = tracking_files.update
       
       if changed
         Console.log_substep("Updated tracking files")
@@ -50,7 +51,7 @@ module MultiRepo
       end
       
       if @commit
-        committed = TrackingFiles.commit("[multirepo] Updated tracking files manually")
+        committed = tracking_files.commit("[multirepo] Updated tracking files manually")
         Console.log_substep("Committed tracking files") if committed
       elsif changed
         Console.log_substep(log_message)

data/lib/multirepo/files/tracking-files.rb

@@ -4,39 +4,44 @@ require_relative "lock-file"
 
 module MultiRepo
   class TrackingFiles
-    FILES = [MetaFile.new("."), LockFile.new(".")]
+    attr_accessor :files
     
-    def self.update
+    def initialize(path)
+      @path = path
+      @files = [MetaFile.new(path), LockFile.new(path)]
+    end
+    
+    def update
       updated = false
-      FILES.each { |f| updated |= f.update }
+      files.each { |f| updated |= f.update }
       return updated
     end
     
-    def self.stage
-      GitRunner.run_in_current_dir("add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    def stage
+      GitRunner.run_in_working_dir(@path, "add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
     end
     
-    def self.commit(message)
+    def commit(message)
       stage
       
-      output = GitRunner.run_in_current_dir("ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
+      output = GitRunner.run_in_working_dir(@path, "ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
       files_are_untracked_or_modified = output.strip != ""
       
-      output = GitRunner.run_in_current_dir("diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
+      output = GitRunner.run_in_working_dir(@path, "diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
       files_are_staged = output.strip != ""
       
       must_commit = files_are_untracked_or_modified || files_are_staged
-      GitRunner.run_in_current_dir("commit -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
-            
+      GitRunner.run_in_working_dir(@path, "commit --no-verify -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
+      
       return must_commit
     end
     
-    def self.delete
-      FILES.each { |f| FileUtils.rm_f(f.file) }
+    def delete
+      files.each { |f| FileUtils.rm_f(f.file) }
     end
     
-    def self.files_pathspec
-      FILES.map{ |f| f.file }.join(" ")
+    def files_pathspec
+      files.map{ |f| File.basename(f.file) }.join(" ")
     end
   end
 end

data/lib/multirepo/git/branch.rb

@@ -15,9 +15,12 @@ module MultiRepo
       branch_names.include?(@name)
     end
 
-    def create(remote_tracking = false)
+    def create
       GitRunner.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      GitRunner.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
+    end
+    
+    def push
+      GitRunner.run_in_working_dir(@repo.path, "push -u origin #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
     end
     
     def checkout

data/lib/multirepo/git/git-runner.rb

@@ -13,7 +13,15 @@ module MultiRepo
     end
     
     def self.run_in_working_dir(path, git_command, verbosity)
-      full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
+      if path == "."
+        # It is always better to skip -C when running git commands in the
+        # current directory (especially in hooks). Doing this prevents
+        # any future issues because we automatically fallback to non-"-C" for ".".
+        # Fixes bug: https://www.pivotaltracker.com/story/show/94505654
+        return run_in_current_dir(git_command, verbosity)
+      else
+        full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
+      end
       
       # True fix for the -C flag issue in pre-commit hook where the status command would
       # fail to provide correct results if a pathspec was provided when performing a commit.

data/lib/multirepo/hooks/post-commit-hook.rb

@@ -11,7 +11,7 @@ module MultiRepo
       Console.log_step("Performing post-commit operations...")
       
       # Works around bug #91565510 (https://www.pivotaltracker.com/story/show/91565510)
-      TrackingFiles.stage
+      TrackingFiles.new(".").stage
       Console.log_info("Cleaned-up staging area")
       
       exit 0 # Success!

data/lib/multirepo/hooks/pre-commit-hook.rb

@@ -17,8 +17,10 @@ module MultiRepo
         exit 1
       end
       
-      TrackingFiles.update
-      TrackingFiles.stage
+      tracking_files = TrackingFiles.new(".")
+      tracking_files.update
+      tracking_files.stage
+      
       Console.log_info("Updated and staged tracking files")
       
       exit 0 # Success!

data/lib/multirepo/logic/node.rb

@@ -10,6 +10,10 @@ module MultiRepo
       @depth = depth
     end
     
+    def name
+      Pathname.new(File.expand_path(@path)).basename.to_s
+    end
+    
     def children
       return [] unless Utils.is_multirepo_enabled(@path)
       config_entries = ConfigFile.new(@path).load_entries

data/lib/multirepo/utility/utils.rb

@@ -54,6 +54,22 @@ module MultiRepo
       components.join(File::ALT_SEPARATOR)
     end
     
+    def self.reveal_in_default_file_browser(unix_path)
+      if OS.osx?
+        system %{open "#{unix_path}"}
+      elsif OS.windows?
+        system %{explorer "#{Utils.convert_to_windows_path(unix_path)}"}
+      end
+    end
+    
+    def self.open_in_default_app(unix_path)
+      if OS.osx?
+        system %{open "#{unix_path}"}
+      elsif OS.windows?
+        system %{cmd /c "start C:\\#{Utils.convert_to_windows_path(unix_path)}"}
+      end
+    end
+    
     def self.append_if_missing(path, pattern, string_to_append)
       unless File.exists?(path)
         File.open(path, 'w') { |f| f.puts(string_to_append) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta38
+  version: 1.0.0.beta39
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: ruby-graphviz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: Track multiple Git repositories side-by-side.
 email:
 - fortinmike@irradiated.net
@@ -151,6 +165,7 @@ files:
 - lib/multirepo/commands/clone-command.rb
 - lib/multirepo/commands/command.rb
 - lib/multirepo/commands/fetch-command.rb
+- lib/multirepo/commands/graph-command.rb
 - lib/multirepo/commands/init-command.rb
 - lib/multirepo/commands/install-command.rb
 - lib/multirepo/commands/merge-command.rb