avm-tools 0.47.0 → 0.52.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (379) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +8 -0
  3. data/lib/avm/data/package/dump.rb +1 -1
  4. data/lib/avm/git/auto_commit_path.rb +49 -0
  5. data/lib/avm/git/issue/complete.rb +1 -1
  6. data/lib/avm/git/issue/complete/_test.rb +17 -3
  7. data/lib/avm/git/issue/complete/_validations.rb +9 -14
  8. data/lib/avm/git/issue/complete/validation.rb +31 -0
  9. data/lib/avm/git/revision_test.rb +2 -2
  10. data/lib/avm/instances/configuration/_rubocop.rb +1 -1
  11. data/lib/avm/instances/configuration/_tests.rb +14 -0
  12. data/lib/avm/rails.rb +9 -0
  13. data/lib/avm/rails/runners.rb +11 -0
  14. data/lib/avm/rails/runners/bundle.rb +35 -0
  15. data/lib/avm/rails/runners/runner.rb +48 -0
  16. data/lib/avm/ruby.rb +0 -20
  17. data/lib/avm/ruby/gems.rb +11 -0
  18. data/lib/avm/ruby/gems/generator.rb +168 -0
  19. data/lib/avm/ruby/rubocop/_gemfile.rb +1 -1
  20. data/lib/avm/stereotypes/eac_redmine_base0/deploy.rb +2 -2
  21. data/lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb +1 -1
  22. data/lib/avm/tools/runner/eac_rails_base0/bundle.rb +14 -0
  23. data/lib/avm/tools/runner/eac_rails_base0/runner.rb +14 -0
  24. data/lib/avm/tools/runner/eac_redmine_base0/bundle.rb +2 -24
  25. data/lib/avm/tools/runner/eac_redmine_base0/runner.rb +2 -31
  26. data/lib/avm/tools/runner/files/format.rb +1 -1
  27. data/lib/avm/tools/runner/git.rb +1 -1
  28. data/lib/avm/tools/runner/git/auto_commit.rb +56 -0
  29. data/lib/avm/tools/runner/git/deploy.rb +2 -2
  30. data/lib/avm/tools/runner/ruby/gems.rb +22 -0
  31. data/lib/avm/tools/runner/ruby/gems/generate.rb +50 -0
  32. data/lib/avm/tools/version.rb +1 -1
  33. data/lib/eac_launcher/git/base.rb +11 -5
  34. data/lib/eac_launcher/git/base/class_methods.rb +26 -0
  35. data/lib/eac_launcher/git/base/dirty_files.rb +30 -0
  36. data/lib/eac_launcher/git/base/remotes.rb +38 -0
  37. data/lib/eac_launcher/git/base/underlying.rb +10 -0
  38. data/template/avm/ruby/gems/generator/gemspec.template +18 -0
  39. data/template/avm/ruby/gems/generator/root_lib.template +7 -0
  40. data/template/avm/ruby/gems/generator/static/Gemfile +5 -0
  41. data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb +7 -0
  42. data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb +100 -0
  43. data/template/avm/ruby/gems/generator/version.template +5 -0
  44. data/vendor/gems/eac_ruby_utils/Gemfile +16 -0
  45. data/vendor/gems/eac_ruby_utils/MIT-LICENCE +16 -0
  46. data/vendor/gems/eac_ruby_utils/README.rdoc +3 -0
  47. data/vendor/gems/eac_ruby_utils/eac_ruby_utils.gemspec +24 -0
  48. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils.rb +6 -0
  49. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/arguments_consumer.rb +81 -0
  50. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/by_reference.rb +23 -0
  51. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb +68 -0
  52. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb +133 -0
  53. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/configs.rb +74 -0
  54. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb +66 -0
  55. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console.rb +5 -0
  56. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb +135 -0
  57. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb +39 -0
  58. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb +18 -0
  59. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_doc.rb +25 -0
  60. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_settings.rb +19 -0
  61. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb +139 -0
  62. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker.rb +133 -0
  63. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_class_methods.rb +39 -0
  64. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_constants.rb +14 -0
  65. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/list.rb +63 -0
  66. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/node.rb +26 -0
  67. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/contextualizable.rb +16 -0
  68. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/core_ext.rb +5 -0
  69. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/custom_format.rb +53 -0
  70. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs.rb +23 -0
  71. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/base_env.rb +28 -0
  72. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb +168 -0
  73. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb +46 -0
  74. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb +51 -0
  75. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/file.rb +22 -0
  76. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/local_env.rb +17 -0
  77. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/process.rb +19 -0
  78. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/spawn.rb +32 -0
  79. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env.rb +72 -0
  80. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb +53 -0
  81. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs.rb +9 -0
  82. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/extname.rb +30 -0
  83. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb +52 -0
  84. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/directory.rb +16 -0
  85. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/file.rb +34 -0
  86. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/traversable.rb +47 -0
  87. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb +74 -0
  88. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs_cache.rb +11 -0
  89. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable.rb +17 -0
  90. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/class_methods.rb +14 -0
  91. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/instance_methods.rb +30 -0
  92. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/integer_list.rb +23 -0
  93. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb +93 -0
  94. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/lists.rb +59 -0
  95. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/string_list.rb +19 -0
  96. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/symbol_list.rb +19 -0
  97. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb +38 -0
  98. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/on_clean_ruby_environment.rb +12 -0
  99. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/options_consumer.rb +62 -0
  100. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patch.rb +11 -0
  101. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches.rb +4 -0
  102. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/class.rb +4 -0
  103. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/class/common_constructor.rb +9 -0
  104. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable.rb +4 -0
  105. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable/boolean_combinations.rb +45 -0
  106. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash.rb +5 -0
  107. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/options_consumer.rb +10 -0
  108. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/sym_keys_hash.rb +10 -0
  109. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module.rb +4 -0
  110. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/common_concern.rb +10 -0
  111. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/console_speaker.rb +10 -0
  112. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/listable.rb +10 -0
  113. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb +9 -0
  114. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb +9 -0
  115. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb +10 -0
  116. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb +5 -0
  117. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb +14 -0
  118. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb +19 -0
  119. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb +16 -0
  120. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb +15 -0
  121. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb +4 -0
  122. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb +9 -0
  123. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb +4 -0
  124. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb +16 -0
  125. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb +4 -0
  126. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb +5 -0
  127. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time/local_time_zone.rb +25 -0
  128. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb +93 -0
  129. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb +54 -0
  130. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb +9 -0
  131. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb +38 -0
  132. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec/stubbed_ssh.rb +44 -0
  133. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb +9 -0
  134. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb +31 -0
  135. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb +26 -0
  136. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb +65 -0
  137. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +42 -0
  138. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates.rb +9 -0
  139. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/directory.rb +110 -0
  140. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/file.rb +50 -0
  141. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/searcher.rb +55 -0
  142. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_not_found_error.rb +7 -0
  143. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers.rb +25 -0
  144. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/base.rb +23 -0
  145. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/entries_reader.rb +25 -0
  146. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/generic.rb +25 -0
  147. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/hash.rb +29 -0
  148. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/version.rb +5 -0
  149. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb +96 -0
  150. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/arguments_consumer_spec.rb +17 -0
  151. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb +42 -0
  152. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb +37 -0
  153. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/configs_spec.rb +31 -0
  154. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/configs_spec.rb +14 -0
  155. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/docopt_runner_spec.rb +136 -0
  156. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/speaker_spec.rb +36 -0
  157. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/custom_format_spec.rb +60 -0
  158. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/executable_spec.rb +37 -0
  159. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/ssh_env_spec.rb +25 -0
  160. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb +32 -0
  161. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb +18 -0
  162. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp/temp_spec.rb +12 -0
  163. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp_spec.rb +52 -0
  164. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb +212 -0
  165. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb +45 -0
  166. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerable/boolean_combinations_spec.rb +39 -0
  167. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/options_consumer_spec.rb +17 -0
  168. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/sym_keys_hash_spec.rb +13 -0
  169. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/console_speaker_spec.rb +13 -0
  170. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/listable_spec.rb +13 -0
  171. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/simple_cache_spec.rb +13 -0
  172. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/if_present_spec.rb +13 -0
  173. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec.rb +23 -0
  174. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec_files/path/my_stub_with_template +1 -0
  175. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/basename_sub_spec.rb +17 -0
  176. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/paths_hash_spec.rb +49 -0
  177. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec.rb +19 -0
  178. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_module_a.rb +6 -0
  179. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_not_module.rb +6 -0
  180. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb +22 -0
  181. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb +46 -0
  182. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +102 -0
  183. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec.rb +35 -0
  184. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/expected_content +2 -0
  185. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/source.template +2 -0
  186. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec.rb +30 -0
  187. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file1.template +1 -0
  188. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file2 +1 -0
  189. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path2/subdir1/file3.template +1 -0
  190. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/yaml_spec.rb +75 -0
  191. data/vendor/gems/eac_ruby_utils/spec/locales/pt-BR.yml +55 -0
  192. data/vendor/gems/eac_ruby_utils/spec/rubocop_check_spec.rb +7 -0
  193. data/vendor/gems/eac_ruby_utils/spec/spec_helper.rb +12 -0
  194. data/vendor/git-subrepo/Changes +51 -0
  195. data/vendor/git-subrepo/Intro.pod +508 -0
  196. data/vendor/git-subrepo/License +21 -0
  197. data/vendor/git-subrepo/Makefile +80 -0
  198. data/vendor/git-subrepo/Meta +28 -0
  199. data/vendor/git-subrepo/ReadMe.pod +695 -0
  200. data/vendor/git-subrepo/doc/comparison.swim +35 -0
  201. data/vendor/git-subrepo/doc/git-subrepo.swim +611 -0
  202. data/vendor/git-subrepo/doc/intro-to-subrepo.swim +387 -0
  203. data/vendor/git-subrepo/ext/bashplus/Changes +15 -0
  204. data/vendor/git-subrepo/ext/bashplus/License +21 -0
  205. data/vendor/git-subrepo/ext/bashplus/Makefile +45 -0
  206. data/vendor/git-subrepo/ext/bashplus/Meta +28 -0
  207. data/vendor/git-subrepo/ext/bashplus/ReadMe.pod +77 -0
  208. data/vendor/git-subrepo/ext/bashplus/bin/bash+ +43 -0
  209. data/vendor/git-subrepo/ext/bashplus/doc/bash+.swim +61 -0
  210. data/vendor/git-subrepo/ext/bashplus/lib/bash+.bash +92 -0
  211. data/vendor/git-subrepo/ext/bashplus/man/man1/bash+.1 +134 -0
  212. data/vendor/git-subrepo/ext/bashplus/man/man3/bash+.3 +134 -0
  213. data/vendor/git-subrepo/ext/bashplus/test/base.t +12 -0
  214. data/vendor/git-subrepo/ext/bashplus/test/fcopy.t +22 -0
  215. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/bar.bash +3 -0
  216. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/foo.bash +3 -0
  217. data/vendor/git-subrepo/ext/bashplus/test/source-bash+-std.t +18 -0
  218. data/vendor/git-subrepo/ext/bashplus/test/source-bash+.t +23 -0
  219. data/vendor/git-subrepo/ext/bashplus/test/test.bash +70 -0
  220. data/vendor/git-subrepo/ext/bashplus/test/use.t +19 -0
  221. data/vendor/git-subrepo/ext/test-more-bash/Changes +15 -0
  222. data/vendor/git-subrepo/ext/test-more-bash/License +21 -0
  223. data/vendor/git-subrepo/ext/test-more-bash/Makefile +20 -0
  224. data/vendor/git-subrepo/ext/test-more-bash/Meta +30 -0
  225. data/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod +115 -0
  226. data/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim +89 -0
  227. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes +15 -0
  228. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License +21 -0
  229. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile +45 -0
  230. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta +28 -0
  231. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod +77 -0
  232. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+ +43 -0
  233. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim +61 -0
  234. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash +92 -0
  235. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +134 -0
  236. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +134 -0
  237. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/base.t +12 -0
  238. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/fcopy.t +22 -0
  239. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/bar.bash +3 -0
  240. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/foo.bash +3 -0
  241. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +18 -0
  242. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+.t +23 -0
  243. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/test.bash +70 -0
  244. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/use.t +19 -0
  245. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Changes +15 -0
  246. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/License +21 -0
  247. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Makefile +37 -0
  248. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Meta +28 -0
  249. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +66 -0
  250. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +48 -0
  251. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +153 -0
  252. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +119 -0
  253. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +13 -0
  254. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/done.t +10 -0
  255. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail.t +20 -0
  256. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +15 -0
  257. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +9 -0
  258. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/pass.t +9 -0
  259. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/plan.t +10 -0
  260. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/skip_all.t +20 -0
  261. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/tap.t +13 -0
  262. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/bail.t +14 -0
  263. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail.t +7 -0
  264. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail_fast.t +12 -0
  265. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-init.t +8 -0
  266. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-plan.t +9 -0
  267. data/vendor/git-subrepo/ext/test-more-bash/lib/test/more.bash +95 -0
  268. data/vendor/git-subrepo/ext/test-more-bash/man/man3/test-more.3 +173 -0
  269. data/vendor/git-subrepo/ext/test-more-bash/test/fail.t +20 -0
  270. data/vendor/git-subrepo/ext/test-more-bash/test/more.t +20 -0
  271. data/vendor/git-subrepo/ext/test-more-bash/test/pass.t +9 -0
  272. data/vendor/git-subrepo/ext/test-more-bash/test/setup +8 -0
  273. data/vendor/git-subrepo/ext/test-more-bash/test/skip_all.t +11 -0
  274. data/vendor/git-subrepo/ext/test-more-bash/test/test/fail1.t +12 -0
  275. data/vendor/git-subrepo/ext/test-more-bash/test/test/skip_all.t +10 -0
  276. data/vendor/git-subrepo/lib/git-subrepo +1891 -0
  277. data/vendor/git-subrepo/lib/git-subrepo.d/help-functions.bash +343 -0
  278. data/vendor/git-subrepo/man/man1/git-subrepo.1 +746 -0
  279. data/vendor/git-subrepo/note/0.4.0 +12 -0
  280. data/vendor/git-subrepo/note/AllGitCmds +148 -0
  281. data/vendor/git-subrepo/note/Cases +32 -0
  282. data/vendor/git-subrepo/note/Commands +33 -0
  283. data/vendor/git-subrepo/note/Dags +199 -0
  284. data/vendor/git-subrepo/note/Gists +7 -0
  285. data/vendor/git-subrepo/note/Links +25 -0
  286. data/vendor/git-subrepo/note/Plugins +10 -0
  287. data/vendor/git-subrepo/note/Spec +39 -0
  288. data/vendor/git-subrepo/note/Story1 +57 -0
  289. data/vendor/git-subrepo/note/ToDo +55 -0
  290. data/vendor/git-subrepo/note/design.swim +137 -0
  291. data/vendor/git-subrepo/note/design2.swim +85 -0
  292. data/vendor/git-subrepo/note/init-test +38 -0
  293. data/vendor/git-subrepo/note/pull-dance.txt +18 -0
  294. data/vendor/git-subrepo/note/recreate-rebase-conflict.sh +56 -0
  295. data/vendor/git-subrepo/note/subtree-rebase-fail-example/test.bash +29 -0
  296. data/vendor/git-subrepo/note/test-subrepo-push.sh +69 -0
  297. data/vendor/git-subrepo/note/test.sh +58 -0
  298. data/vendor/git-subrepo/pkg/bin/generate-completion.pl +210 -0
  299. data/vendor/git-subrepo/pkg/bin/generate-help-functions.pl +89 -0
  300. data/vendor/git-subrepo/share/completion.bash +42 -0
  301. data/vendor/git-subrepo/share/enable-completion.sh +50 -0
  302. data/vendor/git-subrepo/share/git-completion.bash +2738 -0
  303. data/vendor/git-subrepo/share/zsh-completion/_git-subrepo +82 -0
  304. data/vendor/git-subrepo/test/branch-all.t +41 -0
  305. data/vendor/git-subrepo/test/branch-rev-list-one-path.t +43 -0
  306. data/vendor/git-subrepo/test/branch-rev-list.t +47 -0
  307. data/vendor/git-subrepo/test/branch.t +52 -0
  308. data/vendor/git-subrepo/test/clean.t +43 -0
  309. data/vendor/git-subrepo/test/clone-annotated-tag.t +45 -0
  310. data/vendor/git-subrepo/test/clone.t +107 -0
  311. data/vendor/git-subrepo/test/compile.t +19 -0
  312. data/vendor/git-subrepo/test/config.t +58 -0
  313. data/vendor/git-subrepo/test/encode.t +91 -0
  314. data/vendor/git-subrepo/test/error.t +171 -0
  315. data/vendor/git-subrepo/test/fetch.t +43 -0
  316. data/vendor/git-subrepo/test/gitignore.t +61 -0
  317. data/vendor/git-subrepo/test/init.t +64 -0
  318. data/vendor/git-subrepo/test/issue29.t +98 -0
  319. data/vendor/git-subrepo/test/issue95.t +98 -0
  320. data/vendor/git-subrepo/test/issue96.t +96 -0
  321. data/vendor/git-subrepo/test/pull-all.t +38 -0
  322. data/vendor/git-subrepo/test/pull-merge.t +113 -0
  323. data/vendor/git-subrepo/test/pull-message.t +88 -0
  324. data/vendor/git-subrepo/test/pull-new-branch.t +58 -0
  325. data/vendor/git-subrepo/test/pull-ours.t +90 -0
  326. data/vendor/git-subrepo/test/pull-theirs.t +82 -0
  327. data/vendor/git-subrepo/test/pull-twice.t +44 -0
  328. data/vendor/git-subrepo/test/pull.t +99 -0
  329. data/vendor/git-subrepo/test/push-after-init.t +51 -0
  330. data/vendor/git-subrepo/test/push-force.t +56 -0
  331. data/vendor/git-subrepo/test/push-new-branch.t +61 -0
  332. data/vendor/git-subrepo/test/push-no-changes.t +29 -0
  333. data/vendor/git-subrepo/test/push-squash.t +56 -0
  334. data/vendor/git-subrepo/test/push.t +176 -0
  335. data/vendor/git-subrepo/test/reclone.t +45 -0
  336. data/vendor/git-subrepo/test/repo/bar/HEAD +1 -0
  337. data/vendor/git-subrepo/test/repo/bar/config +4 -0
  338. data/vendor/git-subrepo/test/repo/bar/objects/1f/0c4b264caed0126814a0ede851a1e0b4e16ae6 +0 -0
  339. data/vendor/git-subrepo/test/repo/bar/objects/87/46903fdb1b9c2101377880125917c2e05b4d69 +0 -0
  340. data/vendor/git-subrepo/test/repo/bar/objects/94/c86ffc745232d89f78c6f895e11e71272518db +0 -0
  341. data/vendor/git-subrepo/test/repo/bar/objects/c6/76c57b6576743fa56278527aa60ebd2e202a7c +0 -0
  342. data/vendor/git-subrepo/test/repo/bar/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  343. data/vendor/git-subrepo/test/repo/bar/objects/f6/2a8ff3feadf39b0a98f1a86ec6d1eb33858ee9 +0 -0
  344. data/vendor/git-subrepo/test/repo/bar/refs/heads/master +1 -0
  345. data/vendor/git-subrepo/test/repo/bar/refs/tags/A +1 -0
  346. data/vendor/git-subrepo/test/repo/foo/HEAD +1 -0
  347. data/vendor/git-subrepo/test/repo/foo/config +4 -0
  348. data/vendor/git-subrepo/test/repo/foo/objects/a0/f4cdaaf533a936296cdebbed8206c3b9ededa8 +0 -0
  349. data/vendor/git-subrepo/test/repo/foo/objects/e2/1291a1ad392a9d4c51dd9586804f1467b28afd +0 -0
  350. data/vendor/git-subrepo/test/repo/foo/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  351. data/vendor/git-subrepo/test/repo/foo/refs/heads/master +1 -0
  352. data/vendor/git-subrepo/test/repo/init/HEAD +1 -0
  353. data/vendor/git-subrepo/test/repo/init/config +5 -0
  354. data/vendor/git-subrepo/test/repo/init/objects/11/523f5dcf03b4c89b592dc8a3d0308f68da2386 +0 -0
  355. data/vendor/git-subrepo/test/repo/init/objects/14/2addf8ec5f37334e837440122c62f2c68a29ad +0 -0
  356. data/vendor/git-subrepo/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09 +2 -0
  357. data/vendor/git-subrepo/test/repo/init/objects/3d/918c6901c02f43af5d31779dd5e1f9166aeb36 +0 -0
  358. data/vendor/git-subrepo/test/repo/init/objects/3e/4cb596066dce63ba4d047abddb677389b65e19 +0 -0
  359. data/vendor/git-subrepo/test/repo/init/objects/4b/6e53022e7a04f07887697e4f3d7c377fd9822b +0 -0
  360. data/vendor/git-subrepo/test/repo/init/objects/58/931fc1bd559b59c41ea738fc7ad04f9ad01bd3 +0 -0
  361. data/vendor/git-subrepo/test/repo/init/objects/5e/c0c28e1b806f25efdca18fcf7a74b49c3755bd +0 -0
  362. data/vendor/git-subrepo/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2 +1 -0
  363. data/vendor/git-subrepo/test/repo/init/objects/80/2d5edbd5e1cb7fca82b5bd38e7c8a0a496fb20 +0 -0
  364. data/vendor/git-subrepo/test/repo/init/objects/94/7b3d714c38791e95ad6f928b48c98bb8708acd +0 -0
  365. data/vendor/git-subrepo/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a +1 -0
  366. data/vendor/git-subrepo/test/repo/init/objects/b1/5f4a7666baf40d949548ead946a3370e273479 +0 -0
  367. data/vendor/git-subrepo/test/repo/init/objects/c3/ee8978c4c5d84c3b7d00ba8e5906933d027882 +0 -0
  368. data/vendor/git-subrepo/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa +3 -0
  369. data/vendor/git-subrepo/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626 +2 -0
  370. data/vendor/git-subrepo/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135 +2 -0
  371. data/vendor/git-subrepo/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1 +1 -0
  372. data/vendor/git-subrepo/test/repo/init/objects/f1/cc1a657b2e805c400f5dcaaa76bd29c6178b1b +0 -0
  373. data/vendor/git-subrepo/test/repo/init/refs/heads/master +1 -0
  374. data/vendor/git-subrepo/test/setup +205 -0
  375. data/vendor/git-subrepo/test/status.t +68 -0
  376. data/vendor/git-subrepo/test/submodule.t +45 -0
  377. metadata +361 -14
  378. data/lib/avm/patches/eac_launcher_git_base.rb +0 -77
  379. data/lib/eac_launcher/git/base/_remotes.rb +0 -36
