git-multirepo 1.0.0.beta65 → 1.0.0.beta66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e6b02fa31b56ca23a764798d1751e76d7244a8b
-  data.tar.gz: 20b86b72f4c6d20bd998273e2a1bb47c9ff421a3
+  metadata.gz: baf501295e4ea3de37c02728c5dddf493df5433d
+  data.tar.gz: 1dc6718b74f99f4539076ea2157fc5de18a6cf2e
 SHA512:
-  metadata.gz: 1c24d0fde49001ddb7688774309edff59e5f69604a6a18b2ef6ef8b60dfe12252de84c0cc2bbe430de24032520562ba859db80f327147aa9d61c53ba82dbc7ac
-  data.tar.gz: aba753409736be5182583449fcbaef65dea3fce9466b778642328c978ad8fd3d30acaaef979af2fe74d8da6bc6f7626674fc0bd824f31bc3555495da7c954938
+  metadata.gz: '05768d2040e6cff5326d33b5df35a1bd9470fd1efc18f86d3b3dc3545090c13b46b27a5848865ec05dcc4802b12509a23a2969a7f87b0ee690b33bd654a7f432'
+  data.tar.gz: c892dc7010a6f4a78fc280b330f504a742b2b36fa494e5f1c3b636dcccd62a1c95c7d359d4f785743969ff7407ef7e41921fdeadd107f8d635ec2cebd0954476

data/.gitattributes

@@ -1,4 +1,4 @@
-resources/post-commit eol=lf
-resources/pre-commit eol=lf
-.multirepo.lock merge=ours
-.multirepo.meta merge=ours
+resources/post-commit eol=lf
+resources/pre-commit eol=lf
+.multirepo.lock merge=ours
+.multirepo.meta merge=ours

data/.gitbugtraq

@@ -1,3 +1,3 @@
-[bugtraq "pivotal"]
-  url = https://www.pivotaltracker.com/story/show/%BUGID%
-  logRegex = (\\b\\d{8}\\b)
+[bugtraq "pivotal"]
+  url = https://www.pivotaltracker.com/story/show/%BUGID%
+  logRegex = (\\b\\d{8}\\b)

data/.gitignore

@@ -1,38 +1,38 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# Project-specific
-/.multirepo
-/.multirepo.lock
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# Project-specific
+/.multirepo
+/.multirepo.lock

data/.rspec

@@ -1,2 +1,2 @@
---color
---require spec_helper
+--color
+--require spec_helper

data/.rubocop.yml

@@ -1,79 +1,79 @@
-# This is the configuration used to check the rubocop source code.
-
-AllCops:
-  DisplayCopNames: true
-  Exclude:
-    - 'resources/*'
-    - 'pkg/*'
-    - 'docs/*'
-    - 'spec/spec_helper.rb'
-    - 'spec/fixtures/**/*'
-
-Style/RescueModifier:
-  Enabled: false
-
-Lint/EndAlignment:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Style/EachWithObject:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/RedundantReturn:
-  Enabled: false
-
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/TrailingWhitespace:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Style/ElseAlignment:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: false
-
-Style/MultilineOperationIndentation:
-  Enabled: false
-
-Style/Semicolon:
-  AllowAsExpressionSeparator: true
-
-Style/IndentationWidth:
-  Enabled: false
-
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-Metrics/PerceivedComplexity:
-  Max: 8
-
-Style/FileName:
-  Enabled: false
-
-Style/SpecialGlobalVars:
-  Enabled: false
+# This is the configuration used to check the rubocop source code.
+
+AllCops:
+  DisplayCopNames: true
+  Exclude:
+    - 'resources/*'
+    - 'pkg/*'
+    - 'docs/*'
+    - 'spec/spec_helper.rb'
+    - 'spec/fixtures/**/*'
+
+Style/RescueModifier:
+  Enabled: false
+
+Lint/EndAlignment:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: false
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/TrailingWhitespace:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Style/ElseAlignment:
+  Enabled: false
+
+Style/HashSyntax:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+Style/Semicolon:
+  AllowAsExpressionSeparator: true
+
+Style/IndentationWidth:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/PerceivedComplexity:
+  Max: 8
+
+Style/FileName:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false

data/CHANGELOG.md

