bundler 1.7.15 → 1.8.0.pre

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bundler might be problematic. Click here for more details.

Files changed (191) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +5 -14
  3. data/.rspec +1 -0
  4. data/.travis.yml +22 -15
  5. data/CHANGELOG.md +43 -13
  6. data/CODE_OF_CONDUCT.md +40 -0
  7. data/CONTRIBUTING.md +14 -12
  8. data/DEVELOPMENT.md +4 -2
  9. data/ISSUES.md +1 -1
  10. data/README.md +10 -14
  11. data/Rakefile +10 -10
  12. data/bin/bundle +1 -1
  13. data/bundler.gemspec +5 -4
  14. data/lib/bundler.rb +22 -3
  15. data/lib/bundler/anonymizable_uri.rb +24 -8
  16. data/lib/bundler/cli.rb +103 -66
  17. data/lib/bundler/cli/cache.rb +1 -0
  18. data/lib/bundler/cli/clean.rb +11 -4
  19. data/lib/bundler/cli/common.rb +2 -0
  20. data/lib/bundler/cli/console.rb +22 -26
  21. data/lib/bundler/cli/exec.rb +29 -22
  22. data/lib/bundler/cli/gem.rb +125 -37
  23. data/lib/bundler/cli/install.rb +22 -9
  24. data/lib/bundler/cli/outdated.rb +1 -1
  25. data/lib/bundler/cli/package.rb +8 -1
  26. data/lib/bundler/cli/show.rb +29 -3
  27. data/lib/bundler/cli/update.rb +2 -2
  28. data/lib/bundler/cli/viz.rb +1 -1
  29. data/lib/bundler/definition.rb +14 -22
  30. data/lib/bundler/dependency.rb +8 -1
  31. data/lib/bundler/dsl.rb +17 -4
  32. data/lib/bundler/endpoint_specification.rb +1 -1
  33. data/lib/bundler/env.rb +44 -25
  34. data/lib/bundler/fetcher.rb +33 -25
  35. data/lib/bundler/friendly_errors.rb +38 -5
  36. data/lib/bundler/gem_helper.rb +16 -10
  37. data/lib/bundler/gem_helpers.rb +1 -0
  38. data/lib/bundler/graph.rb +4 -1
  39. data/lib/bundler/index.rb +15 -25
  40. data/lib/bundler/installer.rb +6 -6
  41. data/lib/bundler/lockfile_parser.rb +7 -7
  42. data/lib/bundler/resolver.rb +2 -1
  43. data/lib/bundler/ruby_version.rb +1 -1
  44. data/lib/bundler/rubygems_ext.rb +1 -0
  45. data/lib/bundler/rubygems_integration.rb +1 -1
  46. data/lib/bundler/runtime.rb +22 -40
  47. data/lib/bundler/settings.rb +14 -5
  48. data/lib/bundler/setup.rb +2 -1
  49. data/lib/bundler/shared_helpers.rb +56 -4
  50. data/lib/bundler/source.rb +8 -9
  51. data/lib/bundler/source/git.rb +5 -1
  52. data/lib/bundler/source/git/git_proxy.rb +4 -0
  53. data/lib/bundler/source/path.rb +8 -11
  54. data/lib/bundler/source/path/installer.rb +0 -2
  55. data/lib/bundler/source/rubygems.rb +58 -72
  56. data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +13 -0
  57. data/lib/bundler/templates/newgem/LICENSE.txt.tt +17 -18
  58. data/lib/bundler/templates/newgem/README.md.tt +9 -1
  59. data/lib/bundler/templates/newgem/Rakefile.tt +2 -0
  60. data/lib/bundler/templates/newgem/bin/console.tt +14 -0
  61. data/lib/bundler/templates/newgem/bin/setup.tt +7 -0
  62. data/lib/bundler/templates/newgem/exe/newgem.tt +3 -0
  63. data/lib/bundler/templates/newgem/gitignore.tt +2 -0
  64. data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +1 -1
  65. data/lib/bundler/templates/newgem/newgem.gemspec.tt +17 -13
  66. data/lib/bundler/templates/newgem/test/test_newgem.rb.tt +1 -1
  67. data/lib/bundler/ui/shell.rb +1 -1
  68. data/lib/bundler/version.rb +1 -1
  69. data/lib/bundler/worker.rb +73 -0
  70. data/man/bundle-config.ronn +17 -15
  71. data/man/bundle-install.ronn +102 -93
  72. data/man/bundle-update.ronn +39 -30
  73. data/man/bundle.ronn +6 -0
  74. data/man/gemfile.5.ronn +74 -13
  75. metadata +10 -231
  76. data/lib/bundler/parallel_workers.rb +0 -18
  77. data/lib/bundler/parallel_workers/thread_worker.rb +0 -30
  78. data/lib/bundler/parallel_workers/unix_worker.rb +0 -101
  79. data/lib/bundler/parallel_workers/worker.rb +0 -69
  80. data/lib/bundler/templates/newgem/bin/newgem.tt +0 -3
  81. data/spec/bundler/anonymizable_uri_spec.rb +0 -32
  82. data/spec/bundler/bundler_spec.rb +0 -72
  83. data/spec/bundler/cli_spec.rb +0 -16
  84. data/spec/bundler/definition_spec.rb +0 -22
  85. data/spec/bundler/dsl_spec.rb +0 -82
  86. data/spec/bundler/friendly_errors_spec.rb +0 -13
  87. data/spec/bundler/gem_helper_spec.rb +0 -226
  88. data/spec/bundler/psyched_yaml_spec.rb +0 -8
  89. data/spec/bundler/retry_spec.rb +0 -59
  90. data/spec/bundler/settings_spec.rb +0 -13
  91. data/spec/bundler/source/rubygems_spec.rb +0 -25
  92. data/spec/bundler/source_list_spec.rb +0 -361
  93. data/spec/cache/gems_spec.rb +0 -284
  94. data/spec/cache/git_spec.rb +0 -188
  95. data/spec/cache/path_spec.rb +0 -121
  96. data/spec/cache/platform_spec.rb +0 -57
  97. data/spec/commands/binstubs_spec.rb +0 -219
  98. data/spec/commands/check_spec.rb +0 -278
  99. data/spec/commands/clean_spec.rb +0 -592
  100. data/spec/commands/config_spec.rb +0 -263
  101. data/spec/commands/console_spec.rb +0 -76
  102. data/spec/commands/exec_spec.rb +0 -309
  103. data/spec/commands/help_spec.rb +0 -39
  104. data/spec/commands/init_spec.rb +0 -39
  105. data/spec/commands/inject_spec.rb +0 -78
  106. data/spec/commands/licenses_spec.rb +0 -18
  107. data/spec/commands/newgem_spec.rb +0 -428
  108. data/spec/commands/open_spec.rb +0 -68
  109. data/spec/commands/outdated_spec.rb +0 -156
  110. data/spec/commands/package_spec.rb +0 -114
  111. data/spec/commands/show_spec.rb +0 -125
  112. data/spec/install/binstubs_spec.rb +0 -24
  113. data/spec/install/bundler_spec.rb +0 -146
  114. data/spec/install/deploy_spec.rb +0 -250
  115. data/spec/install/gemfile/gemspec_spec.rb +0 -170
  116. data/spec/install/gemfile/git_spec.rb +0 -967
  117. data/spec/install/gemfile/path_spec.rb +0 -500
  118. data/spec/install/gemfile_spec.rb +0 -44
  119. data/spec/install/gems/c_ext_spec.rb +0 -48
  120. data/spec/install/gems/dependency_api_spec.rb +0 -652
  121. data/spec/install/gems/env_spec.rb +0 -107
  122. data/spec/install/gems/flex_spec.rb +0 -314
  123. data/spec/install/gems/groups_spec.rb +0 -308
  124. data/spec/install/gems/mirror_spec.rb +0 -39
  125. data/spec/install/gems/platform_spec.rb +0 -195
  126. data/spec/install/gems/post_install_spec.rb +0 -121
  127. data/spec/install/gems/resolving_spec.rb +0 -124
  128. data/spec/install/gems/simple_case_spec.rb +0 -377
  129. data/spec/install/gems/sources_spec.rb +0 -386
  130. data/spec/install/gems/standalone_spec.rb +0 -260
  131. data/spec/install/gems/sudo_spec.rb +0 -136
  132. data/spec/install/gems/win32_spec.rb +0 -26
  133. data/spec/install/gemspecs_spec.rb +0 -50
  134. data/spec/install/path_spec.rb +0 -150
  135. data/spec/install/post_bundle_message_spec.rb +0 -142
  136. data/spec/install/prereleases_spec.rb +0 -43
  137. data/spec/install/security_policy_spec.rb +0 -77
  138. data/spec/install/upgrade_spec.rb +0 -26
  139. data/spec/lock/git_spec.rb +0 -34
  140. data/spec/lock/lockfile_spec.rb +0 -924
  141. data/spec/other/bundle_ruby_spec.rb +0 -142
  142. data/spec/other/cli_dispatch_spec.rb +0 -21
  143. data/spec/other/ext_spec.rb +0 -60
  144. data/spec/other/platform_spec.rb +0 -1285
  145. data/spec/other/ssl_cert_spec.rb +0 -23
  146. data/spec/quality_spec.rb +0 -88
  147. data/spec/realworld/dependency_api_spec.rb +0 -60
  148. data/spec/realworld/edgecases_spec.rb +0 -212
  149. data/spec/realworld/parallel_spec.rb +0 -71
  150. data/spec/resolver/basic_spec.rb +0 -66
  151. data/spec/resolver/platform_spec.rb +0 -88
  152. data/spec/runtime/executable_spec.rb +0 -149
  153. data/spec/runtime/load_spec.rb +0 -107
  154. data/spec/runtime/platform_spec.rb +0 -90
  155. data/spec/runtime/require_spec.rb +0 -332
  156. data/spec/runtime/setup_spec.rb +0 -853
  157. data/spec/runtime/with_clean_env_spec.rb +0 -91
  158. data/spec/spec_helper.rb +0 -123
  159. data/spec/support/artifice/endopint_marshal_fail_basic_authentication.rb +0 -13
  160. data/spec/support/artifice/endpoint.rb +0 -71
  161. data/spec/support/artifice/endpoint_500.rb +0 -37
  162. data/spec/support/artifice/endpoint_api_forbidden.rb +0 -11
  163. data/spec/support/artifice/endpoint_api_missing.rb +0 -16
  164. data/spec/support/artifice/endpoint_basic_authentication.rb +0 -13
  165. data/spec/support/artifice/endpoint_creds_diff_host.rb +0 -38
  166. data/spec/support/artifice/endpoint_extra.rb +0 -31
  167. data/spec/support/artifice/endpoint_extra_api.rb +0 -32
  168. data/spec/support/artifice/endpoint_extra_missing.rb +0 -15
  169. data/spec/support/artifice/endpoint_fallback.rb +0 -17
  170. data/spec/support/artifice/endpoint_host_redirect.rb +0 -15
  171. data/spec/support/artifice/endpoint_marshal_fail.rb +0 -11
  172. data/spec/support/artifice/endpoint_redirect.rb +0 -15
  173. data/spec/support/artifice/endpoint_strict_basic_authentication.rb +0 -18
  174. data/spec/support/artifice/endpoint_timeout.rb +0 -13
  175. data/spec/support/builders.rb +0 -693
  176. data/spec/support/fakeweb/rack-1.0.0.marshal +0 -2
  177. data/spec/support/fakeweb/windows.rb +0 -23
  178. data/spec/support/hax.rb +0 -22
  179. data/spec/support/helpers.rb +0 -361
  180. data/spec/support/indexes.rb +0 -280
  181. data/spec/support/matchers.rb +0 -77
  182. data/spec/support/path.rb +0 -85
  183. data/spec/support/permissions.rb +0 -10
  184. data/spec/support/platforms.rb +0 -94
  185. data/spec/support/ruby_ext.rb +0 -20
  186. data/spec/support/rubygems_ext.rb +0 -39
  187. data/spec/support/streams.rb +0 -13
  188. data/spec/support/sudo.rb +0 -16
  189. data/spec/update/gems_spec.rb +0 -201
  190. data/spec/update/git_spec.rb +0 -283
  191. data/spec/update/path_spec.rb +0 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 87c0e0f8a86277370e75de2355fc489fcafc1cc5