@@ -0,0 +1,64 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ git clone $UPSTREAM/init $OWNER/init &>/dev/null
10
+
11
+ gitrepo=$OWNER/init/doc/.gitrepo
12
+
13
+ # Test that the initial repo look ok:
14
+ {
15
+ test-exists \
16
+ "$OWNER/init/.git/" \
17
+ "$OWNER/init/ReadMe" \
18
+ "$OWNER/init/doc/" \
19
+ "$OWNER/init/doc/init.swim" \
20
+ "!$gitrepo"
21
+ }
22
+
23
+ output="$(
24
+ cd "$OWNER/init"
25
+ git subrepo init doc
26
+ )"
27
+
28
+ is "$output" "Subrepo created from 'doc' (with no remote)." \
29
+ 'Command output is correct'
30
+
31
+ {
32
+ test-exists \
33
+ "$gitrepo"
34
+ }
35
+
36
+ # Test init/doc/.gitrepo file contents:
37
+ {
38
+ init_clone_commit="$(cd $OWNER/init; git rev-parse HEAD^)"
39
+ test-gitrepo-comment-block
40
+ test-gitrepo-field "remote" "none"
41
+ test-gitrepo-field "branch" "master"
42
+ test-gitrepo-field "commit" ""
43
+ test-gitrepo-field "parent" ""
44
+ test-gitrepo-field "method" "merge"
45
+ test-gitrepo-field "cmdver" "`git subrepo --version`"
46
+ }
47
+
48
+ rm -fr "$OWNER/init"
49
+ git clone $UPSTREAM/init $OWNER/init &>/dev/null
50
+ (
51
+ cd "$OWNER/init"
52
+ git subrepo init doc -r git@github.com:user/repo -b foo -M rebase
53
+ ) >/dev/null
54
+
55
+ test-gitrepo-field "remote" "git@github.com:user/repo"
56
+ test-gitrepo-field "branch" "foo"
57
+ test-gitrepo-field "commit" ""
58
+ test-gitrepo-field "parent" ""
59
+ test-gitrepo-field "method" "rebase"
60
+ test-gitrepo-field "cmdver" "`git subrepo --version`"
61
+
62
+ done_testing
63
+
64
+ teardown
@@ -0,0 +1,98 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ # if [[ $1 == ReRun ]]; then
10
+ # set -x
11
+ # else
12
+ # "$0" ReRun 2>&1 | tee log
13
+ # exit 0
14
+ # fi
15
+
16
+ cd "$TMP"
17
+
18
+ # Make 3 new repos:
19
+ (
20
+ mkdir share main1 main2
21
+ git init share
22
+ git init main1
23
+ git init main2
24
+ ) > /dev/null
25
+
26
+ # Add an empty 'readme' to the share repo:
27
+ (
28
+ cd share
29
+ echo '* text eol=lf' > .gitattributes
30
+ touch readme
31
+ git add readme .gitattributes
32
+ git commit -m "Initial share"
33
+ # To push into here later we must not have working copy on master branch:
34
+ git checkout -b temp
35
+ ) &> /dev/null
36
+
37
+ # `subrepo clone` the share repo into main1:
38
+ (
39
+ cd main1
40
+ touch main1
41
+ git add main1
42
+ git commit -m "Initial main1"
43
+ git subrepo clone ../share share -b master
44
+ ) > /dev/null
45
+
46
+ # `subrepo clone` the share repo into main2:
47
+ (
48
+ cd main2
49
+ touch main2
50
+ git add main2
51
+ git commit -m "Initial main2"
52
+ git subrepo clone ../share share -b master
53
+ ) > /dev/null
54
+
55
+
56
+ # Make a change to the main1 subrepo and push it:
57
+ msg_main1="main1 initial add to subrepo"
58
+ ( set -x
59
+ cd main1
60
+ echo "$msg_main1" >> share/readme
61
+ git add share/readme
62
+ git commit -m "$msg_main1"
63
+
64
+ git subrepo push share
65
+ ) &> /dev/null
66
+
67
+ ok "`! git:branch-exists "subrepo-push/share"`" \
68
+ "The subrepo-push/share branch was deleted after push"
69
+
70
+ # TODO Check the state of refs made
71
+
72
+ # Pull in the subrepo changes from above into main2.
73
+ # Make a local change to the main2 subrepo and push it:
74
+ msg_main2="main2 initial add to subrepo"
75
+ ( set -x
76
+ cd main2
77
+ git subrepo pull share
78
+ echo "$msg_main2" >> share/readme
79
+ git add share/readme
80
+ git commit -m "$msg_main2"
81
+
82
+ git subrepo push share
83
+ ) &> /dev/null || die
84
+
85
+ # Go back into main1 and pull the subrepo updates:
86
+ ( set -x
87
+ cd main1
88
+ git subrepo pull share
89
+ ) &> /dev/null || die
90
+
91
+ # The readme file should have both changes:
92
+ is "$(cat main1/share/readme)" \
93
+ "$msg_main1"$'\n'"$msg_main2" \
94
+ "The readme file in the share repo has both subrepo commits"
95
+
96
+ done_testing
97
+
98
+ teardown
@@ -0,0 +1,98 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ {
10
+ cd "$TMP"
11
+
12
+ # Make two new repos
13
+ (
14
+ mkdir host sub
15
+ git init host
16
+ git init sub
17
+ ) > /dev/null
18
+
19
+ # Initialize host repo
20
+ (
21
+ cd host
22
+ touch host
23
+ git add host
24
+ git commit -m "host initial commit"
25
+ ) > /dev/null
26
+
27
+ # Initialize sub repo
28
+ (
29
+ cd sub
30
+ git init
31
+ touch subrepo
32
+ git add subrepo
33
+ git commit -m "subrepo initial commit"
34
+ ) > /dev/null
35
+
36
+ # Make sub a subrepo of host
37
+ (
38
+ cd host
39
+ git subrepo clone ../sub sub
40
+ ) > /dev/null
41
+
42
+ # Create a branch in host and make some changes in it
43
+ (
44
+ cd host
45
+ git checkout -b feature
46
+ touch feature
47
+ git add feature
48
+ git commit -m "feature added"
49
+ git checkout master
50
+ ) &> /dev/null
51
+
52
+ # Commit directly to subrepo
53
+ (
54
+ cd sub
55
+ echo "direct change in sub" >> subrepo
56
+ git commit -a -m "direct change in sub"
57
+ ) > /dev/null
58
+
59
+ # pull subrepo changes
60
+ (
61
+ cd host
62
+ git subrepo pull sub
63
+ ) > /dev/null
64
+
65
+ # commit directly to subrepo
66
+ (
67
+ cd sub
68
+ echo "another direct change in sub" >> subrepo
69
+ git commit -a -m "another direct change in sub"
70
+ ) > /dev/null
71
+
72
+ # commit to host/sub
73
+ (
74
+ cd host
75
+ echo "change from host" >> sub/subrepo-host
76
+ git add sub/subrepo-host
77
+ git commit -m "change from host"
78
+ ) > /dev/null
79
+
80
+ # merge previously created feature branch
81
+ (
82
+ cd host
83
+ git merge --no-ff --no-edit feature
84
+ ) > /dev/null
85
+
86
+ # pull subrepo changes
87
+ # expected: successful pull without conflicts
88
+ is "$(
89
+ cd host
90
+ git subrepo pull sub
91
+ )" \
92
+ "Subrepo 'sub' pulled from '../sub' (master)."
93
+
94
+ }
95
+
96
+ done_testing 1
97
+
98
+ teardown
@@ -0,0 +1,96 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ cd "$TMP"
10
+
11
+ # Make two new repos
12
+ (
13
+ mkdir host sub
14
+ git init host
15
+ git init sub
16
+ ) > /dev/null
17
+
18
+ # Initialize host repo
19
+ (
20
+ cd host
21
+ touch host
22
+ git add host
23
+ git commit -m "host initial commit"
24
+ ) > /dev/null
25
+
26
+ # Initialize sub repo
27
+ (
28
+ cd sub
29
+ git init
30
+ touch subrepo
31
+ git add subrepo
32
+ git commit -m "subrepo initial commit"
33
+ ) > /dev/null
34
+
35
+ # Make sub a subrepo of host
36
+ (
37
+ cd host
38
+ git subrepo clone ../sub sub
39
+ ) > /dev/null
40
+
41
+ # Commit some changes to the host repo
42
+ (
43
+ cd host
44
+ touch feature
45
+ git add feature
46
+ git commit -m "feature added"
47
+ ) &> /dev/null
48
+
49
+ # Commit directly to subrepo
50
+ (
51
+ cd sub
52
+ echo "direct change in sub" >> subrepo
53
+ git commit -a -m "direct change in sub"
54
+ ) > /dev/null
55
+
56
+ # Pull subrepo changes
57
+ (
58
+ cd host
59
+ git subrepo pull sub
60
+ ) > /dev/null
61
+
62
+ # Commit directly to subrepo
63
+ (
64
+ cd sub
65
+ echo "another direct change in sub" >> subrepo
66
+ git commit -a -m "another direct change in sub"
67
+ git checkout -b temp # otherwise push to master will fail
68
+ ) &> /dev/null
69
+
70
+ # Commit to host/sub
71
+ (
72
+ cd host
73
+ echo "change from host" >> sub/subrepo-host
74
+ git add sub/subrepo-host
75
+ git commit -m "change from host"
76
+ ) > /dev/null
77
+
78
+ # Pull subrepo changes
79
+ # expected: successful pull without conflicts
80
+ is "$(
81
+ cd host
82
+ git subrepo pull sub
83
+ )" \
84
+ "Subrepo 'sub' pulled from '../sub' (master)."
85
+
86
+ # Push subrepo changes
87
+ # expected: successful push without conflicts
88
+ is "$(
89
+ cd host
90
+ git subrepo push sub -b master -u
91
+ )" \
92
+ "Subrepo 'sub' pushed to '../sub' (master)."
93
+
94
+ done_testing 2
95
+
96
+ teardown
@@ -0,0 +1,38 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ (
12
+ cd $OWNER/foo
13
+ git subrepo clone ../bar bar1
14
+ git subrepo clone ../bar bar2
15
+ ) &> /dev/null || die
16
+
17
+ (
18
+ cd $OWNER/bar
19
+ modify-files Bar
20
+ ) &> /dev/null || die
21
+
22
+ (
23
+ cd $OWNER/foo
24
+ git subrepo pull --all
25
+ ) &> /dev/null || die
26
+
27
+ {
28
+ is "$(cat $OWNER/foo/bar1/Bar)" \
29
+ "a new line" \
30
+ 'bar1/Bar content correct'
31
+ is "$(cat $OWNER/foo/bar2/Bar)" \
32
+ "a new line" \
33
+ 'bar2/Bar content correct'
34
+ }
35
+
36
+ done_testing
37
+
38
+ teardown
@@ -0,0 +1,113 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ subrepo-clone-bar-into-foo
12
+
13
+ note "Pull - Conflict - Merge ours/theirs - Push"
14
+
15
+ (
16
+ cd $OWNER/bar
17
+ add-new-files Bar2
18
+ git push
19
+ ) &> /dev/null || die
20
+
21
+ gitrepo=$OWNER/foo/bar/.gitrepo
22
+ # Test foo/bar/.gitrepo file contents:
23
+ {
24
+ foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
25
+ bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD^)"
26
+ test-gitrepo-field "commit" "$bar_head_commit"
27
+ test-gitrepo-field "parent" "$foo_pull_commit"
28
+ }
29
+
30
+ foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD)"
31
+
32
+ (
33
+ cd $OWNER/foo
34
+ git subrepo pull bar
35
+ modify-files-ex bar/Bar2
36
+ git push
37
+ ) &> /dev/null || die
38
+
39
+ (
40
+ cd $OWNER/bar
41
+ modify-files-ex Bar2
42
+ git push
43
+ ) &> /dev/null || die
44
+
45
+ (
46
+ cd $OWNER/foo
47
+ git subrepo pull bar || {
48
+ cd .git/tmp/subrepo/bar
49
+ echo "Merged Bar2" > Bar2
50
+ git add Bar2
51
+ git commit --file ../../../../.git/worktrees/bar/MERGE_MSG
52
+ cd ../../../..
53
+ git subrepo commit bar
54
+ git subrepo clean bar
55
+ }
56
+ ) &> /dev/null || die
57
+
58
+ test-exists \
59
+ "$OWNER/foo/bar/Bar2" \
60
+ "$OWNER/bar/Bar2" \
61
+
62
+ is "$(cat $OWNER/foo/bar/Bar2)" \
63
+ "Merged Bar2" \
64
+ "The readme file in the mainrepo is merged"
65
+
66
+ # Check commit messages
67
+ {
68
+ foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
69
+ like "$foo_new_commit_message" \
70
+ "git subrepo commit \(merge\) bar" \
71
+ "subrepo pull should have merge message"
72
+ }
73
+
74
+ # Test foo/bar/.gitrepo file contents:
75
+ {
76
+ bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
77
+ test-gitrepo-field "commit" "$bar_head_commit"
78
+ test-gitrepo-field "parent" "$foo_pull_commit"
79
+ }
80
+
81
+ (
82
+ cd $OWNER/foo
83
+ git subrepo push bar
84
+ ) &> /dev/null || die
85
+
86
+ # Check commit messages
87
+ {
88
+ foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
89
+ like "$foo_new_commit_message" \
90
+ "git subrepo push bar" \
91
+ "subrepo push should not have merge message"
92
+ }
93
+
94
+ (
95
+ cd $OWNER/bar
96
+ git pull
97
+ ) &> /dev/null || die
98
+
99
+ test-exists \
100
+ "$OWNER/foo/bar/Bar2" \
101
+ "$OWNER/bar/Bar2" \
102
+
103
+ is "$(cat $OWNER/foo/bar/Bar2)" \
104
+ "Merged Bar2" \
105
+ "The readme file in the mainrepo is merged"
106
+
107
+ is "$(cat $OWNER/bar/Bar2)" \
108
+ "Merged Bar2" \
109
+ "The readme file in the subrepo is merged"
110
+
111
+ done_testing
112
+
113
+ teardown