mack 0.8.2 → 0.8.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (602) hide show
  1. data/CHANGELOG +17 -1
  2. data/bin/env_handler.rb +1 -1
  3. data/bin/mack +2 -2
  4. data/bin/mackery-server +1 -1
  5. data/lib/gems.rb +6 -1
  6. data/lib/gems/builder-2.1.2/lib/blankslate.rb +2 -2
  7. data/lib/gems/builder-2.1.2/lib/builder/xchar.rb +3 -3
  8. data/lib/gems/builder-2.1.2/lib/builder/xmlbase.rb +9 -9
  9. data/lib/gems/builder-2.1.2/lib/builder/xmlmarkup.rb +15 -15
  10. data/lib/gems/configatron-2.2.2/lib/configatron.rb +9 -0
  11. data/lib/gems/{configatron-2.1.5 → configatron-2.2.2}/lib/configatron/configatron.rb +8 -6
  12. data/lib/gems/configatron-2.2.2/lib/configatron/core_ext/class.rb +26 -0
  13. data/lib/gems/{configatron-2.1.5/lib/configatron → configatron-2.2.2/lib/configatron/core_ext}/kernel.rb +0 -0
  14. data/lib/gems/configatron-2.2.2/lib/configatron/core_ext/object.rb +9 -0
  15. data/lib/gems/configatron-2.2.2/lib/configatron/core_ext/string.rb +84 -0
  16. data/lib/gems/configatron-2.2.2/lib/configatron/errors.rb +13 -0
  17. data/lib/gems/{configatron-2.1.5 → configatron-2.2.2}/lib/configatron/store.rb +37 -6
  18. data/lib/gems/cucumber-0.1.15/lib/autotest/cucumber.rb +6 -0
  19. data/lib/gems/cucumber-0.1.15/lib/autotest/cucumber_mixin.rb +130 -0
  20. data/lib/gems/cucumber-0.1.15/lib/autotest/cucumber_rails.rb +6 -0
  21. data/lib/gems/cucumber-0.1.15/lib/autotest/cucumber_rails_rspec.rb +6 -0
  22. data/lib/gems/cucumber-0.1.15/lib/autotest/cucumber_rspec.rb +6 -0
  23. data/lib/gems/cucumber-0.1.15/lib/autotest/discover.rb +9 -0
  24. data/lib/gems/cucumber-0.1.15/lib/cucumber.rb +19 -0
  25. data/lib/gems/cucumber-0.1.15/lib/cucumber/broadcaster.rb +20 -0
  26. data/lib/gems/cucumber-0.1.15/lib/cucumber/cli.rb +360 -0
  27. data/lib/gems/cucumber-0.1.15/lib/cucumber/core_ext/exception.rb +20 -0
  28. data/lib/gems/cucumber-0.1.15/lib/cucumber/core_ext/proc.rb +69 -0
  29. data/lib/gems/cucumber-0.1.15/lib/cucumber/core_ext/string.rb +29 -0
  30. data/lib/gems/cucumber-0.1.15/lib/cucumber/executor.rb +205 -0
  31. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters.rb +1 -0
  32. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/ansicolor.rb +105 -0
  33. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/autotest_formatter.rb +23 -0
  34. data/lib/gems/{rspec-1.1.11/story_server/prototype/stylesheets/rspec.css → cucumber-0.1.15/lib/cucumber/formatters/cucumber.css} +33 -37
  35. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/cucumber.js +11 -0
  36. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/html_formatter.rb +151 -0
  37. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/jquery.js +32 -0
  38. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/pretty_formatter.rb +285 -0
  39. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/profile_formatter.rb +92 -0
  40. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/progress_formatter.rb +61 -0
  41. data/lib/gems/cucumber-0.1.15/lib/cucumber/formatters/unicode.rb +35 -0
  42. data/lib/gems/cucumber-0.1.15/lib/cucumber/languages.yml +271 -0
  43. data/lib/gems/cucumber-0.1.15/lib/cucumber/model.rb +1 -0
  44. data/lib/gems/cucumber-0.1.15/lib/cucumber/model/table.rb +28 -0
  45. data/lib/gems/cucumber-0.1.15/lib/cucumber/platform.rb +32 -0
  46. data/lib/gems/cucumber-0.1.15/lib/cucumber/rails/rspec.rb +12 -0
  47. data/lib/gems/cucumber-0.1.15/lib/cucumber/rails/world.rb +73 -0
  48. data/lib/gems/cucumber-0.1.15/lib/cucumber/rake/task.rb +101 -0
  49. data/lib/gems/cucumber-0.1.15/lib/cucumber/step_methods.rb +49 -0
  50. data/lib/gems/cucumber-0.1.15/lib/cucumber/step_mother.rb +98 -0
  51. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree.rb +16 -0
  52. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/feature.rb +89 -0
  53. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/features.rb +21 -0
  54. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/given_scenario.rb +13 -0
  55. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/scenario.rb +236 -0
  56. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/step.rb +173 -0
  57. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/table.rb +26 -0
  58. data/lib/gems/cucumber-0.1.15/lib/cucumber/tree/top_down_visitor.rb +23 -0
  59. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature.treetop.erb +254 -0
  60. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_ar.rb +1951 -0
  61. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_cy.rb +1951 -0
  62. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_da.rb +1951 -0
  63. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_de.rb +1951 -0
  64. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_en-lol.rb +1951 -0
  65. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_en-tx.rb +1951 -0
  66. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_en.rb +1951 -0
  67. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_es.rb +1951 -0
  68. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_et.rb +1951 -0
  69. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_fr.rb +1951 -0
  70. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_id.rb +1951 -0
  71. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_it.rb +1951 -0
  72. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_ja.rb +1951 -0
  73. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_ko.rb +1951 -0
  74. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_lt.rb +1951 -0
  75. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_nl.rb +1951 -0
  76. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_no.rb +1951 -0
  77. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_parser.rb +36 -0
  78. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_pl.rb +1951 -0
  79. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_pt.rb +1951 -0
  80. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_ro.rb +1951 -0
  81. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_ro2.rb +1951 -0
  82. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_ru.rb +1951 -0
  83. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_se.rb +1951 -0
  84. data/lib/gems/cucumber-0.1.15/lib/cucumber/treetop_parser/feature_zh-CN.rb +1951 -0
  85. data/lib/gems/cucumber-0.1.15/lib/cucumber/version.rb +10 -0
  86. data/lib/gems/cucumber-0.1.15/lib/cucumber/world.rb +1 -0
  87. data/lib/gems/cucumber-0.1.15/lib/cucumber/world/pending.rb +22 -0
  88. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs.rb +1105 -0
  89. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/array.rb +21 -0
  90. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/block.rb +51 -0
  91. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb +322 -0
  92. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/change.rb +169 -0
  93. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb +257 -0
  94. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb +226 -0
  95. data/lib/gems/diff-lcs-1.1.2/lib/diff/lcs/string.rb +19 -0
  96. data/lib/gems/polyglot-0.2.3/lib/polyglot.rb +62 -0
  97. data/lib/gems/polyglot-0.2.3/lib/polyglot/version.rb +9 -0
  98. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack.rb +7 -2
  99. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/adapter/camping.rb +1 -1
  100. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/abstract/handler.rb +0 -0
  101. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/abstract/request.rb +0 -0
  102. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/basic.rb +0 -0
  103. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/digest/md5.rb +0 -0
  104. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/digest/nonce.rb +0 -0
  105. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/digest/params.rb +0 -0
  106. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/digest/request.rb +0 -0
  107. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/auth/openid.rb +4 -3
  108. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/builder.rb +12 -1
  109. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/cascade.rb +0 -0
  110. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/commonlogger.rb +0 -0
  111. data/lib/gems/rack-0.9.1/lib/rack/conditionalget.rb +43 -0
  112. data/lib/gems/rack-0.9.1/lib/rack/content_length.rb +25 -0
  113. data/lib/gems/rack-0.9.1/lib/rack/deflater.rb +87 -0
  114. data/lib/gems/rack-0.9.1/lib/rack/directory.rb +150 -0
  115. data/lib/gems/rack-0.9.1/lib/rack/file.rb +85 -0
  116. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler.rb +4 -0
  117. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/cgi.rb +0 -0
  118. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/evented_mongrel.rb +1 -1
  119. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/fastcgi.rb +2 -0
  120. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/lsws.rb +0 -0
  121. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/mongrel.rb +6 -2
  122. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/scgi.rb +0 -0
  123. data/lib/gems/rack-0.9.1/lib/rack/handler/swiftiplied_mongrel.rb +8 -0
  124. data/lib/gems/rack-0.9.1/lib/rack/handler/thin.rb +15 -0
  125. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/handler/webrick.rb +8 -4
  126. data/lib/gems/rack-0.9.1/lib/rack/head.rb +19 -0
  127. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/lint.rb +74 -10
  128. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/lobster.rb +13 -13
  129. data/lib/gems/rack-0.9.1/lib/rack/methodoverride.rb +27 -0
  130. data/lib/gems/rack-0.9.1/lib/rack/mime.rb +204 -0
  131. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/mock.rb +0 -0
  132. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/recursive.rb +0 -0
  133. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/reloader.rb +0 -0
  134. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/request.rb +10 -1
  135. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/response.rb +7 -2
  136. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/session/abstract/id.rb +14 -1
  137. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/session/cookie.rb +19 -1
  138. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/session/memcache.rb +1 -1
  139. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/session/pool.rb +1 -1
  140. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/showexceptions.rb +5 -1
  141. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/showstatus.rb +3 -2
  142. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/static.rb +0 -0
  143. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/urlmap.rb +1 -1
  144. data/lib/gems/{rack-0.4.0 → rack-0.9.1}/lib/rack/utils.rb +42 -13
  145. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/bin/autospec +0 -0
  146. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/bin/spec +0 -0
  147. data/lib/gems/{rspec-1.1.11/plugins → rspec-1.1.12/lib/adapters}/mock_frameworks/flexmock.rb +1 -1
  148. data/lib/gems/{rspec-1.1.11/plugins → rspec-1.1.12/lib/adapters}/mock_frameworks/mocha.rb +1 -1
  149. data/lib/gems/{rspec-1.1.11/plugins → rspec-1.1.12/lib/adapters}/mock_frameworks/rr.rb +1 -1
  150. data/lib/gems/{rspec-1.1.11/plugins → rspec-1.1.12/lib/adapters}/mock_frameworks/rspec.rb +2 -2
  151. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/autotest/discover.rb +0 -0
  152. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/autotest/rspec.rb +4 -3
  153. data/lib/gems/rspec-1.1.12/lib/spec.rb +7 -0
  154. data/lib/gems/rspec-1.1.12/lib/spec/dsl.rb +1 -0
  155. data/lib/gems/{rspec-1.1.11/lib/spec/extensions → rspec-1.1.12/lib/spec/dsl}/main.rb +10 -10
  156. data/lib/gems/rspec-1.1.12/lib/spec/example.rb +186 -0
  157. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/before_and_after_hooks.rb +30 -24
  158. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/errors.rb +0 -0
  159. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/example_group.rb +1 -0
  160. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/example_group_factory.rb +26 -9
  161. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/example_group_methods.rb +138 -113
  162. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/example_matcher.rb +0 -0
  163. data/lib/gems/rspec-1.1.12/lib/spec/example/example_methods.rb +168 -0
  164. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/module_reopening_fix.rb +0 -0
  165. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/example/pending.rb +0 -0
  166. data/lib/gems/rspec-1.1.12/lib/spec/example/shared_example_group.rb +59 -0
  167. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/expectations.rb +22 -18
  168. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/expectations/differs/default.rb +0 -0
  169. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/expectations/errors.rb +0 -0
  170. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/expectations/extensions.rb +0 -0
  171. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/expectations/extensions/object.rb +0 -0
  172. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/expectations/extensions/string_and_symbol.rb +0 -0
  173. data/lib/gems/rspec-1.1.12/lib/spec/expectations/handler.rb +32 -0
  174. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/interop/test.rb +0 -0
  175. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/interop/test/unit/autorunner.rb +0 -0
  176. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/interop/test/unit/testcase.rb +19 -17
  177. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/interop/test/unit/testresult.rb +1 -1
  178. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/interop/test/unit/testsuite_adapter.rb +1 -1
  179. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/interop/test/unit/ui/console/testrunner.rb +0 -0
  180. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers.rb +7 -28
  181. data/lib/gems/rspec-1.1.12/lib/spec/matchers/be.rb +208 -0
  182. data/lib/gems/rspec-1.1.12/lib/spec/matchers/be_close.rb +21 -0
  183. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers/change.rb +0 -0
  184. data/lib/gems/rspec-1.1.12/lib/spec/matchers/eql.rb +25 -0
  185. data/lib/gems/rspec-1.1.12/lib/spec/matchers/equal.rb +25 -0
  186. data/lib/gems/rspec-1.1.12/lib/spec/matchers/errors.rb +5 -0
  187. data/lib/gems/rspec-1.1.12/lib/spec/matchers/exist.rb +16 -0
  188. data/lib/gems/rspec-1.1.12/lib/spec/matchers/generated_descriptions.rb +48 -0
  189. data/lib/gems/rspec-1.1.12/lib/spec/matchers/has.rb +18 -0
  190. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers/have.rb +0 -0
  191. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers/include.rb +12 -9
  192. data/lib/gems/rspec-1.1.12/lib/spec/matchers/match.rb +22 -0
  193. data/lib/gems/rspec-1.1.12/lib/spec/matchers/match_array.rb +79 -0
  194. data/lib/gems/rspec-1.1.12/lib/spec/matchers/method_missing.rb +9 -0
  195. data/lib/gems/rspec-1.1.12/lib/spec/matchers/operator_matcher.rb +70 -0
  196. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers/raise_error.rb +4 -8
  197. data/lib/gems/rspec-1.1.12/lib/spec/matchers/respond_to.rb +71 -0
  198. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers/satisfy.rb +0 -0
  199. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/matchers/simple_matcher.rb +0 -0
  200. data/lib/gems/rspec-1.1.12/lib/spec/matchers/throw_symbol.rb +106 -0
  201. data/lib/gems/rspec-1.1.12/lib/spec/matchers/wrap_expectation.rb +55 -0
  202. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks.rb +0 -0
  203. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/argument_constraints.rb +77 -5
  204. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/argument_expectation.rb +0 -0
  205. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/error_generator.rb +0 -0
  206. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/errors.rb +0 -0
  207. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/extensions.rb +0 -0
  208. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/extensions/object.rb +0 -0
  209. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/framework.rb +0 -0
  210. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/message_expectation.rb +7 -7
  211. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/methods.rb +0 -0
  212. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/mock.rb +0 -0
  213. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/order_group.rb +0 -0
  214. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/proxy.rb +14 -12
  215. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/space.rb +0 -0
  216. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/spec_methods.rb +0 -0
  217. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/rake/spectask.rb +4 -6
  218. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/rake/verify_rcov.rb +0 -0
  219. data/lib/gems/rspec-1.1.12/lib/spec/ruby.rb +9 -0
  220. data/lib/gems/rspec-1.1.12/lib/spec/runner.rb +88 -0
  221. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/backtrace_tweaker.rb +5 -3
  222. data/lib/gems/rspec-1.1.12/lib/spec/runner/class_and_arguments_parser.rb +14 -0
  223. data/lib/gems/rspec-1.1.12/lib/spec/runner/command_line.rb +15 -0
  224. data/lib/gems/{rspec-1.1.11/lib/spec/example → rspec-1.1.12/lib/spec/runner}/configuration.rb +46 -47
  225. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/drb_command_line.rb +0 -0
  226. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/example_group_runner.rb +15 -4
  227. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/base_formatter.rb +0 -0
  228. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/base_text_formatter.rb +4 -3
  229. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/failing_example_groups_formatter.rb +0 -0
  230. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/failing_examples_formatter.rb +0 -0
  231. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/html_formatter.rb +14 -11
  232. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/nested_text_formatter.rb +2 -2
  233. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/profile_formatter.rb +0 -0
  234. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/progress_bar_formatter.rb +0 -0
  235. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/snippet_extractor.rb +0 -0
  236. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/specdoc_formatter.rb +0 -0
  237. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/story/html_formatter.rb +0 -0
  238. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/story/plain_text_formatter.rb +0 -0
  239. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/story/progress_bar_formatter.rb +0 -0
  240. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/text_mate_formatter.rb +0 -0
  241. data/lib/gems/rspec-1.1.12/lib/spec/runner/heckle_runner.rb +74 -0
  242. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/heckle_runner_unsupported.rb +0 -0
  243. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/option_parser.rb +8 -4
  244. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/options.rb +29 -14
  245. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/reporter.rb +1 -1
  246. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/spec_parser.rb +11 -9
  247. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story.rb +0 -0
  248. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/extensions.rb +0 -0
  249. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/extensions/main.rb +0 -0
  250. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/extensions/regexp.rb +0 -0
  251. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/extensions/string.rb +0 -0
  252. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/given_scenario.rb +0 -0
  253. data/lib/gems/rspec-1.1.12/lib/spec/story/runner.rb +57 -0
  254. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/runner/plain_text_story_runner.rb +0 -0
  255. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/runner/scenario_collector.rb +0 -0
  256. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/runner/scenario_runner.rb +0 -0
  257. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/runner/story_mediator.rb +0 -0
  258. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/runner/story_parser.rb +0 -0
  259. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/runner/story_runner.rb +10 -6
  260. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/scenario.rb +0 -0
  261. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/step.rb +0 -0
  262. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/step_group.rb +0 -0
  263. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/step_mother.rb +0 -0
  264. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/story/story.rb +0 -0
  265. data/lib/gems/rspec-1.1.12/lib/spec/story/world.rb +124 -0
  266. data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/version.rb +4 -2
  267. data/lib/gems/rubyforge-1.0.1/lib/rubyforge.rb +475 -0
  268. data/lib/gems/rubyforge-1.0.1/lib/rubyforge/client.rb +134 -0
  269. data/lib/gems/rubyforge-1.0.1/lib/rubyforge/cookie_manager.rb +51 -0
  270. data/lib/gems/term-ansicolor-1.0.3/VERSION +1 -0
  271. data/lib/gems/term-ansicolor-1.0.3/lib/term/ansicolor.rb +220 -0
  272. data/lib/gems/{rspec-1.1.11/spec/spec/runner/empty_file.txt → treetop-1.2.4/lib/metagrammar.rb} +0 -0
  273. data/lib/gems/treetop-1.2.4/lib/treetop.rb +11 -0
  274. data/lib/gems/treetop-1.2.4/lib/treetop/bootstrap_gen_1_metagrammar.rb +45 -0
  275. data/lib/gems/treetop-1.2.4/lib/treetop/compiler.rb +6 -0
  276. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/grammar_compiler.rb +40 -0
  277. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/lexical_address_space.rb +17 -0
  278. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/metagrammar.rb +2887 -0
  279. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/metagrammar.treetop +404 -0
  280. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes.rb +19 -0
  281. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/anything_symbol.rb +18 -0
  282. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/atomic_expression.rb +14 -0
  283. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/character_class.rb +19 -0
  284. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/choice.rb +31 -0
  285. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/declaration_sequence.rb +24 -0
  286. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/grammar.rb +28 -0
  287. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/inline_module.rb +27 -0
  288. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/nonterminal.rb +13 -0
  289. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/optional.rb +19 -0
  290. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/parenthesized_expression.rb +9 -0
  291. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/parsing_expression.rb +138 -0
  292. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/parsing_rule.rb +55 -0
  293. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/predicate.rb +45 -0
  294. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/repetition.rb +55 -0
  295. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/sequence.rb +68 -0
  296. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/terminal.rb +20 -0
  297. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/transient_prefix.rb +9 -0
  298. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/node_classes/treetop_file.rb +9 -0
  299. data/lib/gems/treetop-1.2.4/lib/treetop/compiler/ruby_builder.rb +113 -0
  300. data/lib/gems/treetop-1.2.4/lib/treetop/ruby_extensions.rb +2 -0
  301. data/lib/gems/treetop-1.2.4/lib/treetop/ruby_extensions/string.rb +42 -0
  302. data/lib/gems/treetop-1.2.4/lib/treetop/runtime.rb +5 -0
  303. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/compiled_parser.rb +87 -0
  304. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/interval_skip_list.rb +4 -0
  305. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/interval_skip_list/head_node.rb +15 -0
  306. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb +200 -0
  307. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/interval_skip_list/node.rb +164 -0
  308. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/syntax_node.rb +72 -0
  309. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/terminal_parse_failure.rb +16 -0
  310. data/lib/gems/treetop-1.2.4/lib/treetop/runtime/terminal_syntax_node.rb +17 -0
  311. data/lib/mack/application.rb +5 -5
  312. data/lib/mack/boot/configuration.rb +3 -1
  313. data/lib/mack/boot/console.rb +2 -2
  314. data/lib/mack/boot/core.rb +3 -3
  315. data/lib/mack/boot/environment.rb +1 -1
  316. data/lib/mack/boot/logging.rb +1 -1
  317. data/lib/mack/boot/logging/filter.rb +1 -1
  318. data/lib/mack/boot/paths.rb +34 -30
  319. data/lib/mack/boot/plugins.rb +2 -2
  320. data/lib/mack/controller/controller.rb +2 -2
  321. data/lib/mack/controller/request.rb +32 -32
  322. data/lib/mack/core_extensions/kernel.rb +1 -1
  323. data/lib/mack/generators/controller_generator/controller_generator.rb +14 -4
  324. data/lib/mack/generators/controller_generator/manifest.yml +7 -7
  325. data/lib/mack/generators/controller_generator/templates/test/controllers/rspec.rb.template +1 -1
  326. data/lib/mack/generators/controller_generator/templates/test/controllers/test_case.rb.template +1 -1
  327. data/lib/mack/generators/controller_helper_generator/manifest.yml +6 -6
  328. data/lib/mack/generators/mack_application_generator/mack_application_generator.rb +2 -2
  329. data/lib/mack/generators/mack_application_generator/manifest.yml +57 -54
  330. data/lib/mack/generators/mack_application_generator/templates/config/configatron/default.rb.template +1 -1
  331. data/lib/mack/generators/mack_application_generator/templates/config/database.yml.template +15 -15
  332. data/lib/mack/generators/mack_application_generator/templates/config/initializers/gems.rb.template +4 -1
  333. data/lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_spec.rb.template +1 -1
  334. data/lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_test.rb.template +1 -1
  335. data/lib/mack/generators/mack_application_generator/templates/test/spec_helper.rb.template +3 -3
  336. data/lib/mack/generators/mack_application_generator/templates/test/test_helper.rb.template +3 -3
  337. data/lib/mack/generators/passenger_generator/templates/config.ru.template +1 -1
  338. data/lib/mack/generators/view_helper_generator/manifest.yml +6 -6
  339. data/lib/mack/rendering/engine/builder.rb +1 -1
  340. data/lib/mack/routing/route_map.rb +1 -15
  341. data/lib/mack/routing/urls.rb +16 -2
  342. data/lib/mack/runner_helpers/request_logger.rb +1 -1
  343. data/lib/mack/tasks/mack_update_tasks.rake +5 -5
  344. data/lib/mack/tasks/rake_rules.rake +1 -1
  345. data/lib/mack/tasks/test_tasks.rake +2 -2
  346. data/lib/mack/testing/helpers.rb +24 -24
  347. data/lib/mack/testing/rspec.rb +5 -23
  348. data/lib/mack/testing/test_assertions.rb +0 -1
  349. data/lib/mack/utils/ansi/ansi_color.rb +1 -1
  350. data/lib/mack/version.rb +1 -1
  351. data/lib/mack/view/default_form_builder.rb +9 -0
  352. data/lib/mack/view/form_builder.rb +151 -0
  353. data/lib/mack/view_helpers/form_helpers.rb +7 -6
  354. data/lib/mack_core.rb +3 -3
  355. data/lib/mack_tasks.rb +1 -1
  356. metadata +381 -477
  357. data/lib/gems/builder-2.1.2/lib/builder/css.rb +0 -250
  358. data/lib/gems/configatron-2.1.5/lib/configatron.rb +0 -6
  359. data/lib/gems/configatron-2.1.5/lib/configatron/errors.rb +0 -7
  360. data/lib/gems/lockfile-1.4.3/bin/rlock +0 -360
  361. data/lib/gems/lockfile-1.4.3/bin/rlock-1.4.3 +0 -360
  362. data/lib/gems/logging-0.9.4/data/bad_logging_1.rb +0 -13
  363. data/lib/gems/logging-0.9.4/data/bad_logging_2.rb +0 -21
  364. data/lib/gems/logging-0.9.4/data/logging.rb +0 -42
  365. data/lib/gems/logging-0.9.4/data/logging.yaml +0 -63
  366. data/lib/gems/logging-0.9.4/data/simple_logging.rb +0 -13
  367. data/lib/gems/rack-0.4.0/bin/rackup +0 -172
  368. data/lib/gems/rack-0.4.0/lib/rack/deflater.rb +0 -63
  369. data/lib/gems/rack-0.4.0/lib/rack/directory.rb +0 -158
  370. data/lib/gems/rack-0.4.0/lib/rack/file.rb +0 -116
  371. data/lib/gems/rcov-0.8.1.2.0/ext/rcovrt/callsite.c +0 -242
  372. data/lib/gems/rcov-0.8.1.2.0/ext/rcovrt/extconf.rb +0 -11
  373. data/lib/gems/rcov-0.8.1.2.0/ext/rcovrt/rcovrt.c +0 -329
  374. data/lib/gems/rspec-1.1.11/lib/spec.rb +0 -32
  375. data/lib/gems/rspec-1.1.11/lib/spec/adapters.rb +0 -1
  376. data/lib/gems/rspec-1.1.11/lib/spec/adapters/ruby_engine.rb +0 -26
  377. data/lib/gems/rspec-1.1.11/lib/spec/adapters/ruby_engine/mri.rb +0 -8
  378. data/lib/gems/rspec-1.1.11/lib/spec/adapters/ruby_engine/rubinius.rb +0 -8
  379. data/lib/gems/rspec-1.1.11/lib/spec/example.rb +0 -12
  380. data/lib/gems/rspec-1.1.11/lib/spec/example/example_methods.rb +0 -105
  381. data/lib/gems/rspec-1.1.11/lib/spec/example/shared_example_group.rb +0 -52
  382. data/lib/gems/rspec-1.1.11/lib/spec/expectations/handler.rb +0 -52
  383. data/lib/gems/rspec-1.1.11/lib/spec/extensions.rb +0 -4
  384. data/lib/gems/rspec-1.1.11/lib/spec/extensions/class.rb +0 -24
  385. data/lib/gems/rspec-1.1.11/lib/spec/extensions/metaclass.rb +0 -7
  386. data/lib/gems/rspec-1.1.11/lib/spec/extensions/object.rb +0 -6
  387. data/lib/gems/rspec-1.1.11/lib/spec/matchers/be.rb +0 -221
  388. data/lib/gems/rspec-1.1.11/lib/spec/matchers/be_close.rb +0 -37
  389. data/lib/gems/rspec-1.1.11/lib/spec/matchers/eql.rb +0 -43
  390. data/lib/gems/rspec-1.1.11/lib/spec/matchers/equal.rb +0 -43
  391. data/lib/gems/rspec-1.1.11/lib/spec/matchers/exist.rb +0 -22
  392. data/lib/gems/rspec-1.1.11/lib/spec/matchers/has.rb +0 -34
  393. data/lib/gems/rspec-1.1.11/lib/spec/matchers/match.rb +0 -41
  394. data/lib/gems/rspec-1.1.11/lib/spec/matchers/operator_matcher.rb +0 -79
  395. data/lib/gems/rspec-1.1.11/lib/spec/matchers/respond_to.rb +0 -46
  396. data/lib/gems/rspec-1.1.11/lib/spec/matchers/throw_symbol.rb +0 -74
  397. data/lib/gems/rspec-1.1.11/lib/spec/runner.rb +0 -213
  398. data/lib/gems/rspec-1.1.11/lib/spec/runner/class_and_arguments_parser.rb +0 -16
  399. data/lib/gems/rspec-1.1.11/lib/spec/runner/command_line.rb +0 -17
  400. data/lib/gems/rspec-1.1.11/lib/spec/runner/heckle_runner.rb +0 -72
  401. data/lib/gems/rspec-1.1.11/lib/spec/story/runner.rb +0 -59
  402. data/lib/gems/rspec-1.1.11/lib/spec/story/world.rb +0 -128
  403. data/lib/gems/rspec-1.1.11/rake_tasks/examples.rake +0 -7
  404. data/lib/gems/rspec-1.1.11/rake_tasks/examples_with_rcov.rake +0 -9
  405. data/lib/gems/rspec-1.1.11/rake_tasks/failing_examples_with_html.rake +0 -9
  406. data/lib/gems/rspec-1.1.11/rake_tasks/verify_rcov.rake +0 -7
  407. data/lib/gems/rspec-1.1.11/spec/README.jruby +0 -15
  408. data/lib/gems/rspec-1.1.11/spec/autotest/autotest_helper.rb +0 -6
  409. data/lib/gems/rspec-1.1.11/spec/autotest/autotest_matchers.rb +0 -47
  410. data/lib/gems/rspec-1.1.11/spec/autotest/discover_spec.rb +0 -19
  411. data/lib/gems/rspec-1.1.11/spec/autotest/rspec_spec.rb +0 -150
  412. data/lib/gems/rspec-1.1.11/spec/rspec_suite.rb +0 -6
  413. data/lib/gems/rspec-1.1.11/spec/ruby_forker.rb +0 -13
  414. data/lib/gems/rspec-1.1.11/spec/spec.opts +0 -6
  415. data/lib/gems/rspec-1.1.11/spec/spec/adapters/ruby_engine_spec.rb +0 -16
  416. data/lib/gems/rspec-1.1.11/spec/spec/example/configuration_spec.rb +0 -296
  417. data/lib/gems/rspec-1.1.11/spec/spec/example/example_group_class_definition_spec.rb +0 -48
  418. data/lib/gems/rspec-1.1.11/spec/spec/example/example_group_factory_spec.rb +0 -165
  419. data/lib/gems/rspec-1.1.11/spec/spec/example/example_group_methods_spec.rb +0 -584
  420. data/lib/gems/rspec-1.1.11/spec/spec/example/example_group_spec.rb +0 -683
  421. data/lib/gems/rspec-1.1.11/spec/spec/example/example_matcher_spec.rb +0 -96
  422. data/lib/gems/rspec-1.1.11/spec/spec/example/example_methods_spec.rb +0 -169
  423. data/lib/gems/rspec-1.1.11/spec/spec/example/example_runner_spec.rb +0 -194
  424. data/lib/gems/rspec-1.1.11/spec/spec/example/nested_example_group_spec.rb +0 -71
  425. data/lib/gems/rspec-1.1.11/spec/spec/example/pending_module_spec.rb +0 -145
  426. data/lib/gems/rspec-1.1.11/spec/spec/example/predicate_matcher_spec.rb +0 -21
  427. data/lib/gems/rspec-1.1.11/spec/spec/example/shared_example_group_spec.rb +0 -281
  428. data/lib/gems/rspec-1.1.11/spec/spec/example/subclassing_example_group_spec.rb +0 -25
  429. data/lib/gems/rspec-1.1.11/spec/spec/expectations/differs/default_spec.rb +0 -127
  430. data/lib/gems/rspec-1.1.11/spec/spec/expectations/extensions/object_spec.rb +0 -95
  431. data/lib/gems/rspec-1.1.11/spec/spec/expectations/fail_with_spec.rb +0 -71
  432. data/lib/gems/rspec-1.1.11/spec/spec/extensions/main_spec.rb +0 -71
  433. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/spec_that_fails.rb +0 -10
  434. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/spec_that_passes.rb +0 -10
  435. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/spec_with_errors.rb +0 -10
  436. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/spec_with_options_hash.rb +0 -13
  437. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/test_case_that_fails.rb +0 -10
  438. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/test_case_that_passes.rb +0 -10
  439. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/test_case_with_errors.rb +0 -10
  440. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb +0 -38
  441. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/spec_spec.rb +0 -52
  442. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/test_unit_spec_helper.rb +0 -14
  443. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/testcase_spec.rb +0 -49
  444. data/lib/gems/rspec-1.1.11/spec/spec/interop/test/unit/testsuite_adapter_spec.rb +0 -9
  445. data/lib/gems/rspec-1.1.11/spec/spec/matchers/be_close_spec.rb +0 -39
  446. data/lib/gems/rspec-1.1.11/spec/spec/matchers/be_spec.rb +0 -248
  447. data/lib/gems/rspec-1.1.11/spec/spec/matchers/change_spec.rb +0 -329
  448. data/lib/gems/rspec-1.1.11/spec/spec/matchers/description_generation_spec.rb +0 -153
  449. data/lib/gems/rspec-1.1.11/spec/spec/matchers/eql_spec.rb +0 -28
  450. data/lib/gems/rspec-1.1.11/spec/spec/matchers/equal_spec.rb +0 -28
  451. data/lib/gems/rspec-1.1.11/spec/spec/matchers/exist_spec.rb +0 -57
  452. data/lib/gems/rspec-1.1.11/spec/spec/matchers/handler_spec.rb +0 -150
  453. data/lib/gems/rspec-1.1.11/spec/spec/matchers/has_spec.rb +0 -63
  454. data/lib/gems/rspec-1.1.11/spec/spec/matchers/have_spec.rb +0 -394
  455. data/lib/gems/rspec-1.1.11/spec/spec/matchers/include_spec.rb +0 -64
  456. data/lib/gems/rspec-1.1.11/spec/spec/matchers/match_spec.rb +0 -37
  457. data/lib/gems/rspec-1.1.11/spec/spec/matchers/matcher_methods_spec.rb +0 -78
  458. data/lib/gems/rspec-1.1.11/spec/spec/matchers/mock_constraint_matchers_spec.rb +0 -24
  459. data/lib/gems/rspec-1.1.11/spec/spec/matchers/operator_matcher_spec.rb +0 -191
  460. data/lib/gems/rspec-1.1.11/spec/spec/matchers/raise_error_spec.rb +0 -315
  461. data/lib/gems/rspec-1.1.11/spec/spec/matchers/respond_to_spec.rb +0 -54
  462. data/lib/gems/rspec-1.1.11/spec/spec/matchers/satisfy_spec.rb +0 -36
  463. data/lib/gems/rspec-1.1.11/spec/spec/matchers/simple_matcher_spec.rb +0 -93
  464. data/lib/gems/rspec-1.1.11/spec/spec/matchers/throw_symbol_spec.rb +0 -54
  465. data/lib/gems/rspec-1.1.11/spec/spec/mocks/any_number_of_times_spec.rb +0 -36
  466. data/lib/gems/rspec-1.1.11/spec/spec/mocks/argument_expectation_spec.rb +0 -23
  467. data/lib/gems/rspec-1.1.11/spec/spec/mocks/at_least_spec.rb +0 -97
  468. data/lib/gems/rspec-1.1.11/spec/spec/mocks/at_most_spec.rb +0 -93
  469. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_10260_spec.rb +0 -8
  470. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_10263_spec.rb +0 -24
  471. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_11545_spec.rb +0 -33
  472. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_15719_spec.rb +0 -30
  473. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_496.rb +0 -17
  474. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_7611_spec.rb +0 -19
  475. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_7805_spec.rb +0 -22
  476. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_8165_spec.rb +0 -31
  477. data/lib/gems/rspec-1.1.11/spec/spec/mocks/bug_report_8302_spec.rb +0 -26
  478. data/lib/gems/rspec-1.1.11/spec/spec/mocks/failing_mock_argument_constraints_spec.rb +0 -95
  479. data/lib/gems/rspec-1.1.11/spec/spec/mocks/hash_including_matcher_spec.rb +0 -53
  480. data/lib/gems/rspec-1.1.11/spec/spec/mocks/mock_ordering_spec.rb +0 -84
  481. data/lib/gems/rspec-1.1.11/spec/spec/mocks/mock_space_spec.rb +0 -54
  482. data/lib/gems/rspec-1.1.11/spec/spec/mocks/mock_spec.rb +0 -555
  483. data/lib/gems/rspec-1.1.11/spec/spec/mocks/multiple_return_value_spec.rb +0 -113
  484. data/lib/gems/rspec-1.1.11/spec/spec/mocks/nil_expectation_warning_spec.rb +0 -53
  485. data/lib/gems/rspec-1.1.11/spec/spec/mocks/null_object_mock_spec.rb +0 -54
  486. data/lib/gems/rspec-1.1.11/spec/spec/mocks/once_counts_spec.rb +0 -53
  487. data/lib/gems/rspec-1.1.11/spec/spec/mocks/options_hash_spec.rb +0 -35
  488. data/lib/gems/rspec-1.1.11/spec/spec/mocks/partial_mock_spec.rb +0 -149
  489. data/lib/gems/rspec-1.1.11/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb +0 -66
  490. data/lib/gems/rspec-1.1.11/spec/spec/mocks/passing_mock_argument_constraints_spec.rb +0 -130
  491. data/lib/gems/rspec-1.1.11/spec/spec/mocks/precise_counts_spec.rb +0 -52
  492. data/lib/gems/rspec-1.1.11/spec/spec/mocks/record_messages_spec.rb +0 -26
  493. data/lib/gems/rspec-1.1.11/spec/spec/mocks/stub_spec.rb +0 -188
  494. data/lib/gems/rspec-1.1.11/spec/spec/mocks/twice_counts_spec.rb +0 -67
  495. data/lib/gems/rspec-1.1.11/spec/spec/package/bin_spec_spec.rb +0 -22
  496. data/lib/gems/rspec-1.1.11/spec/spec/runner/class_and_argument_parser_spec.rb +0 -23
  497. data/lib/gems/rspec-1.1.11/spec/spec/runner/command_line_spec.rb +0 -141
  498. data/lib/gems/rspec-1.1.11/spec/spec/runner/drb_command_line_spec.rb +0 -97
  499. data/lib/gems/rspec-1.1.11/spec/spec/runner/examples.txt +0 -2
  500. data/lib/gems/rspec-1.1.11/spec/spec/runner/failed.txt +0 -3
  501. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/base_formatter_spec.rb +0 -112
  502. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb +0 -45
  503. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/failing_examples_formatter_spec.rb +0 -33
  504. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/html_formatted-1.8.4.html +0 -365
  505. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html +0 -387
  506. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/html_formatted-1.8.5.html +0 -371
  507. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html +0 -381
  508. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/html_formatted-1.8.6.html +0 -370
  509. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/html_formatter_spec.rb +0 -61
  510. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/nested_text_formatter_spec.rb +0 -318
  511. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/profile_formatter_spec.rb +0 -65
  512. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/progress_bar_formatter_spec.rb +0 -155
  513. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/snippet_extractor_spec.rb +0 -18
  514. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/spec_mate_formatter_spec.rb +0 -103
  515. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/specdoc_formatter_spec.rb +0 -159
  516. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/story/html_formatter_spec.rb +0 -135
  517. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb +0 -600
  518. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb +0 -82
  519. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html +0 -365
  520. data/lib/gems/rspec-1.1.11/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html +0 -370
  521. data/lib/gems/rspec-1.1.11/spec/spec/runner/heckle_runner_spec.rb +0 -78
  522. data/lib/gems/rspec-1.1.11/spec/spec/runner/heckler_spec.rb +0 -13
  523. data/lib/gems/rspec-1.1.11/spec/spec/runner/noisy_backtrace_tweaker_spec.rb +0 -45
  524. data/lib/gems/rspec-1.1.11/spec/spec/runner/option_parser_spec.rb +0 -421
  525. data/lib/gems/rspec-1.1.11/spec/spec/runner/options_spec.rb +0 -450
  526. data/lib/gems/rspec-1.1.11/spec/spec/runner/output_one_time_fixture.rb +0 -7
  527. data/lib/gems/rspec-1.1.11/spec/spec/runner/output_one_time_fixture_runner.rb +0 -8
  528. data/lib/gems/rspec-1.1.11/spec/spec/runner/output_one_time_spec.rb +0 -16
  529. data/lib/gems/rspec-1.1.11/spec/spec/runner/quiet_backtrace_tweaker_spec.rb +0 -62
  530. data/lib/gems/rspec-1.1.11/spec/spec/runner/reporter_spec.rb +0 -238
  531. data/lib/gems/rspec-1.1.11/spec/spec/runner/resources/a_bar.rb +0 -0
  532. data/lib/gems/rspec-1.1.11/spec/spec/runner/resources/a_foo.rb +0 -0
  533. data/lib/gems/rspec-1.1.11/spec/spec/runner/resources/a_spec.rb +0 -1
  534. data/lib/gems/rspec-1.1.11/spec/spec/runner/spec.opts +0 -2
  535. data/lib/gems/rspec-1.1.11/spec/spec/runner/spec_drb.opts +0 -1
  536. data/lib/gems/rspec-1.1.11/spec/spec/runner/spec_parser/spec_parser_fixture.rb +0 -70
  537. data/lib/gems/rspec-1.1.11/spec/spec/runner/spec_parser_spec.rb +0 -85
  538. data/lib/gems/rspec-1.1.11/spec/spec/runner/spec_spaced.opts +0 -2
  539. data/lib/gems/rspec-1.1.11/spec/spec/runner_spec.rb +0 -11
  540. data/lib/gems/rspec-1.1.11/spec/spec/spec_classes.rb +0 -133
  541. data/lib/gems/rspec-1.1.11/spec/spec/story/builders.rb +0 -46
  542. data/lib/gems/rspec-1.1.11/spec/spec/story/extensions/main_spec.rb +0 -161
  543. data/lib/gems/rspec-1.1.11/spec/spec/story/extensions_spec.rb +0 -14
  544. data/lib/gems/rspec-1.1.11/spec/spec/story/given_scenario_spec.rb +0 -27
  545. data/lib/gems/rspec-1.1.11/spec/spec/story/runner/plain_text_story_runner_spec.rb +0 -90
  546. data/lib/gems/rspec-1.1.11/spec/spec/story/runner/scenario_collector_spec.rb +0 -27
  547. data/lib/gems/rspec-1.1.11/spec/spec/story/runner/scenario_runner_spec.rb +0 -214
  548. data/lib/gems/rspec-1.1.11/spec/spec/story/runner/story_mediator_spec.rb +0 -143
  549. data/lib/gems/rspec-1.1.11/spec/spec/story/runner/story_parser_spec.rb +0 -401
  550. data/lib/gems/rspec-1.1.11/spec/spec/story/runner/story_runner_spec.rb +0 -294
  551. data/lib/gems/rspec-1.1.11/spec/spec/story/runner_spec.rb +0 -93
  552. data/lib/gems/rspec-1.1.11/spec/spec/story/scenario_spec.rb +0 -18
  553. data/lib/gems/rspec-1.1.11/spec/spec/story/step_group_spec.rb +0 -157
  554. data/lib/gems/rspec-1.1.11/spec/spec/story/step_mother_spec.rb +0 -84
  555. data/lib/gems/rspec-1.1.11/spec/spec/story/step_spec.rb +0 -272
  556. data/lib/gems/rspec-1.1.11/spec/spec/story/story_helper.rb +0 -2
  557. data/lib/gems/rspec-1.1.11/spec/spec/story/story_spec.rb +0 -84
  558. data/lib/gems/rspec-1.1.11/spec/spec/story/world_spec.rb +0 -423
  559. data/lib/gems/rspec-1.1.11/spec/spec_helper.rb +0 -77
  560. data/lib/gems/rspec-1.1.11/stories/all.rb +0 -5
  561. data/lib/gems/rspec-1.1.11/stories/configuration/before_blocks.story +0 -21
  562. data/lib/gems/rspec-1.1.11/stories/configuration/stories.rb +0 -7
  563. data/lib/gems/rspec-1.1.11/stories/example_groups/autogenerated_docstrings +0 -45
  564. data/lib/gems/rspec-1.1.11/stories/example_groups/example_group_with_should_methods +0 -17
  565. data/lib/gems/rspec-1.1.11/stories/example_groups/nested_groups +0 -17
  566. data/lib/gems/rspec-1.1.11/stories/example_groups/output +0 -25
  567. data/lib/gems/rspec-1.1.11/stories/example_groups/stories.rb +0 -7
  568. data/lib/gems/rspec-1.1.11/stories/helper.rb +0 -6
  569. data/lib/gems/rspec-1.1.11/stories/interop/examples_and_tests_together +0 -30
  570. data/lib/gems/rspec-1.1.11/stories/interop/stories.rb +0 -7
  571. data/lib/gems/rspec-1.1.11/stories/interop/test_case_with_should_methods +0 -17
  572. data/lib/gems/rspec-1.1.11/stories/mock_framework_integration/stories.rb +0 -7
  573. data/lib/gems/rspec-1.1.11/stories/mock_framework_integration/use_flexmock.story +0 -9
  574. data/lib/gems/rspec-1.1.11/stories/pending_stories/README +0 -3
  575. data/lib/gems/rspec-1.1.11/stories/resources/helpers/cmdline.rb +0 -9
  576. data/lib/gems/rspec-1.1.11/stories/resources/helpers/story_helper.rb +0 -16
  577. data/lib/gems/rspec-1.1.11/stories/resources/matchers/smart_match.rb +0 -37
  578. data/lib/gems/rspec-1.1.11/stories/resources/spec/before_blocks_example.rb +0 -32
  579. data/lib/gems/rspec-1.1.11/stories/resources/spec/example_group_with_should_methods.rb +0 -12
  580. data/lib/gems/rspec-1.1.11/stories/resources/spec/simple_spec.rb +0 -8
  581. data/lib/gems/rspec-1.1.11/stories/resources/spec/spec_with_flexmock.rb +0 -18
  582. data/lib/gems/rspec-1.1.11/stories/resources/steps/running_rspec.rb +0 -50
  583. data/lib/gems/rspec-1.1.11/stories/resources/stories/failing_story.rb +0 -15
  584. data/lib/gems/rspec-1.1.11/stories/resources/test/spec_and_test_together.rb +0 -57
  585. data/lib/gems/rspec-1.1.11/stories/resources/test/test_case_with_should_methods.rb +0 -30
  586. data/lib/gems/rspec-1.1.11/stories/stories/multiline_steps.story +0 -23
  587. data/lib/gems/rspec-1.1.11/stories/stories/steps/multiline_steps.rb +0 -13
  588. data/lib/gems/rspec-1.1.11/stories/stories/stories.rb +0 -6
  589. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/builder.js +0 -136
  590. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/controls.js +0 -972
  591. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/dragdrop.js +0 -976
  592. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/effects.js +0 -1117
  593. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/prototype.js +0 -4140
  594. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/rspec.js +0 -149
  595. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/scriptaculous.js +0 -58
  596. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/slider.js +0 -276
  597. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/sound.js +0 -55
  598. data/lib/gems/rspec-1.1.11/story_server/prototype/javascripts/unittest.js +0 -568
  599. data/lib/gems/rspec-1.1.11/story_server/prototype/lib/server.rb +0 -24
  600. data/lib/gems/rspec-1.1.11/story_server/prototype/stories.html +0 -176
  601. data/lib/gems/rspec-1.1.11/story_server/prototype/stylesheets/test.css +0 -90
  602. data/lib/mack/testing/test_case.rb +0 -52
