RubyGems - git-multirepo - Versions diffs - 1.0.0.beta45 → 1.0.0.beta46 - Mend

git-multirepo 1.0.0.beta45 → 1.0.0.beta46

Files changed (68) hide show

checksums.yaml +4 -4
data/.gitattributes +2 -2
data/.gitbugtraq +3 -3
data/.gitignore +38 -38
data/.multirepo +21 -21
data/.multirepo.lock +26 -26
data/.multirepo.meta +2 -2
data/.rspec +2 -2
data/Gemfile +4 -4
data/Gemfile.lock +42 -42
data/LICENSE +22 -22
data/README.md +154 -144
data/Rakefile +2 -2
data/bin/multi +10 -10
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/commands.rb +14 -14
data/lib/git-multirepo.rb +2 -2
data/lib/info.rb +4 -4
data/lib/multirepo/commands/add-command.rb +50 -50
data/lib/multirepo/commands/branch-command.rb +81 -81
data/lib/multirepo/commands/checkout-command.rb +119 -119
data/lib/multirepo/commands/clone-command.rb +67 -67
data/lib/multirepo/commands/command.rb +89 -89
data/lib/multirepo/commands/do-command.rb +102 -100
data/lib/multirepo/commands/graph-command.rb +42 -42
data/lib/multirepo/commands/init-command.rb +119 -119
data/lib/multirepo/commands/inspect-command.rb +38 -39
data/lib/multirepo/commands/install-command.rb +146 -137
data/lib/multirepo/commands/merge-command.rb +225 -225
data/lib/multirepo/commands/open-command.rb +56 -55
data/lib/multirepo/commands/remove-command.rb +47 -47
data/lib/multirepo/commands/uninit-command.rb +17 -17
data/lib/multirepo/commands/update-command.rb +55 -55
data/lib/multirepo/config.rb +15 -15
data/lib/multirepo/files/config-entry.rb +38 -38
data/lib/multirepo/files/config-file.rb +45 -45
data/lib/multirepo/files/lock-entry.rb +28 -28
data/lib/multirepo/files/lock-file.rb +55 -55
data/lib/multirepo/files/meta-file.rb +40 -40
data/lib/multirepo/files/tracking-file.rb +8 -8
data/lib/multirepo/files/tracking-files.rb +46 -46
data/lib/multirepo/git/branch.rb +31 -31
data/lib/multirepo/git/change.rb +10 -10
data/lib/multirepo/git/commit.rb +6 -6
data/lib/multirepo/git/git-runner.rb +46 -46
data/lib/multirepo/git/git.rb +9 -9
data/lib/multirepo/git/ref.rb +37 -37
data/lib/multirepo/git/remote.rb +16 -16
data/lib/multirepo/git/repo.rb +122 -122
data/lib/multirepo/hooks/post-commit-hook.rb +22 -22
data/lib/multirepo/hooks/pre-commit-hook.rb +34 -34
data/lib/multirepo/logic/dependency.rb +5 -5
data/lib/multirepo/logic/merge-descriptor.rb +94 -94
data/lib/multirepo/logic/node.rb +71 -71
data/lib/multirepo/logic/performer.rb +56 -56
data/lib/multirepo/logic/revision-selector.rb +34 -34
data/lib/multirepo/multirepo-exception.rb +5 -5
data/lib/multirepo/utility/console.rb +51 -51
data/lib/multirepo/utility/runner.rb +34 -34
data/lib/multirepo/utility/utils.rb +94 -94
data/resources/.gitconfig +2 -2
data/resources/post-commit +5 -5
data/resources/pre-commit +5 -5
data/spec/integration/init_spec.rb +18 -18
data/spec/spec_helper.rb +89 -89
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 361b68527d2c9b898a62bedfaa471f44e2f6efef
-  data.tar.gz: 1eed81c527c179d8048c088feb7be89615bfef32
+  metadata.gz: 806e480c091c8f8428f1df498efc838c4c8c3177
+  data.tar.gz: cb5be2b5d4e2c69596f1522f890f91e079599211
 SHA512:
-  metadata.gz: 23212fa9a47c6c53096c96796c62f529892d5151673399c0335be6065cf4a7bc9ef57d762a460046709e24290f0aa9bc8d9f7970518da6a165f34779ebff84e7
-  data.tar.gz: ad3f69b29252e51876fcd5d9972bf84eb709e9e81a37a5b2800c47e66777e9236d77aa4fd3d0f38fb6736b5be5f1b695c90355e60ad4948a87ad89c1de2a6b97
+  metadata.gz: a554908bde6b65d0d78408932af1779f7752d353be0762d3903f264293e71556eb37f07cb0528424acc6cdec1f44043659545e7460b46ec0d0eec76980f88fce
+  data.tar.gz: 0a6523358b1803bb599a59953dec0131eb2385871cbadd714c25bcdf1911b99476e180840e1e5ac0bfb69d20c5d627ef0a2918b00ece70dd10473bad6046c4c7

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

