Rename def.bzl to defs.bzl for more consistency to other rules

yugui · yugui · commit 4479ca39b31f · 2019-11-07T09:21:57.000+09:00
diff --git a/README.md b/README.md
@@ -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:def.bzl",
+    "@com_github_yugui_rules_ruby//ruby:defs.bzl",
     "ruby_binary",
     "ruby_library",
     "ruby_test",
@@ -312,7 +312,7 @@ ruby_register_toolchains()
 
 ruby_register_toolchains()
 
-load("@com_github_yugui_rules_ruby//ruby:def.bzl", "bundle_install")
+load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "bundle_install")
 
 bundle_install(
     name = "gems",
diff --git a/examples/WORKSPACE b/examples/WORKSPACE
@@ -29,7 +29,7 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
-load("@com_github_yugui_rules_ruby//ruby:def.bzl", "bundle_install")
+load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "bundle_install")
 
 bundle_install(
     name = "bundle",
diff --git a/examples/bin/BUILD.bazel b/examples/bin/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@com_github_yugui_rules_ruby//ruby:def.bzl",
+    "@com_github_yugui_rules_ruby//ruby:defs.bzl",
     "ruby_binary",
 )
 
diff --git a/examples/lib/BUILD.bazel b/examples/lib/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//:__subpackages__"])
 
 load(
-    "@com_github_yugui_rules_ruby//ruby:def.bzl",
+    "@com_github_yugui_rules_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/examples/lib/foo/BUILD.bazel b/examples/lib/foo/BUILD.bazel
@@ -6,7 +6,7 @@ package(
 )
 
 load(
-    "@com_github_yugui_rules_ruby//ruby:def.bzl",
+    "@com_github_yugui_rules_ruby//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/examples/spec/foo/BUILD.bazel b/examples/spec/foo/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "@com_github_yugui_rules_ruby//ruby:def.bzl",
+    "@com_github_yugui_rules_ruby//ruby:defs.bzl",
     "ruby_test",
 )
 
diff --git a/ruby/def.bzl b/ruby/def.bzl
@@ -1,8 +1,3 @@
-load(
-    "@com_github_yugui_rules_ruby//ruby/private:toolchain.bzl",
-    _toolchain = "ruby_toolchain",
-)
-
 load(
     "@com_github_yugui_rules_ruby//ruby/private:library.bzl",
     _library = "ruby_library",
@@ -14,13 +9,14 @@ load(
     _test = "ruby_test",
 )
 
-load(
-    "@com_github_yugui_rules_ruby//ruby/private:bundle.bzl",
-    _bundle_install = "bundle_install",
-)
+def ruby_library(**attrs):
+  print("//ruby:def.bzl was deprecated and will be removed soon. Use //ruby:defs.bzl instead")
+  _library(**attrs)
+
+def ruby_binary(**attrs):
+  print("//ruby:def.bzl was deprecated and will be removed soon. Use //ruby:defs.bzl instead")
+  _binary(**attrs)
 
-ruby_toolchain = _toolchain
-ruby_library = _library
-ruby_binary = _binary
-ruby_test = _test
-bundle_install = _bundle_install
+def ruby_test(**attrs):
+  print("//ruby:def.bzl was deprecated and will be removed soon. Use //ruby:defs.bzl instead")
+  _test(**attrs)
diff --git a/ruby/defs.bzl b/ruby/defs.bzl
@@ -0,0 +1,26 @@
+load(
+    "@com_github_yugui_rules_ruby//ruby/private:toolchain.bzl",
+    _toolchain = "ruby_toolchain",
+)
+
+load(
+    "@com_github_yugui_rules_ruby//ruby/private:library.bzl",
+    _library = "ruby_library",
+)
+
+load(
+    "@com_github_yugui_rules_ruby//ruby/private:binary.bzl",
+    _binary = "ruby_binary",
+    _test = "ruby_test",
+)
+
+load(
+    "@com_github_yugui_rules_ruby//ruby/private:bundle.bzl",
+    _bundle_install = "bundle_install",
+)
+
+ruby_toolchain = _toolchain
+ruby_library = _library
+ruby_binary = _binary
+ruby_test = _test
+bundle_install = _bundle_install
diff --git a/ruby/private/BUILD.host_runtime.tpl b/ruby/private/BUILD.host_runtime.tpl
@@ -1,5 +1,5 @@
 load(
-    "{rules_ruby_workspace}//ruby:def.bzl",
+    "{rules_ruby_workspace}//ruby:defs.bzl",
     "ruby_library",
     "ruby_toolchain",
 )
diff --git a/ruby/private/bundle/BUILD.bundle.tpl b/ruby/private/bundle/BUILD.bundle.tpl
@@ -1,5 +1,5 @@
 load(
-  "{workspace_name}//ruby:def.bzl",
+  "{workspace_name}//ruby:defs.bzl",
   "ruby_library",
 )
 
diff --git a/ruby/tests/BUILD.bazel b/ruby/tests/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "//ruby:def.bzl",
+    "//ruby:defs.bzl",
     "ruby_binary",
     "ruby_test",
 )
diff --git a/ruby/tests/testdata/BUILD.bazel b/ruby/tests/testdata/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "//ruby:def.bzl",
+    "//ruby:defs.bzl",
     "ruby_library",
 )
 
diff --git a/ruby/tests/testdata/another_workspace/WORKSPACE b/ruby/tests/testdata/another_workspace/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(name = "com_github_yugui_rules_ruby_ruby_tests_testdata_another_workspace")
 
-load("@com_github_yugui_rules_ruby//ruby:def.bzl", "ruby_register_toolchains")
+load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "ruby_register_toolchains")
 
 ruby_register_toolchains()
diff --git a/ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel b/ruby/tests/testdata/another_workspace/baz/qux/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@com_github_yugui_rules_ruby//ruby:def.bzl", "ruby_library")
+load("@com_github_yugui_rules_ruby//ruby:defs.bzl", "ruby_library")
 
 ruby_library(
     name = "j",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`load(`
`2`		`- "@com_github_yugui_rules_ruby//ruby:def.bzl",`
	`2`	`+ "@com_github_yugui_rules_ruby//ruby:defs.bzl",`
`3`	`3`	`"ruby_binary",`
`4`	`4`	`)`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package(default_visibility = ["//:__subpackages__"])`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "@com_github_yugui_rules_ruby//ruby:def.bzl",`
	`4`	`+ "@com_github_yugui_rules_ruby//ruby:defs.bzl",`
`5`	`5`	`"ruby_library",`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ package(`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`load(`
`9`		`- "@com_github_yugui_rules_ruby//ruby:def.bzl",`
	`9`	`+ "@com_github_yugui_rules_ruby//ruby:defs.bzl",`
`10`	`10`	`"ruby_library",`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`load(`
`2`		`- "{rules_ruby_workspace}//ruby:def.bzl",`
	`2`	`+ "{rules_ruby_workspace}//ruby:defs.bzl",`
`3`	`3`	`"ruby_library",`
`4`	`4`	`"ruby_toolchain",`
`5`	`5`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`load(`
`2`		`- "{workspace_name}//ruby:def.bzl",`
	`2`	`+ "{workspace_name}//ruby:defs.bzl",`
`3`	`3`	`"ruby_library",`
`4`	`4`	`)`
`5`	`5`