git-multirepo 1.0.0.beta18 → 1.0.0.beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88cc72e2ecea7331cc379e0d48f771302960e0c
-  data.tar.gz: 3778236c3c5e1cfe17ba4c16b5e26d3fd54186ab
+  metadata.gz: 0f47b8911b32d25d5daa1fe087296860ff278b04
+  data.tar.gz: 2a9aea7aadbfa5e2ba7ebd20f41048eae806180a
 SHA512:
-  metadata.gz: 7bdbdeff71220ce72b005dc66ac91cd45e0afddf227c0732b84e102d587192a29db3522b97eff8a988b53761b7b301664aeacfd3a5e0af9ec217fb183b4dde2f
-  data.tar.gz: e9f0f748cbd0d2385fee936886eb759f09f5e17898af4510920e51930b7dac92fdb1975dbc148207a73eadd4c401634cd7870f036cf695b7a98131323a99ca40
+  metadata.gz: dc2f4849e897410cda0164e1d3e14dbaf1c821a3777f599e6569c24e43492a1dca53f6260ea5623d64a8f1b561b868db940d17b26650b51eb4b7a16cb244f692
+  data.tar.gz: b8d457f08acceb627267ac30d6c33efa454989457d7e69d337735016a1619d050684c2dc448afe367a5dfee13083b41a147bbafd2fb9c01272f30b1b6faf4a6d

data/README.md

