Skip to content

Commit d31ea8e

Browse files
committed
Correct namespaces so that independent workspaces can import rules_ruby
Made examples directory an independent workspace for testing.
1 parent 940715f commit d31ea8e

18 files changed

Lines changed: 99 additions & 80 deletions

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@ before_install:
2929
- .travis/install-bazel.sh 1.1.0
3030
- bazel $BAZEL_OPTS version
3131
- bazel $BAZEL_OPTS info
32-
- bazel $BAZEL_OPTS fetch --curses=no -- "//..."
32+
- bazel $BAZEL_OPTS fetch --curses=no -- "//ruby/..."
33+
- (cd examples && bazel $BAZEL_OPTS fetch --curses=no -- "//...")
3334
install:
34-
- bazel $BAZEL_OPTS build $BAZEL_BUILD_OPTS --show_progress_rate_limit 0 -- //...
35+
- bazel $BAZEL_OPTS build $BAZEL_BUILD_OPTS --show_progress_rate_limit 0 -- //ruby/...
36+
- (cd examples && bazel $BAZEL_OPTS build $BAZEL_BUILD_OPTS --show_progress_rate_limit 0 -- //...)
3537
script:
36-
- bazel $BAZEL_OPTS test $BAZEL_BUILD_OPTS --show_progress_rate_limit 0 --test_output=streamed -- //...
38+
- bazel $BAZEL_OPTS test $BAZEL_BUILD_OPTS --show_progress_rate_limit 0 --test_output=streamed -- //ruby/...
39+
- (cd examples && bazel $BAZEL_OPTS test $BAZEL_BUILD_OPTS --show_progress_rate_limit 0 --test_output=streamed -- //...)
3740

3841
env:
3942
global:

WORKSPACE

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,12 @@ load("@//ruby:deps.bzl", "ruby_register_toolchains", "ruby_rules_dependencies")
44

55
ruby_rules_dependencies()
66

7-
ruby_register_toolchains(rules_ruby_workspace = "@")
7+
ruby_register_toolchains()
88

99
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
1010

1111
bazel_skylib_workspace()
1212

13-
load("@//ruby/private:bundle.bzl", "bundle_install")
14-
15-
bundle_install(
16-
name = "bundler_test",
17-
gemfile = "//:examples/Gemfile",
18-
gemfile_lock = "//:examples/Gemfile.lock",
19-
rules_ruby_workspace = "@",
20-
)
21-
2213
local_repository(
2314
name = "com_github_yugui_rules_ruby_ruby_tests_testdata_another_workspace",
2415
path = "ruby/tests/testdata/another_workspace",

examples/BUILD.bazel

Whitespace-only changes.

examples/WORKSPACE

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
workspace(name = "com_github_yugui_rules_ruby_example")
2+
3+
# Importing rules_ruby from the parent directory for developing
4+
# rules_ruby itself...
5+
local_repository(
6+
name = "com_github_yugui_rules_ruby",
7+
path = "..",
8+
)
9+
10+
# But you'd usually want to fetch rules_ruby from remote.
11+
#
12+
# git_repository(
13+
# name = "com_github_yugui_rules_ruby",
14+
# remote = "https://github.com/yugui/rules_ruby.git",
15+
# tag = "v0.0.1",
16+
# )
17+
18+
load(
19+
"@com_github_yugui_rules_ruby//ruby:deps.bzl",
20+
"ruby_register_toolchains",
21+
"ruby_rules_dependencies",
22+
)
23+
24+
ruby_rules_dependencies()
25+
26+
ruby_register_toolchains()
27+
28+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
29+
30+
bazel_skylib_workspace()
31+
32+
load("@com_github_yugui_rules_ruby//ruby/private:bundle.bzl", "bundle_install")
33+
34+
bundle_install(
35+
name = "bundle",
36+
gemfile = "//:Gemfile",
37+
gemfile_lock = "//:Gemfile.lock",
38+
)

examples/bin/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
load(
2-
"@//ruby:def.bzl",
2+
"@com_github_yugui_rules_ruby//ruby:def.bzl",
33
"ruby_binary",
44
)
55

66
ruby_binary(
77
name = "show_version",
88
srcs = ["show_version.rb"],
99
deps = [
10-
"//examples/lib:foo",
10+
"//lib:foo",
1111
],
1212
)
1313

examples/lib/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package(default_visibility = ["//examples:__subpackages__"])
1+
package(default_visibility = ["//:__subpackages__"])
22

33
load(
4-
"@//ruby:def.bzl",
4+
"@com_github_yugui_rules_ruby//ruby:def.bzl",
55
"ruby_library",
66
)
77

88
ruby_library(
99
name = "foo",
1010
srcs = ["foo.rb"],
11-
includes = ["examples/lib"],
11+
includes = ["lib"],
1212
deps = [
13-
"//examples/lib/foo:bar",
14-
"//examples/lib/foo:version",
13+
"//lib/foo:bar",
14+
"//lib/foo:version",
1515
],
1616
)

examples/lib/foo/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package(
22
default_visibility = [
3-
"//examples/lib:__pkg__",
4-
"//examples/spec/foo:__pkg__",
3+
"//lib:__pkg__",
4+
"//spec/foo:__pkg__",
55
],
66
)
77

88
load(
9-
"@//ruby:def.bzl",
9+
"@com_github_yugui_rules_ruby//ruby:def.bzl",
1010
"ruby_library",
1111
)
1212

examples/spec/foo/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load(
2-
"@//ruby:def.bzl",
2+
"@com_github_yugui_rules_ruby//ruby:def.bzl",
33
"ruby_test",
44
)
55

@@ -9,7 +9,7 @@ ruby_test(
99
main = "version_spec.rb",
1010
rubyopt = ["-rrspec/autorun"],
1111
deps = [
12-
"//examples/lib:foo",
13-
"@bundler_test//:libs",
12+
"//lib:foo",
13+
"@bundle//:libs",
1414
],
1515
)

ruby/def.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
load(
2-
"@//ruby/private:toolchain.bzl",
2+
"@com_github_yugui_rules_ruby//ruby/private:toolchain.bzl",
33
_toolchain = "ruby_toolchain",
44
)
55

66
load(
7-
"@//ruby/private:library.bzl",
7+
"@com_github_yugui_rules_ruby//ruby/private:library.bzl",
88
_library = "ruby_library",
99
)
1010

1111
load(
12-
"@//ruby/private:binary.bzl",
12+
"@com_github_yugui_rules_ruby//ruby/private:binary.bzl",
1313
_binary = "ruby_binary",
1414
_test = "ruby_test",
1515
)

ruby/deps.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Repository rules
22
load(
3-
"@//ruby/private:dependencies.bzl",
3+
"@com_github_yugui_rules_ruby//ruby/private:dependencies.bzl",
44
_rules_dependencies = "ruby_rules_dependencies",
55
)
66
load(
7-
"@//ruby/private:sdk.bzl",
7+
"@com_github_yugui_rules_ruby//ruby/private:sdk.bzl",
88
_register_toolchains = "ruby_register_toolchains",
99
)
1010

0 commit comments

Comments
 (0)