fixup! Allow to use ruby_bundle() without Gemfile.lock

Author: p0deje

ruby/private/bundle/create_bundle_build_file.rb

@@ -180,14 +180,14 @@ class BundleBuildFileGenerator
   def initialize(workspace_name:,
                  repo_name:,
                  build_file: 'BUILD.bazel',
-                 gemfile: 'Gemfile',
+                 gemfile_lock: 'Gemfile.lock',
                  includes: nil,
                  excludes: nil,
                  additional_require_paths: nil)
     @workspace_name = workspace_name
     @repo_name      = repo_name
     @build_file     = build_file
-    @gemfile_lock   = "#{gemfile}.lock"
+    @gemfile_lock   = gemfile_lock
     @includes       = includes
     @excludes       = excludes
     # This attribute returns 0 as the third minor version number, which happens to be
@@ -320,14 +320,14 @@ def to_flat_string(array)
 # ruby ./create_bundle_build_file.rb "BUILD.bazel" "Gemfile.lock" "repo_name" "{}" "{}" "wsp_name"
 if $0 == __FILE__
   if ARGV.length != 6
-    warn("USAGE: #{$0} BUILD.bazel Gemfile repo-name {includes-json} {excludes-json} workspace-name".orange)
+    warn("USAGE: #{$0} BUILD.bazel Gemfile.lock repo-name {includes-json} {excludes-json} workspace-name".orange)
     exit(1)
   end
 
-  build_file, gemfile, repo_name, includes, excludes, workspace_name, * = *ARGV
+  build_file, gemfile_lock, repo_name, includes, excludes, workspace_name, * = *ARGV
 
   BundleBuildFileGenerator.new(build_file:     build_file,
-                               gemfile:        gemfile,
+                               gemfile_lock:   gemfile_lock,
                                repo_name:      repo_name,
                                includes:       JSON.parse(includes),
                                excludes:       JSON.parse(excludes),

ruby/private/bundle/def.bzl

@@ -137,6 +137,11 @@ def bundle_install(runtime_ctx, previous_result):
         return result
 
 def generate_bundle_build_file(runtime_ctx, previous_result):
+    if runtime_ctx.ctx.attr.gemfile_lock:
+        gemfile_lock = runtime_ctx.ctx.attr.gemfile_lock.name
+    else:
+        gemfile_lock = "{}.lock".format(runtime_ctx.ctx.attr.gemfile.name)
+
     # Create the BUILD file to expose the gems to the WORKSPACE
     # USAGE: ./create_bundle_build_file.rb BUILD.bazel Gemfile.lock repo-name [excludes-json] workspace-name
     args = [
@@ -146,7 +151,7 @@ def generate_bundle_build_file(runtime_ctx, previous_result):
         "bundler/lib",
         SCRIPT_BUILD_FILE_GENERATOR,  # The template used to created bundle file
         "BUILD.bazel",  # Bazel build file (can be empty)
-        runtime_ctx.ctx.attr.gemfile.name,  # Gemfile -> Gemfile.lock where we list all direct and transitive dependencies
+        gemfile_lock,  # Gemfile.lock where we list all direct and transitive dependencies
         runtime_ctx.ctx.name,  # Name of the target
         repr(runtime_ctx.ctx.attr.includes),
         repr(runtime_ctx.ctx.attr.excludes),