warbler 1.4.10 → 2.0.0.pre1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (186) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +12 -29
  3. data/Gemfile +1 -12
  4. data/History.txt +5 -7
  5. data/Mavenfile +1 -2
  6. data/README.rdoc +51 -53
  7. data/Rakefile +7 -13
  8. data/ext/JarMain.java +12 -58
  9. data/ext/WarMain.java +13 -41
  10. data/ext/WarblerJar.java +8 -12
  11. data/lib/warbler.rb +0 -1
  12. data/lib/warbler/config.rb +11 -2
  13. data/lib/warbler/gems.rb +9 -9
  14. data/lib/warbler/jar.rb +2 -4
  15. data/lib/warbler/rake_helper.rb +0 -7
  16. data/lib/warbler/traits.rb +0 -1
  17. data/lib/warbler/traits/bundler.rb +12 -12
  18. data/lib/warbler/traits/gemspec.rb +12 -22
  19. data/lib/warbler/traits/rails.rb +5 -5
  20. data/lib/warbler/traits/war.rb +2 -7
  21. data/lib/warbler/version.rb +1 -1
  22. data/lib/warbler/web_server.rb +4 -16
  23. data/lib/warbler/zip_support.rb +3 -21
  24. data/lib/warbler_jar.jar +0 -0
  25. data/pom.xml +23 -6
  26. data/spec/drb_default_id_conv.rb +48 -50
  27. data/spec/sample_bundler/Gemfile +1 -1
  28. data/spec/sample_bundler/vendor/bundle/jruby/{1.8 → 2.2.0}/bin/rake +7 -3
  29. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/cache/rake-10.4.2.gem +0 -0
  30. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.autotest +7 -0
  31. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.gemtest +0 -0
  32. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.rubocop.yml +27 -0
  33. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.togglerc +7 -0
  34. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/CONTRIBUTING.rdoc +34 -0
  35. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/History.rdoc +651 -0
  36. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/MIT-LICENSE +21 -0
  37. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/Manifest.txt +166 -0
  38. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/README.rdoc +140 -0
  39. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/Rakefile +81 -0
  40. data/spec/sample_bundler/vendor/bundle/{ruby/1.8/gems/rake-0.8.7 → jruby/2.2.0/gems/rake-10.4.2}/bin/rake +5 -3
  41. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake.rb +79 -0
  42. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/alt_system.rb +110 -0
  43. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/application.rb +790 -0
  44. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/backtrace.rb +23 -0
  45. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/clean.rb +76 -0
  46. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/cloneable.rb +16 -0
  47. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/.document +1 -0
  48. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/compositepublisher.rb +21 -0
  49. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/ftptools.rb +137 -0
  50. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/publisher.rb +81 -0
  51. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/rubyforgepublisher.rb +18 -0
  52. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/sshpublisher.rb +61 -0
  53. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/sys.rb +4 -0
  54. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/cpu_counter.rb +125 -0
  55. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/default_loader.rb +14 -0
  56. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/dsl_definition.rb +201 -0
  57. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/early_time.rb +21 -0
  58. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/core.rb +25 -0
  59. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/module.rb +2 -0
  60. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/pathname.rb +25 -0
  61. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/string.rb +173 -0
  62. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/time.rb +16 -0
  63. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_creation_task.rb +24 -0
  64. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_list.rb +428 -0
  65. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_task.rb +46 -0
  66. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_utils.rb +128 -0
  67. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_utils_ext.rb +144 -0
  68. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/gempackagetask.rb +4 -0
  69. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/invocation_chain.rb +56 -0
  70. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/invocation_exception_mixin.rb +16 -0
  71. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/late_time.rb +17 -0
  72. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/linked_list.rb +103 -0
  73. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/loaders/makefile.rb +40 -0
  74. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/multi_task.rb +13 -0
  75. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/name_space.rb +38 -0
  76. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/packagetask.rb +199 -0
  77. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/pathmap.rb +3 -0
  78. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/phony.rb +15 -0
  79. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/private_reader.rb +20 -0
  80. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/promise.rb +99 -0
  81. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/pseudo_status.rb +29 -0
  82. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rake_module.rb +38 -0
  83. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rake_test_loader.rb +22 -0
  84. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rdoctask.rb +4 -0
  85. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ruby182_test_unit_fix.rb +29 -0
  86. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rule_recursion_overflow_error.rb +20 -0
  87. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/runtest.rb +27 -0
  88. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/scope.rb +42 -0
  89. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task.rb +383 -0
  90. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task_argument_error.rb +7 -0
  91. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task_arguments.rb +98 -0
  92. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task_manager.rb +310 -0
  93. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/tasklib.rb +24 -0
  94. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/testtask.rb +212 -0
  95. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/thread_history_display.rb +48 -0
  96. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/thread_pool.rb +164 -0
  97. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/trace_output.rb +22 -0
  98. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/version.rb +7 -0
  99. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/win32.rb +56 -0
  100. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/rakelib/publish.rake +20 -0
  101. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/rakelib/test_times.rake +25 -0
  102. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/file_creation.rb +34 -0
  103. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/helper.rb +130 -0
  104. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/support/rakefile_definitions.rb +478 -0
  105. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/support/ruby_runner.rb +34 -0
  106. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_private_reader.rb +42 -0
  107. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake.rb +40 -0
  108. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_application.rb +643 -0
  109. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_application_options.rb +466 -0
  110. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_backtrace.rb +119 -0
  111. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_clean.rb +61 -0
  112. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_cpu_counter.rb +68 -0
  113. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_definitions.rb +84 -0
  114. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_directory_task.rb +76 -0
  115. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_dsl.rb +40 -0
  116. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_early_time.rb +31 -0
  117. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_extension.rb +59 -0
  118. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_creation_task.rb +56 -0
  119. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_list.rb +655 -0
  120. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_list_path_map.rb +8 -0
  121. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_task.rb +197 -0
  122. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_utils.rb +309 -0
  123. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_ftp_file.rb +74 -0
  124. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_functional.rb +482 -0
  125. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_invocation_chain.rb +64 -0
  126. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_late_time.rb +18 -0
  127. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_linked_list.rb +84 -0
  128. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_makefile_loader.rb +46 -0
  129. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_multi_task.rb +64 -0
  130. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_name_space.rb +57 -0
  131. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_package_task.rb +79 -0
  132. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_path_map.rb +168 -0
  133. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_path_map_explode.rb +34 -0
  134. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_path_map_partial.rb +18 -0
  135. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_pathname_extensions.rb +15 -0
  136. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_pseudo_status.rb +21 -0
  137. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_rake_test_loader.rb +20 -0
  138. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_reduce_compat.rb +26 -0
  139. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_require.rb +40 -0
  140. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_rules.rb +388 -0
  141. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_scope.rb +44 -0
  142. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task.rb +393 -0
  143. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_argument_parsing.rb +119 -0
  144. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_arguments.rb +127 -0
  145. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_lib.rb +9 -0
  146. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_manager.rb +178 -0
  147. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_manager_argument_resolution.rb +19 -0
  148. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_with_arguments.rb +172 -0
  149. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_test_task.rb +146 -0
  150. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_thread_pool.rb +145 -0
  151. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_top_level_functions.rb +71 -0
  152. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_win32.rb +72 -0
  153. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_thread_history_display.rb +101 -0
  154. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_trace_output.rb +52 -0
  155. data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/specifications/rake-10.4.2.gemspec +43 -0
  156. data/spec/sample_jar/sample_jar.gemspec +1 -2
  157. data/spec/spec_helper.rb +2 -8
  158. data/spec/warbler/bundler_spec.rb +11 -22
  159. data/spec/warbler/config_spec.rb +0 -3
  160. data/spec/warbler/jar_spec.rb +3 -77
  161. data/spec/warbler/task_spec.rb +5 -6
  162. data/spec/warbler/web_server_spec.rb +2 -2
  163. data/warble.rb +4 -4
  164. data/warbler.gemspec +8 -8
  165. metadata +451 -64
  166. data/lib/warbler/bundler_helper.rb +0 -22
  167. data/lib/warbler/traits/merb.rb +0 -35
  168. data/spec/sample_bundler/vendor/bundle/jruby/1.8/cache/rake-0.8.7.gem +0 -0
  169. data/spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/bin/rake +0 -31
  170. data/spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/lib/rake.rb +0 -2506
  171. data/spec/sample_bundler/vendor/bundle/jruby/1.8/specifications/rake-0.8.7.gemspec +0 -31
  172. data/spec/sample_bundler/vendor/bundle/jruby/1.9/bin/rake +0 -19
  173. data/spec/sample_bundler/vendor/bundle/jruby/1.9/cache/rake-0.8.7.gem +0 -0
  174. data/spec/sample_bundler/vendor/bundle/jruby/1.9/gems/rake-0.8.7/bin/rake +0 -31
  175. data/spec/sample_bundler/vendor/bundle/jruby/1.9/gems/rake-0.8.7/lib/rake.rb +0 -2506
  176. data/spec/sample_bundler/vendor/bundle/jruby/1.9/specifications/rake-0.8.7.gemspec +0 -30
  177. data/spec/sample_bundler/vendor/bundle/ruby/1.8/bin/rake +0 -19
  178. data/spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem +0 -0
  179. data/spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb +0 -2506
  180. data/spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec +0 -30
  181. data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/bin/rake +0 -19
  182. data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem +0 -0
  183. data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/bin/rake +0 -31
  184. data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb +0 -2506
  185. data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec +0 -30
  186. data/spec/sample_jar/sbin/sample_jar +0 -5
