git-multirepo 1.0.0.beta48 → 1.0.0.beta49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b62e381f56fa28e1019ec5ee90f527e3d6c0caf9
-  data.tar.gz: c3a9718b7a7bf951b3c7ff3e7f4b41e80c010a0e
+  metadata.gz: 4d705faf852214b42b3a430b147767ed8c0f333d
+  data.tar.gz: abcd5b4b4bbe377360350c0349e061cfef5d1c29
 SHA512:
-  metadata.gz: e0595de8789ec53bccb911f904a5f86ab53530f15db76b2986ffb14f11dd2a150912d063cb191573eb760ff0a98191dcd1d90ff6befd813f25df0de54ea2db6e
-  data.tar.gz: 7c97e0eba324fee9bead97e3928919986b94575103b8aacb5fa885080062a114c1d2da18e5094af254af97f775296d72a4af043d918c0b62202f9aece2e8c534
+  metadata.gz: 64f96f9b51c7c621280e06e326e3219ddc076fff8e7f6f6667b11d0001d4f7a9d9931b955d2bcafb1a723db1c245631a19746d4e1103fb83edc987fcd37c70d1
+  data.tar.gz: 057b1e54d7d0c063b8fdc9d87097412a7e094ccceca8784f4bcc1f5fe27f9a88a3417d6a083f1dc96103dcc51f8fa91064210d5f7bab7704b253ef5f1cded597

data/.multirepo.meta

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

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+## Releases
+
+To install betas run `[sudo] gem install git-multirepo --pre`
+
+## 1.0.0.beta49
+
+- **Enhancement:** Added --deps, --main and --all flags to `multi update` and update all by default
+- **Enhancement:** Log a warning on multi install --ci if the main repo HEAD is a merge commit, for CI servers to pick up and optionally force fail with
+- **Bug Fix:** "HEAD" was stored in the lock file instead of `nil` when in floating HEAD, which caused some operations to have unexpected results
+- **Bug Fix:** Incorrect default behavior for `multi open` (now defaults to "all")
+
+## 1.0.0.beta48
+
+- **New:** `multi update` now updates tracking files in subdependencies
+- **Enhancement:** Manual and automated code refactorings using RuboCop
+
+## 1.0.0.beta47
+
+- **Enhancement:** Running commands using system() when we don't need to grab output (enables interactive commands in `multi do` and fixes clone/fetch progress output)
+
+## 1.0.0.beta46
+
+- **Enhancement:** Better `multi install --ci` output
+- **Enhancement:** Not requiring a multirepo-enabled repo in InspectCommand, else it's not very useful to inspect random repos
+- **Bug Fix:** Fixed exception in `multi do` when providing only the `--help` flag

data/lib/info.rb

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

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

@@ -48,13 +48,18 @@ module MultiRepo
     end
     
     def log_ci_info
-      Console.log_warning("Performing continuous-integration-aware install")
+      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}"]

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

@@ -34,13 +34,13 @@ module MultiRepo
       ensure_in_work_tree
       ensure_multirepo_enabled
       
-      if @all
-        open_dependencies
-        open_main
-      elsif @main_only
+      if @main_only
         open_main
+      elsif @deps_only
+        open_dependencies
       else
         open_dependencies
+        open_main
       end
     end
 

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

@@ -9,23 +9,34 @@ module MultiRepo
     
     def self.options
       [
+        ['[--all]', 'Update the main repository and all dependencies.'],
+        ['[--main]', 'Update the main repository.'],
+        ['[--deps]', 'Update dependencies.'],
         ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
         ['[--commit]', 'Commit the tracking files after updating them.']
       ].concat(super)
     end
     
     def initialize(argv)
+      @all = argv.flag?("all")
+      @main_only = argv.flag?("main")
+      @deps_only = argv.flag?("deps")
       @commit = argv.flag?("commit")
       @force = argv.flag?("force")
       super
     end
 
+    def validate!
+      super
+      unless validate_only_one_flag(@all, @main_only, @deps_only)
+        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
+      end
+    end
+
     def run
       ensure_in_work_tree
       ensure_multirepo_enabled
       
-      Console.log_step("Updating...")
-      
       dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
       if dependencies_clean || @force
         update_tracking_files_step
@@ -37,11 +48,28 @@ module MultiRepo
     end
     
     def update_tracking_files_step
+      if @main_only
+        Console.log_step("Updating main repo...")
+        update_main
+      elsif @deps_only
+        Console.log_step("Updating dependencies...")
+        update_dependencies
+      else
+        Console.log_step("Updating main repo and dependencies...")
+        update_dependencies
+        update_main
+      end
+    end
+
+    def update_dependencies
       Performer.dependencies.each do |dependency|
         path = dependency.config_entry.path
         name = dependency.config_entry.name
         update_tracking_files(path, name) if Utils.multirepo_enabled?(path)
       end
+    end
+
+    def update_main
       update_tracking_files(".", "main repo")
     end
     

data/lib/multirepo/git/repo.rb

@@ -83,6 +83,7 @@ module MultiRepo
     def current_branch
       return nil unless exists? && head_born?
       name = GitRunner.run(@path, "rev-parse --abbrev-ref HEAD", Verbosity::OUTPUT_NEVER).strip
+      return nil if name == "HEAD" # Code assumes that current_branch will be nil when we're in floating HEAD
       Branch.new(self, name)
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta48
+  version: 1.0.0.beta49
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - .multirepo.meta
 - .rspec
 - .rubocop.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE