project: remove aliases, review scripts

this was needed for recent leiningen changes

.travis.yml

@@ -21,4 +21,4 @@ before_script:
   - sudo apt-get install -y nodejs colordiff
   - sudo npm install -g [email protected]
 
-script: lein test-all
+script: ./scripts/test-all.sh

project.clj

@@ -31,7 +31,6 @@
                                     "test/resources/.compiled"]
 
   :plugins [[lein-cljsbuild "1.1.7"]
-            [lein-shell "0.5.0"]
             [lein-figwheel "0.5.17"]]
 
   ; this is just for IntelliJ + Cursive to play well
@@ -46,13 +45,10 @@
 
   :cljsbuild {:builds {}}                                                                                                     ; prevent https://github.com/emezeske/lein-cljsbuild/issues/413
 
-  :profiles {:nuke-aliases
-             {:aliases ^:replace {}}
-
+  :profiles {
              :lib
              ^{:pom-scope :provided}                                                                                          ; ! to overcome default jar/pom behaviour, our :dependencies replacement would be ignored for some reason
-             [:nuke-aliases
-              {:dependencies   ~(with-meta lib-deps {:replace true})
+             [{:dependencies   ~(with-meta lib-deps {:replace true})
                :source-paths   ^:replace ["src/lib"]
                :resource-paths ^:replace []
                :test-paths     ^:replace []}]
@@ -154,43 +150,6 @@
 
              :dev-basic-onone
              {:cooper {"server"     ["scripts/launch-fixtures-server.sh"]
-                       "figwheel"   ["lein" "fig-basic-onone"]
+                       "figwheel"   ["scripts/fig-basic-onone.sh"]
                        "repl-agent" ["scripts/launch-repl-with-agent.sh"]
-                       "browser"    ["scripts/launch-test-browser.sh"]}}}
-
-  :aliases {"test"                 ["do"
-                                    ["clean"]
-                                    ["shell" "scripts/test.sh"]]
-            "test-all"             ["shell" "scripts/test-all.sh"]
-            "dev-functional-tests" ["shell" "scripts/dev-functional-tests.sh"]
-            "run-functional-tests" ["do"
-                                    ["clean"]
-                                    ["shell" "scripts/run-functional-tests.sh"]]
-            "run-circus-tests"     ["do"
-                                    ["clean"]
-                                    ["shell" "scripts/run-circus-tests.sh"]]
-            "build-tests"          ["do"
-                                    ["with-profile" "+testing-basic-onone" "cljsbuild" "once" "basic-onone"]
-                                    ["with-profile" "+testing-basic-oadvanced-core" "cljsbuild" "once" "basic-oadvanced-core"]
-                                    ["with-profile" "+testing-basic-oadvanced-goog" "cljsbuild" "once" "basic-oadvanced-goog"]]
-            "auto-build-tests"     ["do"
-                                    ["with-profile" "+testing-basic-onone,+auto-testing" "cljsbuild" "once" "basic-onone"]
-                                    ["with-profile" "+testing-basic-oadvanced-core,+auto-testing" "cljsbuild" "once" "basic-oadvanced-core"]
-                                    ["with-profile" "+testing-basic-oadvanced-goog,+auto-testing" "cljsbuild" "once" "basic-oadvanced-goog"]]
-            "fig-basic-onone"      ["with-profile" "+testing-basic-onone,+dirac,+figwheel" "figwheel"]
-            "auto-basic-onone"     ["with-profile" "+testing-basic-onone,+auto-testing" "cljsbuild" "auto" "basic-onone"]
-            "auto-test"            ["do"
-                                    ["clean"]
-                                    ["auto-build-tests"]]
-            "toc"                  ["shell" "scripts/generate-toc.sh"]
-            "install"              ["do"
-                                    ["shell" "scripts/prepare-jar.sh"]
-                                    ["shell" "scripts/local-install.sh"]]
-            "jar"                  ["shell" "scripts/prepare-jar.sh"]
-            "deploy"               ["shell" "scripts/deploy-clojars.sh"]
-            "release"              ["do"
-                                    ["clean"]
-                                    ["shell" "scripts/check-versions.sh"]
-                                    ["shell" "scripts/prepare-jar.sh"]
-                                    ["shell" "scripts/check-release.sh"]
-                                    ["shell" "scripts/deploy-clojars.sh"]]})
+                       "browser"    ["scripts/launch-test-browser.sh"]}}})