@@ -0,0 +1,52 @@
1
+ require File.expand_path('../helper', __FILE__)
2
+ require 'stringio'
3
+
4
+ class TestTraceOutput < Rake::TestCase
5
+ include Rake::TraceOutput
6
+
7
+ class PrintSpy
8
+ attr_reader :result, :calls
9
+
10
+ def initialize
11
+ @result = ""
12
+ @calls = 0
13
+ end
14
+
15
+ def print(string)
16
+ @result << string
17
+ @calls += 1
18
+ end
19
+ end
20
+
21
+ def test_trace_issues_single_io_for_args_with_empty_args
22
+ spy = PrintSpy.new
23
+ trace_on(spy)
24
+ assert_equal "\n", spy.result
25
+ assert_equal 1, spy.calls
26
+ end
27
+
28
+ def test_trace_issues_single_io_for_args_multiple_strings
29
+ spy = PrintSpy.new
30
+ trace_on(spy, "HI\n", "LO")
31
+ assert_equal "HI\nLO\n", spy.result
32
+ assert_equal 1, spy.calls
33
+ end
34
+
35
+ def test_trace_handles_nil_objects
36
+ spy = PrintSpy.new
37
+ trace_on(spy, "HI\n", nil, "LO")
38
+ assert_equal "HI\nLO\n", spy.result
39
+ assert_equal 1, spy.calls
40
+ end
41
+
42
+ def test_trace_issues_single_io_for_args_multiple_strings_and_alternate_sep
43
+ old_sep = $\
44
+ $\ = "\r"
45
+ spy = PrintSpy.new
46
+ trace_on(spy, "HI\r", "LO")
47
+ assert_equal "HI\rLO\r", spy.result
48
+ assert_equal 1, spy.calls
49
+ ensure
50
+ $\ = old_sep
51
+ end
52
+ end
@@ -0,0 +1,43 @@
1
+ # -*- encoding: utf-8 -*-
2
+ # stub: rake 10.4.2 ruby lib
3
+
4
+ Gem::Specification.new do |s|
5
+ s.name = "rake"
6
+ s.version = "10.4.2"
7
+
8
+ s.required_rubygems_version = Gem::Requirement.new(">= 1.3.2") if s.respond_to? :required_rubygems_version=
9
+ s.require_paths = ["lib"]
10
+ s.authors = ["Eric Hodel", "Jim Weirich"]
11
+ s.date = "2014-12-03"
12
+ s.description = "Rake is a Make-like program implemented in Ruby. Tasks and dependencies are\nspecified in standard Ruby syntax.\n\nRake has the following features:\n\n* Rakefiles (rake's version of Makefiles) are completely defined in\n standard Ruby syntax. No XML files to edit. No quirky Makefile\n syntax to worry about (is that a tab or a space?)\n\n* Users can specify tasks with prerequisites.\n\n* Rake supports rule patterns to synthesize implicit tasks.\n\n* Flexible FileLists that act like arrays but know about manipulating\n file names and paths.\n\n* A library of prepackaged tasks to make building rakefiles easier. For example,\n tasks for building tarballs and publishing to FTP or SSH sites. (Formerly\n tasks for building RDoc and Gems were included in rake but they're now\n available in RDoc and RubyGems respectively.)\n\n* Supports parallel execution of tasks."
13
+ s.email = ["drbrain@segment7.net", ""]
14
+ s.executables = ["rake"]
15
+ s.extra_rdoc_files = ["CONTRIBUTING.rdoc", "History.rdoc", "Manifest.txt", "README.rdoc", "doc/command_line_usage.rdoc", "doc/glossary.rdoc", "doc/proto_rake.rdoc", "doc/rakefile.rdoc", "doc/rational.rdoc", "doc/release_notes/rake-0.4.14.rdoc", "doc/release_notes/rake-0.4.15.rdoc", "doc/release_notes/rake-0.5.0.rdoc", "doc/release_notes/rake-0.5.3.rdoc", "doc/release_notes/rake-0.5.4.rdoc", "doc/release_notes/rake-0.6.0.rdoc", "doc/release_notes/rake-0.7.0.rdoc", "doc/release_notes/rake-0.7.1.rdoc", "doc/release_notes/rake-0.7.2.rdoc", "doc/release_notes/rake-0.7.3.rdoc", "doc/release_notes/rake-0.8.0.rdoc", "doc/release_notes/rake-0.8.2.rdoc", "doc/release_notes/rake-0.8.3.rdoc", "doc/release_notes/rake-0.8.4.rdoc", "doc/release_notes/rake-0.8.5.rdoc", "doc/release_notes/rake-0.8.6.rdoc", "doc/release_notes/rake-0.8.7.rdoc", "doc/release_notes/rake-0.9.0.rdoc", "doc/release_notes/rake-0.9.1.rdoc", "doc/release_notes/rake-0.9.2.2.rdoc", "doc/release_notes/rake-0.9.2.rdoc", "doc/release_notes/rake-0.9.3.rdoc", "doc/release_notes/rake-0.9.4.rdoc", "doc/release_notes/rake-0.9.5.rdoc", "doc/release_notes/rake-0.9.6.rdoc", "doc/release_notes/rake-10.0.0.rdoc", "doc/release_notes/rake-10.0.1.rdoc", "doc/release_notes/rake-10.0.2.rdoc", "doc/release_notes/rake-10.0.3.rdoc", "doc/release_notes/rake-10.1.0.rdoc", "MIT-LICENSE"]
16
+ s.files = ["CONTRIBUTING.rdoc", "History.rdoc", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "bin/rake", "doc/command_line_usage.rdoc", "doc/glossary.rdoc", "doc/proto_rake.rdoc", "doc/rakefile.rdoc", "doc/rational.rdoc", "doc/release_notes/rake-0.4.14.rdoc", "doc/release_notes/rake-0.4.15.rdoc", "doc/release_notes/rake-0.5.0.rdoc", "doc/release_notes/rake-0.5.3.rdoc", "doc/release_notes/rake-0.5.4.rdoc", "doc/release_notes/rake-0.6.0.rdoc", "doc/release_notes/rake-0.7.0.rdoc", "doc/release_notes/rake-0.7.1.rdoc", "doc/release_notes/rake-0.7.2.rdoc", "doc/release_notes/rake-0.7.3.rdoc", "doc/release_notes/rake-0.8.0.rdoc", "doc/release_notes/rake-0.8.2.rdoc", "doc/release_notes/rake-0.8.3.rdoc", "doc/release_notes/rake-0.8.4.rdoc", "doc/release_notes/rake-0.8.5.rdoc", "doc/release_notes/rake-0.8.6.rdoc", "doc/release_notes/rake-0.8.7.rdoc", "doc/release_notes/rake-0.9.0.rdoc", "doc/release_notes/rake-0.9.1.rdoc", "doc/release_notes/rake-0.9.2.2.rdoc", "doc/release_notes/rake-0.9.2.rdoc", "doc/release_notes/rake-0.9.3.rdoc", "doc/release_notes/rake-0.9.4.rdoc", "doc/release_notes/rake-0.9.5.rdoc", "doc/release_notes/rake-0.9.6.rdoc", "doc/release_notes/rake-10.0.0.rdoc", "doc/release_notes/rake-10.0.1.rdoc", "doc/release_notes/rake-10.0.2.rdoc", "doc/release_notes/rake-10.0.3.rdoc", "doc/release_notes/rake-10.1.0.rdoc"]
17
+ s.homepage = "https://github.com/ruby/rake"
18
+ s.licenses = ["MIT"]
19
+ s.rdoc_options = ["--main", "README.rdoc"]
20
+ s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
21
+ s.rubygems_version = "2.4.5"
22
+ s.summary = "Rake is a Make-like program implemented in Ruby"
23
+
24
+ s.installed_by_version = "2.4.5" if s.respond_to? :installed_by_version
25
+
26
+ if s.respond_to? :specification_version then
27
+ s.specification_version = 4
28
+
29
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
30
+ s.add_development_dependency(%q<minitest>, ["~> 5.4"])
31
+ s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
32
+ s.add_development_dependency(%q<hoe>, ["~> 3.13"])
33
+ else
34
+ s.add_dependency(%q<minitest>, ["~> 5.4"])
35
+ s.add_dependency(%q<rdoc>, ["~> 4.0"])
36
+ s.add_dependency(%q<hoe>, ["~> 3.13"])
37
+ end
38
+ else
39
+ s.add_dependency(%q<minitest>, ["~> 5.4"])
40
+ s.add_dependency(%q<rdoc>, ["~> 4.0"])
41
+ s.add_dependency(%q<hoe>, ["~> 3.13"])
42
+ end
43
+ end
@@ -10,8 +10,7 @@ Gem::Specification.new do |s|
10
10
  s.description = ""
