Merge pull request #21 from ixdy/mocha-test-rule

mocha_test: add mocha to runfiles

Author: pcj

node/internal/mocha_test.bzl

@@ -1,4 +1,5 @@
 _js_filetype = FileType([".js"])
+
 _modules_filetype = FileType(["node_modules"])
 
 BASH_TEMPLATE = """
@@ -16,18 +17,6 @@ export NODE_PATH={node_paths}
 "{node}" "{mocha}" {mocha_args} "{script_path}" $@
 """
 
-
-def _get_abs_sourcepath(file):
-    filename = str(file)
-    #print("filename: %s" % filename)
-    parts = filename.partition("[source]]")
-    prefix = parts[0][len("Artifact:["):]
-    suffix = parts[2]
-    d = "/".join([prefix, suffix])
-    #print("abs filename: %s" % d)
-    return d
-
-
 def _get_node_modules_dir_from_binfile(file):
     bin = str(file)
     parts = bin.partition("[source]]")
@@ -36,7 +25,6 @@ def _get_node_modules_dir_from_binfile(file):
     #print("prefix: %s, suffix_parts: %s" % (prefix, suffix_parts))
     return "/".join([prefix] + suffix_parts[0:2] + ["node_modules"])
 
-
 def _get_node_modules_dir_from_package_json(file):
     filename = str(file)
     parts = filename.split("]")
@@ -46,8 +34,6 @@ def _get_node_modules_dir_from_package_json(file):
     d = "/".join([prefix, middle] + suffix[0:-3] + ["node_modules"])
     return d
 
-
-
 def mocha_test_impl(ctx):
     inputs = []
     srcs = []
@@ -57,8 +43,6 @@ def mocha_test_impl(ctx):
     node_paths = []
     node_paths.append(_get_node_modules_dir_from_binfile(mocha))
 
-    mocha_path = _get_abs_sourcepath(mocha)
-
     for file in ctx.files.modules:
         #print("file: %s" % file)
         if not file.basename.endswith("node_modules"):
@@ -84,14 +68,14 @@ def mocha_test_impl(ctx):
             node = node.short_path,
             node_bin_path = node.dirname,
             script_path = script.short_path,
-            mocha = mocha_path,
+            mocha = mocha.path,
             mocha_args = " ".join(ctx.attr.mocha_args),
         ),
     )
 
     #print("node_paths %s" % "\n".join(node_paths))
 
-    runfiles = [node, script] + inputs + srcs
+    runfiles = [node, script, mocha] + inputs + srcs
 
     return struct(
         runfiles = ctx.runfiles(
@@ -100,7 +84,6 @@ def mocha_test_impl(ctx):
         ),
     )
 
-
 mocha_test = rule(
     mocha_test_impl,
     attrs = {