Merging Coinbase changes selectively

Author: kigster

.circleci/.bazelrc

@@ -1,6 +1,17 @@
-build  --verbose_failures --spawn_strategy=standalone --strategy=Genrule=standalone --show_timestamps --show_progress --show_progress_rate_limit 0.5
-test --spawn_strategy=standalone
+# Common options
 common --color=yes
-startup --max_idle_secs=1
-test --verbose_failures --test_output=errors --test_verbose_timeout_warnings --show_progress --show_progress_rate_limit 0.5
-run --verbose_failures --show_progress --show_progress_rate_limit 0.5
+common --verbose_failures
+common --show_progress
+common --show_progress_rate_limit=0.5
+
+# Build options
+build --spawn_strategy=standalone
+build --strategy=Genrule=standalone
+build --show_timestamps
+build --curses=no
+build --jobs=10
+
+# Test options
+test --spawn_strategy=standalone
+test --test_output=all
+test --test_verbose_timeout_warnings

WORKSPACE

@@ -91,9 +91,9 @@ container_pull(
     repository = "library/ruby",
 )
 
-load("@bazelruby_ruby_rules//ruby:defs.bzl", "bundle_install")
+load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_bundle")
 
-bundle_install(
+ruby_bundle(
     name = "bundle",
     bundler_version = "2.1.2",
     excludes = {

examples/simple_script/BUILD.bazel

@@ -1,107 +1,43 @@
-package(default_visibility = ["//:__subpackages__"])
-
 load(
     "@bazelruby_ruby_rules//ruby:defs.bzl",
     "ruby_binary",
-    "ruby_library",
     "ruby_rspec",
+    "ruby_rubocop",
     "ruby_test",
 )
 
-filegroup(
-    name = "sources",
-    srcs = glob([
-        "script.rb",
-        "lib/*.rb",
-    ]),
-)
-
-filegroup(
-    name = "spec_sources",
-    srcs = glob([
-        "spec/**/*.rb",
-    ]),
-)
-
-ruby_library(
-    name = "lib",
-    srcs = [
-        ":sources",
-        ":spec_sources",
-    ],
-    deps = [
-        "@bundle//:awesome_print",
-        "@bundle//:colored2",
-    ],
-)
+package(default_visibility = ["//:__subpackages__"])
 
 ruby_binary(
     name = "bin",
     srcs = ["script.rb"],
     main = "script.rb",
     deps = [
-        ":lib",
         "//lib:foo",
         "@bundle//:awesome_print",
-        "@bundle//:colored2",
-    ],
-)
-
-ruby_binary(
-    name = "bin-all",
-    srcs = ["script.rb"],
-    main = "script.rb",
-    deps = [
-        ":lib",
-        "//lib:foo",
-        "@bundle//:bin",
     ],
 )
 
 # This is an example of the RSpec definition that uses autorun
 # and points to spec_helper as the main spec file. It specifies
 # which specs to run using the args.
+
 ruby_test(
-    name = "rspec-autorun",
+    name = "all-specs",
     timeout = "short",
     srcs = [
-        ":sources",
-        ":spec_sources",
-    ],
-    args = [
-        "--format documentation",
-        "--force-color",
+        "script.rb",
+        "//lib:foo",
     ] + glob([
         "spec/**/*.rb",
     ]),
-    main = "spec/spec_helper.rb",
-    rubyopt = ["-rrspec/autorun"],
-    deps = [
-        "@bundle//:gems",
-    ],
-)
-
-# This is a similar example, except instead of using rubyopt to load
-# rspec, we execute rspec executable located in the bin folder under
-# the bundle, accessible via @bundle//:bin/rspec
-ruby_test(
-    name = "rspec-binary",
-    timeout = "short",
-    srcs = [
-        ":sources",
-        ":spec_sources",
-        "@bundle//:bin/rspec",
-    ],
     args = [
-        "--format documentation",
-        "--force-color",
         "spec",
     ],
     main = "@bundle//:bin/rspec",
     deps = [
         "@bundle//:awesome_print",
         "@bundle//:bin",
-        "@bundle//:colored2",
         "@bundle//:rspec",
         "@bundle//:rspec-its",
     ],
@@ -115,8 +51,8 @@ ruby_test(
 ruby_rspec(
     name = "ruby-rspec-test",
     srcs = [
-        ":sources",
-        ":spec_sources",
+        "script.rb",
+        "//lib:foo",
     ],
     rspec_args = {
         # NOTE: the output is only visible with --test_output=streamed flag
@@ -127,26 +63,34 @@ ruby_rspec(
     ]),
     deps = [
         "@bundle//:awesome_print",
-        "@bundle//:colored2",
     ],
 )
 
 ruby_binary(
-    name = "rubocop",
+    name = "rubocop-bin",
     srcs = [
-        ".relaxed-rubocop-2.4.yml",
-        ".rubocop.yml",
-    ],
+        "script.rb",
+        "//lib:foo",
+    ] + glob([
+        "spec/**/*.rb",
+    ]),
     args = [
-        "-c",
-        ".rubocop.yml",
-        "-P",
-        "-D",
+        "-- *.rb spec/*.rb lib/*.rb -a",
     ],
     main = "@bundle//:bin/rubocop",
     deps = [
-        ":lib",
         "//lib:foo",
         "@bundle//:bin",
     ],
 )
+
+# Rubocop rule
+# To check
+# bazel run rubocop -- -a
+ruby_rubocop(
+    name = "rubocop",
+    bin = "@bundle//:bin/rubocop",
+    deps = [
+        "@bundle//:rubocop",
+    ],
+)

examples/simple_script/README.md

@@ -15,5 +15,5 @@ bundle lock --update
 Run rubocop with:
 
 ```
-bazel run :rubocop -- $(pwd)/* -a
+bazel run //:rubocop
 ```

examples/simple_script/script.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'colored2'
 require 'openssl'
 require 'awesome_print'
 

examples/simple_script/spec/script_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require_relative '../script'
+require 'script'
 
 describe 'oss_rand' do
   it 'generates a String' do

ruby/defs.bzl

@@ -20,12 +20,24 @@ load(
     _ruby_rspec = "ruby_rspec",
     _ruby_rspec_test = "ruby_rspec_test",
 )
+load(
+    "@bazelruby_ruby_rules//ruby/private/rubocop:def.bzl",
+    _rubocop = "rubocop",
+)
 
 ruby_toolchain = _toolchain
 ruby_library = _library
 ruby_binary = _binary
 ruby_test = _test
 ruby_rspec_test = _ruby_rspec_test
 ruby_rspec = _ruby_rspec
-bundle_install = _ruby_bundle
 ruby_bundle = _ruby_bundle
+ruby_rubocop = _rubocop
+
+rb_toolchain = _toolchain
+rb_library = _library
+rb_binary = _binary
+rb_test = _test
+rb_rspec = _ruby_rspec
+rb_bundle = _ruby_bundle
+rb_rubocop = _rubocop

ruby/private/binary.bzl

@@ -10,6 +10,17 @@ def _to_manifest_path(ctx, file):
     else:
         return ("%s/%s" % (ctx.workspace_name, file.short_path))
 
+def _get_gem_path(incpaths):
+    """
+    incpaths is a list of `<bundle_name>/lib/ruby/<version>/gems/<gemname>-<gemversion>/lib`
+    The gem_path is `<bundle_name>/lib/ruby/<version>` so we can go from an incpath to the
+    gem_path pretty easily without much additional work.
+    """
+    if len(incpaths) == 0:
+        return ""
+    incpath = incpaths[0]
+    return incpath.rsplit("/", 3)[0]
+
 # Having this function allows us to override otherwise frozen attributes
 # such as main, srcs and deps. We use this in ruby_rspec_test rule by
 # adding rspec as a main, and sources, and rspec gem as a dependency.
@@ -41,6 +52,8 @@ def ruby_binary_macro(ctx, main, srcs):
         extra_deps = ctx.attr._misc_deps,
     )
 
+    gem_path = _get_gem_path(deps.incpaths.to_list())
+
     rubyopt = reversed(deps.rubyopt.to_list())
 
     ctx.actions.expand_template(
@@ -51,6 +64,7 @@ def ruby_binary_macro(ctx, main, srcs):
             "{rubyopt}": repr(rubyopt),
             "{main}": repr(_to_manifest_path(ctx, main)),
             "{interpreter}": _to_manifest_path(ctx, interpreter),
+            "{gem_path}": gem_path,
         },
     )
 

ruby/private/binary_wrapper.tpl

@@ -103,6 +103,8 @@ def main(args)
   runfiles_envkey, runfiles_envvalue = runfiles_envvar(runfiles)
   ENV[runfiles_envkey] = runfiles_envvalue if runfiles_envkey
 
+  ENV["GEM_PATH"] = File.join(runfiles, "{gem_path}") if "{gem_path}"
+
   ruby_program = find_ruby_binary
 
   main = {main}

ruby/private/bundle/create_bundle_build_file.rb

@@ -35,10 +35,12 @@
       include = [
         ".bundle/config",
         "{gem_lib_files}",
+        "lib/ruby/{ruby_version}/specifications/{name}-{version}.gemspec",
         {gem_binaries}
       ],
       exclude = {exclude},
     ),
+    rubyopt = ["{bundler_setup}"],
     deps = {deps},
     includes = ["lib/ruby/{ruby_version}/gems/{name}-{version}/lib"],
   )
@@ -49,6 +51,7 @@
     name = "gems",
     srcs = glob([{bundle_lib_files}]) + glob(["bin/*"]),
     includes = {bundle_lib_paths},
+    rubyopt = ["{bundler_setup}"],
   )
 
   ruby_library(