brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [1/4] incubator-brooklyn git commit: Docs: Swaps link-checker gem for html-proofer
Date Fri, 09 Jan 2015 20:43:29 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 66f440f96 -> b2474e579


Docs: Swaps link-checker gem for html-proofer

Incorporated into build.sh. Skip with --skip-tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/121d7f3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/121d7f3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/121d7f3a

Branch: refs/heads/master
Commit: 121d7f3a243a4f4a5d868a64366c1d6f4c5524d0
Parents: aa31755
Author: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Authored: Wed Jan 7 11:57:19 2015 +0000
Committer: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Committed: Fri Jan 9 15:56:13 2015 +0000

----------------------------------------------------------------------
 docs/Gemfile         |  2 +-
 docs/Gemfile.lock    | 29 +++++++++++++++++------------
 docs/_build/build.sh | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/121d7f3a/docs/Gemfile
----------------------------------------------------------------------
diff --git a/docs/Gemfile b/docs/Gemfile
index aacd3c9..3a2621a 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -5,5 +5,5 @@ source 'https://rubygems.org'
 
 gem 'jekyll'
 gem 'therubyracer'
-gem 'link-checker'
+gem 'html-proofer'
 gem 'json'

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/121d7f3a/docs/Gemfile.lock
----------------------------------------------------------------------
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index ada2724..e3389ee 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,9 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    anemone (0.7.2)
-      nokogiri (>= 1.3.0)
-      robotex (>= 1.0.0)
+    addressable (2.3.6)
     blankslate (2.1.2.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -14,11 +12,21 @@ GEM
       execjs
     coffee-script-source (1.8.0)
     colorator (0.1)
-    colorize (0.5.8)
+    colored (1.2)
+    ethon (0.7.2)
+      ffi (>= 1.3.0)
     execjs (2.2.2)
     fast-stemmer (1.0.2)
     ffi (1.9.6)
     hitimes (1.2.2)
+    html-proofer (1.6.0)
+      addressable (~> 2.3)
+      colored (~> 1.2)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.5)
+      parallel (~> 1.3)
+      typhoeus (~> 0.6.7)
+      yell (~> 2.0)
     jekyll (2.5.2)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
@@ -45,11 +53,6 @@ GEM
     json (1.8.1)
     kramdown (1.5.0)
     libv8 (3.16.14.7)
-    link-checker (0.7.2)
-      anemone (~> 0.7.2)
-      colorize (~> 0.5.8)
-      nokogiri (~> 1.5.5)
-      trollop (~> 2.0)
     liquid (2.6.1)
     listen (2.8.3)
       celluloid (>= 0.15.2)
@@ -57,6 +60,7 @@ GEM
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
     nokogiri (1.5.11)
+    parallel (1.3.3)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
@@ -68,7 +72,6 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.2.2)
     ref (1.0.5)
-    robotex (1.0.0)
     safe_yaml (1.0.4)
     sass (3.4.9)
     therubyracer (0.12.1)
@@ -78,14 +81,16 @@ GEM
       hitimes
     toml (0.1.2)
       parslet (~> 1.5.0)
-    trollop (2.0)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
     yajl-ruby (1.1.0)
+    yell (2.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  html-proofer
   jekyll
   json
-  link-checker
   therubyracer

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/121d7f3a/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index efbffc6..dcfbb8f 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -29,6 +29,7 @@ function help() {
   echo "* --quick-javadoc : to do a quick javadoc build (for testing)"
   echo "* --serve : serve files from _site after building (for testing)"
   echo "* --install : install files from _site to the appropriate place in "'$'"BROOKLYN_SITE_DIR
(or ../../incubator-brooklyn-site-public)"
+  echo "* --skip-test : skip the HTML Proof run on _site"
   echo ""
 }
 
@@ -130,6 +131,10 @@ function parse_arguments() {
       INSTALL_AFTERWARDS=true
       shift
       ;;
+    "--skip-test")
+      SKIP_TEST=true
+      shift
+      ;;
     *)
       echo "ERROR: invalid argument '"$1"'"
       exit 1
@@ -138,6 +143,17 @@ function parse_arguments() {
   done
 }
 
+# Runs htmlproof against _site
+function test_site() {
+  if [ "$SKIP_TEST" == "true" ]; then
+    return
+  fi
+  echo "Running htmlproof on _site"
+  mkdir -p target
+  LOG="target/htmlproof.log"
+  htmlproof _site 2>&1 | tee $LOG
+}
+
 function make_jekyll() {
   echo JEKYLL running with: jekyll build $JEKYLL_CONFIG
   jekyll build --config $JEKYLL_CONFIG || return 1
@@ -228,6 +244,8 @@ make_jekyll || { echo ERROR: failed jekyll docs build in `pwd` ; exit
1 ; }
 
 make_javadoc || { echo ERROR: failed javadoc build ; exit 1 ; }
 
+test_site
+
 # TODO build catalog
 
 # TODO install


Mime
View raw message