Permalink
Browse files

Merge remote-tracking branch 'rubygems/master' into remove_underscore…

…s_on_suggest_2

Conflicts:
	lib/rubygems/spec_fetcher.rb
  • Loading branch information...
2 parents 5dc16ee + 294aa56 commit f6b91ce9a96aa3182c16b8ff745173339a7defc8 Justin Collins committed Mar 13, 2012
Showing with 22,504 additions and 18,942 deletions.
  1. +18 −9 .autotest
  2. +4 −0 .gitignore
  3. +14 −0 .travis.yml
  4. +0 −5,811 ChangeLog
  5. +0 −340 GPL.txt
  6. +474 −4 History.txt
  7. +38 −37 LICENSE.txt
  8. +20 −0 MIT.txt
  9. +150 −102 Manifest.txt
  10. +25 −22 README.rdoc
  11. +116 −82 Rakefile
  12. +41 −16 UPGRADING.rdoc
  13. +1 −1 bin/gem
  14. +1 −0 bin/update_rubygems
  15. +2 −1 ci_build.sh
  16. +3 −1 cruise_config.rb
  17. +1 −1 lib/rbconfig/datadir.rb
  18. +455 −350 lib/rubygems.rb
  19. +0 −104 lib/rubygems/builder.rb
  20. +31 −9 lib/rubygems/command.rb
  21. +68 −28 lib/rubygems/command_manager.rb
  22. +17 −13 lib/rubygems/commands/build_command.rb
  23. +199 −57 lib/rubygems/commands/cert_command.rb
  24. +2 −17 lib/rubygems/commands/check_command.rb
  25. +23 −22 lib/rubygems/commands/cleanup_command.rb
  26. +17 −14 lib/rubygems/commands/contents_command.rb
  27. +19 −59 lib/rubygems/commands/dependency_command.rb
  28. +13 −13 lib/rubygems/commands/environment_command.rb
  29. +8 −10 lib/rubygems/commands/fetch_command.rb
  30. +8 −31 lib/rubygems/commands/generate_index_command.rb
  31. +0 −5 lib/rubygems/commands/help_command.rb
  32. +63 −32 lib/rubygems/commands/install_command.rb
  33. +5 −5 lib/rubygems/commands/lock_command.rb
  34. +7 −101 lib/rubygems/commands/mirror_command.rb
  35. +9 −9 lib/rubygems/commands/outdated_command.rb
  36. +15 −6 lib/rubygems/commands/owner_command.rb
  37. +40 −21 lib/rubygems/commands/pristine_command.rb
  38. +20 −5 lib/rubygems/commands/push_command.rb
  39. +47 −52 lib/rubygems/commands/query_command.rb
  40. +21 −26 lib/rubygems/commands/rdoc_command.rb
  41. +1 −1 lib/rubygems/commands/server_command.rb
  42. +48 −39 lib/rubygems/commands/setup_command.rb
  43. +19 −43 lib/rubygems/commands/sources_command.rb
  44. +33 −29 lib/rubygems/commands/specification_command.rb
  45. +2 −1 lib/rubygems/commands/stale_command.rb
  46. +21 −1 lib/rubygems/commands/uninstall_command.rb
  47. +78 −24 lib/rubygems/commands/unpack_command.rb
  48. +110 −94 lib/rubygems/commands/update_command.rb
  49. +6 −10 lib/rubygems/commands/which_command.rb
  50. +50 −0 lib/rubygems/compatibility.rb
  51. +119 −80 lib/rubygems/config_file.rb
  52. +80 −11 lib/rubygems/custom_require.rb
  53. +37 −14 lib/rubygems/defaults.rb
  54. +129 −13 lib/rubygems/dependency.rb
  55. +165 −80 lib/rubygems/dependency_installer.rb
  56. +44 −11 lib/rubygems/dependency_list.rb
  57. +562 −0 lib/rubygems/dependency_resolver.rb
  58. +70 −0 lib/rubygems/deprecate.rb
  59. +64 −28 lib/rubygems/doc_manager.rb
  60. +79 −24 lib/rubygems/errors.rb
  61. +19 −4 lib/rubygems/exceptions.rb
  62. +16 −12 lib/rubygems/ext/builder.rb
  63. +2 −2 lib/rubygems/ext/configure_builder.rb
  64. +2 −2 lib/rubygems/ext/ext_conf_builder.rb
  65. +13 −5 lib/rubygems/ext/rake_builder.rb
  66. +0 −79 lib/rubygems/format.rb
  67. +0 −92 lib/rubygems/gem_openssl.rb
  68. +0 −117 lib/rubygems/gem_path_searcher.rb
  69. +6 −17 lib/rubygems/gem_runner.rb
  70. +52 −4 lib/rubygems/gemcutter_utilities.rb
  71. +119 −235 lib/rubygems/indexer.rb
  72. +12 −0 lib/rubygems/install_message.rb
  73. +63 −19 lib/rubygems/install_update_options.rb
  74. +383 −201 lib/rubygems/installer.rb
  75. +194 −0 lib/rubygems/installer_test_case.rb
  76. +2 −2 lib/rubygems/local_remote_options.rb
  77. +88 −0 lib/rubygems/mock_gem_ui.rb
  78. +110 −0 lib/rubygems/name_tuple.rb
  79. +0 −152 lib/rubygems/old_format.rb
  80. +401 −60 lib/rubygems/package.rb
  81. +24 −0 lib/rubygems/package/digest_io.rb
  82. +0 −23 lib/rubygems/package/f_sync_dir.rb
  83. +147 −0 lib/rubygems/package/old.rb
  84. +18 −55 lib/rubygems/package/tar_header.rb
  85. +0 −222 lib/rubygems/package/tar_input.rb
  86. +0 −144 lib/rubygems/package/tar_output.rb
  87. +3 −3 lib/rubygems/package/tar_reader.rb
  88. +6 −1 lib/rubygems/package/tar_reader/entry.rb
  89. +5 −2 test/gem_package_tar_test_case.rb → lib/rubygems/package/tar_test_case.rb
  90. +45 −1 lib/rubygems/package/tar_writer.rb
  91. +10 −6 lib/rubygems/package_task.rb
  92. +77 −0 lib/rubygems/path_support.rb
  93. +13 −2 lib/rubygems/platform.rb
  94. +16 −0 lib/rubygems/psych_tree.rb
  95. +308 −0 lib/rubygems/rdoc.rb
  96. +177 −68 lib/rubygems/remote_fetcher.rb
  97. +182 −0 lib/rubygems/request_set.rb
  98. +0 −17 lib/rubygems/require_paths_builder.rb
  99. +119 −23 lib/rubygems/requirement.rb
  100. +293 −557 lib/rubygems/security.rb
  101. +115 −0 lib/rubygems/security/policies.rb
  102. +221 −0 lib/rubygems/security/policy.rb
  103. +118 −0 lib/rubygems/security/signer.rb
  104. +104 −0 lib/rubygems/security/trust_dir.rb
  105. +70 −139 lib/rubygems/server.rb
  106. +139 −0 lib/rubygems/source.rb
  107. +0 −566 lib/rubygems/source_index.rb
  108. +0 −394 lib/rubygems/source_info_cache.rb
  109. +0 −56 lib/rubygems/source_info_cache_entry.rb
  110. +87 −0 lib/rubygems/source_list.rb
  111. +92 −0 lib/rubygems/source_local.rb
  112. +28 −0 lib/rubygems/source_specific_file.rb
  113. +105 −213 lib/rubygems/spec_fetcher.rb
  114. +1,910 −944 lib/rubygems/specification.rb
  115. +67 −0 lib/rubygems/syck_hack.rb
  116. +965 −0 lib/rubygems/test_case.rb
  117. +42 −22 lib/rubygems/test_utilities.rb
  118. +1 −1 lib/rubygems/text.rb
  119. +113 −86 lib/rubygems/uninstaller.rb
  120. +152 −95 lib/rubygems/user_interaction.rb
  121. +35 −99 lib/rubygems/validator.rb
  122. +24 −7 lib/rubygems/version.rb
  123. +0 −3 pkgs/sources/lib/sources.rb
  124. +0 −14 pkgs/sources/sources.gemspec
  125. +8 −3 setup.rb
  126. +0 −92 test/functional.rb
  127. +0 −97 test/gem_installer_test_case.rb
  128. +0 −610 test/gemutilities.rb
  129. +0 −56 test/mockgemui.rb
  130. +0 −1 test/plugin/load/rubygems_plugin.rb
  131. +0 −27 test/private_key.pem
  132. +0 −20 test/public_cert.pem
  133. +9 −0 test/rubygems/alternate_cert.pem
  134. +9 −0 test/rubygems/alternate_cert_32.pem
  135. +9 −0 test/rubygems/alternate_key.pem
  136. +1 −0 test/rubygems/bad_rake.rb
  137. 0 test/{ → rubygems}/bogussources.rb
  138. +9 −0 test/rubygems/child_cert.pem
  139. +9 −0 test/rubygems/child_cert_32.pem
  140. +9 −0 test/rubygems/child_key.pem
  141. 0 test/{ → rubygems}/data/gem-private_key.pem
  142. 0 test/{ → rubygems}/data/gem-public_cert.pem
  143. +9 −0 test/rubygems/expired_cert.pem
  144. 0 test/{ → rubygems}/fake_certlib/openssl.rb
  145. +12 −0 test/rubygems/fix_openssl_warnings.rb
  146. 0 test/{ → rubygems}/foo/discover.rb
  147. +9 −0 test/rubygems/future_cert.pem
  148. +9 −0 test/rubygems/future_cert_32.pem
  149. +1 −0 test/rubygems/good_rake.rb
  150. +9 −0 test/rubygems/grandchild_cert.pem
  151. +9 −0 test/rubygems/grandchild_cert_32.pem
  152. +9 −0 test/rubygems/grandchild_key.pem
  153. 0 test/{ → rubygems}/insure_session.rb
  154. +9 −0 test/rubygems/invalid_issuer_cert.pem
  155. +9 −0 test/rubygems/invalid_issuer_cert_32.pem
  156. +9 −0 test/rubygems/invalid_key.pem
  157. +9 −0 test/rubygems/invalid_signer_cert.pem
  158. +9 −0 test/rubygems/invalid_signer_cert_32.pem
  159. +9 −0 test/rubygems/invalidchild_cert.pem
  160. +9 −0 test/rubygems/invalidchild_cert_32.pem
  161. +9 −0 test/rubygems/invalidchild_key.pem
  162. 0 test/{ → rubygems}/plugin/exception/rubygems_plugin.rb
  163. +3 −0 test/rubygems/plugin/load/rubygems_plugin.rb
  164. 0 test/{ → rubygems}/plugin/standarderror/rubygems_plugin.rb
  165. +9 −0 test/rubygems/private_key.pem
  166. +10 −0 test/rubygems/public_cert.pem
  167. +10 −0 test/rubygems/public_cert_32.pem
  168. +4 −0 test/rubygems/public_key.pem
  169. 0 test/rubygems/{ → rubygems}/commands/crash_command.rb
  170. 0 test/{ → rubygems}/rubygems_plugin.rb
  171. 0 test/{ → rubygems}/sff/discover.rb
  172. +2 −2 test/{ → rubygems}/simple_gem.rb
  173. +2 −2 test/{ → rubygems}/test_config.rb
  174. +75 −0 test/rubygems/test_deprecate.rb
  175. +1,494 −0 test/rubygems/test_gem.rb
  176. +13 −3 test/{ → rubygems}/test_gem_command.rb
  177. +70 −11 test/{ → rubygems}/test_gem_command_manager.rb
  178. +37 −9 test/{ → rubygems}/test_gem_commands_build_command.rb
  179. +524 −0 test/rubygems/test_gem_commands_cert_command.rb
  180. +2 −2 test/{ → rubygems}/test_gem_commands_check_command.rb
  181. +108 −0 test/rubygems/test_gem_commands_cleanup_command.rb
  182. +22 −33 test/{ → rubygems}/test_gem_commands_contents_command.rb
  183. +34 −19 test/{ → rubygems}/test_gem_commands_dependency_command.rb
  184. +2 −2 test/{ → rubygems}/test_gem_commands_environment_command.rb
  185. +101 −0 test/rubygems/test_gem_commands_fetch_command.rb
  186. +5 −56 test/{ → rubygems}/test_gem_commands_generate_index_command.rb
  187. +58 −0 test/rubygems/test_gem_commands_help_command.rb
  188. +849 −0 test/rubygems/test_gem_commands_install_command.rb
  189. +3 −6 test/{ → rubygems}/test_gem_commands_list_command.rb
  190. +3 −3 test/{ → rubygems}/test_gem_commands_lock_command.rb
  191. +32 −0 test/rubygems/test_gem_commands_mirror.rb
  192. +38 −0 test/rubygems/test_gem_commands_outdated_command.rb
  193. +49 −11 test/{ → rubygems}/test_gem_commands_owner_command.rb
  194. +231 −0 test/rubygems/test_gem_commands_pristine_command.rb
  195. +161 −0 test/rubygems/test_gem_commands_push_command.rb
  196. +68 −84 test/{ → rubygems}/test_gem_commands_query_command.rb
  197. +2 −2 test/{ → rubygems}/test_gem_commands_server_command.rb
  198. +20 −18 test/{ → rubygems}/test_gem_commands_sources_command.rb
  199. +273 −0 test/rubygems/test_gem_commands_specification_command.rb
  200. +10 −8 test/{ → rubygems}/test_gem_commands_stale_command.rb
  201. +178 −0 test/rubygems/test_gem_commands_uninstall_command.rb
  202. +81 −16 test/{ → rubygems}/test_gem_commands_unpack_command.rb
  203. +388 −0 test/rubygems/test_gem_commands_update_command.rb
  204. +83 −0 test/rubygems/test_gem_commands_which_command.rb
  205. +62 −23 test/{ → rubygems}/test_gem_config_file.rb
  206. +100 −11 test/{ → rubygems}/test_gem_dependency.rb
  207. +422 −119 test/{ → rubygems}/test_gem_dependency_installer.rb
  208. +61 −32 test/{ → rubygems}/test_gem_dependency_list.rb
  209. +327 −0 test/rubygems/test_gem_dependency_resolver.rb
  210. +7 −6 test/{ → rubygems}/test_gem_doc_manager.rb
  211. +4 −4 test/{ → rubygems}/test_gem_ext_configure_builder.rb
  212. +6 −8 test/{ → rubygems}/test_gem_ext_ext_conf_builder.rb
  213. +15 −15 test/{ → rubygems}/test_gem_ext_rake_builder.rb
  214. +94 −0 test/rubygems/test_gem_gem_path_searcher.rb
  215. +27 −8 test/{ → rubygems}/test_gem_gem_runner.rb
  216. +71 −4 test/{ → rubygems}/test_gem_gemcutter_utilities.rb
  217. +98 −263 test/{ → rubygems}/test_gem_indexer.rb
  218. +142 −0 test/rubygems/test_gem_install_update_options.rb
  219. +487 −175 test/{ → rubygems}/test_gem_installer.rb
  220. +10 −4 test/{ → rubygems}/test_gem_local_remote_options.rb
  221. +15 −0 test/rubygems/test_gem_name_tuple.rb
  222. +480 −0 test/rubygems/test_gem_package.rb
  223. +37 −0 test/rubygems/test_gem_package_old.rb
  224. +2 −2 test/{ → rubygems}/test_gem_package_tar_header.rb
  225. +2 −2 test/{ → rubygems}/test_gem_package_tar_reader.rb
  226. +12 −2 test/{ → rubygems}/test_gem_package_tar_reader_entry.rb
  227. +73 −2 test/{ → rubygems}/test_gem_package_tar_writer.rb
  228. +15 −2 test/{ → rubygems}/test_gem_package_task.rb
  229. +67 −0 test/rubygems/test_gem_path_support.rb
  230. +14 −7 test/{ → rubygems}/test_gem_platform.rb
  231. +241 −0 test/rubygems/test_gem_rdoc.rb
  232. +210 −57 test/{ → rubygems}/test_gem_remote_fetcher.rb
  233. +70 −0 test/rubygems/test_gem_request_set.rb
  234. +75 −17 test/{ → rubygems}/test_gem_requirement.rb
  235. +246 −0 test/rubygems/test_gem_security.rb
  236. +374 −0 test/rubygems/test_gem_security_policy.rb
  237. +187 −0 test/rubygems/test_gem_security_signer.rb
  238. +94 −0 test/rubygems/test_gem_security_trust_dir.rb
  239. +9 −171 test/{ → rubygems}/test_gem_server.rb
  240. +111 −0 test/rubygems/test_gem_silent_ui.rb
  241. +188 −0 test/rubygems/test_gem_source.rb
  242. +87 −0 test/rubygems/test_gem_source_list.rb
  243. +74 −0 test/rubygems/test_gem_source_local.rb
  244. +33 −0 test/rubygems/test_gem_source_specific_file.rb
  245. +230 −0 test/rubygems/test_gem_spec_fetcher.rb
  246. +750 −209 test/{ → rubygems}/test_gem_specification.rb
  247. +42 −4 test/{ → rubygems}/test_gem_stream_ui.rb
  248. +17 −2 test/{ → rubygems}/test_gem_text.rb
  249. +295 −0 test/rubygems/test_gem_uninstaller.rb
  250. +25 −3 test/{ → rubygems}/test_gem_validator.rb
  251. +21 −19 test/{ → rubygems}/test_gem_version.rb
  252. +2 −2 test/{ → rubygems}/test_gem_version_option.rb
  253. +4 −5 test/{ → rubygems}/test_kernel.rb
  254. +170 −0 test/rubygems/test_require.rb
  255. +9 −0 test/rubygems/wrong_key_cert.pem
  256. +9 −0 test/rubygems/wrong_key_cert_32.pem
  257. +0 −766 test/test_gem.rb
  258. +0 −27 test/test_gem_builder.rb
  259. +0 −124 test/test_gem_commands_cert_command.rb
  260. +0 −76 test/test_gem_commands_fetch_command.rb
  261. +0 −317 test/test_gem_commands_install_command.rb
  262. +0 −60 test/test_gem_commands_mirror_command.rb
  263. +0 −40 test/test_gem_commands_outdated_command.rb
  264. +0 −108 test/test_gem_commands_pristine_command.rb
  265. +0 −81 test/test_gem_commands_push_command.rb
  266. +0 −139 test/test_gem_commands_specification_command.rb
  267. +0 −83 test/test_gem_commands_uninstall_command.rb
  268. +0 −169 test/test_gem_commands_update_command.rb
  269. +0 −66 test/test_gem_commands_which_command.rb
  270. +0 −70 test/test_gem_format.rb
  271. +0 −78 test/test_gem_gem_path_searcher.rb
  272. +0 −68 test/test_gem_install_update_options.rb
  273. +0 −112 test/test_gem_package_tar_input.rb
  274. +0 −97 test/test_gem_package_tar_output.rb
  275. +0 −90 test/test_gem_security.rb
  276. +0 −455 test/test_gem_source_index.rb
  277. +0 −410 test/test_gem_spec_fetcher.rb
  278. +0 −146 test/test_gem_uninstaller.rb
  279. +0 −304 util/gem_prelude.rb
