git-multirepo 1.0.0.beta43 → 1.0.0.beta44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff5fa90b7325f5f997ce975839c229f9e027483
-  data.tar.gz: 85e5266dfdafb76b7a9a4360182138825eec3af3
+  metadata.gz: c94db73c957e83def2963148314ae81c9867655a
+  data.tar.gz: a9ccff47aed61ed13e5c63e91edc9186acbd142a
 SHA512:
-  metadata.gz: f1e0869dde622b905daa713a5d5deed7b2043d047942dc014071815df88a0ebfa6840e1968fe3ea6794a9c114503a59b7a704457a492fb6d4c7cdc73867462cf
-  data.tar.gz: 0094423be10677e3ed047e4b8d1eb3e13c1fc8200fb964127fa6ef4a82d9b850d10e21378148bcf611f67277ebf854a12adabf79fb5ccd27da29ddd3096ccfad
+  metadata.gz: 6e21d03ac2e5a534db8e82e33aac4f825c3cf1a1b623f6f00431bb8979e613419ebc05a2e8ca26df5d06cdfee4661e310c3146f5cc3bffafd8b6457b3f777b9e
+  data.tar.gz: 1c1ffe438f95de180904f875649419eba79aa6897036a3e278c7695706874af5ecaddd22d72431bd91ac27362355bea2e469c24d71be4f43114a6bd2af55eb12

data/.multirepo.meta

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

data/README.md

@@ -122,7 +122,7 @@ Here is a quick rundown of commands available to you in git-multirepo:
 | clone | Clones the specified repository in a subfolder, then installs it. |
 | do | Perform an arbitrary Git operation in the main repository, dependency repositories or all repositories. |
 | 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. |
+| install | Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks. Idempotent for a given main repo checkout. |
 | merge | Performs a git merge on all dependencies and the main repo, in the proper order. |
 | open | Opens repositories in the OS's file explorer. |
 | remove | Removes the specified dependency from multirepo. |

data/lib/info.rb

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

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

@@ -111,7 +111,7 @@ module MultiRepo
       
       # Checkout!
       if config_entry.repo.checkout(revision)
-        Console.log_substep("Checked out #{dependency_name} #{revision}")
+        Console.log_substep("Checked out #{dependency_name} '#{revision}'")
       else
         raise MultiRepoException, "Couldn't check out the appropriate version of dependency #{dependency_name}"
       end

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

@@ -10,23 +10,35 @@ module MultiRepo
     self.summary = "Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks."
     
     def self.options
-      [['[--hooks]', 'Only install local git hooks.']].concat(super)
+      [
+        ['[--hooks]', 'Only install local git hooks.'],
+        ['[--ci]', 'For use in a continuous integration context (such as on a CI build server or agent).']
+      ].concat(super)
     end
     
     def initialize(argv)
       @hooks = argv.flag?("hooks")
+      @ci = argv.flag?("ci")
       super
     end
+    
+    def validate!
+      super
+      unless validate_only_one_flag(@hooks, @ci)
+        help! "You can't provide more than one operation modifier (--hooks, --ci, etc.)"
+      end
+    end
         
     def run
-      ensure_in_work_tree
+      ensure_in_work_tree unless @ci
       ensure_multirepo_tracked
       
       if @hooks
         Console.log_step("Installing hooks in main repo and all dependencies...")
         install_hooks_step
       else
-        Console.log_step("Cloning dependencies and installing hooks...")
+        Console.log_step("Installing dependencies...")
+        Console.log_warning("Performing continuous-integration-aware install")
         full_install
       end
       
@@ -35,8 +47,8 @@ module MultiRepo
     
     def full_install
       install_dependencies_step
-      install_hooks_step
-      update_gitconfigs_step
+      install_hooks_step unless @ci
+      update_gitconfigs_step unless @ci
     end
     
     def install_dependencies_step
@@ -49,7 +61,8 @@ module MultiRepo
       
       # Checkout the appropriate branches as specified in the lock file
       checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
-      checkout_command.dependencies_checkout_step(RevisionSelectionMode::LATEST)
+      mode = @ci ? RevisionSelectionMode::AS_LOCK : RevisionSelectionMode::LATEST
+      checkout_command.dependencies_checkout_step(mode)
     end
     
     def install_hooks_step
@@ -76,7 +89,7 @@ module MultiRepo
       if dependency.config_entry.repo.exists?
         check_repo_validity(dependency)
         
-        Console.log_substep("Working copy '#{dependency.config_entry.repo.path}' already exists, fetching instead...")
+        Console.log_substep("Working copy '#{dependency.config_entry.repo.path}' already exists, fetching...")
         fetch_repo(dependency)
       else
         Console.log_substep("Cloning #{dependency.config_entry.url} into '#{dependency.config_entry.repo.path}'")

metadata

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