Upgrade Bazel version to 1.2.1 + use bin/setup(s) (#31)

* instead of .travis/install-bazel.sh use bin/setup-linux
 * checkin ~/.bazelversion file used by bazelisk on OS-X
 * split up Darwin and Linux installers, but reuse what's common
 * updated .travis.yml

Author: kigster

.bazelversion

@@ -0,0 +1 @@
+1.2.1

.envrc

@@ -0,0 +1,6 @@
+# vi: ft=sh
+
+PATH_add bin
+
+source bin/deps
+

.travis.yml

@@ -26,7 +26,7 @@ addons:
     - g++
 
 before_install:
-- .travis/install-bazel.sh 1.1.0
+- bin/setup-linux 1.2.1
 - bazel $BAZEL_OPTS version
 - bazel $BAZEL_OPTS info
 - bazel $BAZEL_OPTS fetch --curses=no -- "//ruby/..."

.travis/install-bazel.sh

@@ -10,6 +10,10 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
+load("@bazel_skylib//lib:versions.bzl", "versions")
+
+versions.check("1.2.1")
+
 local_repository(
     name = "bazelruby_ruby_rules_ruby_tests_testdata_another_workspace",
     path = "ruby/tests/testdata/another_workspace",
@@ -47,7 +51,7 @@ go_rules_dependencies()
 
 go_register_toolchains(go_version = "1.12.9")
 
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 
 gazelle_dependencies()
 

WORKSPACE

@@ -1,4 +1,5 @@
-# vim: ft=shell
+#!/usr/bin/env bash
+# vim: ft=sh
 
 export BashMatic="${HOME}/.bashmatic"
 
@@ -8,4 +9,3 @@ export BashMatic="${HOME}/.bashmatic"
 }
 
 source "${BashMatic}/init.sh"
-

bin/deps

@@ -1,27 +1,38 @@
 #!/usr/bin/env bash
+#
+# Main dependency shell script that installs BashMatic Library in ~/.bashmatic folder.
 
 export COLUMNS=90
 
-[[ -x bin/deps ]] && source bin/deps
-[[ -x bin/setup ]] && source bin/setup
+export BashMatic="${HOME}/.bashmatic"
 
-[[ -z ${BashMatic} ]] && { 
+[[ -x ./bin/deps ]] && {
+  # shellcheck disable=SC1091
+  source bin/deps
+}
+
+[[ -x ./bin/setup ]] && {
+  # shellcheck disable=SC1091
+  source bin/setup gem::dependencies
+}
+
+[[ -z "${BashMatic}" ]] && {
   echo "Failed to initialize BASH library."
   exit 1
 }
 
 set +e
 
 info "Running Rubocop, please wait..."
-rubocop -F -D 
+rubocop -F -D
 code=$?
 
 if [[ ${code} -ne 0 ]]; then
   run::set-next show-output-on
   run "rubocop -a -D -P"
-  
+
   run::set-next abort-on-error
   run "rubocop -D -P"
 fi
-  
+
 success "RuboCop ran successfully."

bin/pre-commit

@@ -7,11 +7,44 @@
   exit 1
 }
 
-# abort on error
-run::set-all abort-on-error
+function setup::gem::dependencies() {
+  # abort on error
+  run::set-all abort-on-error
 
-lib::gem::cache-refresh
-lib::gem::install rubocop
-lib::gem::install relaxed-rubocop
+  lib::gem::cache-refresh
+  lib::gem::install rubocop
+  lib::gem::install relaxed-rubocop
+}
+
+function setup::git::commit-hook() {
+  [[ -L .git/hooks/pre-commit ]] || run "ln -nfs bin/pre-commit .git/hooks/pre-commit"
+}
+
+function setup::detect-bazel-version() {
+  local version
+  version="$(grep versions.check WORKSPACE | awk 'BEGIN{FS="\""}{print $2}')"
+  [[ -z "${version}" && -f .bazelversion ]] && version="$(cat .bazelversion | tr -d '\n')"
+  printf "%s" "${version}"
+}
+
+#——————————————————————————————  main ———————————————————————————————————————————
+
+function setup::main() {
+  setup::gem::dependencies
+  [[ -z ${CI} ]] && setup::git::commit-hook
+
+  local os=$(uname -s | tr '[:upper:]' '[:lower:]')
+  local script
+
+  script="./bin/setup-${os}"
+
+  if [[ -x ${script} ]]; then
+    "${script}" "$(setup::detect-bazel-version)"
+  else
+    echo "Operating system $(uname -s) is not currently supported." >&2
+    return 1
+  fi
+}
+
+setup::main "$@"
 