4
- data.tar.gz: db0d05676f078159a3387ea000fe20ef755603b7
3
+ metadata.gz: 479faa1691c86039ec5e869bad6dcce4d5ccf4fc
4
+ data.tar.gz: 5292b6135750e581aeb3007b8a8675f7530b3e2a
5
5
  SHA512:
6
- metadata.gz: 918b79b442b84c1ea8b128dc3ac1016d31402e17fe5e083c5cc923f4adea219abc1b8eb3485fcba2bef465f68ff0cf19d89fa1a2a213e437ec8583743a161e2a
7
- data.tar.gz: 74ca32121adf3f19442d2815deec3186dca5ecc434ca9337df4445a0107b59e8c8516f768f50551554b4011b81a0d057eb9fc1566b9693611d8816cd0ab52683
6
+ metadata.gz: cb0d50e7108d2175c806dc8e3057243ba7f69ca53d17d7c7acb23da574339eaba836811a7287060c83f4143edeeee461b27fa5bc868b8c623391a88dc0a91d48
7
+ data.tar.gz: d90bbeeca48a52828aa24304b71a3f68e4ced97001a13ea404262b4ae2c28ca99af70f3c2bfa62330090fd562b40a98d9da673768d5f37360ebc3824972b1426
data/.gitignore CHANGED
@@ -3,23 +3,14 @@
3
3
  # https://help.github.com/articles/ignoring-files and find useful gitignore
