Upgrading bazel and ruby

Author: kigster

.bazelversion

@@ -1 +1 @@
-4.1.0
+5.2.0

.circleci/Dockerfile

@@ -1,7 +1,7 @@
 #
 # rules_ruby circleci Docker file.
 #
-FROM ruby:3.0.2
+FROM ruby:3.1.2
 
 # make Apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

WORKSPACE

@@ -12,7 +12,7 @@ load("@bazel_skylib//lib:versions.bzl", "versions")
 
 versions.check("3.4.1")
 
-rules_ruby_select_sdk("3.0.2")
+rules_ruby_select_sdk("3.1.2")
 
 local_repository(
     name = "bazelruby_rules_ruby_ruby_tests_testdata_another_workspace",

bin/setup

@@ -16,6 +16,8 @@
 
 source "bin/deps"
 
+export ruby_version="$(cat .ruby-version | tr -d '\n')"
+
 #—————————————————————————————————————————————————————————————————————————————————————————————————————————————
 # Private Functions
 #—————————————————————————————————————————————————————————————————————————————————————————————————————————————
@@ -30,8 +32,19 @@ __setup.actions() {
 #—————————————————————————————————————————————————————————————————————————————————————————————————————————————
 
 setup.rbenv() {
+  command -v rbenv >/dev/null || {
+    if [[ $(uname -s) == "Darwin" ]]; then
+      command -v brew>/dev/null || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      brew.install.packages rbenv ruby-build
+      brew.upgrade.packages rbenv ruby-build
+    else
+      setup.local-rbenv
+    fi
+  }
+}
+
+setup.local-rbenv() {
   local rbenv_home="${HOME}/.rbenv"
-  local ruby_version="$(cat .ruby-version | tr -d '\n')"
 
   if [[ -n $(command -v ruby) ]]; then
     local installed_version="$(ruby -e 'puts RUBY_VERSION' | tr -d '\n')"
@@ -65,9 +78,10 @@ setup.rbenv() {
     error "PATH: ${PATH}"
     return 1
   }
+}
 
-  # Set our current ruby version to the desired one, even if it's not yet there.
-  # This allows the next block to auto-detect it and skip the remainder.
+setup.ruby() {
+  run "rbenv install -s ${ruby_version}"
   run "rbenv global ${ruby_version} || true"
   # see if we even need to install anything:
   local ruby_sdk_marker="$(rbenv versions | grep "${ruby_version}" | cut -d ' ' -f 1)"
@@ -171,6 +185,7 @@ setup.main() {
     set +e
     h2 "Installing required development dependencies for working with rules_ruby and Bazel."
     setup.rbenv
+    setup.ruby
     setup.gems
     [[ -z ${CI} ]] && setup.git-hook
     setup.os-specific "$@"

bin/setup-darwin

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# vim: ft=bash
 # —————————————————————————————————————————————————————————————————————————————————————
 # NOTE: These setup scripts rely on an open source BASH framework BashMatic.
 #       https://github.com/kigster/bashmatic
@@ -52,24 +53,21 @@ setup.xcode-tools() {
     info: "xcode-select tools are already installed."
   fi
 
-  info "Next command requires sudo privileges to accept XCode License"
-  run.set-next show-output-on
-  run "sudo xcodebuild -license accept"
+  info "Next command may require a sudo privileges to accept XCode License"
+  bin/xcode-accept
 }
 
 setup.bazel() {
   brew.package.is-installed bazelisk && 
-    brew.uninstall.package bazelisk && 
-      run "brew unlink bazel"
+    brew.uninstall.package bazelisk 1>/dev/null 2>/dev/null && 
+      run "brew unlink bazel 2>/dev/null || true"
 
   if __setup.is-bazelisk-installed && __setup.is-bazel-installed ; then
     info: "Bazel & bazelisk are already installed."
   else
     brew.install.packages bazel bazelisk
     run "brew link bazel || true"
   fi
-
-  
 }
 
 setup.darwin() {

bin/xcode-accept

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# vim: ft=bash
+
+# https://stackoverflow.com/questions/58632629/how-to-check-if-xcode-license-needs-to-be-accepted
+
+XCODE_VERSION=$(xcodebuild -version | grep '^Xcode\s' | sed -E 's/^Xcode[[:space:]]+([0-9\.]+)/\1/')
+ACCEPTED_LICENSE_VERSION=$(defaults read /Library/Preferences/com.apple.dt.Xcode 2> /dev/null | grep IDEXcodeVersionForAgreedToGMLicense | cut -d '"' -f 2)
+
+if [[ "$XCODE_VERSION" = "$ACCEPTED_LICENSE_VERSION" ]]; then 
+    exit 0
+else
+    exit 1
+fi

examples/simple_rails_api/WORKSPACE

@@ -15,7 +15,7 @@ load(
 
 rules_ruby_dependencies()
 
-rules_ruby_select_sdk(version = "3.0.2")
+rules_ruby_select_sdk(version = "3.1.2")
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 

examples/simple_script/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

examples/simple_script/WORKSPACE

@@ -15,7 +15,7 @@ load(
 
 rules_ruby_dependencies()
 
-rules_ruby_select_sdk(version = "3.0.2")
+rules_ruby_select_sdk(version = "3.1.2")
 
 load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
 

ruby/private/sdk.bzl

@@ -28,6 +28,7 @@ def rules_ruby_select_sdk(version = "host"):
         "3.0.3",
         "3.1.0",
         "3.1.1",
+        "3.1.2",
     ]
 
     if version in supported_versions:

ruby/tests/testdata/bundle_includes_workspace/WORKSPACE

@@ -13,7 +13,7 @@ load(
 
 rules_ruby_dependencies()
 
-rules_ruby_select_sdk(version = "3.0.2")
+rules_ruby_select_sdk(version = "3.1.2")
 
 load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")