Fixing bad naming by replacing gems_.. with bundle_...

Author: kigster

examples/simple_script/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.5

examples/simple_script/WORKSPACE

@@ -21,10 +21,10 @@ load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "bundle",
+    bundler_version = "2.1.2",
     excludes = {
         "mini_portile": ["test/**/*"],
     },
     gemfile = "//:Gemfile",
     gemfile_lock = "//:Gemfile.lock",
-    version = "2.0.2",
 )

ruby/private/bundle/create_bundle_build_file.rb

@@ -47,14 +47,14 @@
 ALL_GEMS = <<~ALL_GEMS
   ruby_library(
     name = "gems",
-    srcs = glob([{gems_lib_files}]) + glob(["bin/*"]),
-    includes = {gems_lib_paths},
+    srcs = glob([{bundle_lib_files}]) + glob(["bin/*"]),
+    includes = {bundle_lib_paths},
   )
 
   ruby_library(
     name = "bin",
     srcs = glob(["bin/*"]),
-    deps = {gems_with_binaries}
+    deps = {bundle_with_binaries}
   )
 ALL_GEMS
 
@@ -180,20 +180,20 @@ def generate!
     remove_bundler_version!
 
     # Append to the end specific gem libraries and dependencies
-    bundle        = Bundler::LockfileParser.new(Bundler.read_file(gemfile_lock))
-    gem_lib_paths = []
-    gems_binaries = {} # gem-name => [ gem's binaries ], ...
-    gems          = bundle.specs.map(&:name)
+    bundle           = Bundler::LockfileParser.new(Bundler.read_file(gemfile_lock))
+    bundle_lib_paths = []
+    bundle_binaries  = {} # gem-name => [ gem's binaries ], ...
+    gems             = bundle.specs.map(&:name)
 
-    bundle.specs.each { |spec| register_gem(spec, template_out, gem_lib_paths, gems_binaries) }
+    bundle.specs.each { |spec| register_gem(spec, template_out, bundle_lib_paths, bundle_binaries) }
 
     template_out.puts ALL_GEMS
-                        .gsub('{gems_lib_files}', to_flat_string(gem_lib_paths.map { |p| "#{p}/**/*" }))
-                        .gsub('{gems_binaries}', gems_binaries.values.flatten.to_s)
-                        .gsub('{gems_lib_paths}', gem_lib_paths.to_s)
+                        .gsub('{bundle_lib_files}', to_flat_string(bundle_lib_paths.map { |p| "#{p}/**/*" }))
+                        .gsub('{bundle_with_binaries}', bundle_binaries.keys.map { |g| ":#{g}" }.to_s)
+                        .gsub('{bundle_binaries}', bundle_binaries.values.flatten.to_s)
+                        .gsub('{bundle_lib_paths}', bundle_lib_paths.to_s)
                         .gsub('{bundler_setup}', bundler_setup_require)
-                        .gsub('{gems_deps}', gems.map { |g| ":#{g}" }.to_s)
-                        .gsub('{gems_with_binaries}', gems_binaries.keys.map { |g| ":#{g}" }.to_s)
+                        .gsub('{bundle_deps}', gems.map { |g| ":#{g}" }.to_s)
                         .gsub('{exclude}', DEFAULT_EXCLUDES.to_s)
 
     ::File.open(build_file, 'w') { |f| f.puts template_out.string }
@@ -221,17 +221,17 @@ def remove_bundler_version!
     ::FileUtils.move(temp_gemfile_lock, gemfile_lock, force: true)
   end
 
-  def register_gem(spec, template_out, gem_lib_paths, gems_binaries)
+  def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries)
     gem_path = GEM_PATH[ruby_version, spec.name, spec.version]
-    gem_lib_paths << gem_lib_path = gem_path + '/lib'
+    bundle_lib_paths << gem_lib_path = gem_path + '/lib'
 
     # paths to search for executables
-    gem_binaries             = find_gems_binaries(gem_path)
-    gems_binaries[spec.name] = gem_binaries unless gem_binaries.nil? || gem_binaries.empty?
+    gem_binaries               = find_bundle_binaries(gem_path)
+    bundle_binaries[spec.name] = gem_binaries unless gem_binaries.nil? || gem_binaries.empty?
 
     deps = spec.dependencies.map { |d| ":#{d.name}" }
 
-    warn("registering gem #{spec.name} with binaries: #{gem_binaries}") if gems_binaries.key?(spec.name)
+    warn("registering gem #{spec.name} with binaries: #{gem_binaries}") if bundle_binaries.key?(spec.name)
 
     template_out.puts GEM_TEMPLATE
                         .gsub('{gem_lib_path}', gem_lib_path)
@@ -246,7 +246,7 @@ def register_gem(spec, template_out, gem_lib_paths, gems_binaries)
                         .gsub('{bundler_setup}', bundler_setup_require)
   end
 
-  def find_gems_binaries(gem_path)
+  def find_bundle_binaries(gem_path)
     gem_bin_paths = %W(#{gem_path}/bin #{gem_path}/exe)
 
     gem_bin_paths

ruby/tests/container_test.sh

@@ -9,7 +9,7 @@ fi
 
 # check if we are running without access to Docker Server (eg, on CI
 # within its own Docker container) and if so — skip this test.
-if [[ -n "$(docker info 2>/dev/null | grep 'Cannot connect')" ]]; then
+if [[ -z $(command -v docker) || -n "$(docker info 2>/dev/null | grep 'Cannot connect')" ]]; then
   echo "No Docker runtime detected, skipping tests."
   exit 0
 else