Merge pull request #106 from nestdotland/dev

0.3.2

Drakefile.ts

@@ -1,6 +1,8 @@
 import { desc, run, sh, task } from "https://x.nest.land/[email protected]/mod.ts";
 import { version } from "./src/version.ts";
 
+const encoder = new TextEncoder();
+
 desc("Run tests.");
 task("test", [], async function () {
   await sh(
@@ -57,9 +59,12 @@ task("dry-ship", ["link", "dry-publish"]);
 desc("Ship eggs to nest.land.");
 task("ship", ["link", "publish"]);
 
-task("get-version", [], function () {
+task("get-version", [], async function () {
   console.log(`Eggs version: ${version}`);
-  console.log(`::set-env name=EGGS_VERSION::${version}`);
+  const env = encoder.encode(`\nEGGS_VERSION=${version}\n`);
+  const GITHUB_ENV = Deno.env.get("GITHUB_ENV");
+  if (!GITHUB_ENV) throw new Error("Unable to get Github env");
+  await Deno.writeFile(GITHUB_ENV, env, { append: true });
 });
 
 task("setup-github-actions", [], async function () {
@@ -68,21 +73,6 @@ task("setup-github-actions", [], async function () {
   });
   await process.status();
   process.close();
-
-  switch (Deno.build.os) {
-    case "windows":
-      console.log("::add-path::C:\\Users\\runneradmin\\.deno\\bin");
-      break;
-    case "linux":
-      console.log("::add-path::/home/runner/.deno/bin");
-      console.log("::set-env name=SHELL::/bin/bash");
-      break;
-    case "darwin":
-      console.log("::add-path::/Users/runner/.deno/bin");
-      break;
-    default:
-      break;
-  }
 });
 
 desc("Development tools. Should ideally be run before each commit.");

deps.ts

@@ -9,37 +9,37 @@ export {
   join,
   relative,
   resolve,
-} from "https://x.nest.land/std@0.74.0/path/mod.ts";
+} from "https://x.nest.land/std@0.75.0/path/mod.ts";
 
 export {
   exists,
   existsSync,
   expandGlob,
   expandGlobSync,
   walkSync,
-} from "https://x.nest.land/std@0.74.0/fs/mod.ts";
+} from "https://x.nest.land/std@0.75.0/fs/mod.ts";
 
-export * as log from "https://x.nest.land/std@0.74.0/log/mod.ts";
+export * as log from "https://x.nest.land/std@0.75.0/log/mod.ts";
 
-export { LogRecord } from "https://x.nest.land/std@0.74.0/log/logger.ts";
+export { LogRecord } from "https://x.nest.land/std@0.75.0/log/logger.ts";
 
-export type { LevelName } from "https://x.nest.land/std@0.74.0/log/levels.ts";
-export { LogLevels } from "https://x.nest.land/std@0.74.0/log/levels.ts";
+export type { LevelName } from "https://x.nest.land/std@0.75.0/log/levels.ts";
+export { LogLevels } from "https://x.nest.land/std@0.75.0/log/levels.ts";
 
-export { BaseHandler } from "https://x.nest.land/std@0.74.0/log/handlers.ts";
+export { BaseHandler } from "https://x.nest.land/std@0.75.0/log/handlers.ts";
 
-export * from "https://x.nest.land/std@0.74.0/fmt/colors.ts";
+export * from "https://x.nest.land/std@0.75.0/fmt/colors.ts";
 
 export {
   assert,
   assertEquals,
   assertMatch,
-} from "https://x.nest.land/std@0.74.0/testing/asserts.ts";
+} from "https://x.nest.land/std@0.75.0/testing/asserts.ts";
 
 export {
   parse as parseYaml,
   stringify as stringifyYaml,
-} from "https://x.nest.land/std@0.74.0/encoding/yaml.ts";
+} from "https://x.nest.land/std@0.75.0/encoding/yaml.ts";
 
 /**************** cliffy ****************/
 export {
@@ -68,13 +68,15 @@ export * as base64 from "https://denopkg.com/chiefbiiko/[email protected]/mod.ts";
 
 /**************** hatcher ****************/
 export {
-  getLatestVersion,
+  latestVersion,
   NestLand,
   parseURL,
   UpdateNotifier,
-} from "https://x.nest.land/hatcher@0.9.2/mod.ts";
+} from "https://x.nest.land/hatcher@0.10.1/mod.ts";
 
-export { install as installHatcher } from "https://x.nest.land/[email protected]/lib/cli.ts";
+export { isVersionUnstable } from "https://x.nest.land/[email protected]/lib/utilities/utils.ts";
+
+export { install as installHatcher } from "https://x.nest.land/[email protected]/lib/cli.ts";
 
 /**************** analyzer ****************/
 export type { DependencyTree } from "https://x.nest.land/[email protected]/deno/tree.ts";

src/api/module_test.ts

@@ -17,7 +17,7 @@ Deno.test({
       ],
     });
 
