mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
chore: Better user friendly error messages (#64)
This commit is contained in:
+4
-5
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/dry/log"
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
@@ -21,7 +20,7 @@ func NewBunCommand() *cobra.Command {
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executeBunFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
log.Errorf("Failed to execute bun flow: %s", err)
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -33,12 +32,12 @@ func executeBunFlow(ctx context.Context, args []string) error {
|
||||
analytics.TrackCommandBun()
|
||||
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultBunPackageManagerConfig())
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create bun package manager proxy: %s", err)
|
||||
return fmt.Errorf("failed to create bun package manager proxy: %w", err)
|
||||
}
|
||||
|
||||
config, err := config.FromContext(ctx)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to get config: %s", err)
|
||||
return fmt.Errorf("failed to get config: %w", err)
|
||||
}
|
||||
|
||||
parsedCommand, err := packageManager.ParseCommand(args)
|
||||
@@ -53,7 +52,7 @@ func executeBunFlow(ctx context.Context, args []string) error {
|
||||
|
||||
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create dependency resolver: %s", err)
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
return flows.Common(packageManager, packageResolver, config).Run(ctx, args, parsedCommand)
|
||||
|
||||
+4
-5
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/dry/log"
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
@@ -21,7 +20,7 @@ func NewNpmCommand() *cobra.Command {
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executeNpmFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
log.Errorf("Failed to execute npm flow: %s", err)
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -33,12 +32,12 @@ func executeNpmFlow(ctx context.Context, args []string) error {
|
||||
analytics.TrackCommandNpm()
|
||||
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultNpmPackageManagerConfig())
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create npm package manager proxy: %s", err)
|
||||
return fmt.Errorf("failed to create npm package manager proxy: %w", err)
|
||||
}
|
||||
|
||||
config, err := config.FromContext(ctx)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to get config: %s", err)
|
||||
return fmt.Errorf("failed to get config: %w", err)
|
||||
}
|
||||
|
||||
parsedCommand, err := packageManager.ParseCommand(args)
|
||||
@@ -53,7 +52,7 @@ func executeNpmFlow(ctx context.Context, args []string) error {
|
||||
|
||||
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create dependency resolver: %s", err)
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
return flows.Common(packageManager, packageResolver, config).Run(ctx, args, parsedCommand)
|
||||
|
||||
+6
-4
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/dry/log"
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
@@ -21,7 +20,7 @@ func NewPnpmCommand() *cobra.Command {
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executePnpmFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
log.Errorf("Failed to execute pnpm flow: %s", err)
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -33,12 +32,12 @@ func executePnpmFlow(ctx context.Context, args []string) error {
|
||||
analytics.TrackCommandPnpm()
|
||||
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultPnpmPackageManagerConfig())
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create pnpm package manager proxy: %s", err)
|
||||
return fmt.Errorf("failed to create pnpm package manager proxy: %w", err)
|
||||
}
|
||||
|
||||
config, err := config.FromContext(ctx)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to get config: %s", err)
|
||||
return fmt.Errorf("failed to get config: %w", err)
|
||||
}
|
||||
|
||||
parsedCommand, err := packageManager.ParseCommand(args)
|
||||
@@ -52,6 +51,9 @@ func executePnpmFlow(ctx context.Context, args []string) error {
|
||||
packageResolverConfig.IncludeDevDependencies = config.IncludeDevDependencies
|
||||
|
||||
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
return flows.Common(packageManager, packageResolver, config).Run(ctx, args, parsedCommand)
|
||||
}
|
||||
|
||||
+4
-5
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/dry/log"
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
@@ -21,7 +20,7 @@ func NewPipCommand() *cobra.Command {
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executePipFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
log.Errorf("Failed to execute pip flow: %s", err)
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -33,12 +32,12 @@ func executePipFlow(ctx context.Context, args []string) error {
|
||||
analytics.TrackCommandPip()
|
||||
packageManager, err := packagemanager.NewPypiPackageManager(packagemanager.DefaultPipPackageManagerConfig())
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create pip package manager: %w", err)
|
||||
return fmt.Errorf("failed to create pip package manager proxy: %w", err)
|
||||
}
|
||||
|
||||
config, err := config.FromContext(ctx)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to get config: %s", err)
|
||||
return fmt.Errorf("failed to get config: %w", err)
|
||||
}
|
||||
|
||||
parsedCommand, err := packageManager.ParseCommand(args)
|
||||
@@ -55,7 +54,7 @@ func executePipFlow(ctx context.Context, args []string) error {
|
||||
|
||||
packageResolver, err := packagemanager.NewPypiDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create dependency resolver: %s", err)
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
return flows.Common(packageManager, packageResolver, config).Run(ctx, args, parsedCommand)
|
||||
|
||||
+3
-5
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/dry/log"
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
@@ -21,7 +20,7 @@ func NewUvCommand() *cobra.Command {
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executeUvFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
log.Errorf("Failed to execute uv flow: %s", err)
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -38,7 +37,7 @@ func executeUvFlow(ctx context.Context, args []string) error {
|
||||
|
||||
config, err := config.FromContext(ctx)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to get config: %s", err)
|
||||
return fmt.Errorf("failed to get config: %w", err)
|
||||
}
|
||||
|
||||
parsedCommand, err := packageManager.ParseCommand(args)
|
||||
@@ -46,7 +45,6 @@ func executeUvFlow(ctx context.Context, args []string) error {
|
||||
return fmt.Errorf("failed to parse command: %w", err)
|
||||
}
|
||||
|
||||
// Parse the args right here
|
||||
packageResolverConfig := packagemanager.NewDefaultPypiDependencyResolverConfig()
|
||||
packageResolverConfig.IncludeTransitiveDependencies = config.Transitive
|
||||
packageResolverConfig.TransitiveDepth = config.TransitiveDepth
|
||||
@@ -55,7 +53,7 @@ func executeUvFlow(ctx context.Context, args []string) error {
|
||||
|
||||
packageResolver, err := packagemanager.NewPypiDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
ui.Fatalf("Failed to create dependency resolver: %s", err)
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
return flows.Common(packageManager, packageResolver, config).Run(ctx, args, parsedCommand)
|
||||
|
||||
+4
-2
@@ -32,7 +32,8 @@ func NewInstallCommand() *cobra.Command {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
aliasManager := alias.New(*config, rcFileManager)
|
||||
|
||||
aliasManager := alias.New(config, rcFileManager)
|
||||
return aliasManager.Install()
|
||||
},
|
||||
}
|
||||
@@ -48,7 +49,8 @@ func NewRemoveCommand() *cobra.Command {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
aliasManager := alias.New(*config, rcFileManager)
|
||||
|
||||
aliasManager := alias.New(config, rcFileManager)
|
||||
return aliasManager.Remove()
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user