git-multirepo 1.0.0.beta20 → 1.0.0.beta21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292c05d1335e888a82eeaea12ca7170378669a90
-  data.tar.gz: d8c27f7671954a3aeab46ddb9ad55461dfbac529
+  metadata.gz: 8a2847900b5c1e42e101b309f6a493dadd74ed7c
+  data.tar.gz: e97802efdf245c8731831f5ca759c0395e7f9a2e
 SHA512:
-  metadata.gz: 088543b1a14197625ed68c3aed17bbd8a6b959f638cad894da37f94bca89896249c8152914b9a265727aaf3daee0761a986d213826591ff41ea91ac35e74af59
-  data.tar.gz: d98eb47bc0c08028b255f4f229981d2d2608c2ddfc96710706249e4198a7470e17d4c3415f8b906ed987e500630878ccccadab5070e28c34b642f2d9413dc12d
+  metadata.gz: 01ee0b062a92963e616137d44980a2614b6ff201b58d87efc8aab5a7388975e20e16b9ebef478387573ed4f9d72f6635dd342c8e347307e26c3479f70a6da566
+  data.tar.gz: a935be358532182e80fe9d9da69842d3590d1941c824054e765593a54e66e55ba7562f6c40706e2a99b48f9cd55f0c24ec8299ea4951e171df86891e1a62f1e8

data/lib/git-multirepo.rb

@@ -1,2 +1,3 @@
 require "multirepo/hooks/pre-commit-hook.rb"
+require "multirepo/hooks/prepare-commit-msg-hook.rb"
 require "multirepo/hooks/post-merge-hook.rb"

data/lib/info.rb

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

data/lib/multirepo/commands/command.rb

@@ -34,9 +34,16 @@ module MultiRepo
     def install_hooks(path = nil)
       actual_path = path || "."
       Utils.install_hook("pre-commit", actual_path)
+      Utils.install_hook("prepare-commit-msg", actual_path)
       Utils.install_hook("post-merge", actual_path)
     end
     
+    def uninstall_hooks
+      File.delete(".git/hooks/pre-commit")
+      File.delete(".git/hooks/prepare-commit-msg")
+      File.delete(".git/hooks/post-merge")
+    end
+    
     def ensure_multirepo_initialized
       raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
     end

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

@@ -11,8 +11,7 @@ module MultiRepo
       
       File.delete(".multirepo")
       File.delete(".multirepo.lock")
-      File.delete(".git/hooks/pre-commit")
-      File.delete(".git/hooks/post-merge")
+      uninstall_hooks
       
       Console.log_step("All traces of multirepo have been removed from this repository")
     rescue MultiRepoException => e

data/lib/multirepo/files/lock-file.rb

@@ -27,7 +27,7 @@ module MultiRepo
     end
 
     def self.commit(message = nil)
-      message = message || "Updated multirepo lock file with the latest version of all dependencies"
+      message = message || "[multirepo] Updated lock file"
       Git.run_in_current_dir("commit -m \"#{message}\" -o -- #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
     end
     

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

@@ -6,6 +6,8 @@ module MultiRepo
     def self.run
       Config.instance.running_git_hook = true
       
+      Console.log_step("multirepo: Performing post-merge operations...")
+      
       LockFile.update
       Console.log_info("multirepo: Updated the lock file with current HEAD revisions for all dependencies")
       

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

@@ -8,10 +8,12 @@ module MultiRepo
     def self.run
       Config.instance.running_git_hook = true
       
+      Console.log_step("multirepo: Performing pre-commit operations...")
+      
       dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
       
       if !dependencies_clean
-        Console.log_error("multirepo: 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 this repo")
         exit 1
       end
       

data/lib/multirepo/hooks/prepare-commit-msg-hook.rb

@@ -0,0 +1,28 @@
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PrepareCommitMsgHook
+    def self.run(argv)
+      Config.instance.running_git_hook = true
+      
+      pre_merge if argv[1] == "merge"
+      
+      exit 0 # Success!
+    end
+    
+    def self.pre_merge
+      Console.log_step("multirepo: Performing pre-merge operations...")
+      ensure_dependencies_clean
+    end
+    
+    def self.ensure_dependencies_clean
+      unless Utils.ensure_dependencies_clean(ConfigFile.load)
+        Console.log_error("multirepo: You must commit changes to your dependencies before you can commit this repo")
+        exit 1
+      end
+    end
+  end
+end

data/resources/prepare-commit-msg

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "git-multirepo"
+
+MultiRepo::PrepareCommitMsgHook.run(ARGV)

data/spec/integration/init_spec.rb

@@ -13,11 +13,7 @@ RSpec.describe("Init") do
     pending
   end
   
-  it "installs the pre-commit hook" do
-    pending
-  end
-
-  it "installs the post-merge hook" do
+  it "installs the hooks" do
     pending
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta20
+  version: 1.0.0.beta21
 platform: ruby
 authors:
 - Michaël Fortin
@@ -146,12 +146,14 @@ files:
 - lib/multirepo/git/repo.rb
 - lib/multirepo/hooks/post-merge-hook.rb
 - lib/multirepo/hooks/pre-commit-hook.rb
+- lib/multirepo/hooks/prepare-commit-msg-hook.rb
 - lib/multirepo/multirepo-exception.rb
 - lib/multirepo/utility/console.rb
 - lib/multirepo/utility/runner.rb
 - lib/multirepo/utility/utils.rb
 - resources/post-merge
 - resources/pre-commit
+- resources/prepare-commit-msg
 - spec/integration/init_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/fortinmike/git-multirepo