RubyGems - git-multirepo - Versions diffs - 1.0.0.beta51 → 1.0.0.beta52 - Mend

git-multirepo 1.0.0.beta51 → 1.0.0.beta52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

checksums.yaml +4 -4
data/.gitattributes +2 -2
data/.gitbugtraq +3 -3
data/.gitignore +38 -38
data/.multirepo.meta +2 -2
data/.rspec +2 -2
data/.rubocop.yml +79 -79
data/CHANGELOG.md +48 -43
data/Gemfile +4 -4
data/Gemfile.lock +42 -42
data/LICENSE +22 -22
data/README.md +178 -154
data/Rakefile +1 -1
data/bin/multi +11 -11
data/docs/bug-repros/91565510-repro.sh +20 -20
data/docs/git-multirepo-cheatsheet.docx +0 -0
data/git-multirepo.gemspec +31 -31
data/lib/git-multirepo.rb +3 -3
data/lib/multirepo/commands/add-command.rb +51 -51
data/lib/multirepo/commands/branch-command.rb +82 -82
data/lib/multirepo/commands/checkout-command.rb +123 -121
data/lib/multirepo/commands/clone-command.rb +68 -68
data/lib/multirepo/commands/command.rb +86 -86
data/lib/multirepo/commands/commands.rb +15 -15
data/lib/multirepo/commands/do-command.rb +101 -101
data/lib/multirepo/commands/graph-command.rb +43 -43
data/lib/multirepo/commands/init-command.rb +121 -121
data/lib/multirepo/commands/inspect-command.rb +48 -39
data/lib/multirepo/commands/install-command.rb +153 -153
data/lib/multirepo/commands/merge-command.rb +249 -249
data/lib/multirepo/commands/open-command.rb +55 -55
data/lib/multirepo/commands/remove-command.rb +48 -48
data/lib/multirepo/commands/uninit-command.rb +18 -18
data/lib/multirepo/commands/update-command.rb +112 -112
data/lib/multirepo/config.rb +16 -16
data/lib/multirepo/files/config-entry.rb +39 -39
data/lib/multirepo/files/config-file.rb +46 -46
data/lib/multirepo/files/lock-entry.rb +29 -29
data/lib/multirepo/files/lock-file.rb +56 -56
data/lib/multirepo/files/meta-file.rb +41 -41
data/lib/multirepo/files/tracking-file.rb +9 -9
data/lib/multirepo/files/tracking-files.rb +47 -47
data/lib/multirepo/git/branch.rb +32 -32
data/lib/multirepo/git/change.rb +11 -11
data/lib/multirepo/git/commit.rb +7 -7
data/lib/multirepo/git/git-runner.rb +56 -56
data/lib/multirepo/git/git.rb +10 -10
data/lib/multirepo/git/ref.rb +38 -38
data/lib/multirepo/git/remote.rb +17 -17
data/lib/multirepo/git/repo.rb +124 -124
data/lib/multirepo/hooks/post-commit-hook.rb +23 -23
data/lib/multirepo/hooks/pre-commit-hook.rb +35 -35
data/lib/multirepo/info.rb +5 -5
data/lib/multirepo/logic/dependency.rb +6 -6
data/lib/multirepo/logic/merge-descriptor.rb +95 -95
data/lib/multirepo/logic/node.rb +72 -72
data/lib/multirepo/logic/performer.rb +55 -55
data/lib/multirepo/logic/repo-selection.rb +25 -25
data/lib/multirepo/logic/revision-selection.rb +15 -15
data/lib/multirepo/logic/revision-selector.rb +23 -23
data/lib/multirepo/multirepo-exception.rb +6 -6
data/lib/multirepo/utility/console.rb +52 -52
data/lib/multirepo/utility/popen-runner.rb +27 -27
data/lib/multirepo/utility/system-runner.rb +14 -14
data/lib/multirepo/utility/utils.rb +99 -99
data/lib/multirepo/utility/verbosity.rb +6 -6
data/resources/.gitconfig +2 -2
data/resources/post-commit +6 -6
data/resources/pre-commit +6 -6
data/spec/integration/init_spec.rb +19 -19
data/spec/spec_helper.rb +89 -89
metadata +3 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69d3b2b70a1a87eaf12962cb4d324f62368e5e5
-  data.tar.gz: 8ff1400b4b192b6ebd80077005f01983baf2691c
+  metadata.gz: ed31946049c082a1fc4cfa57e5c861e9d35c12b4
+  data.tar.gz: 594cc4590f22e4b415b5519b46f6a0e8e4620339
 SHA512:
-  metadata.gz: 8003b60e23ec40811e2946958285c637aef6ccd537f884912f165a4c142fb49ab147916d653f27138aa18e714bfb9bb63c6a50a674c5cb404af5ae9db35498c5
-  data.tar.gz: 493424da5709a8404eb17541accbb49c1d5ed1bce257407e0a1d2ee3c93c551353c9af2b150c502ee47e63ad89f680b1d40ddd2f7c5bf228344bd2dba9b1bb6b
+  metadata.gz: eb8056a7484abf9175b5ffd80e6ea1e7d33c5da783dccd7917ceb8aa4a83b98f2e4c73d7f39f6d6a082e76cfa7651a600b594bf7cac2a940145ba39fec6eb904
+  data.tar.gz: 532ffc21be392c5a53c2a2debd1249aa1a1ad05e48b366eae729da50843993b88538e388f736d16605e3348929198cebb0d6e0081fa92705eb2ff3800aa36627

data/.gitattributes CHANGED Viewed

@@ -1,2 +1,2 @@
-.multirepo.lock merge=ours
-.multirepo.meta merge=ours
+.multirepo.lock merge=ours
+.multirepo.meta merge=ours

data/.gitbugtraq CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/.multirepo.meta CHANGED Viewed

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

data/.rspec CHANGED Viewed

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

data/.rubocop.yml CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,43 +1,48 @@
-## Releases
-To install betas run `[sudo] gem install git-multirepo --pre`
-## 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.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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,42 +1,42 @@
-PATH
-  remote: .
-  specs:
-    git-multirepo (1.0.0.beta38)
-      claide (~> 0.8, >= 0.8.0)
-      colored (~> 1.2)
-      os (~> 0.9.6)
-      ruby-graphviz (~> 1.2.1)
-      terminal-table (~> 1.4.5)
-GEM
-  remote: https://rubygems.org/
-  specs:
-    claide (0.8.1)
-    colored (1.2)
-    diff-lcs (1.2.5)
-    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)
-    ruby-graphviz (1.2.2)
-    terminal-table (1.4.5)
-PLATFORMS
-  ruby
-  x64-mingw32
-DEPENDENCIES
-  bundler (~> 1.7)
-  git-multirepo!
-  rake (~> 10.0)
-  rspec (~> 3.1.0)
+PATH
+  remote: .
+  specs:
+    git-multirepo (1.0.0.beta38)
+      claide (~> 0.8, >= 0.8.0)
+      colored (~> 1.2)
+      os (~> 0.9.6)
+      ruby-graphviz (~> 1.2.1)
+      terminal-table (~> 1.4.5)
+GEM
+  remote: https://rubygems.org/
+  specs:
+    claide (0.8.1)
+    colored (1.2)
+    diff-lcs (1.2.5)
+    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)
+    ruby-graphviz (1.2.2)
+    terminal-table (1.4.5)
+PLATFORMS
+  ruby
+  x64-mingw32
+DEPENDENCIES
+  bundler (~> 1.7)
+  git-multirepo!
+  rake (~> 10.0)
+  rspec (~> 3.1.0)