Update

1 files changed, 14 insertions, 27 deletions

diff --git a/commands/upgrade.js b/commands/upgrade.js
index cf8bd0b..7dcdb4a 100644
--- a/commands/upgrade.js
+++ b/commands/upgrade.js
@@ -13,7 +13,6 @@ module.exports = async (argv) => {
             let installable = true;
             let dir = pack.id.substring(0, 1).replace(/[^a-zA-Z0-9]/gm, "#");
             let pkg = JSON.parse(fs.readFileSync(home + "/repository/" + dir + "/" + pack.id + ".json").toString());
-            console.log("  " + pkg.name + " (" + pkg.id + ")")
             if ((argv.package !== undefined && argv.package === pack.id) || argv.package === undefined) {
                 updated = true;
                 if (os.platform() === "win32" && pkg.platforms.windows === 0) {
@@ -52,41 +51,29 @@ module.exports = async (argv) => {
                 spinner.succeed("Checking dependencies... done")
 
                 if (installable) {
-                    spinner = ora("Fetching latest version...").start();
-                    let version = (await axios.get(pkg.version)).data.commit.short_id;
-                    let publisher = (await axios.get(pkg.version)).data.commit.author_name;
-                    let publisherMail = (await axios.get(pkg.version)).data.commit.author_email;
-                    let date = moment((await axios.get(pkg.version)).data.commit.created_at).fromNow();
+                    let version = pkg.verdata.latest;
+                    let publisher = pkg.verdata.publisher.name;
+                    let publisherMail = pkg.verdata.publisher.email;
+                    let date = moment(pkg.verdata.date).fromNow();
 
                     let signed = false;
                     let signInfo = "";
                     let verified = false;
 
-                    let signRaw = { error: "404 Not Found" };
-                    try {
-                        signRaw = (await axios.get(pkg.signature.replace("{version}", (await axios.get(pkg.version)).data.commit.id))).data;
-                    } catch (e) {}
-
-                    if (signRaw.error !== "404 Not Found") {
+                    if (pkg.sign.signed) {
                         signed = true;
-                        if (signRaw.verification_status === "verified") {
-                            verified = true;
-                        } else {
-                            verified = false;
-                        }
-                        if (signRaw.gpg_key_user_name && signRaw.gpg_key_user_email && signRaw.gpg_key_primary_keyid) {
-                            signInfo = signRaw.gpg_key_user_name + " <" + signRaw.gpg_key_user_email + "> " + c.gray("(" + signRaw.gpg_key_primary_keyid + ")");
-                        } else if (signRaw.gpg_key_user_name && signRaw.gpg_key_primary_keyid) {
-                            signInfo = signRaw.gpg_key_user_name + c.gray(" (" + signRaw.gpg_key_primary_keyid + ")");
-                        } else if (signRaw.gpg_key_user_email && signRaw.gpg_key_primary_keyid) {
-                            signInfo = signRaw.gpg_key_user_email + c.gray(" (" + signRaw.gpg_key_primary_keyid + ")");
-                        } else if (signRaw.gpg_key_primary_keyid) {
-                            signInfo = signRaw.gpg_key_primary_keyid;
+                        verified = pkg.sign.verified;
+                        if (pkg.sign.signer.name && pkg.sign.signer.email && pkg.sign.key) {
+                            signInfo = pkg.sign.signer.name + " <" + pkg.sign.signer.email + "> " + c.gray("(" + pkg.sign.key + ")");
+                        } else if (pkg.sign.signer.name && pkg.sign.key) {
+                            signInfo = pkg.sign.signer.name + c.gray(" (" + pkg.sign.key + ")");
+                        } else if (pkg.sign.signer.email && pkg.sign.key) {
+                            signInfo = pkg.sign.signer.email + c.gray(" (" + pkg.sign.key + ")");
+                        } else if (pkg.sign.key) {
+                            signInfo = pkg.sign.key;
                         }
                     }
 
-                    spinner.succeed("Fetching latest version... done");
-
                     if (pack.version !== version) {
                         console.log("  Installing '" + pkg.name + "'...")
                         console.log("      version:   " + pack.version + " -> " + version);