From a18c6e815c32f41115385dc39e89b108a02707ed Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Fri, 11 Nov 2022 09:42:53 -0500
Subject: [PATCH] Fix lack of separators for `pnpm`/`npm`/`yarn` (#170)

---
 src/steps/node.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/steps/node.rs b/src/steps/node.rs
index 29908108..190739a8 100644
--- a/src/steps/node.rs
+++ b/src/steps/node.rs
@@ -22,13 +22,6 @@ enum NPMVariant {
 }
 
 impl NPMVariant {
-    const fn long_name(&self) -> &str {
-        match self {
-            NPMVariant::Npm => "Node Package Manager",
-            NPMVariant::Pnpm => "PNPM",
-        }
-    }
-
     const fn short_name(&self) -> &str {
         match self {
             NPMVariant::Npm => "npm",
@@ -96,7 +89,6 @@ impl NPM {
     }
 
     fn upgrade(&self, run_type: RunType, use_sudo: bool) -> Result<()> {
-        print_separator(self.variant.long_name());
         let args = ["update", self.global_location_arg()];
         if use_sudo {
             run_type.execute("sudo").args(args).status_checked()?;
@@ -155,7 +147,6 @@ impl Yarn {
     }
 
     fn upgrade(&self, run_type: RunType, use_sudo: bool) -> Result<()> {
-        print_separator("Yarn Package Manager");
         let args = ["global", "upgrade"];
 
         if use_sudo {
@@ -216,6 +207,8 @@ fn should_use_sudo_yarn(yarn: &Yarn, ctx: &ExecutionContext) -> Result<bool> {
 pub fn run_npm_upgrade(ctx: &ExecutionContext) -> Result<()> {
     let npm = require("npm").map(|b| NPM::new(b, NPMVariant::Npm))?;
 
+    print_separator("Node Package Manager");
+
     #[cfg(target_os = "linux")]
     {
         npm.upgrade(ctx.run_type(), should_use_sudo(&npm, ctx)?)
@@ -230,6 +223,8 @@ pub fn run_npm_upgrade(ctx: &ExecutionContext) -> Result<()> {
 pub fn run_pnpm_upgrade(ctx: &ExecutionContext) -> Result<()> {
     let pnpm = require("pnpm").map(|b| NPM::new(b, NPMVariant::Pnpm))?;
 
+    print_separator("Node Package Manager");
+
     #[cfg(target_os = "linux")]
     {
         pnpm.upgrade(ctx.run_type(), should_use_sudo(&pnpm, ctx)?)
@@ -249,6 +244,8 @@ pub fn run_yarn_upgrade(ctx: &ExecutionContext) -> Result<()> {
         return Ok(());
     }
 
+    print_separator("Yarn Package Manager");
+
     #[cfg(target_os = "linux")]
     {
         yarn.upgrade(ctx.run_type(), should_use_sudo_yarn(&yarn, ctx)?)