@@ -1,5 +1,3 @@
-![git-multirepo](images/logo.png)
-
 # git-multirepo
 
 [![Gem Version](https://badge.fury.io/rb/git-multirepo.svg)](http://badge.fury.io/rb/git-multirepo)

data/lib/info.rb

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

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

@@ -85,7 +85,7 @@ module MultiRepo
         # First, make sure the repo exists on disk, and clone it if it doesn't
         # (in case the checked-out revision had an additional dependency)
         unless config_entry.repo.exists?
-          Console.log_substep("Cloning missing dependency #{config_entry.path} from #{config_entry.url}")
+          Console.log_substep("Cloning missing dependency '#{config_entry.path}' from #{config_entry.url}")
           config_entry.repo.clone(config_entry.url)
         end
         

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

@@ -39,7 +39,7 @@ module MultiRepo
       FileUtils.mkpath(main_repo_path)
 
       main_repo = Repo.new(main_repo_path)
-      main_repo.clone(@url)
+      raise MultiRepoException, "Could not clone repo from #{@url}" unless main_repo.clone(@url)
       
       original_path = Dir.pwd
       Dir.chdir(main_repo_path)

data/lib/multirepo/commands/command.rb

@@ -20,14 +20,25 @@ module MultiRepo
       raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
     end
     
-    def install_hooks
-      Utils.install_hook("pre-commit")
-      Utils.install_hook("post-merge")
-      Console.log_substep("Installed git hooks")
+    def install_hooks_in_multirepo_enabled_dependencies
+      # Install the local git hooks in dependency repos
+      # if they are themselves tracked with multirepo
+      ConfigFile.load.each do |entry|
+        if Utils.is_multirepo_enabled(entry.repo.path)
+          install_hooks(entry.repo.path)
+          Console.log_substep("Installed hooks in multirepo-enabled dependency '#{entry.repo.path}'")
+        end
+      end
+    end
+    
+    def install_hooks(path = nil)
+      actual_path = path || "."
+      Utils.install_hook("pre-commit", actual_path)
+      Utils.install_hook("post-merge", actual_path)
     end
     
     def ensure_multirepo_initialized
-      raise MultiRepoException, "multirepo is not initialized in this repository." unless ConfigFile.exists?
+      raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
     end
   end
 end

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

@@ -22,7 +22,9 @@ module MultiRepo
       if sibling_repos.any?
         entries = []
         sibling_repos.each do |repo|
-          if Console.ask_yes_no("Do you want to add '#{repo.path}' (#{repo.remote('origin').url} #{repo.current_branch}) as a dependency?")
+          origin_desc = repo.remote('origin').url || "[none]"
+          current_branch = repo.current_branch
+          if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: '#{origin_desc}', branch: #{current_branch}]")
             entries.push(ConfigEntry.new(repo))
             Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
           end
@@ -30,16 +32,12 @@ module MultiRepo
         
         ConfigFile.save(entries)
         ConfigFile.stage
-      
-        dependencies_clean = Utils.ensure_dependencies_clean(entries)
-        raise MultiRepoException, "Can't finish initialization!" unless dependencies_clean
-        
-        LockFile.update
       else
         Console.log_info("There are no sibling repositories to add")
       end
       
       install_hooks
+      Console.log_substep("Installed git hooks")
       
       Console.log_step("Done!")
     rescue MultiRepoException => e

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

@@ -35,14 +35,17 @@ module MultiRepo
 
       Console.log_substep("Installing #{config_entries.count} dependencies...");
       
-      # Clone or fetch configured repos
-      config_entries.each { |e| clone_or_fetch(e) }
+      # Clone or fetch all configured dependencies
+      config_entries.each { |entry| clone_or_fetch(entry) }
       
-      # Checkout the repos as specified in the lock file
+      # Checkout the appropriate branches as specified in the lock file
       checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
       checkout_command.checkout_core(ref || "master", CheckoutCommand::CheckoutMode::LATEST)
       
       install_hooks
+      Console.log_substep("Installed git hooks in main repo")
+      
+      install_hooks_in_multirepo_enabled_dependencies
     end
     
     def clone_or_fetch(entry)
@@ -62,7 +65,7 @@ module MultiRepo
     end
     
     def clone_repo(entry)
-      Console.log_substep("Cloning '#{entry.url} to #{entry.repo.path}'")
+      Console.log_substep("Cloning #{entry.url} into '#{entry.repo.path}'")
       raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
     end
     

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

@@ -24,8 +24,12 @@ module MultiRepo
       
       Console.log_step("Updating...")
       
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
+      install_hooks
+      Console.log_substep("Installed git hooks in main repo")
+      
+      install_hooks_in_multirepo_enabled_dependencies
       
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
       if dependencies_clean
         LockFile.update
         Console.log_substep("Updated lock file with latest dependency commits")
@@ -36,8 +40,6 @@ module MultiRepo
         raise MultiRepoException, "Can't update because not all dependencies are clean"
       end
       
-      install_hooks
-
       if @commit
         Console.log_substep("Committing updated lock file")
         LockFile.commit

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

@@ -7,10 +7,10 @@ module MultiRepo
       Config.instance.running_git_hook = true
       
       LockFile.update
-      Console.log_info("Updated the lock file with current HEAD revisions for all dependencies")
+      Console.log_info("multirepo: Updated the lock file with current HEAD revisions for all dependencies")
       
       LockFile.commit("Automatic post-merge multirepo lock file update")
-      Console.log_info("Committed the updated lock file")
+      Console.log_info("multirepo: Committed the updated lock file")
       
       exit 0 # Success!
     end

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

@@ -11,12 +11,12 @@ module MultiRepo
       dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
       
       if !dependencies_clean
-        Console.log_error("You must commit changes to your dependencies before you can commit the main repo")
+        Console.log_error("multirepo: You must commit changes to your dependencies before you can commit the main repo")
         exit 1
       end
       
       LockFile.update
-      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
+      Console.log_info("multirepo: Updated and staged lock file with current HEAD revisions for all dependencies")
       
       exit 0 # Success!
     end

data/lib/multirepo/utility/utils.rb

@@ -7,8 +7,12 @@ module MultiRepo
       File.join(gem_path, "resources/#{resource_name}")
     end
     
-    def self.install_hook(name)
-      FileUtils.cp(path_for_resource(name), ".git/hooks")
+    def self.is_multirepo_enabled(path)
+      File.exists?(File.join(path, ".multirepo"))
+    end
+    
+    def self.install_hook(name, path)
+      FileUtils.cp(path_for_resource(name), File.join(path, ".git/hooks"))
     end
     
     def self.sibling_repos
@@ -19,18 +23,19 @@ module MultiRepo
     
     def self.ensure_dependencies_clean(config_entries)
       config_entries.all? do |e|
-        return true unless e.repo.exists?
+        next true unless e.repo.exists?
         clean = e.repo.is_clean?
+        Console.log_info("Dependency '#{e.repo.path}' is clean") if clean
         Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless clean
-        return clean
+        next clean
       end
     end
     
     def self.ensure_working_copies_clean(repos)
       repos.all? do |repo|
         clean = repo.is_clean?
-        Console.log_warning("Repo #{repo.path} contains uncommitted changes") unless clean
-        return clean
+        Console.log_warning("Repo '#{repo.path}' contains uncommitted changes") unless clean
+        next clean
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta18
+  version: 1.0.0.beta19
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,6 @@ files:
 - Rakefile
 - bin/multi
 - git-multirepo.gemspec
-- images/logo.png
 - lib/commands.rb
 - lib/git-multirepo.rb
 - lib/info.rb