11
11
  s.email = ["nick@nicksieger.com"]
12
12
  s.executables = ["sample_jar"]
13
- s.bindir = 'sbin'
14
- s.files = ["History.txt", "Rakefile", "README.txt", "sample_jar.gemspec", "bin/sample_jar", "sbin/sample_jar", "lib/sample_jar.rb", "test/test_sample_jar.rb"]
13
+ s.files = ["History.txt", "Rakefile", "README.txt", "sample_jar.gemspec", "bin/sample_jar", "lib/sample_jar.rb", "test/test_sample_jar.rb"]
15
14
  s.homepage = ""
16
15
  s.require_paths = ["lib"]
17
16
  s.rubygems_version = "1.8.15"
data/spec/spec_helper.rb CHANGED
@@ -88,9 +88,6 @@ module ExampleGroupHelpers
88
88
  cur_dir = Dir.pwd
89
89
  Dir.chdir(@gem_dir) do
90
90
  `git init`
91
- `git config user.email "warbler-test@null.com"`
92
- `git config user.name "Warbler Test"`
93
-
94
91
  # create the gemspec and Gemfile
95
92
  File.open("Gemfile", "w") do |f|
96
93
  f << <<-RUBY
@@ -105,11 +102,9 @@ module ExampleGroupHelpers
105
102
  Gem::Specification.new do |gem|
