From 086ab2e1a3dbf22117b79b5e833295158c5dc97c Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 19 Apr 2017 08:11:33 -0400 Subject: [PATCH] Update HTML Proofer and use without bundler --- .travis.yml | 5 ++++- Gemfile | 4 ---- Gemfile.lock | 35 ----------------------------------- Rakefile | 6 +++--- package.json | 2 +- 5 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/.travis.yml b/.travis.yml index 7713d97b672..8ca2b67a601 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,12 @@ env: global: - TRAVIS_COMMIT_MSG="$(git log --format=%B --no-merges -n 1)" +before_install: + - rvm install 2.2.2 + install: - ./script/setup - - bundle install + - gem install rake html-proofer script: - npm run-script travis_script diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 996a4cb6454..00000000000 --- a/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source "https://rubygems.org" - -gem "html-proofer" -gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index a9a8938636b..00000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,35 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.3.8) - colored (1.2) - ethon (0.7.4) - ffi (>= 1.3.0) - ffi (1.9.10) - html-proofer (2.3.0) - addressable (~> 2.3) - colored (~> 1.2) - mercenary (~> 0.3.2) - nokogiri (~> 1.5) - parallel (~> 1.3) - typhoeus (~> 0.7) - yell (~> 2.0) - mercenary (0.3.5) - mini_portile (0.6.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - parallel (1.6.0) - rake (10.4.2) - typhoeus (0.7.2) - ethon (>= 0.7.4) - yell (2.0.5) - -PLATFORMS - ruby - -DEPENDENCIES - html-proofer - rake - -BUNDLED WITH - 1.11.2 diff --git a/Rakefile b/Rakefile index 421c818060a..e2a1eee2d01 100644 --- a/Rakefile +++ b/Rakefile @@ -1,12 +1,12 @@ # encoding: utf-8 -require "html/proofer" +require "html-proofer" task :default => [:test] task :test do - HTML::Proofer.new("dist/", { - :href_ignore => [ + HTMLProofer.check_directory("dist/", { + :url_ignore => [ "#", # The additional anchor link is picked up from the Geomap JSON, but shouldn't be flagged "\\\"#\\\"", diff --git a/package.json b/package.json index a6fb2e7b8ea..3e5b14fdde4 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "test": "grunt test", "postinstall": "bower update && grunt init", - "travis_script": "grunt dist test-mocha && bundle exec rake", + "travis_script": "grunt dist test-mocha && rake", "travis_after_success": "grunt deploy saucelabs" }, "repository": {