Added File argument alternatives with Path and String.

Upgraded to bld 2.0.0.

.github/workflows/bld.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17, 19, 20 ]
+        java-version: [ 17, 19 ]
 
     steps:
       - name: Checkout source repository

.idea/bld.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BldConfiguration">
+    <events />
+  </component>
+</project>

.idea/codeStyles/Project.xml

@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/libraries/bld.xml

@@ -2,11 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.18.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.18-sources.jar!/" />
+      <root url="file://$PROJECT_DIR$/lib/bld" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/libraries/compile.xml

@@ -2,12 +2,16 @@
   <library name="compile">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
   </library>
 </component>

.idea/libraries/runtime.xml

@@ -2,6 +2,7 @@
   <library name="runtime">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
+      <root url="file://$PROJECT_DIR$/src/main/resources" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/test.xml

@@ -2,12 +2,16 @@
   <library name="test">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/test" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
   </library>
 </component>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />

.idea/runConfigurations/Run Tests.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Run Tests" type="JUnit" factoryName="JUnit">
     <module name="app" />
     <option name="PACKAGE_NAME" value="moog" />
-    <option name="MAIN_CLASS_NAME" value="rife.bld.extension" />
+    <option name="MAIN_CLASS_NAME" value="rife.bld.extension.TestZipOperation" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="directory" />
     <dir value="$PROJECT_DIR$/src/test/java" />

.vscode/launch.json

@@ -1,12 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "java",
-            "name": "Run Main",
-            "request": "launch",
-            "mainClass": "rife.bld.extension.ArchiveMain"
-        },
         {
             "type": "java",
             "name": "Run Tests",

.vscode/settings.json

@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.18.jar",
+        "${HOME}/.bld/dist/bld-2.0.1.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/test/*.jar"

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -0,0 +1,29 @@
+# [Bld](https://github.com/rife2/rife2/wiki/What-Is-Bld) extension for working with archives
+
+[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive)
+[![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml)
+
+A `bld` extension for generating archives.
+
+It's in an incomplete state and currently only generates ZIP archives that
+preserve the original Posix file permissions. Support for additional features
+will be added soon.
+
+The complete documentation can be found in its [javadocs](https://rife2.github.io/bld-archive/rife/bld/extension/package-summary.html).
+
+This is a short example of how to create a ZIP archive of a directory:
+
+```java
+@BuildCommand
+public void zip()
+throws Exception {
+    new ZipOperation()
+        .sourceDirectories(new File("dir/to/zip"))
+        .destinationDirectory(new File("destination/dir"))
+        .destinationFileName("archive.zip")
+        .execute();
+}
+```

lib/bld/bld-wrapper.properties

@@ -2,5 +2,5 @@ bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.extensions=
 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
-rife2.downloadLocation=
+bld.downloadLocation=
-rife2.version=1.5.18
+bld.version=2.0.1

local.properties

@@ -0,0 +1 @@
+bld.repo.github=https://maven.pkg.github.com/rife2/bld-archive

src/bld/java/rife/bld/extension/ArchiveBuild.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2001-2023 Geert Bevin (gbevin[remove] at uwyn dot com)
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
 package rife.bld.extension;
 
 import rife.bld.Project;
@@ -15,7 +19,7 @@ public class ArchiveBuild extends Project {
     public ArchiveBuild() {
         pkg = "rife.bld.extension";
         name = "Archive";
-        version = version(0,2,0);
+        version = version(0,5,0);
         archiveBaseName = "bld-archive";
 
         javaRelease = 17;
@@ -24,11 +28,11 @@ public class ArchiveBuild extends Project {
 
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
         scope(compile)
-            .include(dependency("com.uwyn.rife2", "rife2", version(1,5,18)))
+            .include(dependency("com.uwyn.rife2", "bld", version(2,0,1)))
-            .include(dependency("org.apache.commons", "commons-compress", version(1,23,0)));
+            .include(dependency("org.apache.commons", "commons-compress", version(1,27,1)));
         scope(test)
-            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,2)))
+            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0)))
-            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,9,2)));
+            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,0)));
 
         javadocOperation()
             .javadocOptions()