106
103
  gem.name = "#{gem_name}"
107
104
  gem.version = '1.0'
108
- gem.authors = ['John Doe']
109
- gem.summary = "Gem for testing"
110
105
  gem.platform = Gem::Platform::RUBY
111
106
  gem.files = `git ls-files`.split("\n")
112
- gem.add_runtime_dependency 'rake', ['>= 0.8.7']
107
+ gem.add_runtime_dependency 'rake', [">= 10.4.2"]
113
108
  end
114
109
  RUBY
115
110
  end
@@ -161,9 +156,8 @@ module ExampleGroupHelpers
161
156
  if defined?(JRUBY_VERSION)
162
157
  require 'jruby'
163
158
  let(:drb) do
164
- version_arg = JRuby.runtime.is1_9 ? "--1.9" : "--1.8"
165
159
  drb_thread = Thread.new do
166
- ruby *([ version_arg ] + drb_helper_args)
160
+ ruby *(drb_helper_args)
167
161
  end
168
162
  drb_thread.run
169
163
  drb_thread
@@ -21,10 +21,6 @@ describe Warbler::Jar, "with Bundler" do
21
21
  @extra_config = block
22
22
  end
23
23
 
24
- def bundle_install(*args)
25
- `cd #{Dir.pwd} && #{RUBY_EXE} -S bundle install #{args.join(' ')}`
26
- end
27
-
28
24
  let(:config) { drbclient.config(@extra_config) }
