From 459d964d9a6fc2b371fd4bfc476db6d3c0df5f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aslak=20Helles=C3=B8y?= Date: Tue, 22 Dec 2009 15:17:43 +0100 Subject: [PATCH] New --jars option --- History.txt | 6 +++++- VERSION.yml | 2 +- cucumber.gemspec | 15 ++++++++++++--- lib/cucumber/cli/options.rb | 11 +++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/History.txt b/History.txt index 52938af982..5abb14ba67 100644 --- a/History.txt +++ b/History.txt @@ -1,4 +1,8 @@ -== In git +== 0.5.2 2009-12-22 + +=== New Features +* On JRuby/Cuke4Duke, --require DIR will put DIR on the $CLASSPATH, making it easier to load step def classes (Aslak Hellesøy) +* New --jars option that will load jar files. Only available on JRuby. Practical for Cuke4Duke. (Aslak Hellesøy) === Bugfixes * Add #embed back to html formatter (#547 Brandon Faloona) diff --git a/VERSION.yml b/VERSION.yml index 47222d91c2..6f25662719 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,4 +1,4 @@ --- -:patch: 1 +:patch: 2 :major: 0 :minor: 5 diff --git a/cucumber.gemspec b/cucumber.gemspec index 29f9ac6895..cc0ddfce12 100644 --- a/cucumber.gemspec +++ b/cucumber.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{cucumber} - s.version = "0.5.1" + s.version = "0.5.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Aslak Helles\303\270y"] - s.date = %q{2009-12-16} + s.date = %q{2009-12-22} s.default_executable = %q{cucumber} s.description = %q{A BDD tool written in Ruby} s.email = %q{cukes@googlegroups.com} @@ -314,6 +314,7 @@ Gem::Specification.new do |s| "examples/tickets/features/tickets.feature", "examples/watir/README.textile", "examples/watir/Rakefile", + "examples/watir/cucumber.yml", "examples/watir/features/search.feature", "examples/watir/features/step_definitions/search_steps.rb", "examples/watir/features/support/env.rb", @@ -367,6 +368,7 @@ Gem::Specification.new do |s| "features/usage_and_stepdefs_formatter.feature", "features/wire_protocol.feature", "features/wire_protocol_table_diffing.feature", + "features/wire_protocol_timeouts.feature", "features/work_in_progress.feature", "gem_tasks/contributors.rake", "gem_tasks/environment.rake", @@ -470,12 +472,14 @@ Gem::Specification.new do |s| "lib/cucumber/step_mother.rb", "lib/cucumber/webrat/element_locator.rb", "lib/cucumber/webrat/table_locator.rb", + "lib/cucumber/wire_support/configuration.rb", "lib/cucumber/wire_support/connection.rb", "lib/cucumber/wire_support/request_handler.rb", "lib/cucumber/wire_support/wire_exception.rb", "lib/cucumber/wire_support/wire_language.rb", "lib/cucumber/wire_support/wire_packet.rb", "lib/cucumber/wire_support/wire_protocol.rb", + "lib/cucumber/wire_support/wire_protocol/requests.rb", "lib/cucumber/wire_support/wire_step_definition.rb", "spec/cucumber/ast/background_spec.rb", "spec/cucumber/ast/feature_element_spec.rb", @@ -525,6 +529,7 @@ Gem::Specification.new do |s| "spec/cucumber/treetop_parser/test_dos.feature", "spec/cucumber/treetop_parser/with_comments.feature", "spec/cucumber/treetop_parser/with_tags.feature", + "spec/cucumber/wire_support/configuration_spec.rb", "spec/cucumber/wire_support/wire_exception_spec.rb", "spec/cucumber/wire_support/wire_language_spec.rb", "spec/cucumber/wire_support/wire_packet_spec.rb", @@ -539,7 +544,7 @@ Gem::Specification.new do |s| (::) U P G R A D I N G (::) -Thank you for installing cucumber-0.5.1. +Thank you for installing cucumber-0.5.2. Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading for important information about this release. Happy cuking! @@ -586,6 +591,7 @@ for important information about this release. Happy cuking! "spec/cucumber/rb_support/regexp_argument_matcher_spec.rb", "spec/cucumber/step_match_spec.rb", "spec/cucumber/step_mother_spec.rb", + "spec/cucumber/wire_support/configuration_spec.rb", "spec/cucumber/wire_support/wire_exception_spec.rb", "spec/cucumber/wire_support/wire_language_spec.rb", "spec/cucumber/wire_support/wire_packet_spec.rb", @@ -716,6 +722,7 @@ for important information about this release. Happy cuking! s.add_runtime_dependency(%q, [">= 0.2.9"]) s.add_runtime_dependency(%q, [">= 2.1.2"]) s.add_runtime_dependency(%q, [">= 1.1.2"]) + s.add_runtime_dependency(%q, [">= 1.2.0"]) s.add_development_dependency(%q, [">= 1.4.0"]) s.add_development_dependency(%q, [">= 0.5.1"]) s.add_development_dependency(%q, [">= 1.2.9"]) @@ -726,6 +733,7 @@ for important information about this release. Happy cuking! s.add_dependency(%q, [">= 0.2.9"]) s.add_dependency(%q, [">= 2.1.2"]) s.add_dependency(%q, [">= 1.1.2"]) + s.add_dependency(%q, [">= 1.2.0"]) s.add_dependency(%q, [">= 1.4.0"]) s.add_dependency(%q, [">= 0.5.1"]) s.add_dependency(%q, [">= 1.2.9"]) @@ -737,6 +745,7 @@ for important information about this release. Happy cuking! s.add_dependency(%q, [">= 0.2.9"]) s.add_dependency(%q, [">= 2.1.2"]) s.add_dependency(%q, [">= 1.1.2"]) + s.add_dependency(%q, [">= 1.2.0"]) s.add_dependency(%q, [">= 1.4.0"]) s.add_dependency(%q, [">= 0.5.1"]) s.add_dependency(%q, [">= 1.2.9"]) diff --git a/lib/cucumber/cli/options.rb b/lib/cucumber/cli/options.rb index 900369f4f5..847127a9f8 100644 --- a/lib/cucumber/cli/options.rb +++ b/lib/cucumber/cli/options.rb @@ -116,7 +116,18 @@ def parse!(args) "loaded first.", "This option can be specified multiple times.") do |v| @options[:require] << v + if(Cucumber::JRUBY && File.directory?(v)) + $CLASSPATH << v + end end + + if(Cucumber::JRUBY) + opts.on("-j DIR", "--jars DIR", + "Load all the jars under DIR") do |jars| + Dir["#{jars}/**/*.jar"].each {|jar| require jar} + end + end + opts.on("--i18n LANG", "List keywords for in a particular language", %{Run with "--i18n help" to see all languages}) do |lang|