Rename repo to rules_ruby for consistency

mkruskal-google · mkruskal-google · commit 5e545317e4bf · 2022-09-02T17:24:27.000-04:00
diff --git a/README.adoc b/README.adoc
@@ -92,13 +92,13 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 #———————————————————————————————————————————————————————————————————————
 
 git_repository(
-    name = "bazelruby_rules_ruby",
+    name = "rules_ruby",
     remote = "https://github.com/bazelruby/rules_ruby.git",
     branch = "master"
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
+    "@rules_ruby//ruby:deps.bzl",
     "rules_ruby_dependencies",
     "rules_ruby_select_sdk",
 )
@@ -120,7 +120,7 @@ rules_ruby_select_sdk(version = "3.0.2")
 #———————————————————————————————————————————————————————————————————————
 
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_bundle",
 )
 
@@ -170,7 +170,7 @@ Add `ruby_library`, `ruby_binary`, `ruby_rspec` or `ruby_test` into your `BUILD.
 #———————————————————————————————————————————————————————————————————————
 
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_binary",
     "ruby_library",
     "ruby_test",
@@ -215,7 +215,7 @@ Use `ruby_gem` rule to package any number of ruby files or folders into a Ruby-G
 [source,python]
 ----
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_gem",
 )
 
@@ -555,7 +555,7 @@ List of glob patterns per gem to be excluded from the library. Keys are the name
 
 [source,python]
 ----
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "gems",
@@ -572,7 +572,7 @@ your workspace. The name should match the name of the bundle.
 
 [source,python]
 ----
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 workspace(
     name = "my_wksp",
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "bazelruby_rules_ruby")
+workspace(name = "rules_ruby")
 
 load("@//ruby:deps.bzl", "rules_ruby_dependencies", "rules_ruby_select_sdk")
 
@@ -15,12 +15,12 @@ versions.check("3.4.1")
 rules_ruby_select_sdk("3.0.2")
 
 local_repository(
-    name = "bazelruby_rules_ruby_ruby_tests_testdata_another_workspace",
+    name = "rules_ruby_ruby_tests_testdata_another_workspace",
     path = "ruby/tests/testdata/another_workspace",
 )
 
 local_repository(
-    name = "bazelruby_rules_ruby_ruby_tests_testdata_bundle_includes_workspace",
+    name = "rules_ruby_ruby_tests_testdata_bundle_includes_workspace",
     path = "ruby/tests/testdata/bundle_includes_workspace",
 )
 
@@ -95,7 +95,7 @@ container_pull(
     repository = "library/ruby",
 )
 
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "bundle",
diff --git a/examples/example_gem/BUILD.bazel b/examples/example_gem/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_gem",
 )
 
diff --git a/examples/example_gem/WORKSPACE b/examples/example_gem/WORKSPACE
@@ -1,14 +1,14 @@
-workspace(name = "bazelruby_rules_ruby_example_gem")
+workspace(name = "rules_ruby_example_gem")
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_rules_ruby",
+    name = "rules_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
+    "@rules_ruby//ruby:deps.bzl",
     "rules_ruby_dependencies",
     "rules_ruby_select_sdk",
 )
diff --git a/examples/example_gem/lib/BUILD b/examples/example_gem/lib/BUILD
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/examples/example_gem/lib/foo/BUILD b/examples/example_gem/lib/foo/BUILD
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/examples/simple_rails_api/BUILD b/examples/simple_rails_api/BUILD
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_binary",
 )
 
diff --git a/examples/simple_rails_api/WORKSPACE b/examples/simple_rails_api/WORKSPACE
@@ -1,14 +1,14 @@
-workspace(name = "bazelruby_rules_ruby_example")
+workspace(name = "rules_ruby_example")
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_rules_ruby",
+    name = "rules_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
+    "@rules_ruby//ruby:deps.bzl",
     "rules_ruby_dependencies",
     "rules_ruby_select_sdk",
 )
@@ -21,7 +21,7 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "bundle",
diff --git a/examples/simple_script/BUILD.bazel b/examples/simple_script/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_binary",
     "ruby_rspec",
     "ruby_rubocop",
diff --git a/examples/simple_script/WORKSPACE b/examples/simple_script/WORKSPACE
@@ -1,14 +1,14 @@
-workspace(name = "bazelruby_rules_ruby_example")
+workspace(name = "rules_ruby_example")
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_rules_ruby",
+    name = "rules_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
+    "@rules_ruby//ruby:deps.bzl",
     "rules_ruby_dependencies",
     "rules_ruby_select_sdk",
 )
@@ -17,7 +17,7 @@ rules_ruby_dependencies()
 
 rules_ruby_select_sdk(version = "3.0.2")
 
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "bundle",
diff --git a/examples/simple_script/lib/BUILD b/examples/simple_script/lib/BUILD
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/examples/simple_script_vendored/BUILD.bazel b/examples/simple_script_vendored/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_binary",
     "ruby_rspec",
     "ruby_rubocop",
diff --git a/examples/simple_script_vendored/WORKSPACE b/examples/simple_script_vendored/WORKSPACE
@@ -1,17 +1,17 @@
 workspace(
-    name = "bazelruby_rules_ruby_example",
+    name = "rules_ruby_example",
     managed_directories = {"@bundle": ["vendor"]},
 )
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_rules_ruby",
+    name = "rules_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
+    "@rules_ruby//ruby:deps.bzl",
     "rules_ruby_dependencies",
     "rules_ruby_select_sdk",
 )
@@ -20,7 +20,7 @@ rules_ruby_dependencies()
 
 rules_ruby_select_sdk(version = "2.7.1")
 
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "bundle",
diff --git a/examples/simple_script_vendored/lib/BUILD b/examples/simple_script_vendored/lib/BUILD
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/ruby/defs.bzl b/ruby/defs.bzl
@@ -1,32 +1,32 @@
 load(
-    "@bazelruby_rules_ruby//ruby/private:toolchain.bzl",
+    "@rules_ruby//ruby/private:toolchain.bzl",
     _toolchain = "ruby_toolchain",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private:library.bzl",
+    "@rules_ruby//ruby/private:library.bzl",
     _library = "ruby_library",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private:binary.bzl",
+    "@rules_ruby//ruby/private:binary.bzl",
     _binary = "ruby_binary",
     _test = "ruby_test",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private/bundle:def.bzl",
+    "@rules_ruby//ruby/private/bundle:def.bzl",
     _bundle = "bundle_install",
     _ruby_bundle = "ruby_bundle_install",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private:rspec.bzl",
+    "@rules_ruby//ruby/private:rspec.bzl",
     _rspec = "ruby_rspec",
     _rspec_test = "ruby_rspec_test",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private/rubocop:def.bzl",
+    "@rules_ruby//ruby/private/rubocop:def.bzl",
     _rubocop = "rubocop",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private/gemspec:def.bzl",
+    "@rules_ruby//ruby/private/gemspec:def.bzl",
     _gem = "gem",
     _gemspec = "gemspec",
 )
diff --git a/ruby/deps.bzl b/ruby/deps.bzl
@@ -1,10 +1,10 @@
 # Repository rules
 load(
-    "@bazelruby_rules_ruby//ruby/private:dependencies.bzl",
+    "@rules_ruby//ruby/private:dependencies.bzl",
     _rules_ruby_dependencies = "rules_ruby_dependencies",
 )
 load(
-    "@bazelruby_rules_ruby//ruby/private:sdk.bzl",
+    "@rules_ruby//ruby/private:sdk.bzl",
     _rules_ruby_select_sdk = "rules_ruby_select_sdk",
 )
 
diff --git a/ruby/private/constants.bzl b/ruby/private/constants.bzl
@@ -1,7 +1,7 @@
 # Ruby Constants
 load(":providers.bzl", "RubyLibraryInfo")
 
-RULES_RUBY_WORKSPACE_NAME = "@bazelruby_rules_ruby"
+RULES_RUBY_WORKSPACE_NAME = "@rules_ruby"
 TOOLCHAIN_TYPE_NAME = "%s//ruby:toolchain_type" % RULES_RUBY_WORKSPACE_NAME
 
 DEFAULT_BUNDLER_VERSION = "2.1.4"
diff --git a/ruby/private/rubocop/def.bzl b/ruby/private/rubocop/def.bzl
@@ -1,4 +1,4 @@
-load("@bazelruby_rules_ruby//ruby/private:binary.bzl", "ruby_binary")
+load("@rules_ruby//ruby/private:binary.bzl", "ruby_binary")
 
 # This wraps an rb_binary in a script that is executed from the workspace folder
 def rubocop(name, bin, deps):
@@ -9,7 +9,7 @@ def rubocop(name, bin, deps):
         deps = deps,
     )
 
-    runner = "@bazelruby_rules_ruby//ruby/private/rubocop:runner.sh.tpl"
+    runner = "@rules_ruby//ruby/private/rubocop:runner.sh.tpl"
     native.genrule(
         name = name,
         tools = [bin_name],
diff --git a/ruby/private/sdk.bzl b/ruby/private/sdk.bzl
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby/private/toolchains:ruby_runtime.bzl",
+    "@rules_ruby//ruby/private/toolchains:ruby_runtime.bzl",
     _ruby_runtime = "ruby_runtime",
 )
 
diff --git a/ruby/tests/BUILD.bazel b/ruby/tests/BUILD.bazel
@@ -120,7 +120,7 @@ ruby_binary(
     main = "load_path_in_runfiles_test.rb",
     deps = [
         "//ruby/tests/testdata:g",
-        "@bazelruby_rules_ruby_ruby_tests_testdata_another_workspace//baz/qux:j",
+        "@rules_ruby_ruby_tests_testdata_another_workspace//baz/qux:j",
     ],
 )
 
@@ -137,7 +137,7 @@ ruby_test(
     main = "load_path_in_runfiles_test.rb",
     deps = [
         "//ruby/tests/testdata:g",
-        "@bazelruby_rules_ruby_ruby_tests_testdata_another_workspace//baz/qux:j",
+        "@rules_ruby_ruby_tests_testdata_another_workspace//baz/qux:j",
     ],
 )
 
@@ -250,13 +250,13 @@ pkg_tar(
     include_runfiles = True,
     package_dir = "/app",
     remap_paths = {
-        "ruby": "load_path_in_runfiles.runfiles/bazelruby_rules_ruby/ruby",
+        "ruby": "load_path_in_runfiles.runfiles/rules_ruby/ruby",
         ".": "load_path_in_runfiles.runfiles/",
     },
     strip_prefix = "dummy",
     symlinks = {
-        "/app/load_path_in_runfiles.runfiles/bazelruby_rules_ruby/external": "/app/load_path_in_runfiles.runfiles",
-        "/app/load_path_in_runfiles": "/app/load_path_in_runfiles.runfiles/bazelruby_rules_ruby/ruby/tests/load_path_in_runfiles",
+        "/app/load_path_in_runfiles.runfiles/rules_ruby/external": "/app/load_path_in_runfiles.runfiles",
+        "/app/load_path_in_runfiles": "/app/load_path_in_runfiles.runfiles/rules_ruby/ruby/tests/load_path_in_runfiles",
     },
 )
 
diff --git a/ruby/tests/load_path_in_runfiles_test.rb b/ruby/tests/load_path_in_runfiles_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 require 'ruby/tests/testdata/foo/g'
-require 'external/bazelruby_rules_ruby_ruby_tests_testdata_another_workspace/baz/qux/j'
+require 'external/rules_ruby_ruby_tests_testdata_another_workspace/baz/qux/j'
 
 [g, j]
diff --git a/ruby/tests/testdata/another_workspace/WORKSPACE b/ruby/tests/testdata/another_workspace/WORKSPACE
@@ -1,5 +1,5 @@
-workspace(name = "bazelruby_rules_ruby_ruby_tests_testdata_another_workspace")
+workspace(name = "rules_ruby_ruby_tests_testdata_another_workspace")
 
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "rules_ruby_select_sdk")
+load("@rules_ruby//ruby:defs.bzl", "rules_ruby_select_sdk")
 
 rules_ruby_select_sdk()
diff --git a/ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel b/ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_library")
+load("@rules_ruby//ruby:defs.bzl", "ruby_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/ruby/tests/testdata/bundle_includes_workspace/BUILD.bazel b/ruby/tests/testdata/bundle_includes_workspace/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@rules_ruby//ruby:defs.bzl",
     "ruby_binary",
 )
 
diff --git a/ruby/tests/testdata/bundle_includes_workspace/WORKSPACE b/ruby/tests/testdata/bundle_includes_workspace/WORKSPACE

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`load(`
`2`		`- "@bazelruby_rules_ruby//ruby:defs.bzl",`
	`2`	`+ "@rules_ruby//ruby:defs.bzl",`
`3`	`3`	`"ruby_gem",`
`4`	`4`	`)`
`5`	`5`