review comments

5 files changed, 17 insertions, 16 deletions

diff --git a/BUILD b/BUILD
index 98caf14..40cfcad 100644
--- a/BUILD
+++ b/BUILD
@@ -13,9 +13,11 @@
 # limitations under the License.
 
 load("@rules_license//rules:license.bzl", "license")
+load("@rules_license//rules:package_info.bzl", "package_info")
+load("@rules_license//:version.bzl", "version")
 
 package(
-    default_applicable_licenses = [":license"],
+    default_applicable_licenses = [":license", ":package_info"],
     default_visibility = ["//visibility:public"],
 )
 
@@ -29,6 +31,12 @@ license(
     license_text = "LICENSE",
 )
 
+package_info(
+    name = "package_info",
+    package_name = "rules_license",
+    package_version = version,
+)
+
 exports_files(
     ["LICENSE", "WORKSPACE"],
     visibility = ["//visibility:public"],
diff --git a/rules/gather_metadata.bzl b/rules/gather_metadata.bzl
index 4fc0bbd..9e96cba 100644
--- a/rules/gather_metadata.bzl
+++ b/rules/gather_metadata.bzl
@@ -101,7 +101,7 @@ gather_metadata_info_and_write = aspect(
     doc = """Collects TransitiveMetadataInfo providers and writes JSON representation to a file.
 
     Usage:
-      blaze build //some:target \
+      bazel build //some:target \
           --aspects=@rules_license//rules:gather_metadata_info.bzl%gather_metadata_info_and_write
           --output_groups=licenses
     """,
@@ -265,7 +265,6 @@ def metadata_info_to_json(metadata_info):
     #for package in sorted(metadata_info.package_info.to_list(), key = lambda x: x.label):
     #    all_packages.append(package_info_template.format(
     #        label = _strip_null_repo(package.label),
-    #        copyright_notice = package.copyright_notice,
     #        package_name = package.package_name,
     #        package_url = package.package_url,
     #        package_version = package.package_version,
diff --git a/rules/package_info.bzl b/rules/package_info.bzl
index 8f5460a..a8643f8 100644
--- a/rules/package_info.bzl
+++ b/rules/package_info.bzl
@@ -50,9 +50,6 @@ def _package_info_impl(ctx):
 _package_info = rule(
     implementation = _package_info_impl,
     attrs = {
-        "copyright_notice": attr.string(
-            doc = "Copyright notice.",
-        ),
         "package_name": attr.string(
             doc = "A human readable name identifying this package." +
                   " This may be used to produce an index of OSS packages used by" +
@@ -75,7 +72,6 @@ _package_info = rule(
 # buildifier: disable=function-docstring-args
 def package_info(
         name,
-        copyright_notice = None,
         package_name = None,
         package_url = None,
         package_version = None,
@@ -84,18 +80,16 @@ def package_info(
 
     Args:
       name: str target name.
-      license_kind: label a single license_kind. Only one of license_kind or license_kinds may
-                    be specified
-      license_kinds: list(label) list of license_kind targets.
-      copyright_notice: str Copyright notice associated with this package.
       package_name : str A human readable name identifying this package. This
                      may be used to produce an index of OSS packages used by
                      an application.
-      tags: list(str) tags applied to the rule
+      package_url: str The canoncial URL this package distribution was retrieved from.
+                       Note that, because of local mirroring, that might not be the 
+                       physical URL it was retrieved from.
+      package_version: str A human readable name identifying version of this package.
     """
     _package_info(
         name = name,
-        copyright_notice = copyright_notice,
         package_name = package_name,
         package_url = package_url,
         package_version = package_version,
diff --git a/rules/providers.bzl b/rules/providers.bzl
index b8e61ce..3b1f090 100644
--- a/rules/providers.bzl
+++ b/rules/providers.bzl
@@ -87,12 +87,12 @@ MetadataInfo = provider(
 TransitiveMetadataInfo = provider(
     doc = """The transitive set of licenses used by a target.""",
     fields = {
-        "top_level_target": "Label: The top level target label.",
+        "top_level_target": "Label: The top level target label we are examining.",
         "other_metadata": "depset(MetatdataInfo)",
         "licenses": "depset(LicenseInfo)",
         "package_info": "depset(PackageInfo)",
 
-        "target_under_license": "Label: The top level target label.",
+        "target_under_license": "Label: A target which will be associated with some licenses.",
         "deps": "depset(LicensedTargetInfo): The transitive list of dependencies that have licenses.",
         "traces": "list(string) - diagnostic for tracing a dependency relationship to a target.",
     },
diff --git a/tools/BUILD b/tools/BUILD
index bc4005f..2b56a34 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -15,7 +15,7 @@
 """License declaration and compliance checking tools."""
 
 package(
-    default_applicable_licenses = ["//:license"],
+    default_applicable_licenses = ["//:license", "//:package_info"],
     default_visibility = ["//visibility:public"],
 )