git-multirepo 1.0.0.beta67 → 1.0.0.beta68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b8d5e54993a9c655577c2bffdc0bd6f6ee6fa361d304da3f087bbd14dd187c60
-  data.tar.gz: 95ad5c33a935295ac813657980d79246e50935ea924a03d75036c11a5feb3615
+SHA1:
+  metadata.gz: 5ad6d2c08552b45aa55273d43af72fadb98c2e7a
+  data.tar.gz: ea3133fff7c5a8e3a8d7485a94b0cce30264b21e
 SHA512:
-  metadata.gz: aa242412b13bcc850004c36aae4c7c935904ec6741db514dc2f2f0ee35368d88c1dc8195b332ee17c3837a554abdac67ce2bc3547e7e250f3691a629609f97ec
-  data.tar.gz: c63eca773f85ad93ea84fa7993c3ecc35f340a79ee874845d8e5692744f35de641dda153aeb143b901c8c6136eb9a33533cdf2618e97f8b682719da45f7ee921
+  metadata.gz: e8436a2cdf77e0974dd22cb72f603d408356da6061a4f9473fc07860731b71edfa2c5cca36a88d4e29aa215ba76e0a43dec2d239e1aa0a8bbf62dbe3b99abe1e
+  data.tar.gz: f1578fa69dfe4266cb1d1ea7904fe06eddd5522cc8c300d5c6d1aafbee0ccc822eaa5d95b0ee135ac39379ab26636725ce399062f80466f98e0f2d6dc20bcdc3

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,95 +1,99 @@
-## 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.
+## Releases
+
+To install betas run `gem install git-multirepo --pre`
+
+## 1.0.0.beta67
+
+* **Bug Fix:** Fix a crash related to the presence of trailing slashes in dependency paths
+
+## 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.