-[[ -L .git/hooks/pre-commit ]] || run "ln -nfs bin/pre-commit .git/hooks/pre-commit"

bin/setup

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+[[ -x bin/deps ]] && source bin/deps
+[[ -z "${BashMatic}" ]] && {
+  echo "Failed to initialize BASH library."
+  exit 1
+}
+
+#——————————————————————————————  OS-X SPECIFIC INSTALLERS —————————————————————————
+
+function setup::brew-validate() {
+  # Homebrew is required to install Bazel
+  if ! brew help >/dev/null; then
+    echo "brew is not installed, please install from https://brew.sh"
+  fi
+}
+
+function setup::brew-install-jdk() {
+  # The JDK homebrew cask is a required to install the java dependencies for Bazel
+  if ! brew cask list | grep -q openjdk; then
+    brew cask install homebrew/cask-versions/adoptopenjdk8
+  fi
+}
+
+function setup::brew-deps() {
+  if ! brew list | grep -q xz; then
+    brew install xz
+  fi
+}
+
+function setup::osx-deps() {
+  # xcode command line tools are required, specifically gcc
+  # if xcode already exists, this command will error, otherwise prompt the user
+  if [[ -n $(xcode-select --install 2>&1 | grep 'already installed') ]]; then
+    echo "xcode-select tools are already installed."
+  fi
+}
+
+function setup::bazelisk-install() {
+  brew install bazelbuild/tap/bazelisk
+}
+
+function setup::darwin() {
+  setup::brew-validate
+  setup::brew-install-jdk
+  setup::brew-deps
+  setup::osx-deps
+  setup::bazelisk-install
+}
+
+setup::darwin "$@"

bin/setup-darwin

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+[[ -x bin/deps ]] && source bin/deps
+
+[[ -z "${BashMatic}" ]] && {
+  echo "Failed to initialize BASH library."
+  exit 1
+}
+
+function setup::linux() {
+  local version
+  version="${1}"
+
+  [[ -z "${version}" && -f .bazelversion ]] && version=$(cat .bazelversion | tr -d '\n')
+
+  if [[ -z "${version}" ]]; then
+    echo "Usage: setup-linux BAZEL-VERSION" >&2
+    exit 1
+  else
+    hl::subtle "Installing Bazel version ${version}"
+  fi
+
+  local installer=bazel-${version}-installer-linux-x86_64.sh
+  local release_base_uri=https://github.com/bazelbuild/bazel/releases/download/${version}
+  local require_install=true
+  if test -x ${HOME}/local/${installer}; then
+    cd ${HOME}/local
+    if curl ${release_base_uri}/${installer}.sha256 | sha256sum -c; then
+      require_install=false
+    fi
+  fi
+
+  if ${require_install}; then
+    run "rm -rf ${HOME}/local"
+    run "mkdir ${HOME}/local"
+    run "cd ${HOME}/local"
+    run "wget ${release_base_uri}/${installer}"
+    run "chmod +x ${installer}"
+
+    run::set-next show-output-on
+    run "./${installer} --prefix=${HOME}/local --base=${HOME}/.bazel"
+  fi
+}
+
+setup::linux "$@"