29
25
  let(:jar) { drbclient.jar }
30
26
 
@@ -70,7 +66,7 @@ describe Warbler::Jar, "with Bundler" do
70
66
 
71
67
  it "works with :git entries in Gemfiles" do
72
68
  File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
73
- bundle_install '--local'
69
+ `#{RUBY_EXE} -S bundle install --local`
74
70
  jar.apply(config)
75
71
  file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb}).should_not be_empty
76
72
  file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
@@ -78,7 +74,7 @@ describe Warbler::Jar, "with Bundler" do
78
74
 
79
75
  it "bundles only the gemspec for :git entries that are excluded" do
80
76
  File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'tester', :git => '#{@gem_dir}'\nend\n"}
81
- bundle_install '--local'
77
+ `#{RUBY_EXE} -S bundle install --local`
82
78
  jar.apply(config)
83
79
  file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb}).should be_empty
84
80
  file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
@@ -86,7 +82,7 @@ describe Warbler::Jar, "with Bundler" do
86
82
 
87
83
  it "does not work with :path entries in Gemfiles" do
88
84
  File.open("Gemfile", "w") {|f| f << "gem 'tester', :path => '#{@gem_dir}'\n"}
89
- bundle_install '--local'
85
+ `#{RUBY_EXE} -S bundle install --local`
90
86
  silence { jar.apply(config) }
