Skip to content

Updating the remote reference to match the Org #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2019
Merged

Updating the remote reference to match the Org #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ Add `ruby_rules_dependencies` and `ruby_register_toolchains` into your

```python
git_repository(
name = "com_github_yugui_rules_ruby",
name = "bazelruby_ruby_rules",
remote = "https://github.com/yugui/rules_ruby.git",
tag = "v0.1.0",
)

load(
"@com_github_yugui_rules_ruby//ruby:deps.bzl",
"@bazelruby_ruby_rules//ruby:deps.bzl",
"ruby_register_toolchains",
"ruby_rules_dependencies",
)
Expand All @@ -33,7 +33,7 @@ Add `ruby_library`, `ruby_binary` or `ruby_test` into your `BUILD.bazel` files.

```python
load(
"@com_github_yugui_rules_ruby//ruby:defs.bzl",
"@bazelruby_ruby_rules//ruby:defs.bzl",
"ruby_binary",
"ruby_library",
"ruby_test",
Expand Down Expand Up @@ -297,13 +297,13 @@ Example: `WORKSPACE`:

```python
git_repository(
name = "com_github_yugui_rules_ruby",
name = "bazelruby_ruby_rules",
remote = "https://github.com/yugui/rules_ruby.git",
tag = "v0.1.0",
)

load(
"@com_github_yugui_rules_ruby//ruby:deps.bzl",
"@bazelruby_ruby_rules//ruby:deps.bzl",
"ruby_register_toolchains",
"ruby_rules_dependencies",
)
Expand All @@ -312,7 +312,7 @@ ruby_rules_dependencies()

ruby_register_toolchains()

load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "bundle_install")
load("@bazelruby_ruby_rules//ruby:defs.bzl", "bundle_install")

bundle_install(
name = "gems",
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
workspace(name = "com_github_yugui_rules_ruby")
workspace(name = "bazelruby_ruby_rules")

load("@//ruby:deps.bzl", "ruby_register_toolchains", "ruby_rules_dependencies")

Expand All @@ -11,6 +11,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
bazel_skylib_workspace()

local_repository(
name = "com_github_yugui_rules_ruby_ruby_tests_testdata_another_workspace",
name = "bazelruby_ruby_rules_ruby_tests_testdata_another_workspace",
path = "ruby/tests/testdata/another_workspace",
)
10 changes: 5 additions & 5 deletions examples/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
workspace(name = "com_github_yugui_rules_ruby_example")
workspace(name = "bazelruby_ruby_rules_example")

# Importing rules_ruby from the parent directory for developing
# rules_ruby itself...
local_repository(
name = "com_github_yugui_rules_ruby",
name = "bazelruby_ruby_rules",
path = "..",
)

# But you'd usually want to fetch rules_ruby from remote.
#
# git_repository(
# name = "com_github_yugui_rules_ruby",
# name = "bazelruby_ruby_rules",
# remote = "https://github.com/yugui/rules_ruby.git",
# tag = "v0.1.0",
# )

load(
"@com_github_yugui_rules_ruby//ruby:deps.bzl",
"@bazelruby_ruby_rules//ruby:deps.bzl",
"ruby_register_toolchains",
"ruby_rules_dependencies",
)
Expand All @@ -29,7 +29,7 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "bundle_install")
load("@bazelruby_ruby_rules//ruby:defs.bzl", "bundle_install")

bundle_install(
name = "bundle",
Expand Down
2 changes: 1 addition & 1 deletion examples/bin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(
"@com_github_yugui_rules_ruby//ruby:defs.bzl",
"@bazelruby_ruby_rules//ruby:defs.bzl",
"ruby_binary",
)

Expand Down
2 changes: 1 addition & 1 deletion examples/lib/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package(default_visibility = ["//:__subpackages__"])

load(
"@com_github_yugui_rules_ruby//ruby:defs.bzl",
"@bazelruby_ruby_rules//ruby:defs.bzl",
"ruby_library",
)

Expand Down
2 changes: 1 addition & 1 deletion examples/lib/foo/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package(
)

load(
"@com_github_yugui_rules_ruby//ruby:defs.bzl",
"@bazelruby_ruby_rules//ruby:defs.bzl",
"ruby_library",
)

Expand Down
2 changes: 1 addition & 1 deletion examples/spec/foo/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(
"@com_github_yugui_rules_ruby//ruby:defs.bzl",
"@bazelruby_ruby_rules//ruby:defs.bzl",
"ruby_test",
)

Expand Down
4 changes: 2 additions & 2 deletions ruby/def.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
load(
"@com_github_yugui_rules_ruby//ruby/private:library.bzl",
"@bazelruby_ruby_rules//ruby/private:library.bzl",
_library = "ruby_library",
)

load(
"@com_github_yugui_rules_ruby//ruby/private:binary.bzl",
"@bazelruby_ruby_rules//ruby/private:binary.bzl",
_binary = "ruby_binary",
_test = "ruby_test",
)
Expand Down
8 changes: 4 additions & 4 deletions ruby/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
load(
"@com_github_yugui_rules_ruby//ruby/private:toolchain.bzl",
"@bazelruby_ruby_rules//ruby/private:toolchain.bzl",
_toolchain = "ruby_toolchain",
)

load(
"@com_github_yugui_rules_ruby//ruby/private:library.bzl",
"@bazelruby_ruby_rules//ruby/private:library.bzl",
_library = "ruby_library",
)

load(
"@com_github_yugui_rules_ruby//ruby/private:binary.bzl",
"@bazelruby_ruby_rules//ruby/private:binary.bzl",
_binary = "ruby_binary",
_test = "ruby_test",
)

load(
"@com_github_yugui_rules_ruby//ruby/private:bundle.bzl",
"@bazelruby_ruby_rules//ruby/private:bundle.bzl",
_bundle_install = "bundle_install",
)

Expand Down
4 changes: 2 additions & 2 deletions ruby/deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Repository rules
load(
"@com_github_yugui_rules_ruby//ruby/private:dependencies.bzl",
"@bazelruby_ruby_rules//ruby/private:dependencies.bzl",
_rules_dependencies = "ruby_rules_dependencies",
)
load(
"@com_github_yugui_rules_ruby//ruby/private:sdk.bzl",
"@bazelruby_ruby_rules//ruby/private:sdk.bzl",
_register_toolchains = "ruby_register_toolchains",
)

Expand Down
2 changes: 1 addition & 1 deletion ruby/private/constants.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
RULES_RUBY_WORKSPACE_NAME = "@com_github_yugui_rules_ruby"
RULES_RUBY_WORKSPACE_NAME = "@bazelruby_ruby_rules"
TOOLCHAIN_TYPE_NAME = "%s//ruby:toolchain_type" % RULES_RUBY_WORKSPACE_NAME
2 changes: 1 addition & 1 deletion ruby/tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ruby_test(
main = "load_path_in_runfiles_test.rb",
deps = [
"//ruby/tests/testdata:g",
"@com_github_yugui_rules_ruby_ruby_tests_testdata_another_workspace//baz/qux:j",
"@bazelruby_ruby_rules_ruby_tests_testdata_another_workspace//baz/qux:j",
],
)

Expand Down
2 changes: 1 addition & 1 deletion ruby/tests/load_path_in_runfiles_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'ruby/tests/testdata/foo/g'
require 'external/com_github_yugui_rules_ruby_ruby_tests_testdata_another_workspace/baz/qux/j'
require 'external/bazelruby_ruby_rules_ruby_tests_testdata_another_workspace/baz/qux/j'

[g, j]
4 changes: 2 additions & 2 deletions ruby/tests/testdata/another_workspace/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
workspace(name = "com_github_yugui_rules_ruby_ruby_tests_testdata_another_workspace")
workspace(name = "bazelruby_ruby_rules_ruby_tests_testdata_another_workspace")

load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "ruby_register_toolchains")
load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_register_toolchains")

ruby_register_toolchains()
2 changes: 1 addition & 1 deletion ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])

load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "ruby_library")
load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_library")

ruby_library(
name = "j",
Expand Down