scripts/auto-basic-onone.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
+
+lein with-profile +testing-basic-onone,+auto-testing cljsbuild auto basic-onone

scripts/auto-build-tests.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
+
+lein clean
+./scripts/build-tests.sh +auto-testing

scripts/build-tests.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
+
+if [[ -z "$1" ]]; then
+  PROFILES=""
+else
+  PROFILES="$1,"
+fi
+
+lein with-profile "$PROFILES+testing-basic-onone" cljsbuild once basic-onone
+lein with-profile "$PROFILES+testing-basic-oadvanced-core" cljsbuild once basic-oadvanced-core
+lein with-profile "$PROFILES+testing-basic-oadvanced-goog" cljsbuild once basic-oadvanced-goog

scripts/check-release.sh

@@ -2,10 +2,7 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 ./scripts/list-jar.sh
 
@@ -15,5 +12,3 @@ if [[ "$LEIN_VERSION" =~ "SNAPSHOT" ]]; then
   echo "Publishing SNAPSHOT versions is not allowed. Bump current version $LEIN_VERSION to a non-snapshot version."
   exit 2
 fi
-
-popd

scripts/check-versions.sh

@@ -2,28 +2,21 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 LEIN_VERSION=`cat "$PROJECT_FILE" | grep "defproject" | cut -d' ' -f3 | cut -d\" -f2`
 
 # same version must be in src/version.clj
 
 PROJECT_VERSION=`cat "$PROJECT_VERSION_FILE" | grep "(def current-version" | cut -d" " -f3 | cut -d\" -f2`
-if [ -z "$PROJECT_VERSION" ] ; then
+if [[ -z "$PROJECT_VERSION" ]] ; then
   echo "Unable to retrieve 'current-version' string from '$PROJECT_VERSION_FILE'"
-  popd
   exit 1
 fi
 
-if [ ! "$LEIN_VERSION" = "$PROJECT_VERSION" ] ; then
+if [[ ! "$LEIN_VERSION" = "$PROJECT_VERSION" ]] ; then
   echo "Lein's project.clj version differs from version in '$PROJECT_VERSION_FILE': '$LEIN_VERSION' != '$PROJECT_VERSION'"
-  popd
   exit 2
 fi
 
 echo "All version strings are consistent: '$LEIN_VERSION'"
-
-popd

scripts/deploy-clojars.sh

@@ -2,10 +2,7 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 ./scripts/list-jar.sh
 
@@ -19,7 +16,3 @@ if [[ "$REPLY" =~ ^[Yy]$ ]]; then
 else
   exit 1
 fi
-
-popd
-
-popd

scripts/dev-functional-tests.sh

@@ -2,14 +2,7 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 export OOPS_DISABLE_TEST_RUNNER_ANSI=1
 lein with-profile +cooper,+dev-basic-onone cooper
-
-popd
-
-popd

scripts/fig-basic-onone.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
+
+lein with-profile +testing-basic-onone,+dirac,+figwheel figwheel

scripts/generate-toc.sh

@@ -4,16 +4,9 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 # using https://github.com/ekalinin/github-markdown-toc.go
 # brew install github-markdown-toc
 
 gh-md-toc readme.md --depth 3
-
-popd
-
-popd

scripts/launch-fixtures-server.sh

