Renaming the repo to @bazelruby_rules_ruby

kigster · kigster · commit 20a67ec25690 · 2020-02-29T18:09:56.000-08:00
* Also renaming all ruby_rules_ to rules_ruby_
diff --git a/README.md b/README.md
@@ -43,11 +43,11 @@ This is the README for Ruby Rules for the [Bazel Build](https://bazel.build) sys
 
 ## Rules Development Status
 
-| **Readiness** | **Types of Applications**	|
-|:-------------------------------------------------------------------------------| :----------|
-| ![Ready](docs/img/status-ready.svg) | ruby apps, ruby gems, micro-services, ideally in a mono-repo |
-| ![Wait](docs/img/status-wait.svg) | medium-sized Ruby on Rails apps, ideally in a mono-repo |
-| ![Not Ready](docs/img/status-not-ready.svg) | complex Ruby on Rails monoliths, single-repo |
+| **Readiness**                               | **Types of Applications**                                    |
+| :------------------------------------------ | :----------------------------------------------------------- |
+| ![Ready](docs/img/status-ready.svg)         | ruby apps, ruby gems, micro-services, ideally in a mono-repo |
+| ![Wait](docs/img/status-wait.svg)           | medium-sized Ruby on Rails apps, ideally in a mono-repo      |
+| ![Not Ready](docs/img/status-not-ready.svg) | complex Ruby on Rails monoliths, single-repo                 |
 
 
 Note: we have a short guide on [Building your first Ruby Project](https://github.com/bazelruby/rules_ruby/wiki/Build-your-ruby-project) on the Wiki. We encourage you to check it out.
@@ -56,26 +56,26 @@ Note: we have a short guide on [Building your first Ruby Project](https://github
 
 ### `WORKSPACE` File
 
-Add `ruby_rules_dependencies` and `ruby_rules_toolchains` into your `WORKSPACE` file.
+Add `rules_ruby_dependencies` and `rules_ruby_toolchains` into your `WORKSPACE` file.
 
 ```python
 # To get the latest, grab the 'develop' branch.
 
 git_repository(
-    name = "bazelruby_rules_ruby",
+    name = "bazelrules_ruby_ruby",
     remote = "https://github.com/bazelruby/rules_ruby.git",
     branch = "develop",
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
-    "ruby_rules_toolchains",
-    "ruby_rules_dependencies",
+    "@bazelrules_ruby_ruby//ruby:deps.bzl",
+    "rules_ruby_toolchains",
+    "rules_ruby_dependencies",
 )
 
-ruby_rules_dependencies()
+rules_ruby_dependencies()
 
-ruby_rules_toolchains()
+rules_ruby_toolchains()
 ```
 
 Next, add any external Gem dependencies you may have via `ruby_bundle` command.
@@ -109,7 +109,7 @@ Add `ruby_library`, `ruby_binary` or `ruby_test` into your `BUILD.bazel` files.
 
 ```python
 load(
-    "@bazelruby_rules_ruby//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "ruby_binary",
     "ruby_library",
     "ruby_test",
@@ -424,22 +424,22 @@ Installing using a `Gemfile` that uses the `gemspec` keyword is not currently su
 
 ```python
 git_repository(
-    name = "bazelruby_rules_ruby",
+    name = "bazelrules_ruby_ruby",
     remote = "https://github.com/bazelruby/rules_ruby.git",
     tag = "v0.1.0",
 )
 
 load(
-    "@bazelruby_rules_ruby//ruby:deps.bzl",
-    "ruby_rules_toolchains",
-    "ruby_rules_dependencies",
+    "@bazelrules_ruby_ruby//ruby:deps.bzl",
+    "rules_ruby_toolchains",
+    "rules_ruby_dependencies",
 )
 
-ruby_rules_dependencies()
+rules_ruby_dependencies()
 
-ruby_rules_toolchains()
+rules_ruby_toolchains()
 
-load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
+load("@bazelrules_ruby_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     bundler_version = '2.1.2',
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,8 +1,8 @@
-workspace(name = "bazelruby_ruby_rules")
+workspace(name = "bazelrules_ruby_ruby")
 
-load("@//ruby:deps.bzl", "ruby_register_toolchains", "ruby_rules_dependencies")
+load("@//ruby:deps.bzl", "ruby_register_toolchains", "rules_ruby_dependencies")
 
-ruby_rules_dependencies()
+rules_ruby_dependencies()
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
@@ -15,7 +15,7 @@ versions.check("1.2.1")
 ruby_register_toolchains()
 
 local_repository(
-    name = "bazelruby_ruby_rules_ruby_tests_testdata_another_workspace",
+    name = "bazelrules_ruby_ruby_ruby_tests_testdata_another_workspace",
     path = "ruby/tests/testdata/another_workspace",
 )
 
@@ -91,7 +91,7 @@ container_pull(
     repository = "library/ruby",
 )
 
-load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_bundle")
+load("@bazelrules_ruby_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "bundle",
diff --git a/examples/example_gem/BUILD b/examples/example_gem/BUILD
@@ -1,10 +1,10 @@
-package(default_visibility = ["//:__subpackages__"])
-
 load(
-    "@bazelruby_ruby_rules//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "rb_gem",
 )
 
+package(default_visibility = ["//:__subpackages__"])
+
 rb_gem(
     name = "default_gem",
     authors = ["Coinbase"],
diff --git a/examples/example_gem/WORKSPACE b/examples/example_gem/WORKSPACE
@@ -1,19 +1,19 @@
-workspace(name = "bazelruby_ruby_rules_example_gem")
+workspace(name = "bazelrules_ruby_ruby_example_gem")
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_ruby_rules",
+    name = "bazelrules_ruby_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_ruby_rules//ruby:deps.bzl",
+    "@bazelrules_ruby_ruby//ruby:deps.bzl",
     "ruby_register_toolchains",
-    "ruby_rules_dependencies",
+    "rules_ruby_dependencies",
 )
 
-ruby_rules_dependencies()
+rules_ruby_dependencies()
 
 ruby_register_toolchains()
 
diff --git a/examples/example_gem/lib/BUILD b/examples/example_gem/lib/BUILD
@@ -1,10 +1,10 @@
-package(default_visibility = ["//:__subpackages__"])
-
 load(
-    "@bazelruby_ruby_rules//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "rb_library",
 )
 
+package(default_visibility = ["//:__subpackages__"])
+
 rb_library(
     name = "example_gem",
     srcs = ["example_gem.rb"],
diff --git a/examples/example_gem/lib/foo/BUILD b/examples/example_gem/lib/foo/BUILD
@@ -1,10 +1,10 @@
-package(default_visibility = ["//:__subpackages__"])
-
 load(
-    "@bazelruby_ruby_rules//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "rb_library",
 )
 
+package(default_visibility = ["//:__subpackages__"])
+
 rb_library(
     name = "default_library",
     srcs = ["bar.rb"],
diff --git a/examples/simple_rails_api/BUILD b/examples/simple_rails_api/BUILD
@@ -1,11 +1,10 @@
-package(default_visibility = ["//:__subpackages__"])
-
 load(
-    "@bazelruby_ruby_rules//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "ruby_binary",
-    "ruby_test",
 )
 
+package(default_visibility = ["//:__subpackages__"])
+
 ruby_binary(
     name = "server",
     srcs = glob(
diff --git a/examples/simple_rails_api/WORKSPACE b/examples/simple_rails_api/WORKSPACE
@@ -1,27 +1,27 @@
-workspace(name = "bazelruby_ruby_rules_example")
+workspace(name = "bazelrules_ruby_ruby_example")
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_ruby_rules",
+    name = "bazelrules_ruby_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_ruby_rules//ruby:deps.bzl",
+    "@bazelrules_ruby_ruby//ruby:deps.bzl",
     "ruby_register_toolchains",
-    "ruby_rules_dependencies",
+    "rules_ruby_dependencies",
 )
 
-ruby_rules_dependencies()
+rules_ruby_dependencies()
 
 ruby_register_toolchains(version = "2.7.0")
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
-load("@bazelruby_ruby_rules//ruby:defs.bzl", "bundle_install")
+load("@bazelrules_ruby_ruby//ruby:defs.bzl", "bundle_install")
 
 bundle_install(
     name = "bundle",
diff --git a/examples/simple_script/BUILD.bazel b/examples/simple_script/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@bazelruby_ruby_rules//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "ruby_binary",
     "ruby_rspec",
     "ruby_rubocop",
diff --git a/examples/simple_script/WORKSPACE b/examples/simple_script/WORKSPACE
@@ -1,23 +1,23 @@
-workspace(name = "bazelruby_ruby_rules_example")
+workspace(name = "bazelrules_ruby_ruby_example")
 
 # Importing rules_ruby from the parent directory for developing
 # rules_ruby itself...
 local_repository(
-    name = "bazelruby_ruby_rules",
+    name = "bazelrules_ruby_ruby",
     path = "../..",
 )
 
 load(
-    "@bazelruby_ruby_rules//ruby:deps.bzl",
+    "@bazelrules_ruby_ruby//ruby:deps.bzl",
     "ruby_register_toolchains",
-    "ruby_rules_dependencies",
+    "rules_ruby_dependencies",
 )
 
-ruby_rules_dependencies()
+rules_ruby_dependencies()
 
 ruby_register_toolchains(version = "2.7.0")
 
-load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_bundle")
+load("@bazelrules_ruby_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,10 +1,10 @@
-package(default_visibility = ["//:__subpackages__"])
-
 load(
-    "@bazelruby_ruby_rules//ruby:defs.bzl",
+    "@bazelrules_ruby_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
+package(default_visibility = ["//:__subpackages__"])
+
 ruby_library(
     name = "foo",
     srcs = ["foo.rb"],
diff --git a/ruby/defs.bzl b/ruby/defs.bzl
@@ -1,35 +1,35 @@
 load(
-    "@bazelruby_ruby_rules//ruby/private:toolchain.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:toolchain.bzl",
     _toolchain = "ruby_toolchain",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:library.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:library.bzl",
     _library = "ruby_library",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:binary.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:binary.bzl",
     _binary = "ruby_binary",
     _test = "ruby_test",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:bundle.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:bundle.bzl",
     _ruby_bundle = "ruby_bundle",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:rspec.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:rspec.bzl",
     _ruby_rspec = "ruby_rspec",
     _ruby_rspec_test = "ruby_rspec_test",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private/rubocop:def.bzl",
+    "@bazelrules_ruby_ruby//ruby/private/rubocop:def.bzl",
     _rubocop = "rubocop",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:gemspec.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:gemspec.bzl",
     _gemspec = "rb_gemspec",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:gem.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:gem.bzl",
     _gem = "rb_gem",
 )
 
diff --git a/ruby/deps.bzl b/ruby/deps.bzl
@@ -1,13 +1,13 @@
 # Repository rules
 load(
-    "@bazelruby_ruby_rules//ruby/private:dependencies.bzl",
-    _ruby_rules_dependencies = "ruby_rules_dependencies",
+    "@bazelrules_ruby_ruby//ruby/private:dependencies.bzl",
+    _rules_ruby_dependencies = "rules_ruby_dependencies",
 )
 load(
-    "@bazelruby_ruby_rules//ruby/private:sdk.bzl",
+    "@bazelrules_ruby_ruby//ruby/private:sdk.bzl",
     _register_toolchains = "ruby_register_toolchains",
 )
 
-ruby_rules_dependencies = _ruby_rules_dependencies
+rules_ruby_dependencies = _rules_ruby_dependencies
 
 ruby_register_toolchains = _register_toolchains
diff --git a/ruby/private/constants.bzl b/ruby/private/constants.bzl
@@ -1,6 +1,6 @@
 load(":providers.bzl", "RubyLibrary")
 
-RULES_RUBY_WORKSPACE_NAME = "@bazelruby_ruby_rules"
+RULES_RUBY_WORKSPACE_NAME = "@bazelrules_ruby_ruby"
 TOOLCHAIN_TYPE_NAME = "%s//ruby:toolchain_type" % RULES_RUBY_WORKSPACE_NAME
 
 DEFAULT_BUNDLER_VERSION = "2.1.2"
diff --git a/ruby/private/dependencies.bzl b/ruby/private/dependencies.bzl
@@ -1,7 +1,6 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-def ruby_rules_dependencies():
+def rules_ruby_dependencies():
     if "bazel_skylib" not in native.existing_rules():
         http_archive(
             name = "bazel_skylib",
diff --git a/ruby/private/rubocop/def.bzl b/ruby/private/rubocop/def.bzl
@@ -1,4 +1,4 @@
-load("@bazelruby_ruby_rules//ruby/private:binary.bzl", "ruby_binary")
+load("@bazelrules_ruby_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_ruby_rules//ruby/private/rubocop:runner.sh.tpl"
+    runner = "@bazelrules_ruby_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_ruby_rules//ruby/private/toolchains:ruby_runtime.bzl",
+    "@bazelrules_ruby_ruby//ruby/private/toolchains:ruby_runtime.bzl",
     _ruby_runtime = "ruby_runtime",
 )
 
diff --git a/ruby/tests/BUILD.bazel b/ruby/tests/BUILD.bazel
diff --git a/ruby/tests/load_path_in_runfiles_test.rb b/ruby/tests/load_path_in_runfiles_test.rb
diff --git a/ruby/tests/testdata/another_workspace/WORKSPACE b/ruby/tests/testdata/another_workspace/WORKSPACE
diff --git a/ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel b/ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel
