From 761a9bceadf35b35be3cc0efd709d6fc50f23223 Mon Sep 17 00:00:00 2001
From: soulgalore <peter@soulgalore.com>
Date: Mon, 11 Nov 2013 22:11:22 +0100
Subject: [PATCH] new naming standard

---
 .travis.yml                                   |  4 ++--
 CHANGELOG                                     |  1 +
 Makefile                                      |  4 ++--
 ...{sitespeed-junit.io => sitespeed.io-junit} | 24 ++++---------------
 ...{sitespeed-sites.io => sitespeed.io-sites} |  0
 5 files changed, 10 insertions(+), 23 deletions(-)
 rename bin/{sitespeed-junit.io => sitespeed.io-junit} (95%)
 rename bin/{sitespeed-sites.io => sitespeed.io-sites} (100%)

diff --git a/.travis.yml b/.travis.yml
index daeb6cf1e..b5bf9d2b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,9 @@ before_script:
 - "make build"
 - python -m SimpleHTTPServer 8009 &
 - sleep 10
-- "./build/bin/sitespeed-sites.io -i test/sitespeed-sites.txt"
+- "./build/bin/sitespeed.io-sites -i test/sitespeed-sites.txt"
 - "./build/bin/sitespeed.io -u http://localhost:8009/test/server/www/ -o csv -k true -c true"
-- "./build/bin/sitespeed-junit.io -o build"
+- "./build/bin/sitespeed.io-junit -o build"
 
 script: ./test/test.sh
 
diff --git a/CHANGELOG b/CHANGELOG
index 4b9e444f9..2a59b515c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ version 2.2
 * Moved all scripts to the bin folder, following the standard and easier to package
 * Cleanup all scripts to use absolute paths, making it easier to package for Homebrew
 * sitespeed-sites.io now always need to be feed with the filename of the text file containing all the URLS
+* New names: sitespeed.io-sites & sitespeed.io-junit
 * New BrowserTime version including backEndTime & frontEndTime
 * Changed default summary page to show backend & frontend time (removed redirectionTime & domInteractiveTime)
 * Increased timeout for the crawler for really slow pages
diff --git a/Makefile b/Makefile
index 18dc2eb17..e3c1e98f4 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ build:
 	@if [ ! -d $(BUILD)/$(REPORT)/$(XSLT) ]; then mkdir -p $(BUILD)/$(REPORT)/$(XSLT); fi
 	@cp CHANGELOG LICENSE $(BUILD)/
 	@cp $(BIN)/sitespeed.io $(BUILD)/$(BIN)/
-	@cp $(BIN)/sitespeed-junit.io $(BUILD)/$(BIN)/
-	@cp $(BIN)/sitespeed-sites.io $(BUILD)/$(BIN)/
+	@cp $(BIN)/sitespeed.io-junit $(BUILD)/$(BIN)/
+	@cp $(BIN)/sitespeed.io-sites $(BUILD)/$(BIN)/
 	@cp $(BIN)//travis-ci.sh $(BUILD)/$(BIN)/
 	@cp $(DEP)/LICENSE.txt $(BUILD)/$(DEP)/
 	@cp $(DEP)/crawler-1.5.7-full.jar $(BUILD)/$(DEP)/
diff --git a/bin/sitespeed-junit.io b/bin/sitespeed.io-junit
similarity index 95%
rename from bin/sitespeed-junit.io
rename to bin/sitespeed.io-junit
index da0d727c9..31cecef60 100755
--- a/bin/sitespeed-junit.io
+++ b/bin/sitespeed.io-junit
@@ -43,15 +43,15 @@ REPORT_BASE_DIR=$(pwd)/sitespeed-result
 # The limit if a rule should signal an error
 PAGE_LIMIT=90
 
+## Default output dir
+ OUTPUT_DIR=$(pwd)
+
 # The average limit, if it is below this figure, it is an error
 AVERAGE_LIMIT=90
 
 # List of tests to skip.
 SKIP_TESTS=
 
-# Where to put the data
-OUTPUT_DIR=
-
 #The timing limit file
 TIMINGS_LIMIT_FILE_INPUT=
 
@@ -111,21 +111,6 @@ done
 #*******************************************************
 function verify_input() {
 
-if [[ -z $OUTPUT_DIR ]]
-then
-     help
-     exit 0
-fi
-
-# absolute path
-if [[ "$OUTPUT_DIR" = /* ]]
-then
-OUTPUT_DIR=$OUTPUT_DIR
-else
-#relative
-OUTPUT_DIR=$SITESPEED_HOME/$OUTPUT_DIR
-fi
-
 OUTPUT_RULE_XML="--output $OUTPUT_DIR/sitespeed.io-rules-junit.xml"
 OUTPUT_TIMINGS_XML="--output $OUTPUT_DIR/sitespeed.io-timings-junit.xml"
 
@@ -178,6 +163,7 @@ xsltproc --stringparam page-limit $PAGE_LIMIT --stringparam avg-limit $AVERAGE_L
 
 xsltproc --stringparam limits-file $LIMITS_FILE $OUTPUT_TIMINGS_XML $xsl_timings_file $result_xml
 
+echo "Will copy files to $OUTPUT_DIR"
 cp $ABSOLUTE_ANALYZE_DIR/data/summary.xml $OUTPUT_DIR/summary.xml
 cp $ABSOLUTE_ANALYZE_DIR/data/result.xml $OUTPUT_DIR/result.xml
 }
@@ -195,7 +181,7 @@ sitespeed-juni.io is a tool that will convert your sitespeed result into a junit
 
 OPTIONS:
    -h      Help
-   -o      The output dir
+   -o      The output dir. Default one is the current dir [optional]
    -r      The result base directory, default is sitespeed-result [optional]
    -l      The page rule score limit. Below this page score it will be a failure. Default is 90. [optional]
    -a      The average rule score limit for all tested pages, below this score it will be a failure. Default is 90. [optional]
diff --git a/bin/sitespeed-sites.io b/bin/sitespeed.io-sites
similarity index 100%
rename from bin/sitespeed-sites.io
rename to bin/sitespeed.io-sites