View
@@ -1,34 +1,43 @@
# -*- ruby -*-
+Gem.refresh
+
require 'autotest/restart'
+require 'autotest/isolate'
Autotest.add_hook :initialize do |at|
- at.order = :natural # I am a bad person - Eric Hodel
at.testlib = 'minitest/autorun'
at.add_exception %r%/\.git/%
at.add_exception %r%/\.svn/%
at.add_exception %r%\.rbc$%
- at.add_exception %r%test/rubygems%
+ at.add_exception %r%test/rubygems/rubygems%
at.find_directories.clear
at.find_directories.push 'lib', 'test'
at.add_mapping %r%^lib/rubygems.rb$% do |_, m|
- "test/test_gem.rb"
+ "test/rubygems/test_gem.rb"
end
at.add_mapping %r%^lib/rubygems/(.*).rb$% do |_, m|
- "test/test_gem_#{m[1].gsub '/', '_'}.rb"
+ "test/rubygems/test_gem_#{m[1].gsub '/', '_'}.rb"
end
at.add_mapping %r%^test/support/(.*).rb$% do |_, m|
- at.files_matching %r%^test/test_(.*)\.rb$%
+ at.files_matching %r%^test/rubygems/test_(.*)\.rb$%
end
- # at.add_mapping %r%^test/support/(.*).rb$% do |_, m|
- # files_matching %r%^test/test_(.*)\.rb%%
- # end
+ args = ARGV.reject { |a| a =~ /^-/ }
+ at.find_directories = args unless args.empty?
+end
+
+class Autotest
+ alias :old_path_to_classname :path_to_classname
+ def path_to_classname s
+ classname = old_path_to_classname(s.sub(/test.rubygems.test_/, ""))
+ classname = classname.gsub('Rdoc', 'RDoc')
- at.find_directories = ARGV unless ARGV.empty?
+ classname
+ end
end
View
@@ -1,6 +1,10 @@
*.rbc
*.swp
+.DS_Store
/.rvmrc
/TAGS
/doc
/pkg
+/tmp
+/misc
+/notes.txt
View
@@ -0,0 +1,14 @@
+before_script:
+ - gem install minitest
+ - gem install rdoc
+ - gem install hoe
+ - gem install hoe-seattlerb
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ruby-head
+notifications:
+ email:
+ - drbrain@segment7.net
+ - evan+notify@phx.io
Oops, something went wrong.

0 comments on commit f6b91ce

Please sign in to comment.