-    const maze_generator = new Module({
+    const mazeGenerator = new Module({
       name: "maze_generator",
       owner: "TheWizardBear",
       description: "A module for generating mazes",
@@ -30,6 +30,6 @@ Deno.test({
     });
 
     assertEquals(eggs.getLatestVersion(), "0.1.9-rc1");
-    assertEquals(maze_generator.getLatestVersion(), "0.1.0-alpha.0");
+    assertEquals(mazeGenerator.getLatestVersion(), "0.1.0-alpha.0");
   },
 });

src/commands/info.ts

@@ -9,10 +9,12 @@ import {
   green,
   italic,
   log,
+  magenta,
   parseURL,
   red,
   resolve,
   rgb24,
+  yellow,
 } from "../../deps.ts";
 import type { DefaultOptions } from "../commands.ts";
 import { version } from "../version.ts";
@@ -29,6 +31,8 @@ const format = {
   denoLand: cyan("deno.land"),
   github: blue("github.com"),
   denopkgCom: green("denopkg.com"),
+  skypack: magenta("cdn.skypack.dev"),
+  jspm: yellow("jspm.dev"),
 };
 
 /** Info Command. */
@@ -154,6 +158,12 @@ function beautifyDependency(dep: string) {
           formatVersion(version)
         } ${formatPath(relativePath)}`;
 
+      case "cdn.skypack.dev":
+        return `${format.skypack} ${bold(name)} ${formatVersion(version)}`;
+
+      case "jspm.dev":
+        return `${format.jspm} ${bold(name)} ${formatVersion(version)}`;
+
       default:
         return dep;
     }

src/commands/publish.ts

@@ -10,6 +10,7 @@ import {
   globToRegExp,
   gray,
   green,
+  isVersionUnstable,
   italic,
   join,
   log,
@@ -98,10 +99,6 @@ async function deprecationWarnings(config: Config) {
   // no deprecated feature for the time being :)
 }
 
-function isVersionUnstable(v: string) {
-  return !((semver.major(v) === 0) || semver.prerelease(v));
-}
-
 function gatherOptions(
   options: Options,
   name?: string,

src/commands/update.ts

@@ -1,7 +1,7 @@
 import {
   Command,
-  getLatestVersion,
   green,
+  latestVersion,
   log,
   parseURL,
   semver,
@@ -76,7 +76,7 @@ export async function update(
     }
 
     // Get latest release
-    const latestRelease = await getLatestVersion(registry, name, owner);
+    const latestRelease = await latestVersion(registry, name, owner);
 
     // Basic safety net
 

src/commands/upgrade.ts

@@ -7,7 +7,11 @@ import { setupLog } from "../utilities/log.ts";
 export async function upgrade(options: DefaultOptions) {
   await setupLog(options.debug);
 
-  const newVersion = await NestLand.getLatestVersion("eggs");
+  const newVersion = await NestLand.latestVersion("eggs");
+  if (!newVersion) {
+    log.error("Could not retrieve latest version.");
+    return;
+  }
   if (semver.eq(newVersion, version)) {
     log.info("You are already using the latest CLI version!");
     return;
@@ -18,11 +22,8 @@ export async function upgrade(options: DefaultOptions) {
       "deno",
       "install",
       "--unstable",
-      "-A",
-      "-f",
-      "-n",
-      "eggs",
-      `https://x.nest.land/eggs@${newVersion}/mod.ts`,
+      "-Afq",
+      `https://x.nest.land/eggs@${newVersion}/eggs.ts`,
     ],
     stdout: "piped",
     stderr: "piped",

src/version.ts

@@ -1 +1 @@
-export const version = "0.3.1";
+export const version = "0.3.2";