Clean up build scripts and expression specs

5 files changed, 14 insertions, 19 deletions

diff --git a/bin/cibuild b/bin/cibuild
index 249c72d..b13d996 100755
--- a/bin/cibuild
+++ b/bin/cibuild
@@ -2,19 +2,23 @@
 
 set -e
 
+[ -z "$DEBUG" ] || set -x
+
 cd "$(dirname "$0")/.."
 
 echo ["$(date "+%H:%M:%S")"] "==> Started at…"
 
-# GC customizations
 export RUBY_GC_MALLOC_LIMIT=79000000
 export RUBY_GC_HEAP_INIT_SLOTS=800000
 export RUBY_HEAP_FREE_MIN=100000
 export RUBY_HEAP_SLOTS_INCREMENT=400000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 
-ruby -v
-gem install bundler --conservative -v '~> 2.0'
-git submodule update --init
+echo ["$(date "+%H:%M:%S")"] "==> Running setup…"
+bin/setup
+
+echo ["$(date "+%H:%M:%S")"] "==> Running tests…"
 bin/test
+
+echo ["$(date "+%H:%M:%S")"] "==> Running linters…"
 bin/lint
diff --git a/bin/lint b/bin/lint
index 857904b..3ebed83 100755
--- a/bin/lint
+++ b/bin/lint
@@ -2,10 +2,6 @@
 
 set -e
 
-[ -z "$DEBUG" ] || set -x
+cd "$(dirname "$0")/.."
 
-echo ["$(date "+%H:%M:%S")"] "==> Running setup…"
-bin/setup
-
-echo ["$(date "+%H:%M:%S")"] "==> Running linters…"
 bundle exec rake lint
diff --git a/bin/setup b/bin/setup
index 3372dd0..3fe8847 100755
--- a/bin/setup
+++ b/bin/setup
@@ -2,5 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+ruby -v
+gem install bundler --conservative -v '~> 2.0'
+git submodule update --init
 bundle check || bundle install --jobs "$(sysctl -n hw.ncpu || nproc)"
-bundle exec ./exe/spandx pull
+ruby -Ilib ./exe/spandx pull
diff --git a/bin/shipit b/bin/shipit
index 5271880..1172298 100755
--- a/bin/shipit
+++ b/bin/shipit
@@ -4,7 +4,5 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-[ -z "$DEBUG" ] || set -x
-
 bin/cibuild
 bundle exec rake release
diff --git a/bin/test b/bin/test
index 1cb9218..1e22e9e 100755
--- a/bin/test
+++ b/bin/test
@@ -4,14 +4,8 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-[ -z "$DEBUG" ] || set -x
-
-echo ["$(date "+%H:%M:%S")"] "==> Running setup…"
-bin/setup
-
-echo ["$(date "+%H:%M:%S")"] "==> Running tests…"
 if [ $# -eq 0 ]; then
   bundle exec parallel_rspec spec
 else
-  bundle exec rspec "$@"
+  bundle exec rspec --format=progress "$@"
 fi