4
4
  # samples at https://github.com/github/gitignore
5
5
 
6
- # system crap
7
- .DS_Store
8
- .*.swp
9
-
10
6
  # files created by running the specs
11
- tmp/
12
-
13
- # built gems
14
- pkg/
15
- *.gem
7
+ /tmp/
16
8
 
17
- # rubinius bytecode
18
- *.rbc
19
- .rbx/
9
+ # gems built by `rake build`
10
+ /pkg/
20
11
 
21
12
  # output from ronn
22
- lib/bundler/man/
13
+ /lib/bundler/man/
23
14
 
24
15
  # output from ci_reporter
25
- spec/reports/
16
+ /spec/reports/
data/.rspec CHANGED
@@ -1,2 +1,3 @@
1
1
  --format documentation
2
2
  --color
3
+ --warnings
@@ -1,9 +1,11 @@
1
1
  language: ruby
2
2
  script: rake spec:travis
3
3
  before_script: travis_retry rake spec:travis:deps
4
+
4
5
  branches:
5
6
  only:
6
7
  - master
8
+ - 1-8-stable
7
9
  - 1-7-stable
8
10
  - 1-6-stable
9
11
  - 1-5-stable
@@ -11,38 +13,49 @@ branches:
11
13
  - 1-2-stable
12
14
  - 1-1-stable
