merged master

CHANGELOG

@@ -3,6 +3,10 @@ CHANGELOG sitespeed.io
 version 2.5-wip
 ------------------------
 
+version 2.4.1
+------------------------
+* Put the HAR file in the HAR directory instead of sitespeed home dir (fixes #343), now it will work in Jenkins for Ubuntu
+
 version 2.4
 ------------------------
 * If Chrome or IE is used, display firstPaintTime in the summary as default #307

CONTRIBUTING.md

@@ -5,14 +5,14 @@ Sitespeed.io continues to evolve thanks to people who contributes, so please ple
 If you want help out, that's great! Check the issue list and see if there's something there you want to do and drop me a note so I know and I can help you get into the project.
 
 ## Add a defect
-First, check the defect/bug list https://github.com/soulgalore/sitespeed.io/issues?labels=bug&page=1&state=open to make sure that it hasn't been filed yet.
+First, check the [defect/bug list](https://github.com/sitespeedio/sitespeed.io/issues?labels=bug&page=1&state=open) to make sure that it hasn't been filed yet.
 
 If you find a defect, please file a bug report. Include the following:
  - Explain the bug/defect and what you where doing.
- - OS & versions (Windows is not supported, it may work, but I don't test it)
+ - OS & versions 
  - Always add the URL of the page you where analyzing (if it is secret, drop me an email peter**at**soulgalore.com and send me the address). 
  - Add a screenshot and clearly point out where the defect is.
- - Add a log of the output and include the content of the data/error.log file. 
+ - Add a log of the output and include the content of the data/error.log file in a [gist](https://gist.github.com/) and attach it to the issue. 
 
 If you have the skills & the time, it is perfect if you send a pull request with a fix, that helps me a lot!
 

bin/sitespeed.io

@@ -786,8 +786,7 @@ function analyze() {
     local pagefilename=$(get_filename $1 $2)
 
     echo "Analyzing $url"
-    phantomjs --ignore-ssl-errors=yes $PROXY_PHANTOMJS $YSLOW_FILE -d -r $RULESET -f xml --ua "$USER_AGENT_YSLOW" $VIEWPORT_YSLOW -n "$pagefilename.har" "$url"  >"$REPORT_DATA_PAGES_DIR/$pagefilename.xml"  2>> $REPORT_DATA_DIR/phantomjs.error.log || echo "PhantomJS could not handle $url , check the error log:  $REPORT_DATA_DIR/phantomjs.error.log"
-
+    phantomjs --ignore-ssl-errors=yes $PROXY_PHANTOMJS $YSLOW_FILE -d -r $RULESET -f xml --ua "$USER_AGENT_YSLOW" $VIEWPORT_YSLOW -n "$REPORT_DATA_HAR_DIR/$pagefilename.har" "$url"  >"$REPORT_DATA_PAGES_DIR/$pagefilename.xml"  2>> $REPORT_DATA_DIR/phantomjs.error.log || echo "PhantomJS could not handle $url , check the error log:  $REPORT_DATA_DIR/phantomjs.error.log"
     local s=$(du -k "$REPORT_DATA_PAGES_DIR/$pagefilename.xml" | cut -f1)
     # Check that the size is bigger than 0
     if [ $s -lt 10 ]
@@ -796,14 +795,12 @@ function analyze() {
       ## do the same thing again but setting console to log the error to output
       log_error "Could not analyze $url unrecoverable error when parsing the page"
       log_error "Input parameters: $INPUT"
-      phantomjs --ignore-ssl-errors=yes $PROXY_PHANTOMJS $YSLOW_FILE -d -r $RULESET -f xml "$USER_AGENT_YSLOW" $VIEWPORT_YSLOW "$url" -c 2  >> $REPORT_DATA_DIR/$ERROR_LOG
+      phantomjs --ignore-ssl-errors=yes $PROXY_PHANTOMJS $YSLOW_FILE -d -r $RULESET -f xml "$USER_AGENT_YSLOW" $VIEWPORT_YSLOW "$url" -c 2  2>&1 >> $REPORT_DATA_DIR/$ERROR_LOG
 
       ## write the error url to the list
       echo "sitespeed.io got an unrecoverable error when parsing the page,$url" >> $REPORT_DATA_DIR/errorurls.txt
       rm "$REPORT_DATA_PAGES_DIR/$pagefilename.xml"
     else
-      #move the HAR-file to the HAR dir
-      mv "$pagefilename.har" $REPORT_DATA_HAR_DIR/
 
       # Sometimes the yslow script adds output before the xml tag, should probably be reported ...
       sed '/<?xml/,$!d' $REPORT_DATA_PAGES_DIR/$pagefilename.xml > $REPORT_DATA_PAGES_DIR/$pagefilename-bup  || exit 1