Use zipper rather than jdk/jar in the thrift rules (#286)

* use latest 0.6.0 in travis

* use workers in travis

* handle 0 input cases without the jar warning

* Use zipper with an arg file instead of jdk/jar in thrift

* fix incorrect args

* use new lines on the arg files

* Add a test with multiple thrifts

* Append a newline at the end of the file

Author: johnynek

test/src/main/scala/scala/test/twitter_scrooge/thrift/BUILD

@@ -9,3 +9,9 @@ thrift_library(
   ],
   visibility = ["//visibility:public"],
 )
+
+thrift_library(
+  name = "thrift_many",
+  srcs = ["ThriftMany1.thrift", "ThriftMany2.thrift"],
+  visibility = ["//visibility:public"],
+)

test/src/main/scala/scala/test/twitter_scrooge/thrift/ThriftMany1.thrift

@@ -0,0 +1,3 @@
+struct Many1 {
+  1: i32 one
+}

test/src/main/scala/scala/test/twitter_scrooge/thrift/ThriftMany2.thrift

@@ -0,0 +1,3 @@
+struct Many2 {
+  1: i16 two
+}

thrift/thrift.bzl

@@ -25,7 +25,7 @@ def _thrift_library_impl(ctx):
   if len(src_paths) <= 0 and len(ctx.attr.external_jars) <= 0:
     fail("we require at least one thrift file in a target")
 
-  jarcmd = "{jar} cMf {out} -C {out}_tmp ."
+  zipper_args = "\n".join(src_paths) + "\n"
   if len(prefixes) > 0:
     common_prefix = _common_prefix(src_paths)
     found_prefixes = [p for p in prefixes if common_prefix.find(p) >= 0]
@@ -43,34 +43,43 @@ def _thrift_library_impl(ctx):
       pos = common_prefix.find(prefix)
       endpos = pos + len(prefix)
       actual_prefix = common_prefix[0:endpos]
-      jarcmd = "{{jar}} cMf {{out}} -C {{out}}_tmp/{pf} .".format(pf=actual_prefix)
-
-  _valid_thrift_deps(ctx.attr.deps)
-  # We move the files and touch them so that the output file is a purely deterministic
-  # product of the _content_ of the inputs
-  cmd = """
-rm -rf {out}_tmp
-mkdir -p {out}_tmp
-{jar} cMf {out}_tmp/tmp.jar $@
-unzip -q -o {out}_tmp/tmp.jar -d {out}_tmp 2>/dev/null
-rm -rf {out}_tmp/tmp.jar
-find {out}_tmp -exec touch -t 198001010000 {{}} \;
-""" + jarcmd + """
-rm -rf {out}_tmp"""
-
-  cmd = cmd.format(out=ctx.outputs.libarchive.path,
-                   jar=ctx.executable._jar.path)
-
-  # We need _jdk to even run _jar. Depending on _jar is not enough with sandbox
-  ctx.action(
-    inputs = ctx.files.srcs +
-      ctx.files._jdk +
-      [ctx.executable._jar],
-    outputs = [ctx.outputs.libarchive],
-    command = cmd,
-    progress_message = "making thrift archive %s" % ctx.label,
-    arguments = src_paths,
-  )
+      zipper_args = "\n".join([ "%s=%s" % (src[endpos+1:], src) for src in src_paths ]) + "\n"
+
+  if len(src_paths) > 0:
+    zipper_arg_path = ctx.actions.declare_file("%s_zipper_args" % ctx.outputs.libarchive.path)
+    ctx.file_action(zipper_arg_path, zipper_args)
+    _valid_thrift_deps(ctx.attr.deps)
+    # We move the files and touch them so that the output file is a purely deterministic
+    # product of the _content_ of the inputs
+    cmd = """
+rm -f {out}
+{zipper} c {out} @{path}
+"""
+
+    cmd = cmd.format(out=ctx.outputs.libarchive.path,
+                     path=zipper_arg_path.path,
+                     zipper=ctx.executable._zipper.path)
+    ctx.action(
+      inputs = ctx.files.srcs + [ctx.executable._zipper, zipper_arg_path],
+      outputs = [ctx.outputs.libarchive],
+      command = cmd,
+      progress_message = "making thrift archive %s (%s files)" % (ctx.label, len(src_paths)),
+    )
+  else:
+    # we still have to create the output we declared
+    ctx.action(
+      inputs = [ctx.executable._zipper],
+      outputs = [ctx.outputs.libarchive],
+      command = """
+echo "empty" > {out}.contents
+rm -f {out}
+{zipper} c {out} {out}.contents
+rm {out}.contents
+""".format(out=ctx.outputs.libarchive.path,
+           zipper=ctx.executable._zipper.path),
+      progress_message = "making empty thrift archive %s" % ctx.label,
+    )
+
 
   transitive_srcs = _collect_thrift_srcs(ctx.attr.deps)
   transitive_srcs += [ctx.outputs.libarchive]
@@ -135,8 +144,7 @@ thrift_library = rule(
       "absolute_prefixes": attr.string_list(),
       # This is a list of JARs which only contain Thrift files
       "external_jars": attr.label_list(),
-      "_jar": attr.label(executable=True, cfg="host", default=Label("@bazel_tools//tools/jdk:jar"), allow_files=True),
-      "_jdk": attr.label(default=Label("//tools/defaults:jdk"), allow_files=True),
+      "_zipper": attr.label(executable=True, cfg="host", default=Label("@bazel_tools//tools/zip:zipper"), allow_files=True)
   },
   outputs={"libarchive": "lib%{name}.jar"},
 )