git-multirepo 1.0.0.beta3 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e47d03eba5e760c151e04bfcb7a3301a19c964
-  data.tar.gz: 4c851995c6891c658e9f3214aa8ed1e26cedc1e8
+  metadata.gz: bc4fcacdeda46d9bd6dbaf5f70cfdfd1e9a42752
+  data.tar.gz: de1ffba314e943dcd1357dd7c23c8a0a5f9c4138
 SHA512:
-  metadata.gz: 94ce390a9c7dd25481619d3236d3fd18f0a7edc8b40a6210e09a5a531649839adf2b9f0dfd06025d758823464a83d8f11f18cd93b7873542d4b0087553e534f4
-  data.tar.gz: 95d8231b95904970179a1e7c68f831bcd8fad7fc7281d14e0bf8f05a84f00a72153c09e4a4385ab536f49463354a332077d26a52641619bfffef41a7d3468f4a
+  metadata.gz: 4d06277c5724ddd505c7d41219ac947111e6c3184def6b05b7069ffe85378e0c77e4d267fdefdf81df366a2f55190a1ec318ef6b10701e55cd47acfcedaeaf69
+  data.tar.gz: e66429331d6bdd52a8c86010685fa803a20ff2cf261acba1679b4fc84f1f979c5ca3f0d1d53eaeae6b28d3b4ab136e7f8a8074e2d1ac95e0f9603f995293319e

data/README.md

@@ -98,7 +98,7 @@ If you want to stop using git-multirepo, run `multi uninit`. This will remove al
 
 ## Limitations
 
-- git-multirepo should be considered beta at the moment. All of the core features work as described, though. Suggestions and contributions are welcome.
+- git-multirepo should be considered alpha at the moment. All of the core features work as described, though. Suggestions and contributions are welcome.
 - The project and its dependencies must live beside each other on disk (for now).
 - There are currently no features to facilitate branch-heavy workflows.
 - You must (ideally) install the tool on your CI server: `gem install git-multirepo`

data/lib/info.rb

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

data/lib/multirepo/commands/init.rb

@@ -27,8 +27,8 @@ module MultiRepo
             Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
           end
         end
-        ConfigFile.save(entries)
         
+        ConfigFile.save(entries)
         ConfigFile.stage
       
         uncommitted = Utils.warn_of_uncommitted_changes(entries)

data/lib/multirepo/commands/install.rb

@@ -13,7 +13,11 @@ module MultiRepo
       
       Console.log_step("Cloning dependencies and installing hook...")
       
-      ConfigFile.load.each { |e| install(e) }
+      config_entries = ConfigFile.load
+
+      Console.log_info("There are #{config_entries.count} dependencies to install");
+      
+      config_entries.each { |e| install(e) }
       
       self.install_pre_commit_hook
       

data/lib/multirepo/commands/update.rb

@@ -9,9 +9,14 @@ module MultiRepo
       super
       ensure_multirepo_initialized
       
+      Console.log_step("Updating...")
+      
       LockFile.update
+      Console.log_substep("Updated lock file")
+      
+      self.install_pre_commit_hook
       
-      Console.log_step("Lock file updated")
+      Console.log_step("Done!")
     rescue MultiRepoException => e
       Console.log_error(e.message)
     end

data/lib/multirepo/config.rb

@@ -6,5 +6,8 @@ module MultiRepo
     
     attr_accessor :verbose
     @verbose = false
+    
+    attr_accessor :running_git_hook
+    @running_git_hook = false
   end
 end

data/lib/multirepo/git/git.rb

@@ -15,11 +15,12 @@ module MultiRepo
     
     def self.run_in_working_dir(path, git_command, show_output)
       full_command = "git -C \"#{path}\" #{git_command}";
-      run(full_command, show_output)
-    end
-    
-    def self.run_in_working_dir_with_env_unset(path, git_command, show_output)
-      full_command = "unset $(git rev-parse --local-env-vars); git -C \"#{path}\" #{git_command}";
+      
+      # 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.
+      # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
+      full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
+      
       run(full_command, show_output)
     end
     

data/lib/multirepo/git/repo.rb

@@ -28,7 +28,7 @@ module MultiRepo
     end
     
     def changes
-      output = Git.run_in_working_dir_with_env_unset(@path, "status --porcelain", false)
+      output = Git.run_in_working_dir(@path, "status --porcelain", false)
       lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
       lines.map { |l| Change.new(l) }
     end

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

@@ -6,6 +6,8 @@ require "multirepo/utility/console"
 module MultiRepo
   class PreCommitHook
     def self.run
+      Config.instance.running_git_hook = true
+
       entries =  ConfigFile.load
       uncommitted = Utils.warn_of_uncommitted_changes(entries)
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .multirepo
+- .multirepo.lock
 - .rspec
 - Gemfile
 - Gemfile.lock