@@ -2,15 +2,10 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
-pushd "$DEV_FIXTURES_SERVER_ROOT"
+cd "$DEV_FIXTURES_SERVER_ROOT"
 
 echo "launching fixtures server for development (silent mode) in '$DEV_FIXTURES_SERVER_ROOT' on port $DEV_FIXTURES_SERVER_PORT"
 
 python -m SimpleHTTPServer "$DEV_FIXTURES_SERVER_PORT" >/dev/null 2>&1
-
-popd
-
-popd

scripts/launch-repl-with-agent.sh

@@ -2,15 +2,8 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 echo "launching dirac agent with repl"
 
 lein with-profile +repl-with-agent repl :headless
-
-popd
-
-popd

scripts/launch-test-browser.sh

@@ -2,26 +2,23 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
-pushd "$ROOT"
-
-if [ ! -d "$OOPS_BROWSER_TESTS_USER_PROFILE" ] ; then
+if [[ ! -d "$OOPS_BROWSER_TESTS_USER_PROFILE" ]] ; then
   mkdir -p "$OOPS_BROWSER_TESTS_USER_PROFILE"
 fi
 
 EXE="/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary"
-if [ -f /usr/bin/google-chrome-unstable ] ; then
+if [[ -f /usr/bin/google-chrome-unstable ]] ; then
   EXE="/usr/bin/google-chrome-unstable" # this is for ubuntu
 fi
-if [ -n "$OOPS_USE_CHROME" ] ; then
+if [[ -n "$OOPS_USE_CHROME" ]] ; then
   EXE="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
 fi
-if [ -n "$OOPS_USE_CHROMIUM" ] ; then
+if [[ -n "$OOPS_USE_CHROMIUM" ]] ; then
   EXE="/Applications/Chromium.app/Contents/MacOS/Chromium"
 fi
-if [ -n "$OOPS_USE_CUSTOM_CHROME" ] ; then
+if [[ -n "$OOPS_USE_CUSTOM_CHROME" ]] ; then
   EXE="$OOPS_USE_CUSTOM_CHROME"
 fi
 
@@ -43,7 +40,3 @@ set -x
       --disable-gpu \
       "http://localhost:$DEV_FIXTURES_SERVER_PORT/main.html?script=basic_onone" 2> /dev/null
 set +x
-
-popd
-
-popd

scripts/list-jar.sh

@@ -2,10 +2,7 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 ./scripts/check-versions.sh
 
@@ -26,7 +23,3 @@ cat "$INSPECT_DIR/$POM_PATH" | grep -E -i "artifactId|version"
 echo
 echo "----------------------------"
 echo
-
-popd
-
-popd

scripts/local-install.sh

@@ -2,15 +2,8 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
+./scripts/prepare-jar.sh
 ./scripts/list-jar.sh
-
 lein with-profile lib install
-
-popd
-
-popd

scripts/prepare-jar.sh

@@ -2,13 +2,6 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 lein with-profile lib jar
-
-popd
-
-popd

scripts/release.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
+
+lein clean
+./scripts/check-versions.sh
+./scripts/prepare-jar.sh
+./scripts/check-release.sh
+./scripts/deploy-clojars.sh

scripts/rerun-tests.sh

@@ -2,11 +2,8 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
-pushd "$ROOT/test/resources"
+cd "$ROOT/test/resources"
 
 phantomjs phantom.js "$@"
-
-popd

scripts/run-circus-tests.sh

@@ -2,17 +2,13 @@
 
 set -e
 
-pushd `dirname "${BASH_SOURCE[0]}"` > /dev/null
-source "./config.sh"
-
-pushd "$ROOT"
+cd `dirname "${BASH_SOURCE[0]}"` && source "./config.sh" && cd "$ROOT"
 
 export OOPS_ELIDE_DEVTOOLS=1
 
 if [[ ! -z "$1" ]]; then
   export OOPS_FT_FILTER="$1"
 fi
 
+lein clean
 lein with-profile +circus run -m "oops.circus"
-
-popd