Fix canary install

README.md

@@ -83,7 +83,7 @@ Full examples available at [/docs/src/examples](/docs/src/examples)
   released.
 
 - `canary`: The canary channel provides the most up-to-date and cutting-edge versions of Pup. It includes the latest changes and may not be as stable as the other channels. It is primarily intended
-  for developers and early adopters who want to stay on the bleeding edge of Pup's development. Based on the current state of the `main` repo of the github repository.
+  for developers and early adopters who want to stay on the bleeding edge of Pup's development. Based on the current state of the `dev` repo of the github repository.
 
 > **Note** Built-in plugins, such as splunk-hec and webinterace does not work with canary versions right now.
 

application.meta.ts

@@ -21,10 +21,10 @@
 
 const Application = {
   name: "pup",
-  version: "1.0.0",
+  version: "1.0.1",
   url: "jsr:@pup/pup@$VERSION",
   description: "Powerful universal process manager, designed to keep your scripts, applications and services alive.",
-  canary_url: "https://raw.githubusercontent.com/Hexagon/pup/main/pup.ts",
+  canary_url: "https://raw.githubusercontent.com/Hexagon/pup/dev/pup.ts",
   deno: "1.44.0", /* Minimum stable version of Deno required to run Pup (without --unstable-* flags)  */
   deno_unstable: "1.44.0", /* Minimum version of Deno required to run Pup (with --unstable-* flags) */
   repository: "https://github.com/hexagon/pup",

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@pup/pup",
-  "version": "1.0.0",
+  "version": "1.0.1",
 
   "exports": {
     ".": "./pup.ts",
@@ -40,7 +40,7 @@
     "@cross/env": "jsr:@cross/env@~1.0.2",
     "@cross/fs": "jsr:@cross/fs@~0.1.11",
     "@cross/jwt": "jsr:@cross/jwt@~0.5.0",
-    "@cross/kv": "jsr:@cross/kv@~0.17.0",
+    "@cross/kv": "jsr:@cross/kv@~0.17.1",
     "@cross/runtime": "jsr:@cross/runtime@~1.1.0",
     "@cross/service": "jsr:@cross/service@~1.0.3",
     "@cross/test": "jsr:@cross/test@~0.0.9",

docs/src/_data.json

@@ -6,7 +6,7 @@
     "description": "Universal Process Manager"
   },
   "substitute": {
-    "$PUP_VERSION": "1.0.0"
+    "$PUP_VERSION": "1.0.1"
   },
   "top_links": [
     {

docs/src/changelog.md

@@ -9,6 +9,10 @@ nav_order: 13
 
 All notable changes to this project will be documented in this section.
 
+## [1.0.1] - 2024-09-25
+
+- fix(core): Fix `--canary` install/upgrade option
+
 ## [1.0.0] - 2024-09-18
 
 🎉 Initial Stable Release! 🎉

docs/src/contributing/index.md

@@ -19,7 +19,7 @@ Pup is an open-source project, and we welcome contributions from the community.
 ## Submitting code changes
 
 - Fork the Pup repository on GitHub.
-- Create a new branch for your changes and implement the desired feature or bug fix.
+- Create a new branch for your changes based on the `dev` branch, and implement the desired feature or bug fix.
 - Write tests to ensure your changes are reliable and maintainable.
 - Update the documentation as needed to reflect your changes.
 - Run `deno task build` to check format, lint and test the code.

docs/src/installation.md

@@ -59,6 +59,11 @@ The available channels are:
 - `prerelease`: This channel offers pre-release versions of Pup that include new features and improvements. It is suitable for users who want to test the latest enhancements before they are officially
   released.
 
+- `canary`: The canary channel provides the most up-to-date and cutting-edge versions of Pup. It includes the latest changes and may not be as stable as the other channels. It is primarily intended
+  for developers and early adopters who want to stay on the bleeding edge of Pup's development. Based on the current state of the `dev` repo of the github repository.
+
+> **Note** Built-in plugins, such as splunk-hec and webinterace does not work with canary versions right now.
+
 Each channel serves different purposes, so choose the one that best fits your needs and requirements.
 
 ## Verifying the Installation

lib/cli/upgrade.ts

@@ -11,7 +11,8 @@
 import { Application } from "../../application.meta.ts"
 import { greaterThan, lessThan, parse } from "@std/semver"
 import { exit } from "@cross/utils"
-import { readFile } from "@cross/fs"
+import { mktempdir, readFile } from "@cross/fs"
+import { join } from "@std/path/join"
 
 // The deno.land/x-url has to be used until first stable release, or until jsr.io fixes issue
 // https://github.com/jsr-io/jsr/issues/382
@@ -163,6 +164,24 @@ export async function upgrade(
     }
   }
 
+  let temporaryDenoJsonFilePath = ""
+  if (canaryInstall) {
+    const canaryDenoJsonUrl = versions.canary_url.replace("pup.ts", "deno.json")
+
+    // Create a temporary directory
+    const canaryDenoJsonLocation = await mktempdir("pup")
+
+    // Download the canary deno.json file to the temporary directory
+    const response = await fetch(canaryDenoJsonUrl)
+    const data = await response.text()
+    temporaryDenoJsonFilePath = await join(canaryDenoJsonLocation, "deno.json")
+
+    // Write the file to the temporary location
+    await Deno.writeTextFile(temporaryDenoJsonFilePath, data)
+
+    console.log(`Downloaded canary deno.json to ${temporaryDenoJsonFilePath}`)
+  }
+
   // Install
   const installCmd = []
 
@@ -176,6 +195,9 @@ export async function upgrade(
   if (ignoreCertificateErrorsString && ignoreCertificateErrorsString !== "") {
     installCmd.push(ignoreCertificateErrorsString)
   }
+  if (canaryInstall) {
+    installCmd.push("-c", temporaryDenoJsonFilePath)
+  }
   installCmd.push("-n", "pup") // Installed command name = pup
   installCmd.push(canaryInstall ? versions.canary_url : (requestedVersion as Version).url)
 

versions.json

@@ -1,6 +1,21 @@
 {
-  "canary_url": "https://raw.githubusercontent.com/Hexagon/pup/main/pup.ts",
+  "canary_url": "https://raw.githubusercontent.com/Hexagon/pup/dev/pup.ts",
   "stable": [
+    {
+      "version": "1.0.1",
+      "url": "jsr:@pup/[email protected]",
+      "deno": "1.44.0",
+      "deno_unstable": "1.44.0",
+      "default_permissions": [
+        "--allow-env",
+        "--allow-read",
+        "--allow-write",
+        "--allow-sys=loadavg,systemMemoryInfo,osUptime,osRelease,uid,gid",
+        "--allow-net",
+        "--allow-run",
+        "--allow-ffi"
+      ]
+    },
     {
       "version": "1.0.0",
       "url": "jsr:@pup/[email protected]",