@@ -1,91 +1,95 @@
-## Releases
-
-To install betas run `gem install git-multirepo --pre`
-
-## 1.0.0.beta65
-
-- **Removal:** The `graph` command was removed. It was unused and added an unnecessary dependency.
-
-## 1.0.0.beta64
-
-- **Enhancement:** The branch command does not push by default anymore (helps avoid creating branches in wrong origins when setting up new projects)
-
-## 1.0.0.beta63
-
-- **Bug Fix:** Remove some unnecessary debug console output
-
-## 1.0.0.beta62
-
-- **Bug Fix:** Fix post-first-init commit
-
-## 1.0.0.beta61
-
-- **Bug Fix:** Fix crasher in file permissions checking code
-
-## 1.0.0.beta60
-
-- **Enhancement:** Implemented the `--force` option in `multi branch`
-- **Enhancement:** Prevent updating tracking files with an outdated version of the tool
-- **Bug Fix:** Fail gracefully in case of limited tracking file permissions
-
-## 1.0.0.beta59
-
-- **Bug Fix:** Fix clone and install error when on-disk dependency directory case does not match
-
-## 1.0.0.beta57
-
-- **Bug Fix:** Fixed error in multi install clone error message building
-
-## 1.0.0.beta56
-
-- **Enhancement:** Using the `--extra-output` flag will output more CI server-specific info (checkout info, errors, etc.)
-- **Bug Fix:** Some config flags (such as `--verbose`) were reset when calling other commands internally
-
-## 1.0.0.beta53
-
-- **Enhancement:** Added a `--extra-output` flag to output additional CI server-specific messages (such as TeamCity service messages)
-
-## 1.0.0.beta52
-
-- **Enhancement:** InspectCommand now takes the name of a stat as input instead of flags and provides helpful output if the provided stat name is invalid
-- **Enhancement:** Added a `--force` flag to `multi checkout`, which ignores uncommitted changes
-
-## 1.0.0.beta51
-
-- **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
-- **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
-- **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
-- **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
-- **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (`--deps`, `--main`, etc.)
-
-## 1.0.0.beta50
-
-- **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
-- **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
-- **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
-
-## 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
-
-## 1.0.0.beta45 and earlier
-
-Refer to the commit history for details on earlier versions of git-multirepo.
+## Releases
+
+To install betas run `gem install git-multirepo --pre`
+
+## 1.0.0.beta66
+
+- **Enhancement:** Add a `--no-ff` option to `multi merge` to optionally avoid fast-forwarding
+
+## 1.0.0.beta65
+
+- **Removal:** The `graph` command was removed. It was unused and added an unnecessary dependency.
+
+## 1.0.0.beta64
+
+- **Enhancement:** The branch command does not push by default anymore (helps avoid creating branches in wrong origins when setting up new projects)
+
+## 1.0.0.beta63
+
+- **Bug Fix:** Remove some unnecessary debug console output
+
+## 1.0.0.beta62
+
+- **Bug Fix:** Fix post-first-init commit
+
+## 1.0.0.beta61
+
+- **Bug Fix:** Fix crasher in file permissions checking code
+
+## 1.0.0.beta60
+
+- **Enhancement:** Implemented the `--force` option in `multi branch`
+- **Enhancement:** Prevent updating tracking files with an outdated version of the tool
+- **Bug Fix:** Fail gracefully in case of limited tracking file permissions
+
+## 1.0.0.beta59
+
+- **Bug Fix:** Fix clone and install error when on-disk dependency directory case does not match
+
+## 1.0.0.beta57
+
+- **Bug Fix:** Fixed error in multi install clone error message building
+
+## 1.0.0.beta56
+
+- **Enhancement:** Using the `--extra-output` flag will output more CI server-specific info (checkout info, errors, etc.)
+- **Bug Fix:** Some config flags (such as `--verbose`) were reset when calling other commands internally
+
+## 1.0.0.beta53
+
+- **Enhancement:** Added a `--extra-output` flag to output additional CI server-specific messages (such as TeamCity service messages)
+
+## 1.0.0.beta52
+
+- **Enhancement:** InspectCommand now takes the name of a stat as input instead of flags and provides helpful output if the provided stat name is invalid
+- **Enhancement:** Added a `--force` flag to `multi checkout`, which ignores uncommitted changes
+
+## 1.0.0.beta51
+
+- **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
+- **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
+- **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
+- **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
+- **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (`--deps`, `--main`, etc.)
+
+## 1.0.0.beta50
+
+- **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
+- **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
+- **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
+
+## 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
+
+## 1.0.0.beta45 and earlier
+
+Refer to the commit history for details on earlier versions of git-multirepo.

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in git-multirepo.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git-multirepo.gemspec
+gemspec

data/Gemfile.lock

@@ -1,47 +1,47 @@
-PATH
-  remote: .
-  specs:
-    git-multirepo (1.0.0.beta64)
-      claide (~> 1.0.1)
-      colored (~> 1.2)
-      naturally (~> 2.1)
-      os (~> 0.9.6)
-      terminal-table (~> 1.7.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    claide (1.0.1)
-    colored (1.2)
-    diff-lcs (1.2.5)
-    naturally (2.1.0)
-    os (0.9.6)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    unicode-display_width (1.1.3)
-
-PLATFORMS
-  ruby
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  git-multirepo!
-  rake (~> 10.0)
-  rspec (~> 3.1.0)
-
-BUNDLED WITH
-   1.14.6
+PATH
+  remote: .
+  specs:
+    git-multirepo (1.0.0.beta64)
+      claide (~> 1.0.1)
+      colored (~> 1.2)
+      naturally (~> 2.1)
+      os (~> 0.9.6)
+      terminal-table (~> 1.7.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    claide (1.0.1)
+    colored (1.2)
+    diff-lcs (1.2.5)
+    naturally (2.1.0)
+    os (0.9.6)
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
+    unicode-display_width (1.1.3)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 1.7)
+  git-multirepo!
+  rake (~> 10.0)
+  rspec (~> 3.1.0)
+
+BUNDLED WITH
+   1.14.6

data/LICENSE

@@ -1,22 +1,22 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Michaël Fortin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+The MIT License (MIT)
+
+Copyright (c) 2015 Michaël Fortin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+