Browse files

Slightly more robust --verbose reporting

  • Loading branch information...
1 parent 30da3ec commit 64c047c7a4777b3699432bcafe8cb9ab778988c4 @aslakhellesoy aslakhellesoy committed May 26, 2009
Showing with 8 additions and 5 deletions.
  1. +1 −0 History.txt
  2. +2 −2 cucumber.gemspec
  3. +1 −0 lib/cucumber/cli/configuration.rb
  4. +3 −2 lib/cucumber/cli/main.rb
  5. +1 −1 lib/cucumber/version.rb
View
1 History.txt
@@ -6,6 +6,7 @@
* Most formatters now report how long a run took (#228 Aslak Hellesøy)
* Scenario and ExampleRow objects (passed to Before and After hooks) have #name and #line methods (#316 Aslak Hellesøy)
* Rails generator creates a cucumber environment file to avoid potential cache_classes conflicts in test.rb (#165, Ben Mabey)
+* HTML formatter renders @tags (but the CSS is still ugly)
=== Removed/changed features
* The Cucumber Rake task will again fork by default (as before 0.3.4). Forking must be turned off explicitly. (Aslak Hellesøy)
View
4 cucumber.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = %q{cucumber}
- s.version = "0.3.7.3"
+ s.version = "0.3.7.4"
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-05-25}
+ s.date = %q{2009-05-26}
s.default_executable = %q{cucumber}
s.description = %q{Executable Feature scenarios}
s.email = ["aslak.hellesoy@gmail.com"]
View
1 lib/cucumber/cli/configuration.rb
@@ -257,6 +257,7 @@ def files_to_require
requires = @options[:require] || feature_dirs
files = requires.map do |path|
path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
+ path = path.gsub(/\/$/, '') # Strip trailing slash.
File.directory?(path) ? Dir["#{path}/**/*.rb"] : path
end.flatten.uniq
sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=> (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
View
5 lib/cucumber/cli/main.rb
@@ -75,11 +75,12 @@ def configuration
private
def require_files
+ requires = configuration.files_to_require
verbose_log("Ruby files required:")
- configuration.files_to_require.each do |lib|
+ verbose_log(requires.map{|lib| " * #{lib}"}.join("\n"))
+ requires.each do |lib|
begin
require lib
- verbose_log(" * #{lib}")
rescue LoadError => e
e.message << "\nFailed to load #{lib}"
raise e
View
2 lib/cucumber/version.rb
@@ -3,7 +3,7 @@ class VERSION #:nodoc:
MAJOR = 0
MINOR = 3
TINY = 7
- PATCH = 3 # Set to nil for official release
+ PATCH = 4 # Set to nil for official release
STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
STABLE_STRING = [MAJOR, MINOR, TINY].join('.')

0 comments on commit 64c047c

Please sign in to comment.