Merge pull request #25 from marocchino/validate_on_pr

Validate markup on PR

Author: marocchino

Gemfile

@@ -7,7 +7,6 @@ gem 'kramdown'
 gem 'travis'
 
 group :development do
-  gem 'spidr', '~> 0.4'
-  gem 'validate-website', '~> 0.9'
-  gem 'rspec'
+  gem 'validate-website', '~> 1.0'
+  gem 'rspec', '~> 3.0'
 end

Gemfile.lock

@@ -32,14 +32,14 @@ GEM
     fast-stemmer (1.0.2)
     ffi (1.9.6)
     gemoji (2.1.0)
-    gh (0.13.2)
+    gh (0.14.0)
       addressable
       backports
       faraday (~> 0.8)
       multi_json (~> 1.0)
       net-http-persistent (>= 2.7)
       net-http-pipeline
-    github-pages (31)
+    github-pages (32)
       RedCloth (= 4.2.9)
       github-pages-health-check (~> 0.2)
       jekyll (= 2.4.0)
@@ -49,7 +49,7 @@ GEM
       jekyll-sass-converter (= 1.2.0)
       jekyll-sitemap (= 0.6.3)
       jemoji (= 0.4.0)
-      kramdown (= 1.3.1)
+      kramdown (= 1.5.0)
       liquid (= 2.6.1)
       maruku (= 0.7.0)
       mercenary (~> 0.3)
@@ -93,14 +93,14 @@ GEM
     jekyll-sass-converter (1.2.0)
       sass (~> 3.2)
     jekyll-sitemap (0.6.3)
-    jekyll-watch (1.2.0)
+    jekyll-watch (1.2.1)
       listen (~> 2.7)
     jemoji (0.4.0)
       gemoji (~> 2.0)
       html-pipeline (~> 1.9)
       jekyll (~> 2.0)
     json (1.8.2)
-    kramdown (1.3.1)
+    kramdown (1.5.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     liquid (2.6.1)
@@ -119,7 +119,7 @@ GEM
     net-dns (0.8.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     paint (0.9.0)
     parslet (1.5.0)
@@ -180,9 +180,10 @@ GEM
       ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    validate-website (0.9.5)
+    validate-website (1.0.0)
       multipart_body (~> 0.2)
       paint (~> 0.8)
+      slop (~> 3.5)
       spidr (~> 0.4)
     websocket (1.2.1)
     yajl-ruby (1.1.0)
@@ -194,7 +195,6 @@ DEPENDENCIES
   github-pages
   kramdown
   rake
-  rspec
-  spidr (~> 0.4)
+  rspec (~> 3.0)
   travis
-  validate-website (~> 0.9)
+  validate-website (~> 1.0)

Rakefile

@@ -7,7 +7,7 @@ begin
 rescue LoadError => e
   warn e.message
   warn "Run `gem install bundler` to install Bundler"
-  exit -1
+  exit(-1)
 end
 
 task :default => [:build]
@@ -27,7 +27,7 @@ task :preview do
   sh 'jekyll serve --watch'
 end
 
-task travis: ENV["TRAVIS_PULL_REQUEST"] == "false" ? [:test, :build, :release] : [:test]
+task travis: ENV["TRAVIS_PULL_REQUEST"] == "false" ? [:test, :build, :validate_markup, :release] : [:test, :build, :validate_markup]
 
 desc "Release the current commit to ruby-korea/ruby-korea.github.io@master"
 task :release do
@@ -54,22 +54,20 @@ task :release do
   end
 end
 
-namespace :check do
-  desc 'validate _site markup with validate-website'
-  task :markup => :generate do
-    options = Jekyll.configuration({'auto' => false, 'server' => false})
-    Dir.chdir('_site') do
-      system("validate-website-static --site '#{options['url']}/' --quiet")
-      exit($?.exitstatus)
-    end
+desc 'validate _site markup with validate-website'
+task :validate_markup do
+  Dir.chdir('_site') do
+    system("validate-website-static --site 'https://ruby-korea.github.io/'")
+    exit($?.exitstatus)
   end
-  desc "Checks for broken links on http://0.0.0.0:4000/"
-  task :links do
-    require 'spidr'
-    Spidr.start_at('http://0.0.0.0:4000/') do |agent|
-      agent.every_failed_url do |url|
-        puts "Broken link #{url} found."
-      end
+end
+
+desc "Checks for broken links on http://0.0.0.0:4000/"
+task :links do
+  require 'spidr'
+  Spidr.start_at('http://0.0.0.0:4000/') do |agent|
+    agent.every_failed_url do |url|
+      puts "Broken link #{url} found."
     end
   end
 end