git-multirepo 1.0.0.beta57 → 1.0.0.beta58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08fa2ba818b2fd6356962c64ba16f8f8f9a704be
-  data.tar.gz: 8373a82721b03063b3191c789e8cb1462eaadd88
+  metadata.gz: 5d395226345d705bab1e2dcdd86b5f3aa14b48d2
+  data.tar.gz: aa3870bdb60046e7906e5292a0bc806104ea4bd5
 SHA512:
-  metadata.gz: d0c894b783a977cbdb0ab955f58b52e0ea6ccb18ac0f481fb6e2b0afcb0095dde26e04bcae3d5e7afb5d77cea67834eeb478e192a0e5cabfa3fbfa688f9b1a3a
-  data.tar.gz: 4a90bd0940a74e7d204e4b60119fbbf4d607cdb9194f5c6c41d8d19a29206a698e969d0f2f386929f8e6a254c3e8695cfbf270a41381d61f8151dc393990f25c
+  metadata.gz: 821b990a89c3c0a6f14ce0d1390e6a4b0053101a9e24ebe734307ef3490b00e66a76a499e3a591bf08acfe4a341df0dd3a1bc69ee428eba4771d2a18469a554e
+  data.tar.gz: 1363a6fadfa135c58794f71809613cc155b8a0479d6e02c93501b4d6b1fe6de41441debe1f8ebae008061f6ded91e50b119bb6f6e704a61ef4b606d83c88c0ca

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 To install betas run `gem install git-multirepo --pre`
 
+## 1.0.0.beta58
+
+- **Enhancement:** Support for `multi install` in non git-tracked main "repo" using the `--no-repo` flag (for server-side checkout CI scenarios)
+
 ## 1.0.0.beta57
 
 - **Bug Fix:** Fixed error in multi install clone error message building

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

@@ -15,13 +15,15 @@ module MultiRepo
     def self.options
       [
         ['[--hooks]', 'Only install local git hooks.'],
-        ['[--ci]', 'Perform a continuous-integration-aware install (such as on a CI build server or agent).']
+        ['[--ci]', 'Perform a continuous-integration-aware install (such as on a CI build server or agent).'],
+        ['[--no-repo]', 'Tell multirepo that the directory is not a git repository. Useful when the main repo is not a git working copy in CI scenarios.']
       ].concat(super)
     end
     
     def initialize(argv)
       @hooks = argv.flag?("hooks")
       @ci = argv.flag?("ci")
+      @repo = argv.flag?("repo", true)
       super
     end
     
@@ -33,7 +35,7 @@ module MultiRepo
     end
         
     def run
-      ensure_in_work_tree unless @ci
+      ensure_in_work_tree if @no_repo
       ensure_multirepo_tracked
       
       if @hooks
@@ -48,37 +50,6 @@ module MultiRepo
       Console.log_step("Done!")
     end
     
-    def log_ci_info
-      Console.log_info("Performing continuous-integration-aware install")
-      Console.log_info("Using git-multirepo #{MultiRepo::VERSION}")
-      
-      main_repo = Repo.new(".")
-      main_repo_branch = main_repo.current_branch
-      meta_file = MetaFile.new(".").load
-
-      if main_repo.head.merge_commit?
-        Console.log_warning("[MERGE COMMIT] The checked-out main repo revision is a merge commit.")
-        Console.log_warning("[MERGE COMMIT] Lock file might not represent a valid project state.")
-      end
-
-      table = Terminal::Table.new do |t|
-        t.title = "Revision Info"
-        t.add_row ["Tracked Using", "git-multirepo #{meta_file.version}"]
-        t.add_separator
-        t.add_row ["Main Repo", commit_info(main_repo.head.commit_id, (main_repo_branch.name rescue nil))]
-        t.add_separator
-        LockFile.new(".").load_entries.each do |lock_entry|
-          branch_name = lock_entry.branch
-          t.add_row [lock_entry.name, commit_info(lock_entry.head, branch_name)]
-        end
-      end
-      puts table
-    end
-
-    def commit_info(commit_id, branch_name)
-      commit_id + (branch_name ? " (on branch #{branch_name})" : "")
-    end
-    
     def full_install
       install_dependencies_step
       install_hooks_step unless @ci
@@ -157,5 +128,46 @@ module MultiRepo
         fail MultiRepoException, "'#{dependency.config_entry.path}' origin URL (#{dependency.config_entry.repo.remote('origin').url}) does not match entry (#{dependency.config_entry.url})!"
       end
     end
+    
+    # Logging
+    
+    def log_ci_info
+      Console.log_info("Performing continuous-integration-aware install")
+      Console.log_info("Using git-multirepo #{MultiRepo::VERSION}")
+      
+      main_repo = Repo.new(".")
+      
+      return unless @repo
+      log_merge_commit_warning(main_repo)
+      log_merge_table(main_repo)
+    end
+    
+    def log_merge_commit_warning(main_repo)
+      if main_repo.head.merge_commit?
+        Console.log_warning("[MERGE COMMIT] The checked-out main repo revision is a merge commit.")
+        Console.log_warning("[MERGE COMMIT] Lock file might not represent a valid project state.")
+      end
+    end
+    
+    def log_merge_table(main_repo)
+      meta_file = MetaFile.new(".").load
+      main_repo_branch = main_repo.current_branch
+      
+      puts Terminal::Table.new do |t|
+        t.title = "Revision Info"
+        t.add_row ["Tracked Using", "git-multirepo #{meta_file.version}"]
+        t.add_separator
+        t.add_row ["Main Repo", commit_info(main_repo.head.commit_id, (main_repo_branch.name rescue nil))]
+        t.add_separator
+        LockFile.new(".").load_entries.each do |lock_entry|
+          branch_name = lock_entry.branch
+          t.add_row [lock_entry.name, commit_info(lock_entry.head, branch_name)]
+        end
+      end
+    end
+
+    def commit_info(commit_id, branch_name)
+      commit_id + (branch_name ? " (on branch #{branch_name})" : "")
+    end
   end
 end

data/lib/multirepo/info.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta57
+  version: 1.0.0.beta58
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler