Bump Ruby primary to 3.0.2 & Add sdk versions: 2.5.9, 2.6.8, 2.7.3, 2.7.4, 3.0.2 (#114)

* Add sdk versions: 2.5.9, 2.6.8, 2.7.3, 2.7.4, 3.0.2

* Upgrading baseline ruby to 3.0.2

* Default to bash in the Docker image

* Bump build

* Update ruby/private/sdk.bzl

Co-authored-by: Minoru Mizutani <[email protected]>

* Fix the build

* Hoping to fix buildifier errrors

* Fix Docker image, setup link for python

* Remove additional include

Co-authored-by: Takeo Sawada <[email protected]>
Co-authored-by: Minoru Mizutani <[email protected]>

Author: 3 people

.circleci/Dockerfile

@@ -1,7 +1,7 @@
 #
 # rules_ruby circleci Docker file.
 #
-FROM ruby:3.0.1
+FROM ruby:3.0.2
 
 # make Apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -95,7 +95,10 @@ RUN apt-get install -y openjdk-11-jdk python2.7 python3 golang-go
 RUN curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.3.0/bazelisk-linux-amd64 \
     && sudo chmod +x /usr/bin/bazel
 
+RUN cd /usr/bin && ln -s python3 python
+
 USER circleci
 ENV PATH /home/circleci/.local/bin:/home/circleci/bin:/usr/local/bin:/usr/bin:/bin:/sbin:${PATH}
 
-CMD ["/bin/sh"]
+
+CMD ["/bin/bash"]

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
     working_directory: /home/circleci/repo
     resource_class: medium
     docker:
-      - image: bazelruby/ruby-3.0.1
+      - image: bazelruby/ruby-3.0.2
     environment:
       PATH: "/usr/local/bin:/usr/bin:/sbin:/opt/bin:/home/circleci/repo/bin:/bin:/sbin:/usr/sbin"
       BUNDLE_PATH: /home/circleci/.bundle_cache
@@ -24,7 +24,7 @@ jobs:
       - run:
           name: Install Bundler
           command: |
-            gem install bundler:2.0.2 --no-doc
+            gem install bundler:2.2.28 --no-doc
             bundle install --jobs=4 --retry=3 --path ${BUNDLE_PATH}
 
       - run:

.envrc

@@ -1,15 +1,6 @@
 # vi: ft=sh
 
 PATH_add bin
-
-[[ -n $(command -V brew) ]] && { 
-  completion="$(brew --prefix)/etc/bash_completion"
-  [[ -f "${completion}" ]] && {
-    echo "Loading bash completion"
-    source "${completion}"
-  }
-}
-
 eval "$(rbenv init -)"
 rbenv local $(cat .ruby-version)
 echo "Ruby Version is $(ruby --version)"

.rubocop.yml

@@ -1,4 +1,8 @@
-inherit_from: .relaxed-rubocop-2.4.yml
+inherit_from:
+  - .rubocop_todo.yml
+  - .relaxed-rubocop-2.4.yml
+
+
 
 AllCops:
   TargetRubyVersion: 2.6
@@ -23,6 +27,7 @@ AllCops:
     - '**/*.ru'
     - '**/Gemfile'
     - '**/Rakefile'
+  NewCops: enable
 
 Layout/HashAlignment:
   Enabled: true

.rubocop_todo.yml

@@ -0,0 +1,20 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2021-11-08 22:06:35 UTC using RuboCop version 0.93.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/UnreachableLoop:
+  Exclude:
+    - 'ruby/tests/testdata/bundle_includes_workspace/script.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'ruby/tests/testdata/bundle_includes_workspace/script.rb'

.ruby-version

@@ -1 +1 @@
-3.0.1
+3.0.2

Gemfile.lock

@@ -2,8 +2,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     regexp_parser (2.1.1)
@@ -17,10 +17,10 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
 
 PLATFORMS
   ruby
@@ -30,4 +30,4 @@ DEPENDENCIES
   rubocop (~> 0.88)
 
 BUNDLED WITH
-   2.1.4
+   2.2.27

README.adoc

@@ -10,6 +10,7 @@
 :icons: font
 :license: apache
 
+
 ====
 This repo is primarily maintained by https://github.com/kigster[Konstantin Gredeskoul] and https://github.com/yugui[Yuki "Yugui" Sonoda]. We are both very busy and would really love more contributors to join the core team. If you are interested in developing Ruby Rules for Bazel, please submit a couple of PRs and then lets talk!
 ====
@@ -55,9 +56,7 @@ NOTE: we have a short guide on https://github.com/bazelruby/rules_ruby/wiki/Buil
  ** <<table-of-contents,Table of Contents>>
  ** <<usage,Usage>>
   *** <<workspace-file,`WORKSPACE` File>>
-  *** <<buildbazel-files,`BUILD.bazel` file(s)>>
-  *** <<tool-specific-setup,Tool Specific Setup>>
-  *** <<rule-dependency-diagram,Rule Dependency Diagram>>
+  *** <<buildbazel-files,`BUILD.bazel` file(s)>> *** <<tool-specific-setup,Tool Specific Setup>> *** <<rule-dependency-diagram,Rule Dependency Diagram>>
  ** <<rules,Rules>>
   *** <<ruby_library,`ruby_library`>>
   *** <<ruby_binary,`ruby_binary`>>
@@ -114,7 +113,7 @@ rules_ruby_dependencies()
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 bazel_skylib_workspace()
 
-rules_ruby_select_sdk(version = "3.0.1")
+rules_ruby_select_sdk(version = "3.0.2")
 
 #———————————————————————————————————————————————————————————————————————
 # Now, load the ruby_bundle rule & install gems specified in the Gemfile

WORKSPACE

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

bin/deps

@@ -15,7 +15,6 @@
 
 # shellcheck disable=SC1090
 source "${BASHMATIC_HOME}/init.sh" 1>/dev/null 2>&1
-
 command -v rbenv >/dev/null && eval "$(rbenv init -)"
 
 __version.detect() {

examples/example_gem/WORKSPACE

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

examples/simple_rails_api/Gemfile.lock

@@ -1,84 +1,84 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.4)
-      actionpack (= 6.0.4)
+    actioncable (6.0.4.1)
+      actionpack (= 6.0.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4)
-      actionpack (= 6.0.4)
-      activejob (= 6.0.4)
-      activerecord (= 6.0.4)
-      activestorage (= 6.0.4)
-      activesupport (= 6.0.4)
+    actionmailbox (6.0.4.1)
+      actionpack (= 6.0.4.1)
+      activejob (= 6.0.4.1)
+      activerecord (= 6.0.4.1)
+      activestorage (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.4)
-      actionpack (= 6.0.4)
-      actionview (= 6.0.4)
-      activejob (= 6.0.4)
+    actionmailer (6.0.4.1)
+      actionpack (= 6.0.4.1)
+      actionview (= 6.0.4.1)
+      activejob (= 6.0.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4)
-      actionview (= 6.0.4)
-      activesupport (= 6.0.4)
+    actionpack (6.0.4.1)
+      actionview (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4)
-      actionpack (= 6.0.4)
-      activerecord (= 6.0.4)
-      activestorage (= 6.0.4)
-      activesupport (= 6.0.4)
+    actiontext (6.0.4.1)
+      actionpack (= 6.0.4.1)
+      activerecord (= 6.0.4.1)
+      activestorage (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4)
-      activesupport (= 6.0.4)
+    actionview (6.0.4.1)
+      activesupport (= 6.0.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4)
-      activesupport (= 6.0.4)
+    activejob (6.0.4.1)
+      activesupport (= 6.0.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.4)
-      activesupport (= 6.0.4)
-    activerecord (6.0.4)
-      activemodel (= 6.0.4)
-      activesupport (= 6.0.4)
-    activestorage (6.0.4)
-      actionpack (= 6.0.4)
-      activejob (= 6.0.4)
-      activerecord (= 6.0.4)
+    activemodel (6.0.4.1)
+      activesupport (= 6.0.4.1)
+    activerecord (6.0.4.1)
+      activemodel (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
+    activestorage (6.0.4.1)
+      actionpack (= 6.0.4.1)
+      activejob (= 6.0.4.1)
+      activerecord (= 6.0.4.1)
       marcel (~> 1.0.0)
-    activesupport (6.0.4)
+    activesupport (6.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    bootsnap (1.7.5)
+    bootsnap (1.9.1)
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)
-    ffi (1.15.3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    ffi (1.15.4)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.10.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.1)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     msgpack (1.4.2)
@@ -92,33 +92,33 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4)
-      actioncable (= 6.0.4)
-      actionmailbox (= 6.0.4)
-      actionmailer (= 6.0.4)
-      actionpack (= 6.0.4)
-      actiontext (= 6.0.4)
-      actionview (= 6.0.4)
-      activejob (= 6.0.4)
-      activemodel (= 6.0.4)
-      activerecord (= 6.0.4)
-      activestorage (= 6.0.4)
-      activesupport (= 6.0.4)
+    rails (6.0.4.1)
+      actioncable (= 6.0.4.1)
+      actionmailbox (= 6.0.4.1)
+      actionmailer (= 6.0.4.1)
+      actionpack (= 6.0.4.1)
+      actiontext (= 6.0.4.1)
+      actionview (= 6.0.4.1)
+      activejob (= 6.0.4.1)
+      activemodel (= 6.0.4.1)
+      activerecord (= 6.0.4.1)
+      activestorage (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.4)
+      railties (= 6.0.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.4)
-      actionpack (= 6.0.4)
-      activesupport (= 6.0.4)
+    railties (6.0.4.1)
+      actionpack (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rake (13.0.4)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -158,4 +158,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   2.1.4
+   2.2.24

examples/simple_rails_api/WORKSPACE

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

examples/simple_script/.ruby-version

@@ -0,0 +1 @@
+3.0.2