13
15
  - 1-0-stable
16
+
14
17
  notifications:
15
18
  email:
16
19
  # andre
17
20
  - secure: "bCcvqJT7YrBawtkXXwHhT+jOFth7r2Qv/30PkkbhQxk6Jb3xambjCOJ3U6vJ\ngYmiL50exi5lUp3oc3SEbHN5t2CrZqOZDQ6o7P8EAmB5c0oH2RrYaFOkI5Gt\nul/jGH/96A9sj0aMwG7JfdMSfhqj1DUKAm2PnnbXPL853VfmT24="
18
21
  # terence
19
22
  - secure: "MQ8eA5Jb8YzEpAo58DRGfVJklAPcEbAulpBZnTxp0am6ldneDtJHbQk21w6R\nj5GsDHlzr/lMp/GHIimtUZ7rLohfND8fj/W7fs1Dkd4eN02/ERt98x3pHlqv\nvZgSnZ39uVYv+OcphraE24QaRaGWLhWZAMYQTVe/Yz50NyG8g1U="
20
- campfire:
23
+ slack:
21
24
  on_success: change
22
25
  on_failure: always
23
26
  rooms:
24
- # Bundler Ops
25
- secure: MNTSGIySYwHia5gIgRiZxXtPMPDIP9KmzQk7Kq2ZoVvP3mIk8W1TMkvcyFkEf6uCasyVZZixzUBfY+E0BlHAz1ycQpTh1jvSpuIpEVYW48ShJldJ+8W8xfzafyOHii3z7VrDaomEffmMDdmHRsbQAfekMjdR4bTpXtT9V+wOXlg=
27
+ - secure: JxBi7DDJGkIF/7f/FSN/HUHpvV4EKfQccZHTPd1b2pNJn3GXo6u+tNVbAw2WjxYzPyPQI3ZcYBCU9SEXp/i7VmG8uMzh8Kyildw+miSKYKVb90uYqcsXWzbxwyNBgJLvyDkzST45H5lgnyAicee3WkFes/WDZikIajbH7ztdb04=
28
+
26
29
  rvm:
27
- - 2.1.1
30
+ - 2.1
28
31
  - 2.0.0
29
32
  - 1.9.3
30
33
  - 1.8.7
34
+
31
35
  # Rubygems versions MUST be available as rake tasks
32
36
  # see Rakefile:66 for the list of possible RGV values
33
37
  env:
34
38
  # We need to know if changes to rubygems will break bundler on release
35
39
  - RGV=master
36
40
  # Test the latest rubygems release with all of our supported rubies
37
- - RGV=v2.2.2
41
+ - RGV=v2.4.4
42
+
38
43
  matrix:
44
+ fast_finish: true
39
45
  include:
46
+ # Ruby 2.1, Rubygems 2.2.2 and up
47
+ - rvm: 2.1
48
+ env: RGV=v2.2.2
40
49
  # Ruby 2.0.0, Rubygems 2.0 and up
50
+ - rvm: 2.0.0
51
+ env: RGV=v2.2.2
41
52
  - rvm: 2.0.0
42
53
  env: RGV=v2.1.11
43
54
  - rvm: 2.0.0
44
55
  env: RGV=v2.0.14
45
56
  # Ruby 1.9.3, Rubygems 1.5.3 and up
57
+ - rvm: 1.9.3
58
+ env: RGV=v2.2.2
46
59
  - rvm: 1.9.3
47
60
  env: RGV=v2.1.11
48
61
  - rvm: 1.9.3
@@ -57,7 +70,7 @@ matrix:
57
70
  env: RGV=v1.5.3
