pushing for Eric

Author: jfeingold35

src/commands/plugins/index.ts

@@ -28,6 +28,7 @@ export default class PluginsIndex extends Command {
     })
 
     let plugins = this.config.getPluginsList()
+    console.log(`config returned this many ${plugins.length} and they were ${plugins.map(p => p.name).join(', ')}`)
     sortBy(plugins, (p) => this.plugins.friendlyName(p.name))
     if (!flags.core) {
       plugins = plugins.filter((p) => p.type !== 'core' && p.type !== 'dev')

src/plugins.ts

@@ -164,8 +164,14 @@ export default class Plugins {
         const {dependencies} = await this.pjson()
         const {default: npa} = await import('npm-package-arg')
         const normalizedUrl = npa(url)
+        console.log(`=======`)
+
+        console.log(`target is ${JSON.stringify(normalizedUrl)}`)
+
+
         const matches = Object.entries(dependencies ?? {}).find(([, npmVersion]) => {
           const normalized = npa(npmVersion)
+          console.log(`comparing to ${npmVersion}, ${JSON.stringify(normalized)}`)
           if (normalized.type !== normalizedUrl.type) {
             return false
           }
@@ -182,6 +188,7 @@ export default class Plugins {
             normalized.hosted?.project === normalizedUrl.hosted?.project
           )
         })
+        console.log(`=======`)
 
         const installedPluginName = matches?.[0]
         if (!installedPluginName) throw new Errors.CLIError(`Could not find plugin name for ${url}`)
@@ -217,14 +224,12 @@ export default class Plugins {
         }
       } else {
         // npm
-        console.log(`L219`)
         const range = validRange(tag)
         const unfriendly = this.unfriendlyName(name)
         if (unfriendly && (await this.npmHasPackage(unfriendly))) {
           name = unfriendly
         }
 
-        console.log(`L226`)
         // validate that the package name exists in the npm registry before installing
         await this.npmHasPackage(name, true)
 
@@ -237,17 +242,13 @@ export default class Plugins {
           root: join(this.config.dataDir, 'node_modules', name),
           userPlugins: false,
         })
-        console.log(`L239`)
         this.debug(`finished loading plugin ${name} at root ${plugin.root}`)
         notifyUser(plugin, output)
         this.isValidPlugin(plugin)
-        console.log(`L243`)
         await this.add({name, tag: range ?? tag, type: 'user'})
       }
 
-      console.log(`L246`)
       await rm(join(this.config.dataDir, 'yarn.lock'), {force: true})
-      console.log(`L248`)
       console.log(`ending psjon ${JSON.stringify(await this.pjson(), null, 2)}`)
       return plugin
     } catch (error: unknown) {

test/integration/install.integration.ts

@@ -159,9 +159,13 @@ describe('install/uninstall integration tests', () => {
       const {result, stdout} = await runCommand<Array<{name: string}>>('plugins')
       expect(stdout).to.contain(pluginShortName)
       expect(result?.some((r) => r.name === plugin)).to.be.true
+      await runCommand(`plugins install ${otherPlugin}`)
+      const {stdout: otherStdout} = await runCommand<Array<{name: string}>>('plugins')
+      expect(otherStdout).to.contain(otherPlugin)
     })
 
     it('should uninstall plugin from github', async () => {
+      await runCommand(`plugins uninstall ${otherPlugin}`)
       await runCommand(`plugins uninstall ${plugin}`)
       const {result, stdout} = await runCommand<Array<{name: string}>>('plugins')
       expect(stdout).to.contain('No plugins installed.')
@@ -185,7 +189,7 @@ describe('install/uninstall integration tests', () => {
     })
   })
 
-  describe('multiple plugins sequentially', async () => {
+  describe('multiple plugins sequentially', () => {
     /**
      * This is a test for @W-21915680@, a bizarre bug wherein if you installed a plugin from the registry by its true name,
      * and then installed a local tarball whose package name is alphabetically after the previous one, the local tarball
@@ -212,6 +216,7 @@ describe('install/uninstall integration tests', () => {
       console.log(`third add stdout: ${thirdAdd}`)
       const {result: thirdResult, stdout: thirdStdout} = await runCommand<Array<{name: string}>>('plugins')
       expect(thirdStdout).to.contain(pluginShortName)
+      console.log(`plugins stdout is ${thirdStdout}`)
       expect(thirdResult?.some((r) => r.name === otherPlugin)).to.be.true
       expect(thirdResult?.some((r) => r.name === yetAnotherPlugin)).to.be.true
       expect(thirdResult?.some((r) => r.name === plugin)).to.be.true
@@ -261,6 +266,7 @@ describe('install/uninstall integration tests', () => {
 
   describe('legacy plugin', () => {
     it('should install legacy plugin', async () => {
+      /*
       const {stdout: firstAdd} = await runCommand('plugins install @oclif/plugin-legacy')
       const {stdout: secondAdd} = await runCommand('plugins install @heroku-cli/plugin-ps-exec --silent')
       console.log(`firstStdout: ${firstAdd}`)
@@ -269,6 +275,30 @@ describe('install/uninstall integration tests', () => {
       console.log(`stdout is ${stdout}`)
       expect(stdout).to.contain('@heroku-cli/plugin-ps-exec')
       expect(result?.some((r) => r.name === '@heroku-cli/plugin-ps-exec')).to.be.true
+
+     */
+      const {stdout: otherAdd} = await runCommand('plugins install @oclif/plugin-version')
+      console.log(`===== stdout from adding @oclif/plugin-version===\n${otherAdd}\n====`)
+
+
+      const {stdout: otherPlugins} = await runCommand<Array<{ name: string}>>('plugins')
+      console.log(`====== stdout from plugins call after that======\n${otherPlugins}\n======`)
+
+
+
+      const {stdout: firstAdd} = await runCommand('plugins install @oclif/plugin-legacy')
+      const {result: firstResult, stdout: firstPlugins} = await runCommand<Array<{ name: string }>>('plugins')
+      console.log(`===== stdout from adding @oclif/plugin-legacy =====\n${firstAdd}\n=======`)
+      console.log(`=== stdout from running plugins command the first time ===\n${firstPlugins}\n====`)
+      expect(firstPlugins).to.contain('@oclif/plugin-legacy')
+      expect(firstResult?.some((r) => r.name === '@oclif/plugin-legacy')).to.be.true
+
+      const {stdout: secondAdd} = await runCommand('plugins install @heroku-cli/plugin-ps-exec --silent')
+      console.log(`====== stdout from adding @heroku-cli/plugins-ps-exec --silent =====\n${secondAdd}\n==========`)
+      const {result, stdout} = await runCommand<Array<{ name: string }>>('plugins')
+      console.log(`====== stdout from running plugins command the second time ====\n${stdout}\n=====`)
+      expect(stdout).to.contain('@heroku-cli/plugin-ps-exec')
+      expect(result?.some((r) => r.name === '@heroku-cli/plugin-ps-exec')).to.be.true
     })
   })
 })