@@ -1,21 +1,21 @@
----
-- !ruby/object:MultiRepo::ConfigEntry
-  id: e27695e9-e21d-4ad1-81b8-0ed587574c38
-  path: ../git-multirepo-dummy/
-  url: git@github.com:fortinmike/git-multirepo-dummy.git
-- !ruby/object:MultiRepo::ConfigEntry
-  id: dcb567d6-7456-494a-b7b5-adc208a87f2f
-  path: ../git-multirepo-dummy-dep1/
-  url: git@github.com:fortinmike/git-multirepo-dummy-dep1.git
-- !ruby/object:MultiRepo::ConfigEntry
-  id: e0dc3ed7-4b6b-4052-8783-668b405e4941
-  path: ../git-multirepo-dummy-dep2/
-  url: git@github.com:fortinmike/git-multirepo-dummy-dep2.git
-- !ruby/object:MultiRepo::ConfigEntry
-  id: ad6472a5-7238-447f-a54e-50f50197e21e
-  path: ../git-multirepo-migrations/
-  url: git@github.com:fortinmike/git-multirepo-migrations.git
-- !ruby/object:MultiRepo::ConfigEntry
-  id: 6575a4fd-fe53-4c7b-bb79-bc6412df18e3
-  path: ../git-multirepo.gh-pages
-  url: git@github.com:fortinmike/git-multirepo.git
+---
+- !ruby/object:MultiRepo::ConfigEntry
+  id: e27695e9-e21d-4ad1-81b8-0ed587574c38
+  path: ../git-multirepo-dummy/
+  url: git@github.com:fortinmike/git-multirepo-dummy.git
+- !ruby/object:MultiRepo::ConfigEntry
+  id: dcb567d6-7456-494a-b7b5-adc208a87f2f
+  path: ../git-multirepo-dummy-dep1/
+  url: git@github.com:fortinmike/git-multirepo-dummy-dep1.git
+- !ruby/object:MultiRepo::ConfigEntry
+  id: e0dc3ed7-4b6b-4052-8783-668b405e4941
+  path: ../git-multirepo-dummy-dep2/
+  url: git@github.com:fortinmike/git-multirepo-dummy-dep2.git
+- !ruby/object:MultiRepo::ConfigEntry
+  id: ad6472a5-7238-447f-a54e-50f50197e21e
+  path: ../git-multirepo-migrations/
+  url: git@github.com:fortinmike/git-multirepo-migrations.git
+- !ruby/object:MultiRepo::ConfigEntry
+  id: 6575a4fd-fe53-4c7b-bb79-bc6412df18e3
+  path: ../git-multirepo.gh-pages
+  url: git@github.com:fortinmike/git-multirepo.git

data/.multirepo.lock CHANGED Viewed

@@ -1,26 +1,26 @@
----
-- !ruby/object:MultiRepo::LockEntry
-  name: git-multirepo-dummy
-  id: e27695e9-e21d-4ad1-81b8-0ed587574c38
-  head: 210de2d6bef8ceb4dd4c8cd95c502c00e49d029a
-  branch: master
-- !ruby/object:MultiRepo::LockEntry
-  name: git-multirepo-dummy-dep1
-  id: dcb567d6-7456-494a-b7b5-adc208a87f2f
-  head: 3e589d4d391beee411c292a3ce20d06f51fa3c3a
-  branch: HEAD
-- !ruby/object:MultiRepo::LockEntry
-  name: git-multirepo-dummy-dep2
-  id: e0dc3ed7-4b6b-4052-8783-668b405e4941
-  head: 1b8465fcd4f9e5821640bb45ad8c22c960b64517
-  branch: HEAD
-- !ruby/object:MultiRepo::LockEntry
-  name: git-multirepo-migrations
-  id: ad6472a5-7238-447f-a54e-50f50197e21e
-  head: 15ee465101c368193a052cd1f5b0c5accc6fb9fa
-  branch: master
-- !ruby/object:MultiRepo::LockEntry
-  name: git-multirepo.gh-pages
-  id: 6575a4fd-fe53-4c7b-bb79-bc6412df18e3
-  head: e73bbaa0b3de97b1a2aea223d6f69f5e31ceb285
-  branch: gh-pages
+---
+- !ruby/object:MultiRepo::LockEntry
+  name: git-multirepo-dummy
+  id: e27695e9-e21d-4ad1-81b8-0ed587574c38
+  head: 210de2d6bef8ceb4dd4c8cd95c502c00e49d029a
+  branch: master
+- !ruby/object:MultiRepo::LockEntry
+  name: git-multirepo-dummy-dep1
+  id: dcb567d6-7456-494a-b7b5-adc208a87f2f
+  head: 3e589d4d391beee411c292a3ce20d06f51fa3c3a
+  branch: master
+- !ruby/object:MultiRepo::LockEntry
+  name: git-multirepo-dummy-dep2
+  id: e0dc3ed7-4b6b-4052-8783-668b405e4941
+  head: 1b8465fcd4f9e5821640bb45ad8c22c960b64517
+  branch: master
+- !ruby/object:MultiRepo::LockEntry
+  name: git-multirepo-migrations
+  id: ad6472a5-7238-447f-a54e-50f50197e21e
+  head: 15ee465101c368193a052cd1f5b0c5accc6fb9fa
+  branch: master
+- !ruby/object:MultiRepo::LockEntry
+  name: git-multirepo.gh-pages
+  id: 6575a4fd-fe53-4c7b-bb79-bc6412df18e3
+  head: e73bbaa0b3de97b1a2aea223d6f69f5e31ceb285
+  branch: gh-pages

data/.multirepo.meta CHANGED Viewed

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

data/.rspec CHANGED Viewed

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

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)

data/LICENSE CHANGED Viewed

@@ -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.