Fixing merge conflict + some additional fixes (see below)

Also:
 * removing `max_idle_sec` to keep Bazel running persistently
 * adding `example_gem` to CircleCI and Travis CI
 * removing `bundler/setup.rb` rubyopt, because it's responsible for
   loading the entire bundle when we want individual gems.

Author: kigster

.circleci/.bazelrc

@@ -1,6 +1,5 @@
 # Common options
 common --color=yes
-common --verbose_failures
 common --show_progress
 common --show_progress_rate_limit=0.5
 
@@ -15,3 +14,4 @@ build --jobs=10
 test --spawn_strategy=standalone
 test --test_output=all
 test --test_verbose_timeout_warnings
+test --verbose_failures

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
     environment:
       PATH: "/usr/local/bin:/usr/bin:/sbin:/opt/bin:/home/circleci/repo/bin:/bin:/sbin:/usr/sbin"
       BUNDLE_PATH: /home/circleci/.bundle_cache
-      BAZEL_OPTS: "--max_idle_secs=1 --host_jvm_args=-Xmx500m --host_jvm_args=-Xms500m"
+      BAZEL_OPTS: "--host_jvm_args=-Xmx500m --host_jvm_args=-Xms500m"
       BAZEL_BUILD_OPTS: "--curses=no --verbose_failures --jobs 10"
       BAZEL_TEST_OPTS: "--verbose_failures --test_output=streamed --test_verbose_timeout_warnings "
 
@@ -48,7 +48,7 @@ jobs:
           command: |
             /usr/bin/env bash bin/test-suite workspace
 
-  bazel_build_examples:
+  bazel_example_script:
     <<: *bazel_defaults
 
     steps:
@@ -65,6 +65,23 @@ jobs:
           command: |
             /usr/bin/env bash bin/test-suite simple-script
 
+  bazel_example_gem:
+    <<: *bazel_defaults
+
+    steps:
+      - checkout
+
+      - run:
+          name: "Install ~/.bazelrc and run setup"
+          command: |
+            cp .circleci/.bazelrc ${HOME}
+            /usr/bin/env bash bin/setup
+
+      - run:
+          name: "Bazel Build & Test Example"
+          command: |
+            /usr/bin/env bash bin/test-suite example-gem
+
   buildifier:
     <<: *bazel_defaults
 
@@ -91,5 +108,6 @@ workflows:
   rules_ruby:
     jobs:
       - bazel_build_workspace
-      - bazel_build_examples
+      - bazel_example_gem
+      - bazel_example_script
       - buildifier

.travis.yml

@@ -28,6 +28,6 @@ env:
     - CI=true
     - BUNDLE_PATH="${HOME}/.bundle/gems"
     - PATH="${HOME}/.rbenv/bin:${HOME}/.rbenv/shims:/usr/local/bin:/usr/bin:/bin:/sbin:/usr/sbin:/opt/local/bin:${PATH}"
-    - BAZEL_OPTS="--max_idle_secs=1 --host_jvm_args=-Xmx1200m --host_jvm_args=-Xms1200m"
-    - BAZEL_BUILD_OPTS="--curses=no --verbose_failures -j 30 --show_progress_rate_limit 0.5"
+    - BAZEL_OPTS="--host_jvm_args=-Xmx1200m --host_jvm_args=-Xms1200m"
+    - BAZEL_BUILD_OPTS="--curses=no --verbose_failures -j 10 --show_progress_rate_limit 0.5"
     - BAZEL_TEST_OPTS="--verbose_failures --test_output=streamed --test_verbose_timeout_warnings"

bin/linter

@@ -104,7 +104,7 @@ lint::all() {
     hr
     echo
     info "ACTION: ${bldylw}Please add any respective files to the commit and retry."
-    retrn 1
+    return 1
   else
     echo
     success "No changes detected, changes passed linter inspection."

bin/test-suite

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+# vim: ft=bash
 set -e
 
 # shellcheck disable=SC1091
@@ -10,8 +10,8 @@ export BUNDLE_PATH="${BUNDLE_PATH:-${HOME}/.bundle/gems}"
 export PATH="${HOME}/.rbenv/bin:${HOME}/.rbenv/shims:/usr/local/bin:/usr/bin:/bin:/sbin:/usr/sbin:/opt/local/bin"
 
 export BAZEL_OPTS="--host_jvm_args=-Xmx500m --host_jvm_args=-Xms500m"
-export BAZEL_BUILD_OPTS="--curses=no --verbose_failures -j 15 --show_progress_rate_limit 0 "
-export BAZEL_TEST_OPTS="--verbose_failures --test_output=streamed --test_verbose_timeout_warnings "
+export BAZEL_BUILD_OPTS="--curses=no --verbose_failures -j 30 --progress_report_interval=2"
+export BAZEL_TEST_OPTS="--verbose_failures --test_verbose_timeout_warnings --verbose_explanations"
 export RUBY_VERSION=2.7.0
 
 export BashMatic__Expr="
@@ -187,9 +187,10 @@ test::all() {
   test::bazel-info
   test::workspace
   test::simple-script
-  test::buildifier
+  test::example-gem
   test::rubocop
   test::rspec
+  test::buildifier
 }
 
 test-suite::setup() {

ruby/private/bundle/create_bundle_build_file.rb

@@ -22,7 +22,6 @@
         "bundler/**/*",
       ],
     ),
-    rubyopt = ["{bundler_setup}"],
   )
 
   # PULL EACH GEM INDIVIDUALLY
@@ -33,21 +32,13 @@
     name = "{name}",
     srcs = glob(
       include = [
-<<<<<<< HEAD
         ".bundle/config",
         "{gem_lib_files}",
         "lib/ruby/{ruby_version}/specifications/{name}-{version}.gemspec",
         {gem_binaries}
-=======
-        "lib/ruby/{ruby_version}/gems/{name}-{version}*/**",
-        "lib/ruby/{ruby_version}/specifications/{name}-{version}*.gemspec",
-        "lib/ruby/{ruby_version}/cache/{name}-{version}*.gem",
-        "bin/*"
->>>>>>> eeab881... Add force_gem_pristine attr to rb_binary (#11)
       ],
       exclude = {exclude},
     ),
-    rubyopt = ["{bundler_setup}"],
     deps = {deps},
     includes = ["lib/ruby/{ruby_version}/gems/{name}-{version}/lib"],
   )
@@ -58,7 +49,6 @@
     name = "gems",
     srcs = glob([{bundle_lib_files}]) + glob(["bin/*"]),
     includes = {bundle_lib_paths},
-    rubyopt = ["{bundler_setup}"],
   )
 
   ruby_library(