58
71
  # Ruby 1.8.7, Rubygems 1.3.6 and up
59
72
  - rvm: 1.8.7
60
- env: RGV=v2.1.11
73
+ env: RGV=v2.2.2
61
74
  - rvm: 1.8.7
62
75
  env: RGV=v2.0.14
63
76
  - rvm: 1.8.7
@@ -82,20 +95,14 @@ matrix:
82
95
  # Ruby 1.9.2 sanity check
83
96
  # (but it's just too slow and sometimes goes over the Travis limit)
84
97
  - rvm: 1.9.2
85
- env: RGV=v2.2.2
98
+ env: RGV=v2.3.0
86
99
  # Ruby-head (we want to know how we're doing, but not fail the build)
87
100
  - rvm: ruby-head
88
101
  env: RGV=master
89
- # JRuby, the latest (not maintained, but good to know)
90
- - rvm: jruby
91
- env: RGV=v2.2.2
92
- # Rubinius, the latest (not maintained, but good to know)
93
- - rvm: rbx
94
- env: RGV=v2.2.2
95
102
  allow_failures:
96
103
  - rvm: 1.8.7
97
- env: RGV=2.1.11
104
+ env: RGV=v2.1.11
98
105
  - rvm: 1.9.2
99
106
  - rvm: ruby-head
100
107
  - rvm: jruby
101
- - rvm: rbx
108
+ - rvm: rbx-2
@@ -1,23 +1,36 @@
1
- ## 1.7.15 (2015-04-29)
1
+ ## 1.8.0.pre (2015-01-26)
2
2
 
3
- Bugfixes:
4
-
5
- - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
3
+ Features:
6
4
 
