wip: move code from planInstall to new function configlib.SetPlanCust…

…omizations
metrumresearchgroup · Aug 16, 2019 · 3574212 · 3574212
1 parent b836707
commit 3574212
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 42 deletions.
diff --git a/cmd/plan.go b/cmd/plan.go
@@ -16,6 +16,7 @@ package cmd
 
 import (
 	"fmt"
+
 	"github.com/metrumresearchgroup/pkgr/rollback"
 
 	"github.com/metrumresearchgroup/pkgr/desc"
@@ -111,46 +112,7 @@ func planInstall(rv cran.RVersion, exitOnMissing bool) (*cran.PkgNexus, gpsr.Ins
 	}
 
 	dependencyConfigurations := gpsr.NewDefaultInstallDeps()
-
-	if cfg.Suggests {
-		for _, pkg := range cfg.Packages {
-			// set all top level packages to install suggests
-			dp := dependencyConfigurations.Default
-			dp.Suggests = true
-			dependencyConfigurations.Deps[pkg] = dp
-		}
-	}
-	if viper.Sub("Customizations") != nil && viper.Sub("Customizations").AllSettings()["packages"] != nil {
-
-		pkgSettings := viper.Sub("Customizations").AllSettings()["packages"].([]interface{})
-		//repoSettings := viper.Sub("Customizations").AllSettings()["packages"].([]interface{})
-
-		for pkg, v := range cfg.Customizations.Packages {
-			if configlib.IsCustomizationSet("Suggests", pkgSettings, pkg) {
-				pkgDepTypes := dependencyConfigurations.Default
-				pkgDepTypes.Suggests = v.Suggests
-				dependencyConfigurations.Deps[pkg] = pkgDepTypes
-			}
-			if configlib.IsCustomizationSet("Repo", pkgSettings, pkg) {
-				err := pkgNexus.SetPackageRepo(pkg, v.Repo)
-				if err != nil {
-					log.WithFields(log.Fields{
-						"pkg":  pkg,
-						"repo": v.Repo,
-					}).Fatal("error finding custom repo to set")
-				}
-			}
-			if configlib.IsCustomizationSet("Type", pkgSettings, pkg) {
-				err := pkgNexus.SetPackageType(pkg, v.Type)
-				if err != nil {
-					log.WithFields(log.Fields{
-						"pkg":  pkg,
-						"repo": v.Repo,
-					}).Fatal("error finding custom repo to set")
-				}
-			}
-		}
-	}
+	configlib.SetPlanCustomizations(cfg, dependencyConfigurations, pkgNexus)
 
 	availableUserPackages := pkgNexus.GetPackages(cfg.Packages)
 	if len(availableUserPackages.Missing) > 0 {
@@ -223,8 +185,8 @@ func planInstall(rv cran.RVersion, exitOnMissing bool) (*cran.PkgNexus, gpsr.Ins
 	log.WithFields(fields).Info("package installation sources")
 
 	log.WithFields(log.Fields{
-		"to_install":   toInstall,
-		"to_update": pkgsToUpdateCount,
+		"to_install": toInstall,
+		"to_update":  pkgsToUpdateCount,
 	}).Info("package installation plan")
 
 	if toInstall > 0 && toInstall != totalPackagesRequired {

diff --git a/configlib/config.go b/configlib/config.go
@@ -7,7 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/metrumresearchgroup/pkgr-work/feature_lockfile-cfg/pkgr/configlib"
 	"github.com/metrumresearchgroup/pkgr/cran"
+	"github.com/metrumresearchgroup/pkgr/gpsr"
 	"github.com/metrumresearchgroup/pkgr/rcmd"
 	homedir "github.com/mitchellh/go-homedir"
 	log "github.com/sirupsen/logrus"
@@ -215,3 +217,50 @@ func SetCustomizations(rSettings rcmd.RSettings, cfg PkgrConfig) rcmd.RSettings
 	}
 	return rSettings
 }
+
+// SetPlanCustomizations ...
+func SetPlanCustomizations(cfg PkgrConfig, dependencyConfigurations gpsr.InstallDeps, pkgNexus *cran.PkgNexus) {
+	if cfg.Suggests {
+		log.Info("SetPlanCustomizations suggests")
+		for _, pkg := range cfg.Packages {
+			// set all top level packages to install suggests
+			dp := dependencyConfigurations.Default
+			dp.Suggests = true
+			dependencyConfigurations.Deps[pkg] = dp
+		}
+	}
+	if viper.Sub("Customizations") != nil && viper.Sub("Customizations").AllSettings()["packages"] != nil {
+		log.Info("SetPlanCustomizations viper")
+		pkgSettings := viper.Sub("Customizations").AllSettings()["packages"].([]interface{})
+		//repoSettings := viper.Sub("Customizations").AllSettings()["packages"].([]interface{})
+
+		for pkg, v := range cfg.Customizations.Packages {
+			if configlib.IsCustomizationSet("Suggests", pkgSettings, pkg) {
+				pkgDepTypes := dependencyConfigurations.Default
+				pkgDepTypes.Suggests = v.Suggests
+				dependencyConfigurations.Deps[pkg] = pkgDepTypes
+				log.Info("SetPlanCustomizations viper Suggests ")
+			}
+			if configlib.IsCustomizationSet("Repo", pkgSettings, pkg) {
+				err := pkgNexus.SetPackageRepo(pkg, v.Repo)
+				if err != nil {
+					log.WithFields(log.Fields{
+						"pkg":  pkg,
+						"repo": v.Repo,
+					}).Fatal("error finding custom repo to set")
+				}
+				log.Info("SetPlanCustomizations viper Repo ")
+			}
+			if configlib.IsCustomizationSet("Type", pkgSettings, pkg) {
+				err := pkgNexus.SetPackageType(pkg, v.Type)
+				if err != nil {
+					log.WithFields(log.Fields{
+						"pkg":  pkg,
+						"repo": v.Repo,
+					}).Fatal("error finding custom repo to set")
+				}
+				log.Info("SetPlanCustomizations viper Type ")
+			}
+		}
+	}
+}
diff --git a/pkgr_ws.code-workspace b/pkgr_ws.code-workspace
@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}