91
87
  file_list(%r{tester}).should be_empty
92
88
  end
@@ -130,7 +126,7 @@ describe Warbler::Jar, "with Bundler" do
130
126
 
131
127
  it "works with :git entries in Gemfiles" do
132
128
  File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
133
- bundle_install '--local'
129
+ `#{RUBY_EXE} -S bundle install --local`
134
130
  jar.apply(config)
135
131
  file_list(%r{^bundler/gems/tester[^/]*/lib/tester/version\.rb}).should_not be_empty
136
132
  file_list(%r{^bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
@@ -141,7 +137,7 @@ describe Warbler::Jar, "with Bundler" do
141
137
  end
142
138
 
143
139
  it "adds BUNDLE_GEMFILE to init.rb" do
144
- File.open("Gemfile", "w") {|f| f << "source 'http://rubygems.org/'" }
140
+ File.open("Gemfile", "w") {|f| f << "source :rubygems" }
145
141
  jar.add_init_file(config)
146
142
  contents = jar.contents('META-INF/init.rb')
147
143
  contents.should =~ /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/
@@ -196,17 +192,10 @@ describe Warbler::Jar, "with Bundler" do
196
192
 
197
193
  it "can run commands in the generated warfile" do
198
194
  jar.create('foo.war')
199
- if RUBY_VERSION >= '1.9'
200
- stdin, stdout, stderr, wait_thr = Open3.popen3('java -jar foo.war -S rake test_task')
201
- wait_thr.value.success?.should be(true)
202
-
203
- # TODO need to update rake or we'll get an warning in stderr
204
- # stderr.readlines.join.should eq("")
205
- stdout.readlines.join.should include("success\n")
206
- else
207
- `java -jar foo.war -S rake -T`
208
- $?.exitstatus.should == 0
209
- end
195
+ stdin, stdout, stderr, wait_thr = Open3.popen3('java -jar foo.war -S rake test_task')
196
+ wait_thr.value.success?.should be(true)
197
+ stderr.readlines.join.should eq("")
198
+ stdout.readlines.join.should eq("success\n")
210
199
  end
211
200
  end
212
201
  end
@@ -215,9 +204,9 @@ describe Warbler::Jar, "with Bundler" do
215
204
  run_in_directory "spec/sample_bundler"
216
205
 
217
206
  it "includes the bundler gem" do
218
- bundle_install '--deployment'
207
+ `#{RUBY_EXE} -S bundle install --deployment`
219
208
  jar.apply(config)
220
- file_list(%r{gems/rake-0.8.7/lib}).should_not be_empty
209
+ file_list(%r{gems/rake-10.4.2/lib}).should_not be_empty
221
210
  file_list(%r{gems/bundler-}).should_not be_empty
222
211
  file_list(%r{gems/bundler-.*/lib}).should_not be_empty
223
212
  end
@@ -111,9 +111,6 @@ describe Warbler::Config do
111
111
  config.webxml.booter = :rack
112
112
  config.webxml.servlet_context_listener.should == "org.jruby.rack.RackServletContextListener"
113
113
  config = Warbler::Config.new
114
- config.webxml.booter = :merb
115
- config.webxml.servlet_context_listener.should == "org.jruby.rack.merb.MerbServletContextListener"
116
- config = Warbler::Config.new
117
114
  config.webxml.servlet_context_listener.should == "org.jruby.rack.rails.RailsServletContextListener"
118
115
  end
119
116
 
@@ -149,7 +149,7 @@ describe Warbler::Jar do
149
149
  it "loads the default executable in main.rb" do
150
150
  jar.apply(config)
151
151
  contents = jar.contents('META-INF/main.rb')
152
- contents.should == "load 'sample_jar/sbin/sample_jar'"
152
+ contents.should =~ /load.*sample_jar\/bin\/sample_jar/
153
153
  end
154
154
 
155
155
  it "includes compiled .rb and .class files" do
@@ -183,12 +183,7 @@ describe Warbler::Jar do
183
183
  jar.compile(config)
184
184
  jar.apply(config)
185
185
  file_list(%r{sample_jar.*\.rb$}).size.should == 2
186
- if RUBY_VERSION >= '1.9'
187
- file_list(%r{gems.*\.class$}).size.should >= 80 # depending on RubyZip version
188
- else
189
- # 1.8.7 uses an older version of rubyzip and so the number of files compiled changes
190
- file_list(%r{gems.*\.class$}).size.should == 32
191
- end
186
+ file_list(%r{gems.*\.class$}).size.should == 80
192
187
  end
193
188
 
194
189
  it "does not compile included gems by default" do
@@ -196,12 +191,7 @@ describe Warbler::Jar do
196
191
  jar.compile(config)
197
192
  jar.apply(config)
198
193
  file_list(%r{sample_jar.*\.rb$}).size.should == 2
199
- if RUBY_VERSION >= '1.9'
200
- file_list(%r{gems.*\.class$}).size.should == 0
201
- else
202
- # 1.8.7 uses an older version of rubyzip and so the number of files compiled changes
203
- file_list(%r{gems.*\.class$}).size.should == 0
204
- end
194
+ file_list(%r{gems.*\.class$}).size.should == 0
205
195
  end
206
196
 
207
197
  end
@@ -860,70 +850,6 @@ describe Warbler::Jar do
860
850
  end
861
851
  end
862
852
 
863
- context "in a Merb application" do
864
- before :each do
865
- touch "config/init.rb"
866
- @merb = nil
867
- task :merb_env do
868
- @merb = mock_merb_module
869
- end
870
- end
871
-
872
- after :each do
873
- rm_f "config/init.rb"
874
- end
875
-
876
- def mock_merb_module
877
- merb = Module.new
878
- silence { Object.const_set("Merb", merb) }
879
- boot_loader = Module.new
880
- merb.const_set("BootLoader", boot_loader)
881
- merb.const_set("VERSION", "1.0")
882
- dependencies = Class.new do
883
- @dependencies = []
884
- def self.dependencies
885
- @dependencies
886
- end
887
- def self.dependencies=(deps)
888
- @dependencies = deps
889
- end
890
- end
891
- boot_loader.const_set("Dependencies", dependencies)
892
- dependencies
893
- end
894
-
895
- it "detects a Merb trait" do
896
- config.traits.should include(Warbler::Traits::Merb)
897
- end
898
-
899
- it "auto-detects a Merb application" do
900
- config.webxml.booter.should == :merb
901
- config.gems.keys.should_not include("rails")
902
- end
903
-
904
- it "automatically adds Merb::BootLoader::Dependencies.dependencies to the list of gems" do
905
- task :merb_env do
906
- @merb.dependencies = [Gem::Dependency.new("merb-core", ">= 1.0.6.1")]
907
- end
908
- config.gems.keys.should include(Gem::Dependency.new("merb-core", ">= 1.0.6.1"))
909
- end
910
-
911
- it "skips Merb development dependencies" do
912
- task :merb_env do
913
- @merb.dependencies = [Gem::Dependency.new("rake", "= #{Rake::VERSION}", :development)]
914
- end
915
- jar.apply(config)
916
- file_list(/rake-#{Rake::VERSION}/).should be_empty
917
- end
918
-
919
- it "warns about using Merb < 1.0" do
920
- task :merb_env do
921
- silence { Object.const_set("Merb", Module.new) }
922
- end
923
- silence { config.webxml.booter.should == :merb }
924
- end
925
- end
926
-
927
853
  context "in a Rack application" do
928
854
  before :each do
929
855
  mkdir 'tmp' unless File.directory?('tmp')
@@ -109,9 +109,8 @@ describe Warbler::Task do
109
109
  end
110
110
  end
111
111
 
112
- it "should compile ruby 1.9 mode" do
112
+ it "should compile ruby 2 mode" do
113
113
  config.features << "compiled"
114
- config.webxml.jruby.compat.version = '1.9'
115
114
  silence { run_task "warble" }
116
115
 
117
116
  java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
@@ -127,12 +126,12 @@ describe Warbler::Task do
127
126
 
128
127
  it "should allow bytecode version in config" do
129
128
  config.features << "compiled"
130
- config.bytecode_version = '1.6'
129
+ config.bytecode_version = '1.7'
131
130
  silence { run_task "warble" }
132
131
 
133
132
  java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
134
- # 0x32 is version 50, i.e. Java6
135
- java6_version_bytes = [0x00,0x32].map { |magic_char| magic_char.chr }.join
133
+ # 0x33 is version 51, i.e. Java7
134
+ java7_version_bytes = [0x00,0x33].map { |magic_char| magic_char.chr }.join
136
135
 
137
136
  Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
138
137
  class_file_bytes = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.class') {|io| io.read }
@@ -140,7 +139,7 @@ describe Warbler::Task do
140
139
  bytecode_version = class_file_bytes[6..7]
141
140
 
142
141
  java_class_header.should == java_class_magic_number
143
- bytecode_version.should == java6_version_bytes
142
+ bytecode_version.should == java7_version_bytes
144
143
  end
145
144
  end
146
145
 
@@ -29,13 +29,13 @@ describe Warbler::WebServer::Artifact do
29
29
  it "uses default (maven) local repository" do
30
30
  ENV['HOME'] = '/home/borg'
31
31
  ENV.delete('M2_HOME'); ENV.delete('MAVEN_HOME')
32
- sample_artifact.local_repository.should == "/home/borg/.m2/repository"
32
+ expect( sample_artifact.local_repository ).to eql "/home/borg/.m2/repository"
33
33
  end
34
34
 
35
35
  it "detects a custom maven repository setting" do
36
36
  ENV['HOME'] = '/home/borg'
37
37
  ENV['M2_HOME'] = File.expand_path('../m2_home', File.dirname(__FILE__))
38
- sample_artifact.local_repository.should == '/usr/local/maven/repo'
38
+ expect( sample_artifact.local_repository ).to eql '/usr/local/maven/repo'
39
39
  end
40
40
 
41
41
  end
data/warble.rb CHANGED
@@ -61,8 +61,8 @@ Warbler::Config.new do |config|
61
61
 
62
62
  # You can also use regexps or Gem::Dependency objects for flexibility or
63
63
  # finer-grained control.
64
- # config.gems << /^merb-/
65
- # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
64
+ # config.gems << /^sinatra-/
65
+ # config.gems << Gem::Dependency.new("sinatra", "= 1.4.5")
66
66
 
67
67
  # Include gem dependencies not mentioned specifically. Default is
68
68
  # true, uncomment to turn off.
@@ -117,7 +117,7 @@ Warbler::Config.new do |config|
117
117
  # by default. But since 1.4.2 this config defaults to false. It may need to be set to true for
118
118
  # web servers that do not explode the WAR file.
119
119
  # Alternatively, this option can be set to a regular expression, which will
120
- # act as a jar selector -- only jar files that match the pattern will be
120
+ # act as a jar selector -- only jar files that match the pattern will be
121
121
  # included in the archive.
122
122
  # config.move_jars_to_webinf_lib = false
123
123
 
@@ -151,7 +151,7 @@ Warbler::Config.new do |config|
151
151
  # Value of RAILS_ENV for the webapp -- default as shown below
152
152
  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
153
153
 
154
- # Application booter to use, one of :rack, :rails, or :merb (autodetected by default)
154
+ # Application booter to use, either :rack or :rails (autodetected by default)
155
155
  # config.webxml.booter = :rails
156
156
 
157
157
  # Set JRuby to run in 1.9 mode.
data/warbler.gemspec CHANGED
@@ -22,12 +22,12 @@ bundle up all of your application files for deployment to a Java environment.}
22
22
 
23
23
  gem.rdoc_options = ["--main", "README.rdoc", "-H", "-f", "darkfish"]
24
24
 
25
- gem.add_runtime_dependency 'rake', ['>= 0.9.6']
26
- # restrict it for maven not to find jruby-9000.dev
27
- gem.add_runtime_dependency 'jruby-jars', ['>= 1.5.6', '< 2.0']
28
- gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3']
29
- gem.add_runtime_dependency 'rubyzip', ['>= 0.9', "< 1.3"]
30
- gem.add_development_dependency 'jbundler', '~> 0.5.5'
31
- gem.add_development_dependency 'ruby-maven', '~> 3.1.1'
32
- gem.add_development_dependency 'rspec', '~> 2.10'
25
+ gem.add_runtime_dependency 'rake', [">= 10.1.0"]
26
+ gem.add_runtime_dependency 'jruby-jars', [">= 9.0.0.0.pre2"]
27
+ gem.add_runtime_dependency 'jruby-rack', [">= 1.1.1", '< 1.3']
28
+ gem.add_runtime_dependency 'rubyzip', [">= 1.0", "< 1.2"]
29
+ gem.add_development_dependency 'jbundler', "~> 0.5.5"
30
+ gem.add_development_dependency 'ruby-maven', '~> 3.1.1.0'
31
+ gem.add_development_dependency 'rspec', "~> 2.10"
32
+ gem.add_development_dependency 'rdoc', ">= 2.4.2"
33
33
  end