7
- ## 1.7.14 (2015-03-30)
5
+ - add metadata allowed_push_host to new gem template (#3002, @juanitofatas)
6
+ - adds a `--no-install` flag to `bundle package` (@d-reinhold)
7
+ - add `bundle config auto_install true` to install automatically (@smashwilson)
8
+ - add `bundle viz --without` to exclude gem groups from resulting graph (@fnichol)
9
+ - prevent whitespace in gem declarations with clear messaging (@benlakey)
10
+ - tries to find a `bundler-<command>` executable on your path for non-bundler commands (@andremedeiros)
11
+ - tries to find `gems.rb` and it's new counterpart, `gems.locked` (@andremedeiros)
12
+ - change the initial version of new gems from `0.0.1` to `0.1.0` (@petedmarsh)
13
+ - add `package --all-platforms` to cache gems for each known platform (@ccutrer)
14
+ - speed up `exec` when running commands on the $PATH (@kirs)
15
+ - add gem code of conduct file and option (@kirs)
16
+ - add config settings for gem license and tests (@kirs)
17
+ - add `bin/setup` and `bin/console` to new gems (@indirect)
18
+ - include configured user-agent in network requests (@indirect)
19
+ - support `github`, `gist`, and `bitbucket` options on git gems (@indirect)
20
+ - add `package --cache-path` and `config cache_path` for cache location (@jnraine)
21
+ - allow `config` to work even when a Gemfile is not present (@dholdren)
22
+ - add `config gemfile /path` for other Gemfile locations (@dholdren)
8
23
 
9
24
  Bugfixes:
10
25
 
11
- - Keep gems locked when updating another gem from the same source (#3250, @indirect)
12
- - Don't add extra quotes around long, quoted config values (@aroben, #3338)
26
+ - reduce memory usage with threaded parallel workers (@Who828)
27
+ - support read-only git gems (@pmahoney)
28
+ - various resolver performance improvements (@dubek)
29
+ - untaint git gem paths for Rubygems compatibility (@tdtds)
13
30
 
14
- ## 1.7.13 (2015-02-07)
15
-
16
- Bugfixes:
31
+ Documentation:
17
32
 
18
- - Look up installed gems in remote sources (#3300, #3368, #3377, #3380, #3381, @indirect)
19
- - Look up gems across all sources to satisfy dependencies (#3365, @keiths-osc)
20
- - Request dependencies for no more than 100 gems at a time (#3367, @segiddins)
33
+ - add missing Gemfile global `path` explanation (@agenteo)
21
34
 
22
35
  ## 1.7.12 (2015-01-08)
23
36
 
@@ -121,6 +134,22 @@ Bugfixes:
121
134
 
122
135
  - Warn on ambiguous gems available from more than one source (@TimMoore)
123
136
 
137
+ ## 1.6.7 (2014-10-19)
138
+
139
+ Features:
140
+
141
+ - warn to upgrade when using useless source blocks (@danfinnie)
142
+
143
+ Documentation:
144
+
145
+ - explain how to use gem server credentials via ENV (@hwartig)
146
+
147
+ ## 1.6.6 (2014-08-23)
148
+
149
+ Bugfixes:
150
+
151
+ - restore Gemfile credentials to Gemfile.lock (@indirect)
152
+
124
153
  ## 1.6.5 (2014-07-23)
125
154
 
126
155
  Bugfixes:
@@ -202,6 +231,7 @@ Features:
202
231
  - `bundle show --verbose` Add gem summary to the output (@lardcanoe)
203
232
  - `bundle gem GEM --ext` now generates a skeleton for a C extension (@superdealloc)
204
233
  - Avoid using threequals operator where possible (@as-cii)
234
+ - Add `bundle update --group` to update specific group (#2731 @banyan)
205
235
 
206
236
  Documentation:
207
237
 
@@ -0,0 +1,40 @@
1
+ # Bundler Code of Conduct
2
+
3
+ The Bundler project strongly values contributors from anywhere, regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. As a result, the Bundler team has agreed to and enforces this code of conduct in order to provide a harassment-free experience for everyone who participates in the development of Bundler.
4
+
5
+ ### Summary
6
+
7
+ Harassment in code and discussion or violation of physical boundaries is completely unacceptable anywhere in the Bundler project’s codebases, issue trackers, IRC channel, Campfire, mailing lists, meetups, and other events. Violators will be warned and then blocked or banned by the core team at or before the 3rd violation.
8
+
9
+ ### In detail
10
+
11
+ Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, body size, race, religion, sexual images, deliberate intimidation, stalking, sustained disruption, and unwelcome sexual attention.
12
+
13
+ Individuals asked to stop any harassing behavior are expected to comply immediately.
14
+
15
+ Maintainers, including the core team, are also subject to the anti-harassment policy.
16
+
17
+ If anyone engages in harassing behavior, including maintainers, we may take appropriate action, up to and including warning the offender, deletion of comments, removal from the project’s codebase and communication systems, and escalation to Github support.
18
+
19
+ If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of [the core team](http://bundler.io/contributors.html) or [email the core team](mailto:team@bundler.io) immediately.
20
+
21
+ We expect everyone to follow these rules anywhere in the Bundler project’s codebases, issue trackers, IRC channel, group chat, and mailing lists.
22
+
23
+ Finally, don't forget that it is human to make mistakes! We all do. Let’s work together to help each other, resolve issues, and learn from the mistakes that we will all inevitably make from time to time.
24
+
25
+
26
+ ### Thanks
27
+
28
+ Thanks to the [JSConf Code of Conduct](http://jsconf.com/codeofconduct.html) and [Fedora Code of Conduct](http://fedoraproject.org/code-of-conduct) for inspiration and ideas. Additional thanks to [Contributor Covenant](http://contributor-covenant.org) for the [default code of conduct](https://github.com/bundler/bundler/blob/master/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt) included in generated gems.
29
+
30
+
31
+ ### License
32
+
33
+ <p class="license" xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
34
+ To the extent possible under law, <a rel="dct:publisher" href="http://bundler.io">The Bundler Team</a> has waived all copyright and related or neighboring rights to the <span property="dct:title">Bundler Code of Conduct</span>. This work is published from the <span property="vcard:Country" datatype="dct:ISO3166" content="US" about="http://bundler.io">United States.</span>
35
+ <br>
36
+ <br>
37
+ <a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/">
38
+ <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0">
39
+ </a>
40
+ </p>
@@ -2,18 +2,20 @@
2
2
 
3
3
  Bundler welcomes contributions from *everyone*. While contributing, please follow the project [code of conduct](http://bundler.io/conduct.html), so that everyone can be included.
4
4
 
5
- Here are some ways you can contribute:
6
-
7
- - by using prerelease versions
8
- - by reporting bugs
9
- - by suggesting new features
10
- - by writing or editing documentation
11
- - by closing issues
12
- - by reviewing patches
13
- - by refactoring code
14
- - by writing code (no patch is too small! fix typos or bad whitespace)
15
-
16
- If you'd like to help make Bundler better, you totally rock! Please check out the [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md) file for an introduction to the project, guidelines for contributing, and details about what would be helpful.
5
+ If you'd like to help make Bundler better, you totally rock! Here are some ways you can contribute:
6
+
7
+ - by using prerelease versions (run `gem install bundler --pre`)
8
+ - by [reporting bugs you encounter](https://github.com/bundler/bundler/issues/new)
9
+ - by [suggesting new features](https://github.com/bundler/bundler-features/issues/new)
10
+ - by adding to or editing [the Bundler documentation website](http://bundler.io) and [Bundler man pages](http://bundler.io/man/bundle.1.html)
11
+ - by [checking issues for completeness](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md#bug-triage)
12
+ - by closing issues that are not complete
13
+ - by adding a failing test for reproducible [reported bugs](https://github.com/bundler/bundler/issues)
14
+ - by reviewing [pull requests](https://github.com/bundler/bundler/pulls) and suggesting improvements
15
+ - by improving existing code, including [suggestions from PullReview](https://www.pullreview.com/github/bundler/bundler/reviews/master)
16
+ - by [writing code](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md) (no patch is too small! fix typos or bad whitespace)
17
+
18
+ If you need help getting started, check out the [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md) file for steps that will get you up and running.
17
19
 
18
20
  Thanks for helping us make Bundler better.
19
21
 
@@ -2,7 +2,7 @@ Great to have you here! Here are a few ways you can help out with [Bundler](http
2
2
 
3
3
  # Where should I start?
4
4
 
5
- You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/v1.5/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](http://webchat.freenode.net/?channels=%23bundler), which is #bundler on Freenode.
5
+ You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](http://webchat.freenode.net/?channels=%23bundler), which is #bundler on Freenode. Please note that this project is released with a contributor [code of conduct](http://bundler.io/conduct.html). By participating in this project you agree to abide by its terms.
6
6
 
7
7
  ## Your first commits
8
8
 
@@ -70,7 +70,7 @@ Finally, the ticket may be a duplicate of another older ticket. If you notice a
70
70
 
71
71
  If you would like to add a new feature to Bundler, please follow these steps:
72
72
 
73
- 1. [Create an issue](https://github.com/bundler/bundler-features/issues/new) to discuss your feature.
73
+ 1. [Create an issue](https://github.com/bundler/bundler-features/issues/new) in the bundler-features repo to discuss your feature.
74
74
  2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) and don't add new features to old releases.
75
75
  3. Commit the code and at least one test covering your changes to a feature branch in your fork.
76
76
  4. Put a line in the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the "Features" heading.
@@ -115,3 +115,5 @@ Finally, sharing your experiences and discoveries by writing them up is a valuab
115
115
  Examples of how Bundler is used help everyone, and we’ve discovered that people already use it in ways that we never imagined when we were writing it. If you’re still not sure what to write about, there are also several projects doing interesting things based on Bundler. They could probably use publicity too.
116
116
 
117
117
  If you let someone on the core team know you wrote about Bundler, we will add your post to the list of Bundler resources on the Github project wiki.
118
+
119
+ Finally, participate carefully in the all contributors to the Bundler project must agree to the contributor [code of conduct](http://bundler.io/conduct.html). By participating in this project you agree to abide by its terms.
data/ISSUES.md CHANGED
@@ -10,7 +10,7 @@ discuss features. The bundler issue tracker is only for bugs.**
10
10
 
11
11
  Instructions for common Bundler uses can be found on the [Bundler documentation site](http://bundler.io/).
12
12
 
13
- Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://bundler.io/v1.3/man/bundle.1.html).
13
+ Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://bundler.io/man/bundle.1.html).
14
14
 
15
15
  ## Troubleshooting
16
16
 
data/README.md CHANGED
@@ -1,9 +1,11 @@
1
- [![Code Climate](https://img.shields.io/codeclimate/github/bundler/bundler.svg)](https://codeclimate.com/github/bundler/bundler)
2
- [![Build Status](https://img.shields.io/travis/bundler/bundler/master.svg)](https://travis-ci.org/bundler/bundler)
3
- [![Version ](https://img.shields.io/gem/v/bundler.svg)](https://rubygems.org/gems/bundler)
1
+ [![Version ](https://img.shields.io/gem/v/bundler.svg?style=flat)](https://rubygems.org/gems/bundler)
2
+ [![Build Status](https://img.shields.io/travis/bundler/bundler/master.svg?style=flat)](https://travis-ci.org/bundler/bundler)
3
+ [![Code Climate](https://img.shields.io/codeclimate/github/bundler/bundler.svg?style=flat)](https://codeclimate.com/github/bundler/bundler)
4
+ [![Inline docs ](http://inch-ci.org/github/bundler/bundler.svg?style=flat)](http://inch-ci.org/github/bundler/bundler)
4
5
 
5
6
  # Bundler: a gem to bundle gems
6
- Bundler keeps ruby applications running the same code on every machine.
7
+
8
+ Bundler makes sure Ruby applications run the same code on every machine.
7
9
 
8
10
  It does this by managing the gems that the application depends on. Given a list of gems, it can automatically download and install those gems, as well as any other gems needed by the gems that are listed. Before installing gems, it checks the versions of every gem to make sure that they are compatible, and can all be loaded at the same time. After the gems have been installed, Bundler can help you update some or all of them when new versions become available. Finally, it records the exact versions that have been installed, so that others can install the exact same gems.
9
11
 
@@ -23,18 +25,12 @@ See [bundler.io](http://bundler.io) for the full documentation.
23
25
 
24
26
  For help with common problems, see [ISSUES](https://github.com/bundler/bundler/blob/master/ISSUES.md).
25
27
 
26
- ### Contributing
27
-
28
- If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md)
29
-
30
- The `master` branch contains our current progress towards version 1.5. Versions 1.0-1.3 each have their own stable branches. Please submit bugfixes as pull requests to the stable branch for the version you would like to fix.
31
-
32
- ### Core Team
33
-
34
- The Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)), Terence Lee ([@hone](http://github.com/hone)), and Jessica Lynn Suttles ([@jlsuttles](http://github.com/jlsuttles)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
35
-
36
28
  ### Other questions
37
29
 
38
30
  To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md).
39
31
 
40
32
  Feel free to chat with the Bundler core team (and many other users) on IRC in the [#bundler](irc://irc.freenode.net/bundler) channel on Freenode, or via email on the [Bundler mailing list](http://groups.google.com/group/ruby-bundler).
33
+
34
+ ### Contributing
35
+
36
+ If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md)
data/Rakefile CHANGED
@@ -1,10 +1,10 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  $:.unshift File.expand_path("../lib", __FILE__)
3
- require 'rubygems'
4
3
  require 'shellwords'
5
4
  require 'benchmark'
6
5
 
7
6
  RUBYGEMS_REPO = File.expand_path("tmp/rubygems")
7
+ BUNDLER_SPEC = Gem::Specification.load("bundler.gemspec")
8
8
 
9
9
  def safe_task(&block)
10
10
  yield
@@ -30,8 +30,7 @@ end
30
30
  namespace :spec do
31
31
  desc "Ensure spec dependencies are installed"
32
32
  task :deps do
33
- spec = Gem::Specification.load("bundler.gemspec")
34
- deps = Hash[spec.development_dependencies.map do |d|
33
+ deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
35
34
  [d.name, d.requirement.to_s]
36
35
  end]
37
36
 
@@ -65,7 +64,7 @@ namespace :spec do
65
64
  # https://github.com/rubygems/rubygems/issues/784
66
65
  sh "gem update --system 2.1.11"
67
66
  else
68
- # Downgrade Rubygems so RSpec 3 can be instaled
67
+ # Downgrade Rubygems so RSpec 3 can be installed
69
68
  # https://github.com/rubygems/rubygems/issues/813
70
69
  sh "gem update --system 2.2.0"
71
70
  end
@@ -76,13 +75,12 @@ namespace :spec do
76
75
  end
77
76
 
78
77
  begin
78
+ rspec = BUNDLER_SPEC.development_dependencies.find{|d| d.name == "rspec" }
79
+ gem 'rspec', rspec.requirement.to_s
79
80
  require 'rspec/core/rake_task'
80
81
 
81
82
  desc "Run specs"
82
- RSpec::Core::RakeTask.new do |t|
83
- t.rspec_opts = %w(--format documentation --color)
84
- t.ruby_opts = %w(-w)
85
- end
83
+ RSpec::Core::RakeTask.new
86
84
  task :spec => "man:build"
87
85
 
88
86
  namespace :spec do
@@ -114,7 +112,7 @@ begin
114
112
  rubyopt = ENV["RUBYOPT"]
115
113
  # When editing this list, also edit .travis.yml!
116
114
  branches = %w(master 2.2)
117
- releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.2)
115
+ releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.2 v2.4.4)
118
116
  (branches + releases).each do |rg|
119
117
  desc "Run specs with Rubygems #{rg}"
120
118
  RSpec::Core::RakeTask.new(rg) do |t|
@@ -160,7 +158,9 @@ begin
160
158
  end
161
159
 
162
160
  task "setup_co" do
163
- ENV["RUBYOPT"] = "-I#{File.expand_path ENV['RG']} #{rubyopt}"
161
+ rg = File.expand_path ENV['RG']
162
+ puts "Running specs against Rubygems in #{rg}..."
163
+ ENV["RUBYOPT"] = "-I#{rg} #{rubyopt}"
164
164
  end
165
165
 
166
166
  task "co" => "setup_co"
data/bin/bundle CHANGED
@@ -6,7 +6,7 @@ Signal.trap("INT") { exit 1 }
6
6
  require 'bundler'
7
7
  # Check if an older version of bundler is installed
8
8
  $LOAD_PATH.each do |path|
9
- if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
9
+ if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9
10
10
  err = "Looks like you have a version of bundler that's older than 0.9.\n"
11
11
  err << "Please remove your old versions.\n"
12
12
  err << "An easy way to do this is by running `gem cleanup bundler`."