npm-pkgbuild 8.2.3 → 8.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "8.2.3",
+  "version": "8.3.2",
   "publishConfig": {
     "access": "public"
   },
@@ -50,7 +50,7 @@
     "expression-expander": "^7.0.16",
     "globby": "^13.1.0",
     "ini": "^2.0.0",
-    "iterable-string-interceptor": "^1.0.14",
+    "iterable-string-interceptor": "^1.0.15",
     "key-value-transformer": "^2.1.1",
     "node-fetch": "^3.2.3",
     "npm-package-walker": "^5.0.6",

package/src/npm-pkgbuild-cli.mjs

@@ -36,6 +36,7 @@ program
   )
   .option("-p --pkgdir <dir>", "which package to use", process.cwd())
   .option("-a --available", "only excute availabe output methods", false)
+  .option("--continue", "continue on error")
   .option(
     "-c --content <dir>",
     "content directory",
@@ -140,8 +141,10 @@ program
         await publish(fileName, options.publish, properties);
       }
     } catch (e) {
-      console.log(e);
-      process.exit(-1);
+      console.error(e);
+      if(!options.continue) {
+        process.exit(-1);
+      }
     }
   })
   .parse(process.argv);

package/src/output/rpm.mjs

@@ -31,6 +31,16 @@ const hookMapping = {
   post_upgrade:*/
 };
 
+export function requiresFromDependencies(dependencies)
+{
+  return Object.entries(dependencies).map(
+    ([name, e]) =>
+      `${
+        packageNameMapping[name] ? packageNameMapping[name] : name
+      } ${e.replace(/([<=>])(\d)/, (match, p1,p2) => `${p1} ${p2}`)}`
+  );
+}
+
 export class RPM extends Packager {
   static get name() {
     return "rpm";
@@ -75,12 +85,7 @@ export class RPM extends Packager {
     const { properties, tmpdir, staging, destination } =
       await this.prepareExecute(options);
 
-    properties.Requires = Object.entries(dependencies).map(
-      ([name, e]) =>
-        `${
-          packageNameMapping[name] ? packageNameMapping[name] : name
-        } ${e.replace(/([<=>])\d/, (match, p1) => `${p1} `)}`
-    );
+    properties.Requires = requiresFromDependencies(dependencies);
 
     const specFileName = `${properties.name}.spec`;
 

package/src/publish.mjs

@@ -24,7 +24,7 @@ export async function publish(fileName, destination, properties) {
 
   publish.url = publish.url + "/" + basename(fileName);
 
-  console.log(publish.url);
+  console.log(`Publishing to ${publish.url}`);
 
   if (publish.scheme === "http:" || publish.scheme === "https:") {
     const headers = {};
@@ -43,9 +43,9 @@ export async function publish(fileName, destination, properties) {
       body: createReadStream(fileName)
     });
 
-    console.log(response);
-
-    return;
+    if(!response.ok) {
+      throw new Error(`Unable to publish to ${publish.url}: ${response.statusText}(${response.statusCode})`);
+    }
   }
 
   /*