@@ -37,10 +41,11 @@ public class ArchiveBuild extends Project {
 
         publishOperation()
             .repository(version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases"))
+            .repository(repository("github"))
             .info()
                 .groupId("com.uwyn.rife2")
                 .artifactId("bld-archive")
-                .description("bld extension for creating archives")
+                .description("bld extension for working with archives")
                 .url("https://github.com/rife2/bld-archive")
                 .developer(new PublishDeveloper()
                     .id("gbevin")

src/main/java/rife/bld/extension/ZipOperation.java

@@ -7,15 +7,20 @@ package rife.bld.extension;
 import org.apache.commons.compress.archivers.zip.UnixStat;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 import rife.bld.NamedFile;
 import rife.bld.operations.AbstractOperation;
 import rife.tools.FileUtils;
 import rife.tools.StringUtils;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
-import java.util.*;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Pattern;
 
 /**
@@ -135,10 +140,49 @@ public class ZipOperation extends AbstractOperation<ZipOperation> {
      *
      * @param directories source directories
      * @return this operation instance
+     * @see #sourceDirectories(List)
      * @since 1.0
      */
     public ZipOperation sourceDirectories(File... directories) {
-        sourceDirectories_.addAll(List.of(directories));
+        return sourceDirectories(List.of(directories));
+    }
+
+    /**
+     * Provides source directories that will be used for the zip archive creation.
+     *
+     * @param directories source directories
+     * @return this operation instance
+     * @see #sourceDirectoriesPaths(List)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectories(Path... directories) {
+        return sourceDirectoriesPaths(List.of(directories));
+    }
+
+    /**
+     * Provides source directories that will be used for the zip archive creation.
+     *
+     * @param directories source directories
+     * @return this operation instance
+     * @see #sourceDirectoriesStrings(List)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectories(String... directories) {
+        return sourceDirectoriesStrings(List.of(directories));
+    }
+
+    /**
+     * Provides a list of source directories that will be used for the zip archive creation.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param directories a list of source directories
+     * @return this operation instance
+     * @see #sourceDirectories(File...)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectories(List<File> directories) {
+        sourceDirectories_.addAll(directories);
         return this;
     }
 
@@ -149,11 +193,25 @@ public class ZipOperation extends AbstractOperation<ZipOperation> {
      *
      * @param directories a list of source directories
      * @return this operation instance
+     * @see #sourceDirectories(Path...)
      * @since 1.0
      */
-    public ZipOperation sourceDirectories(List<File> directories) {
+    public ZipOperation sourceDirectoriesPaths(List<Path> directories) {
-        sourceDirectories_.addAll(directories);
+        return sourceDirectories(directories.stream().map(Path::toFile).toList());
-        return this;
+    }
+
+    /**
+     * Provides a list of source directories that will be used for the zip archive creation.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param directories a list of source directories
+     * @return this operation instance
+     * @see #sourceDirectories(String...)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectoriesStrings(List<String> directories) {
+        return sourceDirectories(directories.stream().map(File::new).toList());
     }
 
     /**
@@ -194,6 +252,28 @@ public class ZipOperation extends AbstractOperation<ZipOperation> {
         return this;
     }
 
+    /**
+     * Provides the destination directory in which the zip archive will be created.
+     *
+     * @param directory the zip destination directory
+     * @return this operation instance
+     * @since 1.0
+     */
+    public ZipOperation destinationDirectory(Path directory) {
+        return destinationDirectory(directory.toFile());
+    }
+
+    /**
+     * Provides the destination directory in which the zip archive will be created.
+     *
+     * @param directory the zip destination directory
+     * @return this operation instance
+     * @since 1.0
+     */
+    public ZipOperation destinationDirectory(String directory) {
+        return destinationDirectory(new File(directory));
+    }
+
     /**
      * Provides the destination file name that will be used for the zip archive creation.
      *