@@ -0,0 +1,10 @@
1
+ module Cucumber #:nodoc:
2
+ class VERSION #:nodoc:
3
+ MAJOR = 0
4
+ MINOR = 1
5
+ TINY = 15
6
+ PATCH = nil # Set to nil for official release
7
+
8
+ STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
9
+ end
10
+ end
@@ -0,0 +1 @@
1
+ %w{pending}.each{|f| require "cucumber/world/#{f}"}
@@ -0,0 +1,22 @@
1
+ module Cucumber
2
+ module World
3
+ module Pending
4
+
5
+ ##
6
+ # Mark this step as pending
7
+ def pending(message = "TODO")
8
+ if block_given?
9
+ begin
10
+ yield
11
+ rescue Exception => e
12
+ raise Cucumber::ForcedPending.new(message)
13
+ end
14
+ raise Cucumber::ForcedPending.new("Expected pending '#{message}' to fail. No Error was raised.")
15
+ else
16
+ raise Cucumber::ForcedPending.new(message)
17
+ end
18
+ end
19
+
20
+ end
21
+ end
22
+ end
@@ -0,0 +1,1105 @@
1
+ #! /usr/env/bin ruby
2
+ #--
3
+ # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>
4
+ # adapted from:
5
+ # Algorithm::Diff (Perl) by Ned Konz <perl@bike-nomad.com>
6
+ # Smalltalk by Mario I. Wolczko <mario@wolczko.com>
7
+ # implements McIlroy-Hunt diff algorithm
8
+ #
9
+ # This program is free software. It may be redistributed and/or modified
10
+ # under the terms of the GPL version 2 (or later), the Perl Artistic
11
+ # licence, or the Ruby licence.
12
+ #
13
+ # $Id: lcs.rb,v 1.9 2004/10/17 20:31:10 austin Exp $
14
+ #++
15
+
16
+ module Diff
17
+ # = Diff::LCS 1.1.2
18
+ # Computes "intelligent" differences between two sequenced Enumerables.
19
+ # This is an implementation of the McIlroy-Hunt "diff" algorithm for
20
+ # Enumerable objects that include Diffable.
21
+ #
22
+ # Based on Mario I. Wolczko's <mario@wolczko.com> Smalltalk version
23
+ # (1.2, 1993) and Ned Konz's <perl@bike-nomad.com> Perl version
24
+ # (Algorithm::Diff).
25
+ #
26
+ # == Synopsis
27
+ # require 'diff/lcs'
28
+ #
29
+ # seq1 = %w(a b c e h j l m n p)
30
+ # seq2 = %w(b c d e f j k l m r s t)
31
+ #
32
+ # lcs = Diff::LCS.LCS(seq1, seq2)
33
+ # diffs = Diff::LCS.diff(seq1, seq2)
34
+ # sdiff = Diff::LCS.sdiff(seq1, seq2)
35
+ # seq = Diff::LCS.traverse_sequences(seq1, seq2, callback_obj)
36
+ # bal = Diff::LCS.traverse_balanced(seq1, seq2, callback_obj)
37
+ # seq2 == Diff::LCS.patch(seq1, diffs)
38
+ # seq2 == Diff::LCS.patch!(seq1, diffs)
39
+ # seq1 == Diff::LCS.unpatch(seq2, diffs)
40
+ # seq1 == Diff::LCS.unpatch!(seq2, diffs)
41
+ # seq2 == Diff::LCS.patch(seq1, sdiff)
42
+ # seq2 == Diff::LCS.patch!(seq1, sdiff)
43
+ # seq1 == Diff::LCS.unpatch(seq2, sdiff)
44
+ # seq1 == Diff::LCS.unpatch!(seq2, sdiff)
45
+ #
46
+ # Alternatively, objects can be extended with Diff::LCS:
47
+ #
48
+ # seq1.extend(Diff::LCS)
49
+ # lcs = seq1.lcs(seq2)
50
+ # diffs = seq1.diff(seq2)
51
+ # sdiff = seq1.sdiff(seq2)
52
+ # seq = seq1.traverse_sequences(seq2, callback_obj)
53
+ # bal = seq1.traverse_balanced(seq2, callback_obj)
54
+ # seq2 == seq1.patch(diffs)
55
+ # seq2 == seq1.patch!(diffs)
56
+ # seq1 == seq2.unpatch(diffs)
57
+ # seq1 == seq2.unpatch!(diffs)
58
+ # seq2 == seq1.patch(sdiff)
59
+ # seq2 == seq1.patch!(sdiff)
60
+ # seq1 == seq2.unpatch(sdiff)
61
+ # seq1 == seq2.unpatch!(sdiff)
62
+ #
63
+ # Default extensions are provided for Array and String objects through
64
+ # the use of 'diff/lcs/array' and 'diff/lcs/string'.
65
+ #
66
+ # == Introduction (by Mark-Jason Dominus)
67
+ #
68
+ # <em>The following text is from the Perl documentation. The only
69
+ # changes have been to make the text appear better in Rdoc</em>.
70
+ #
71
+ # I once read an article written by the authors of +diff+; they said
72
+ # that they hard worked very hard on the algorithm until they found the
73
+ # right one.
74
+ #
75
+ # I think what they ended up using (and I hope someone will correct me,
76
+ # because I am not very confident about this) was the `longest common
77
+ # subsequence' method. In the LCS problem, you have two sequences of
78
+ # items:
79
+ #
80
+ # a b c d f g h j q z
81
+ # a b c d e f g i j k r x y z
82
+ #
83
+ # and you want to find the longest sequence of items that is present in
84
+ # both original sequences in the same order. That is, you want to find a
85
+ # new sequence *S* which can be obtained from the first sequence by
86
+ # deleting some items, and from the second sequence by deleting other
87
+ # items. You also want *S* to be as long as possible. In this case *S*
88
+ # is:
89
+ #
90
+ # a b c d f g j z
91
+ #
92
+ # From there it's only a small step to get diff-like output:
93
+ #
94
+ # e h i k q r x y
95
+ # + - + + - + + +
96
+ #
97
+ # This module solves the LCS problem. It also includes a canned function
98
+ # to generate +diff+-like output.
99
+ #
100
+ # It might seem from the example above that the LCS of two sequences is
101
+ # always pretty obvious, but that's not always the case, especially when
102
+ # the two sequences have many repeated elements. For example, consider
103
+ #
104
+ # a x b y c z p d q
105
+ # a b c a x b y c z
106
+ #
107
+ # A naive approach might start by matching up the +a+ and +b+ that
108
+ # appear at the beginning of each sequence, like this:
109
+ #
110
+ # a x b y c z p d q
111
+ # a b c a b y c z
112
+ #
113
+ # This finds the common subsequence +a b c z+. But actually, the LCS is
114
+ # +a x b y c z+:
115
+ #
116
+ # a x b y c z p d q
117
+ # a b c a x b y c z
118
+ #
119
+ # == Author
120
+ # This version is by Austin Ziegler <diff-lcs@halostatue.ca>.
121
+ #
122
+ # It is based on the Perl Algorithm::Diff by Ned Konz
123
+ # <perl@bike-nomad.com>, copyright &copy; 2000 - 2002 and the Smalltalk
124
+ # diff version by Mario I. Wolczko <mario@wolczko.com>, copyright &copy;
125
+ # 1993. Documentation includes work by Mark-Jason Dominus.
126
+ #
127
+ # == Licence
128
+ # Copyright &copy; 2004 Austin Ziegler
129
+ # This program is free software; you can redistribute it and/or modify it
130
+ # under the same terms as Ruby, or alternatively under the Perl Artistic
131
+ # licence.
132
+ #
133
+ # == Credits
134
+ # Much of the documentation is taken directly from the Perl
135
+ # Algorithm::Diff implementation and was written originally by Mark-Jason
136
+ # Dominus <mjd-perl-diff@plover.com> and later by Ned Konz. The basic Ruby
137
+ # implementation was re-ported from the Smalltalk implementation, available
138
+ # at ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st
139
+ #
140
+ # #sdiff and #traverse_balanced were written for the Perl version by Mike
141
+ # Schilli <m@perlmeister.com>.
142
+ #
143
+ # "The algorithm is described in <em>A Fast Algorithm for Computing Longest
144
+ # Common Subsequences</em>, CACM, vol.20, no.5, pp.350-353, May 1977, with
145
+ # a few minor improvements to improve the speed."
146
+ module LCS
147
+ VERSION = '1.1.2'
148
+ end
149
+ end
150
+
151
+ require 'diff/lcs/callbacks'
152
+
153
+ module Diff::LCS
154
+ # Returns an Array containing the longest common subsequence(s) between
155
+ # +self+ and +other+. See Diff::LCS#LCS.
156
+ #
157
+ # lcs = seq1.lcs(seq2)
158
+ def lcs(other, &block) #:yields self[ii] if there are matched subsequences:
159
+ Diff::LCS.LCS(self, other, &block)
160
+ end
161
+
162
+ # Returns the difference set between +self+ and +other+. See
163
+ # Diff::LCS#diff.
164
+ def diff(other, callbacks = nil, &block)
165
+ Diff::LCS::diff(self, other, callbacks, &block)
166
+ end
167
+
168
+ # Returns the balanced ("side-by-side") difference set between +self+ and
169
+ # +other+. See Diff::LCS#sdiff.
170
+ def sdiff(other, callbacks = nil, &block)
171
+ Diff::LCS::sdiff(self, other, callbacks, &block)
172
+ end
173
+
174
+ # Traverses the discovered longest common subsequences between +self+ and
175
+ # +other+. See Diff::LCS#traverse_sequences.
176
+ def traverse_sequences(other, callbacks = nil, &block)
177
+ traverse_sequences(self, other, callbacks || Diff::LCS::YieldingCallbacks,
178
+ &block)
179
+ end
180
+
181
+ # Traverses the discovered longest common subsequences between +self+ and
182
+ # +other+ using the alternate, balanced algorithm. See
183
+ # Diff::LCS#traverse_balanced.
184
+ def traverse_balanced(other, callbacks = nil, &block)
185
+ traverse_balanced(self, other, callbacks || Diff::LCS::YieldingCallbacks,
186
+ &block)
187
+ end
188
+
189
+ # Attempts to patch a copy of +self+ with the provided +patchset+. See
190
+ # Diff::LCS#patch.
191
+ def patch(patchset)
192
+ Diff::LCS::patch(self.dup, patchset)
193
+ end
194
+
195
+ # Attempts to unpatch a copy of +self+ with the provided +patchset+.
196
+ # See Diff::LCS#patch.
197
+ def unpatch(patchset)
198
+ Diff::LCS::unpatch(self.dup, patchset)
199
+ end
200
+
201
+ # Attempts to patch +self+ with the provided +patchset+. See
202
+ # Diff::LCS#patch!. Does no autodiscovery.
203
+ def patch!(patchset)
204
+ Diff::LCS::patch!(self, patchset)
205
+ end
206
+
207
+ # Attempts to unpatch +self+ with the provided +patchset+. See
208
+ # Diff::LCS#unpatch. Does no autodiscovery.
209
+ def unpatch!(patchset)
210
+ Diff::LCS::unpatch!(self, patchset)
211
+ end
212
+ end
213
+
214
+ module Diff::LCS
215
+ class << self
216
+ # Given two sequenced Enumerables, LCS returns an Array containing their
217
+ # longest common subsequences.
218
+ #
219
+ # lcs = Diff::LCS.LCS(seq1, seq2)
220
+ #
221
+ # This array whose contents is such that:
222
+ #
223
+ # lcs.each_with_index do |ee, ii|
224
+ # assert(ee.nil? || (seq1[ii] == seq2[ee]))
225
+ # end
226
+ #
227
+ # If a block is provided, the matching subsequences will be yielded from
228
+ # +seq1+ in turn and may be modified before they are placed into the
229
+ # returned Array of subsequences.
230
+ def LCS(seq1, seq2, &block) #:yields seq1[ii] for each matched:
231
+ matches = Diff::LCS.__lcs(seq1, seq2)
232
+ ret = []
233
+ matches.each_with_index do |ee, ii|
234
+ unless matches[ii].nil?
235
+ if block_given?
236
+ ret << (yield seq1[ii])
237
+ else
238
+ ret << seq1[ii]
239
+ end
240
+ end
241
+ end
242
+ ret
243
+ end
244
+
245
+ # Diff::LCS.diff computes the smallest set of additions and deletions
246
+ # necessary to turn the first sequence into the second, and returns a
247
+ # description of these changes.
248
+ #
249
+ # See Diff::LCS::DiffCallbacks for the default behaviour. An alternate
250
+ # behaviour may be implemented with Diff::LCS::ContextDiffCallbacks.
251
+ # If a Class argument is provided for +callbacks+, #diff will attempt
252
+ # to initialise it. If the +callbacks+ object (possibly initialised)
253
+ # responds to #finish, it will be called.
254
+ def diff(seq1, seq2, callbacks = nil, &block) # :yields diff changes:
255
+ callbacks ||= Diff::LCS::DiffCallbacks
256
+ if callbacks.kind_of?(Class)
257
+ cb = callbacks.new rescue callbacks
258
+ callbacks = cb
259
+ end
260
+ traverse_sequences(seq1, seq2, callbacks)
261
+ callbacks.finish if callbacks.respond_to?(:finish)
262
+
263
+ if block_given?
264
+ res = callbacks.diffs.map do |hunk|
265
+ if hunk.kind_of?(Array)
266
+ hunk = hunk.map { |block| yield block }
267
+ else
268
+ yield hunk
269
+ end
270
+ end
271
+ res
272
+ else
273
+ callbacks.diffs
274
+ end
275
+ end
276
+
277
+ # Diff::LCS.sdiff computes all necessary components to show two sequences
278
+ # and their minimized differences side by side, just like the Unix
279
+ # utility <em>sdiff</em> does:
280
+ #
281
+ # old < -
282
+ # same same
283
+ # before | after
284
+ # - > new
285
+ #
286
+ # See Diff::LCS::SDiffCallbacks for the default behaviour. An alternate
287
+ # behaviour may be implemented with Diff::LCS::ContextDiffCallbacks. If
288
+ # a Class argument is provided for +callbacks+, #diff will attempt to
289
+ # initialise it. If the +callbacks+ object (possibly initialised)
290
+ # responds to #finish, it will be called.
291
+ def sdiff(seq1, seq2, callbacks = nil, &block) #:yields diff changes:
292
+ callbacks ||= Diff::LCS::SDiffCallbacks
293
+ if callbacks.kind_of?(Class)
294
+ cb = callbacks.new rescue callbacks
295
+ callbacks = cb
296
+ end
297
+ traverse_balanced(seq1, seq2, callbacks)
298
+ callbacks.finish if callbacks.respond_to?(:finish)
299
+
300
+ if block_given?
301
+ res = callbacks.diffs.map do |hunk|
302
+ if hunk.kind_of?(Array)
303
+ hunk = hunk.map { |block| yield block }
304
+ else
305
+ yield hunk
306
+ end
307
+ end
308
+ res
309
+ else
310
+ callbacks.diffs
311
+ end
312
+ end
313
+
314
+ # Diff::LCS.traverse_sequences is the most general facility provided by this
315
+ # module; +diff+ and +LCS+ are implemented as calls to it.
316
+ #
317
+ # The arguments to #traverse_sequences are the two sequences to
318
+ # traverse, and a callback object, like this:
319
+ #
320
+ # traverse_sequences(seq1, seq2, Diff::LCS::ContextDiffCallbacks.new)
321
+ #
322
+ # #diff is implemented with #traverse_sequences.
323
+ #
324
+ # == Callback Methods
325
+ # Optional callback methods are <em>emphasized</em>.
326
+ #
327
+ # callbacks#match:: Called when +a+ and +b+ are pointing
328
+ # to common elements in +A+ and +B+.
329
+ # callbacks#discard_a:: Called when +a+ is pointing to an
330
+ # element not in +B+.
331
+ # callbacks#discard_b:: Called when +b+ is pointing to an
332
+ # element not in +A+.
333
+ # <em>callbacks#finished_a</em>:: Called when +a+ has reached the end of
334
+ # sequence +A+.
335
+ # <em>callbacks#finished_b</em>:: Called when +b+ has reached the end of
336
+ # sequence +B+.
337
+ #
338
+ # == Algorithm
339
+ # a---+
340
+ # v
341
+ # A = a b c e h j l m n p
342
+ # B = b c d e f j k l m r s t
343
+ # ^
344
+ # b---+
345
+ #
346
+ # If there are two arrows (+a+ and +b+) pointing to elements of
347
+ # sequences +A+ and +B+, the arrows will initially point to the first
348
+ # elements of their respective sequences. #traverse_sequences will
349
+ # advance the arrows through the sequences one element at a time,
350
+ # calling a method on the user-specified callback object before each
351
+ # advance. It will advance the arrows in such a way that if there are
352
+ # elements <tt>A[ii]</tt> and <tt>B[jj]</tt> which are both equal and
353
+ # part of the longest common subsequence, there will be some moment
354
+ # during the execution of #traverse_sequences when arrow +a+ is pointing
355
+ # to <tt>A[ii]</tt> and arrow +b+ is pointing to <tt>B[jj]</tt>. When
356
+ # this happens, #traverse_sequences will call <tt>callbacks#match</tt>
357
+ # and then it will advance both arrows.
358
+ #
359
+ # Otherwise, one of the arrows is pointing to an element of its sequence
360
+ # that is not part of the longest common subsequence.
361
+ # #traverse_sequences will advance that arrow and will call
362
+ # <tt>callbacks#discard_a</tt> or <tt>callbacks#discard_b</tt>, depending
363
+ # on which arrow it advanced. If both arrows point to elements that are
364
+ # not part of the longest common subsequence, then #traverse_sequences
365
+ # will advance one of them and call the appropriate callback, but it is
366
+ # not specified which it will call.
367
+ #
368
+ # The methods for <tt>callbacks#match</tt>, <tt>callbacks#discard_a</tt>,
369
+ # and <tt>callbacks#discard_b</tt> are invoked with an event comprising
370
+ # the action ("=", "+", or "-", respectively), the indicies +ii+ and
371
+ # +jj+, and the elements <tt>A[ii]</tt> and <tt>B[jj]</tt>. Return
372
+ # values are discarded by #traverse_sequences.
373
+ #
374
+ # === End of Sequences
375
+ # If arrow +a+ reaches the end of its sequence before arrow +b+ does,
376
+ # #traverse_sequence try to call <tt>callbacks#finished_a</tt> with the
377
+ # last index and element of +A+ (<tt>A[-1]</tt>) and the current index
378
+ # and element of +B+ (<tt>B[jj]</tt>). If <tt>callbacks#finished_a</tt>
379
+ # does not exist, then <tt>callbacks#discard_b</tt> will be called on
380
+ # each element of +B+ until the end of the sequence is reached (the call
381
+ # will be done with <tt>A[-1]</tt> and <tt>B[jj]</tt> for each element).
382
+ #
383
+ # If +b+ reaches the end of +B+ before +a+ reaches the end of +A+,
384
+ # <tt>callbacks#finished_b</tt> will be called with the current index
385
+ # and element of +A+ (<tt>A[ii]</tt>) and the last index and element of
386
+ # +B+ (<tt>A[-1]</tt>). Again, if <tt>callbacks#finished_b</tt> does not
387
+ # exist on the callback object, then <tt>callbacks#discard_a</tt> will
388
+ # be called on each element of +A+ until the end of the sequence is
389
+ # reached (<tt>A[ii]</tt> and <tt>B[-1]</tt>).
390
+ #
391
+ # There is a chance that one additional <tt>callbacks#discard_a</tt> or
392
+ # <tt>callbacks#discard_b</tt> will be called after the end of the
393
+ # sequence is reached, if +a+ has not yet reached the end of +A+ or +b+
394
+ # has not yet reached the end of +B+.
395
+ def traverse_sequences(seq1, seq2, callbacks = Diff::LCS::SequenceCallbacks, &block) #:yields change events:
396
+ matches = Diff::LCS.__lcs(seq1, seq2)
397
+
398
+ run_finished_a = run_finished_b = false
399
+ string = seq1.kind_of?(String)
400
+
401
+ a_size = seq1.size
402
+ b_size = seq2.size
403
+ ai = bj = 0
404
+
405
+ (0 .. matches.size).each do |ii|
406
+ b_line = matches[ii]
407
+
408
+ ax = string ? seq1[ii, 1] : seq1[ii]
409
+ bx = string ? seq2[bj, 1] : seq2[bj]
410
+
411
+ if b_line.nil?
412
+ unless ax.nil?
413
+ event = Diff::LCS::ContextChange.new('-', ii, ax, bj, bx)
414
+ event = yield event if block_given?
415
+ callbacks.discard_a(event)
416
+ end
417
+ else
418
+ loop do
419
+ break unless bj < b_line
420
+ bx = string ? seq2[bj, 1] : seq2[bj]
421
+ event = Diff::LCS::ContextChange.new('+', ii, ax, bj, bx)
422
+ event = yield event if block_given?
423
+ callbacks.discard_b(event)
424
+ bj += 1
425
+ end
426
+ bx = string ? seq2[bj, 1] : seq2[bj]
427
+ event = Diff::LCS::ContextChange.new('=', ii, ax, bj, bx)
428
+ event = yield event if block_given?
429
+ callbacks.match(event)
430
+ bj += 1
431
+ end
432
+ ai = ii
433
+ end
434
+ ai += 1
435
+
436
+ # The last entry (if any) processed was a match. +ai+ and +bj+ point
437
+ # just past the last matching lines in their sequences.
438
+ while (ai < a_size) or (bj < b_size)
439
+ # last A?
440
+ if ai == a_size and bj < b_size
441
+ if callbacks.respond_to?(:finished_a) and not run_finished_a
442
+ ax = string ? seq1[-1, 1] : seq1[-1]
443
+ bx = string ? seq2[bj, 1] : seq2[bj]
444
+ event = Diff::LCS::ContextChange.new('>', (a_size - 1), ax, bj, bx)
445
+ event = yield event if block_given?
446
+ callbacks.finished_a(event)
447
+ run_finished_a = true
448
+ else
449
+ ax = string ? seq1[ai, 1] : seq1[ai]
450
+ loop do
451
+ bx = string ? seq2[bj, 1] : seq2[bj]
452
+ event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
453
+ event = yield event if block_given?
454
+ callbacks.discard_b(event)
455
+ bj += 1
456
+ break unless bj < b_size
457
+ end
458
+ end
459
+ end
460
+
461
+ # last B?
462
+ if bj == b_size and ai < a_size
463
+ if callbacks.respond_to?(:finished_b) and not run_finished_b
464
+ ax = string ? seq1[ai, 1] : seq1[ai]
465
+ bx = string ? seq2[-1, 1] : seq2[-1]
466
+ event = Diff::LCS::ContextChange.new('<', ai, ax, (b_size - 1), bx)
467
+ event = yield event if block_given?
468
+ callbacks.finished_b(event)
469
+ run_finished_b = true
470
+ else
471
+ bx = string ? seq2[bj, 1] : seq2[bj]
472
+ loop do
473
+ ax = string ? seq1[ai, 1] : seq1[ai]
474
+ event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
475
+ event = yield event if block_given?
476
+ callbacks.discard_a(event)
477
+ ai += 1
478
+ break unless bj < b_size
479
+ end
480
+ end
481
+ end
482
+
483
+ if ai < a_size
484
+ ax = string ? seq1[ai, 1] : seq1[ai]
485
+ bx = string ? seq2[bj, 1] : seq2[bj]
486
+ event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
487
+ event = yield event if block_given?
488
+ callbacks.discard_a(event)
489
+ ai += 1
490
+ end
491
+
492
+ if bj < b_size
493
+ ax = string ? seq1[ai, 1] : seq1[ai]
494
+ bx = string ? seq2[bj, 1] : seq2[bj]
495
+ event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
496
+ event = yield event if block_given?
497
+ callbacks.discard_b(event)
498
+ bj += 1
499
+ end
500
+ end
501
+ end
502
+
503
+ # #traverse_balanced is an alternative to #traverse_sequences. It
504
+ # uses a different algorithm to iterate through the entries in the
505
+ # computed longest common subsequence. Instead of viewing the changes as
506
+ # insertions or deletions from one of the sequences, #traverse_balanced
507
+ # will report <em>changes</em> between the sequences. To represent a
508
+ #
509
+ # The arguments to #traverse_balanced are the two sequences to traverse
510
+ # and a callback object, like this:
511
+ #
512
+ # traverse_balanced(seq1, seq2, Diff::LCS::ContextDiffCallbacks.new)
513
+ #
514
+ # #sdiff is implemented with #traverse_balanced.
515
+ #
516
+ # == Callback Methods
517
+ # Optional callback methods are <em>emphasized</em>.
518
+ #
519
+ # callbacks#match:: Called when +a+ and +b+ are pointing
520
+ # to common elements in +A+ and +B+.
521
+ # callbacks#discard_a:: Called when +a+ is pointing to an
522
+ # element not in +B+.
523
+ # callbacks#discard_b:: Called when +b+ is pointing to an
524
+ # element not in +A+.
525
+ # <em>callbacks#change</em>:: Called when +a+ and +b+ are pointing
526
+ # to the same relative position, but
527
+ # <tt>A[a]</tt> and <tt>B[b]</tt> are
528
+ # not the same; a <em>change</em> has
529
+ # occurred.
530
+ #
531
+ # #traverse_balanced might be a bit slower than #traverse_sequences,
532
+ # noticable only while processing huge amounts of data.
533
+ #
534
+ # The +sdiff+ function of this module is implemented as call to
535
+ # #traverse_balanced.
536
+ #
537
+ # == Algorithm
538
+ # a---+
539
+ # v
540
+ # A = a b c e h j l m n p
541
+ # B = b c d e f j k l m r s t
542
+ # ^
543
+ # b---+
544
+ #
545
+ # === Matches
546
+ # If there are two arrows (+a+ and +b+) pointing to elements of
547
+ # sequences +A+ and +B+, the arrows will initially point to the first
548
+ # elements of their respective sequences. #traverse_sequences will
549
+ # advance the arrows through the sequences one element at a time,
550
+ # calling a method on the user-specified callback object before each
551
+ # advance. It will advance the arrows in such a way that if there are
552
+ # elements <tt>A[ii]</tt> and <tt>B[jj]</tt> which are both equal and
553
+ # part of the longest common subsequence, there will be some moment
554
+ # during the execution of #traverse_sequences when arrow +a+ is pointing
555
+ # to <tt>A[ii]</tt> and arrow +b+ is pointing to <tt>B[jj]</tt>. When
556
+ # this happens, #traverse_sequences will call <tt>callbacks#match</tt>
557
+ # and then it will advance both arrows.
558
+ #
559
+ # === Discards
560
+ # Otherwise, one of the arrows is pointing to an element of its sequence
561
+ # that is not part of the longest common subsequence.
562
+ # #traverse_sequences will advance that arrow and will call
563
+ # <tt>callbacks#discard_a</tt> or <tt>callbacks#discard_b</tt>,
564
+ # depending on which arrow it advanced.
565
+ #
566
+ # === Changes
567
+ # If both +a+ and +b+ point to elements that are not part of the longest
568
+ # common subsequence, then #traverse_sequences will try to call
569
+ # <tt>callbacks#change</tt> and advance both arrows. If
570
+ # <tt>callbacks#change</tt> is not implemented, then
571
+ # <tt>callbacks#discard_a</tt> and <tt>callbacks#discard_b</tt> will be
572
+ # called in turn.
573
+ #
574
+ # The methods for <tt>callbacks#match</tt>, <tt>callbacks#discard_a</tt>,
575
+ # <tt>callbacks#discard_b</tt>, and <tt>callbacks#change</tt> are
576
+ # invoked with an event comprising the action ("=", "+", "-", or "!",
577
+ # respectively), the indicies +ii+ and +jj+, and the elements
578
+ # <tt>A[ii]</tt> and <tt>B[jj]</tt>. Return values are discarded by
579
+ # #traverse_balanced.
580
+ #
581
+ # === Context
582
+ # Note that +ii+ and +jj+ may not be the same index position, even if
583
+ # +a+ and +b+ are considered to be pointing to matching or changed
584
+ # elements.
585
+ def traverse_balanced(seq1, seq2, callbacks = Diff::LCS::BalancedCallbacks)
586
+ matches = Diff::LCS.__lcs(seq1, seq2)
587
+ a_size = seq1.size
588
+ b_size = seq2.size
589
+ ai = bj = mb = 0
590
+ ma = -1
591
+ string = seq1.kind_of?(String)
592
+
593
+ # Process all the lines in the match vector.
594
+ loop do
595
+ # Find next match indices +ma+ and +mb+
596
+ loop do
597
+ ma += 1
598
+ break unless ma < matches.size and matches[ma].nil?
599
+ end
600
+
601
+ break if ma >= matches.size # end of matches?
602
+ mb = matches[ma]
603
+
604
+ # Change(seq2)
605
+ while (ai < ma) or (bj < mb)
606
+ ax = string ? seq1[ai, 1] : seq1[ai]
607
+ bx = string ? seq2[bj, 1] : seq2[bj]
608
+
609
+ case [(ai < ma), (bj < mb)]
610
+ when [true, true]
611
+ if callbacks.respond_to?(:change)
612
+ event = Diff::LCS::ContextChange.new('!', ai, ax, bj, bx)
613
+ event = yield event if block_given?
614
+ callbacks.change(event)
615
+ ai += 1
616
+ bj += 1
617
+ else
618
+ event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
619
+ event = yield event if block_given?
620
+ callbacks.discard_a(event)
621
+ ai += 1
622
+ ax = string ? seq1[ai, 1] : seq1[ai]
623
+ event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
624
+ event = yield event if block_given?
625
+ callbacks.discard_b(event)
626
+ bj += 1
627
+ end
628
+ when [true, false]
629
+ event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
630
+ event = yield event if block_given?
631
+ callbacks.discard_a(event)
632
+ ai += 1
633
+ when [false, true]
634
+ event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
635
+ event = yield event if block_given?
636
+ callbacks.discard_b(event)
637
+ bj += 1
638
+ end
639
+ end
640
+
641
+ # Match
642
+ ax = string ? seq1[ai, 1] : seq1[ai]
643
+ bx = string ? seq2[bj, 1] : seq2[bj]
644
+ event = Diff::LCS::ContextChange.new('=', ai, ax, bj, bx)
645
+ event = yield event if block_given?
646
+ callbacks.match(event)
647
+ ai += 1
648
+ bj += 1
649
+ end
650
+
651
+ while (ai < a_size) or (bj < b_size)
652
+ ax = string ? seq1[ai, 1] : seq1[ai]
653
+ bx = string ? seq2[bj, 1] : seq2[bj]
654
+
655
+ case [(ai < a_size), (bj < b_size)]
656
+ when [true, true]
657
+ if callbacks.respond_to?(:change)
658
+ event = Diff::LCS::ContextChange.new('!', ai, ax, bj, bx)
659
+ event = yield event if block_given?
660
+ callbacks.change(event)
661
+ ai += 1
662
+ bj += 1
663
+ else
664
+ event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
665
+ event = yield event if block_given?
666
+ callbacks.discard_a(event)
667
+ ai += 1
668
+ ax = string ? seq1[ai, 1] : seq1[ai]
669
+ event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
670
+ event = yield event if block_given?
671
+ callbacks.discard_b(event)
672
+ bj += 1
673
+ end
674
+ when [true, false]
675
+ event = Diff::LCS::ContextChange.new('-', ai, ax, bj, bx)
676
+ event = yield event if block_given?
677
+ callbacks.discard_a(event)
678
+ ai += 1
679
+ when [false, true]
680
+ event = Diff::LCS::ContextChange.new('+', ai, ax, bj, bx)
681
+ event = yield event if block_given?
682
+ callbacks.discard_b(event)
683
+ bj += 1
684
+ end
685
+ end
686
+ end
687
+
688
+ PATCH_MAP = { #:nodoc:
689
+ :patch => { '+' => '+', '-' => '-', '!' => '!', '=' => '=' },
690
+ :unpatch => { '+' => '-', '-' => '+', '!' => '!', '=' => '=' }
691
+ }
692
+
693
+ # Given a patchset, convert the current version to the new
694
+ # version. If +direction+ is not specified (must be
695
+ # <tt>:patch</tt> or <tt>:unpatch</tt>), then discovery of the
696
+ # direction of the patch will be attempted.
697
+ def patch(src, patchset, direction = nil)
698
+ string = src.kind_of?(String)
699
+ # Start with a new empty type of the source's class
700
+ res = src.class.new
701
+
702
+ # Normalize the patchset.
703
+ patchset = __normalize_patchset(patchset)
704
+
705
+ direction ||= Diff::LCS.__diff_direction(src, patchset)
706
+ direction ||= :patch
707
+
708
+ ai = bj = 0
709
+
710
+ patchset.each do |change|
711
+ # Both Change and ContextChange support #action
712
+ action = PATCH_MAP[direction][change.action]
713
+
714
+ case change
715
+ when Diff::LCS::ContextChange
716
+ case direction
717
+ when :patch
718
+ el = change.new_element
719
+ op = change.old_position
720
+ np = change.new_position
721
+ when :unpatch
722
+ el = change.old_element
723
+ op = change.new_position
724
+ np = change.old_position
725
+ end
726
+
727
+ case action
728
+ when '-' # Remove details from the old string
729
+ while ai < op
730
+ res << (string ? src[ai, 1] : src[ai])
731
+ ai += 1
732
+ bj += 1
733
+ end
734
+ ai += 1
735
+ when '+'
736
+ while bj < np
737
+ res << (string ? src[ai, 1] : src[ai])
738
+ ai += 1
739
+ bj += 1
740
+ end
741
+
742
+ res << el
743
+ bj += 1
744
+ when '='
745
+ # This only appears in sdiff output with the SDiff callback.
746
+ # Therefore, we only need to worry about dealing with a single
747
+ # element.
748
+ res << el
749
+
750
+ ai += 1
751
+ bj += 1
752
+ when '!'
753
+ while ai < op
754
+ res << (string ? src[ai, 1] : src[ai])
755
+ ai += 1
756
+ bj += 1
757
+ end
758
+
759
+ bj += 1
760
+ ai += 1
761
+
762
+ res << el
763
+ end
764
+ when Diff::LCS::Change
765
+ case action
766
+ when '-'
767
+ while ai < change.position
768
+ res << (string ? src[ai, 1] : src[ai])
769
+ ai += 1
770
+ bj += 1
771
+ end
772
+ ai += 1
773
+ when '+'
774
+ while bj < change.position
775
+ res << (string ? src[ai, 1] : src[ai])
776
+ ai += 1
777
+ bj += 1
778
+ end
779
+
780
+ bj += 1
781
+
782
+ res << change.element
783
+ end
784
+ end
785
+ end
786
+
787
+ while ai < src.size
788
+ res << (string ? src[ai, 1] : src[ai])
789
+ ai += 1
790
+ bj += 1
791
+ end
792
+
793
+ res
794
+ end
795
+
796
+ # Given a set of patchset, convert the current version to the prior
797
+ # version. Does no auto-discovery.
798
+ def unpatch!(src, patchset)
799
+ Diff::LCS.patch(src, patchset, :unpatch)
800
+ end
801
+
802
+ # Given a set of patchset, convert the current version to the next
803
+ # version. Does no auto-discovery.
804
+ def patch!(src, patchset)
805
+ Diff::LCS.patch(src, patchset, :patch)
806
+ end
807
+
808
+ # private
809
+ # Compute the longest common subsequence between the sequenced Enumerables
810
+ # +a+ and +b+. The result is an array whose contents is such that
811
+ #
812
+ # result = Diff::LCS.__lcs(a, b)
813
+ # result.each_with_index do |e, ii|
814
+ # assert_equal(a[ii], b[e]) unless e.nil?
815
+ # end
816
+ def __lcs(a, b)
817
+ a_start = b_start = 0
818
+ a_finish = a.size - 1
819
+ b_finish = b.size - 1
820
+ vector = []
821
+
822
+ # Prune off any common elements at the beginning...
823
+ while (a_start <= a_finish) and
824
+ (b_start <= b_finish) and
825
+ (a[a_start] == b[b_start])
826
+ vector[a_start] = b_start
827
+ a_start += 1
828
+ b_start += 1
829
+ end
830
+
831
+ # Now the end...
832
+ while (a_start <= a_finish) and
833
+ (b_start <= b_finish) and
834
+ (a[a_finish] == b[b_finish])
835
+ vector[a_finish] = b_finish
836
+ a_finish -= 1
837
+ b_finish -= 1
838
+ end
839
+
840
+ # Now, compute the equivalence classes of positions of elements.
841
+ b_matches = Diff::LCS.__position_hash(b, b_start .. b_finish)
842
+
843
+ thresh = []
844
+ links = []
845
+
846
+ (a_start .. a_finish).each do |ii|
847
+ ai = a.kind_of?(String) ? a[ii, 1] : a[ii]
848
+ bm = b_matches[ai]
849
+ kk = nil
850
+ bm.reverse_each do |jj|
851
+ if kk and (thresh[kk] > jj) and (thresh[kk - 1] < jj)
852
+ thresh[kk] = jj
853
+ else
854
+ kk = Diff::LCS.__replace_next_larger(thresh, jj, kk)
855
+ end
856
+ links[kk] = [ (kk > 0) ? links[kk - 1] : nil, ii, jj ] unless kk.nil?
857
+ end
858
+ end
859
+
860
+ unless thresh.empty?
861
+ link = links[thresh.size - 1]
862
+ while not link.nil?
863
+ vector[link[1]] = link[2]
864
+ link = link[0]
865
+ end
866
+ end
867
+
868
+ vector
869
+ end
870
+
871
+ # Find the place at which +value+ would normally be inserted into the
872
+ # Enumerable. If that place is already occupied by +value+, do nothing
873
+ # and return +nil+. If the place does not exist (i.e., it is off the end
874
+ # of the Enumerable), add it to the end. Otherwise, replace the element
875
+ # at that point with +value+. It is assumed that the Enumerable's values
876
+ # are numeric.
877
+ #
878
+ # This operation preserves the sort order.
879
+ def __replace_next_larger(enum, value, last_index = nil)
880
+ # Off the end?
881
+ if enum.empty? or (value > enum[-1])
882
+ enum << value
883
+ return enum.size - 1
884
+ end
885
+
886
+ # Binary search for the insertion point
887
+ last_index ||= enum.size
888
+ first_index = 0
889
+ while (first_index <= last_index)
890
+ ii = (first_index + last_index) >> 1
891
+
892
+ found = enum[ii]
893
+
894
+ if value == found
895
+ return nil
896
+ elsif value > found
897
+ first_index = ii + 1
898
+ else
899
+ last_index = ii - 1
900
+ end
901
+ end
902
+
903
+ # The insertion point is in first_index; overwrite the next larger
904
+ # value.
905
+ enum[first_index] = value
906
+ return first_index
907
+ end
908
+
909
+ # If +vector+ maps the matching elements of another collection onto this
910
+ # Enumerable, compute the inverse +vector+ that maps this Enumerable
911
+ # onto the collection. (Currently unused.)
912
+ def __inverse_vector(a, vector)
913
+ inverse = a.dup
914
+ (0 ... vector.size).each do |ii|
915
+ inverse[vector[ii]] = ii unless vector[ii].nil?
916
+ end
917
+ inverse
918
+ end
919
+
920
+ # Returns a hash mapping each element of an Enumerable to the set of
921
+ # positions it occupies in the Enumerable, optionally restricted to the
922
+ # elements specified in the range of indexes specified by +interval+.
923
+ def __position_hash(enum, interval = 0 .. -1)
924
+ hash = Hash.new { |hh, kk| hh[kk] = [] }
925
+ interval.each do |ii|
926
+ kk = enum.kind_of?(String) ? enum[ii, 1] : enum[ii]
927
+ hash[kk] << ii
928
+ end
929
+ hash
930
+ end
931
+
932
+ # Examine the patchset and the source to see in which direction the
933
+ # patch should be applied.
934
+ #
935
+ # WARNING: By default, this examines the whole patch, so this could take
936
+ # some time. This also works better with Diff::LCS::ContextChange or
937
+ # Diff::LCS::Change as its source, as an array will cause the creation
938
+ # of one of the above.
939
+ def __diff_direction(src, patchset, limit = nil)
940
+ count = left = left_miss = right = right_miss = 0
941
+ string = src.kind_of?(String)
942
+
943
+ patchset.each do |change|
944
+ count += 1
945
+
946
+ case change
947
+ when Diff::LCS::Change
948
+ # With a simplistic change, we can't tell the difference between
949
+ # the left and right on '!' actions, so we ignore those. On '='
950
+ # actions, if there's a miss, we miss both left and right.
951
+ element = string ? src[change.position, 1] : src[change.position]
952
+
953
+ case change.action
954
+ when '-'
955
+ if element == change.element
956
+ left += 1
957
+ else
958
+ left_miss += 1
959
+ end
960
+ when '+'
961
+ if element == change.element
962
+ right += 1
963
+ else
964
+ right_miss += 1
965
+ end
966
+ when '='
967
+ if element != change.element
968
+ left_miss += 1
969
+ right_miss += 1
970
+ end
971
+ end
972
+ when Diff::LCS::ContextChange
973
+ case change.action
974
+ when '-' # Remove details from the old string
975
+ element = string ? src[change.old_position, 1] : src[change.old_position]
976
+ if element == change.old_element
977
+ left += 1
978
+ else
979
+ left_miss += 1
980
+ end
981
+ when '+'
982
+ element = string ? src[change.new_position, 1] : src[change.new_position]
983
+ if element == change.new_element
984
+ right += 1
985
+ else
986
+ right_miss += 1
987
+ end
988
+ when '='
989
+ le = string ? src[change.old_position, 1] : src[change.old_position]
990
+ re = string ? src[change.new_position, 1] : src[change.new_position]
991
+
992
+ left_miss += 1 if le != change.old_element
993
+ right_miss += 1 if re != change.new_element
994
+ when '!'
995
+ element = string ? src[change.old_position, 1] : src[change.old_position]
996
+ if element == change.old_element
997
+ left += 1
998
+ else
999
+ element = string ? src[change.new_position, 1] : src[change.new_position]
1000
+ if element == change.new_element
1001
+ right += 1
1002
+ else
1003
+ left_miss += 1
1004
+ right_miss += 1
1005
+ end
1006
+ end
1007
+ end
1008
+ end
1009
+
1010
+ break if not limit.nil? and count > limit
1011
+ end
1012
+
1013
+ no_left = (left == 0) and (left_miss >= 0)
1014
+ no_right = (right == 0) and (right_miss >= 0)
1015
+
1016
+ case [no_left, no_right]
1017
+ when [false, true]
1018
+ return :patch
1019
+ when [true, false]
1020
+ return :unpatch
1021
+ else
1022
+ raise "The provided patchset does not appear to apply to the provided value as either source or destination value."
1023
+ end
1024
+ end
1025
+
1026
+ # Normalize the patchset. A patchset is always a sequence of changes, but
1027
+ # how those changes are represented may vary, depending on how they were
1028
+ # generated. In all cases we support, we also support the array
1029
+ # representation of the changes. The formats are:
1030
+ #
1031
+ # [ # patchset <- Diff::LCS.diff(a, b)
1032
+ # [ # one or more hunks
1033
+ # Diff::LCS::Change # one or more changes
1034
+ # ] ]
1035
+ #
1036
+ # [ # patchset, equivalent to the above
1037
+ # [ # one or more hunks
1038
+ # [ action, line, value ] # one or more changes
1039
+ # ] ]
1040
+ #
1041
+ # [ # patchset <- Diff::LCS.diff(a, b, Diff::LCS::ContextDiffCallbacks)
1042
+ # # OR <- Diff::LCS.sdiff(a, b, Diff::LCS::ContextDiffCallbacks)
1043
+ # [ # one or more hunks
1044
+ # Diff::LCS::ContextChange # one or more changes
1045
+ # ] ]
1046
+ #
1047
+ # [ # patchset, equivalent to the above
1048
+ # [ # one or more hunks
1049
+ # [ action, [ old line, old value ], [ new line, new value ] ]
1050
+ # # one or more changes
1051
+ # ] ]
1052
+ #
1053
+ # [ # patchset <- Diff::LCS.sdiff(a, b)
1054
+ # # OR <- Diff::LCS.diff(a, b, Diff::LCS::SDiffCallbacks)
1055
+ # Diff::LCS::ContextChange # one or more changes
1056
+ # ]
1057
+ #
1058
+ # [ # patchset, equivalent to the above
1059
+ # [ action, [ old line, old value ], [ new line, new value ] ]
1060
+ # # one or more changes
1061
+ # ]
1062
+ #
1063
+ # The result of this will be either of the following.
1064
+ #
1065
+ # [ # patchset
1066
+ # Diff::LCS::ContextChange # one or more changes
1067
+ # ]
1068
+ #
1069
+ # [ # patchset
1070
+ # Diff::LCS::Change # one or more changes
1071
+ # ]
1072
+ #
1073
+ # If either of the above is provided, it will be returned as such.
1074
+ #
1075
+ def __normalize_patchset(patchset)
1076
+ patchset.map do |hunk|
1077
+ case hunk
1078
+ when Diff::LCS::ContextChange, Diff::LCS::Change
1079
+ hunk
1080
+ when Array
1081
+ if (not hunk[0].kind_of?(Array)) and hunk[1].kind_of?(Array) and hunk[2].kind_of?(Array)
1082
+ Diff::LCS::ContextChange.from_a(hunk)
1083
+ else
1084
+ hunk.map do |change|
1085
+ case change
1086
+ when Diff::LCS::ContextChange, Diff::LCS::Change
1087
+ change
1088
+ when Array
1089
+ # change[1] will ONLY be an array in a ContextChange#to_a call.
1090
+ # In Change#to_a, it represents the line (singular).
1091
+ if change[1].kind_of?(Array)
1092
+ Diff::LCS::ContextChange.from_a(change)
1093
+ else
1094
+ Diff::LCS::Change.from_a(change)
1095
+ end
1096
+ end
1097
+ end
1098
+ end
1099
+ else
1100
+ raise ArgumentError, "Cannot normalise a hunk of class #{hunk.class}."
1101
+ end
1102
+ end.flatten
1103
+ end
1104
+ end
1105
+ end