Merge branch 'kig/bundle-with-gemspec' into develop

Author: Konstantin Gredeskoul

README.md

@@ -418,9 +418,7 @@ bundle_install(name, gemfile, gemfile_lock)
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
-
-### Warranty
+<http://www.apache.org/licenses/LICENSE-2.0>
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

ruby/private/bundle/bundle.bzl

@@ -16,6 +16,8 @@ def bundle_install_impl(ctx):
   ctx.symlink(ctx.attr.gemfile, "Gemfile")
   ctx.symlink(ctx.attr.gemfile_lock, "Gemfile.lock")
   ctx.symlink(ctx.attr._create_bundle_build_file, "create_bundle_build_file.rb")
+  if ctx.attr.gemspec:
+    ctx.symlink(ctx.attr.gemspec, ctx.path(ctx.attr.gemspec).basename)
 
   ruby = _get_interpreter_label(ctx, ctx.attr.ruby_sdk)
   bundler = _get_bundler_label(ctx, ctx.attr.ruby_sdk)
@@ -86,6 +88,9 @@ bundle_install = repository_rule(
         "gemfile_lock": attr.label(
             allow_single_file = True,
         ),
+        "gemspec": attr.label(
+            allow_single_file = True,
+        ),
         "excludes": attr.string_list_dict(
             doc = "List of glob patterns per gem to be excluded from the library",
         ),

ruby/private/tools/deps.bzl

@@ -5,21 +5,13 @@ load(
 )
 
 def _transitive_srcs(deps):
-    return struct(
-        srcs = [
-            d[RubyLibrary].transitive_ruby_srcs
-            for d in deps
-            if RubyLibrary in d
-        ],
-        incpaths = [
-            d[RubyLibrary].ruby_incpaths
-            for d in deps
-            if RubyLibrary in d
-        ],
-        rubyopt = [d[RubyLibrary].rubyopt for d in deps if RubyLibrary in d],
-        data_files = [d[DefaultInfo].data_runfiles.files for d in deps],
-        default_files = [d[DefaultInfo].default_runfiles.files for d in deps],
-    )
+  return struct(
+      srcs = [d[RubyLibrary].transitive_ruby_srcs for d in deps if RubyLibrary in d],
+      incpaths = [d[RubyLibrary].ruby_incpaths for d in deps if RubyLibrary in d],
+      rubyopt = [d[RubyLibrary].rubyopt for d in deps if RubyLibrary in d],
+      data_files = [d[DefaultInfo].data_runfiles.files for d in deps],
+      default_files = [d[DefaultInfo].default_runfiles.files for d in deps],
+   )
 
 def transitive_deps(ctx, extra_files = [], extra_deps = []):
     """Calculates transitive sets of args.