Skip to content

Commit

Permalink
Revert "Fix rake guides:validate task as it should be run from the gu…
Browse files Browse the repository at this point in the history
…ides directory; add exception handling"

This kind of changes should go on a pull request instead.

This reverts commit ecae2f0.
  • Loading branch information
jaimeiniesta committed Aug 24, 2012
1 parent dfd1456 commit fdeaea6
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions guides/w3c_validator.rb
Expand Up @@ -5,9 +5,9 @@
# Guides are taken from the output directory, from where all .html files are
# submitted to the validator.
#
# This script is prepared to be launched from the guides directory as a rake task:
# This script is prepared to be launched from the railties directory as a rake task:
#
# rake guides:validate
# rake validate_guides
#
# If nothing is specified, all files will be validated, but you can check just
# some of them using this environment variable:
Expand All @@ -17,12 +17,12 @@
# enough:
#
# # validates only association_basics.html
# rake guides:validate ONLY=assoc
# ONLY=assoc rake validate_guides
#
# Separate many using commas:
#
# # validates only association_basics.html and migrations.html
# rake guides:validate ONLY=assoc,migrations
# ONLY=assoc,migrations rake validate_guides
#
# ---------------------------------------------------------------------------

Expand All @@ -38,12 +38,7 @@ def validate
errors_on_guides = {}

guides_to_validate.each do |f|
begin
results = validator.validate_file(f)
rescue Exception => e
puts "Could not validate #{f} because of #{e}"
next
end
results = validator.validate_file(f)

if results.validity
print "."
Expand All @@ -58,15 +53,15 @@ def validate

private
def guides_to_validate
guides = Dir["./output/*.html"]
guides.delete("./output/layout.html")
guides = Dir["./guides/output/*.html"]
guides.delete("./guides/output/layout.html")
ENV.key?('ONLY') ? select_only(guides) : guides
end

def select_only(guides)
prefixes = ENV['ONLY'].split(",").map(&:strip)
guides.select do |guide|
prefixes.any? {|p| guide.start_with?("./output/#{p}")}
prefixes.any? {|p| guide.start_with?("./guides/output/#{p}")}
end
end

Expand Down

0 comments on commit fdeaea6

Please sign in to comment.