Merge pull request #331 from metrumresearchgroup/feature/2.0.2-validation

Author: dpastoor

.gitignore

@@ -5,5 +5,4 @@ logfile.txt
 .idea
 pkgr
 pkgr.go
-pkgr.yml
 goreleaser.yml

cmd/add_test.go

@@ -14,140 +14,127 @@
 
 package cmd
 
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-
-	"github.com/spf13/afero"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/assert"
-)
-
-type pkgData struct {
-	name   string
-	folder string
-}
-
-type testData struct {
-	ymlfolder string
-	data      []pkgData
-}
-
-func Test_rAddAndDelete(t *testing.T) {
-	type args struct {
-		ccmd *cobra.Command
-		args []string
-	}
-
-	tests := []testData{
-		{
-			ymlfolder: "testsite/golden/simple",
-			data: []pkgData{
-				{
-					name:   "R6",
-					folder: "testsite/golden/simple/test-library/shiny",
-				},
-				{
-					name:   "jsonlite",
-					folder: "testsite/golden//simple/test-library/abc",
-				},
-			},
-		},
-		// Note: before adding a test, make sure the base test "pkgr install" works before testing "pkgr add --install"
-	}
-	fs := afero.NewOsFs()
-	//fs := afero.NewMemMapFs()
-	pkgrYamlContent := []byte(`
-Version: 1
-
-Packages:
-  - fansi
-Repos:
-  - MPN: "https://mpn.metworx.com/snapshots/stable/2019-12-02"
-
-Library: "test-library"
-`)
-
-	afero.WriteFile(fs, "testsite/golden/simple/pkgr.yml", pkgrYamlContent, 0755)
-
-	defer fs.RemoveAll("testsite/golden/simple/test-library")
-	for _, tt := range tests {
-
-		ymlFilename := filepath.Join(tt.ymlfolder, "pkgr.yml")
-		b, _ := afero.Exists(fs, ymlFilename)
-		assert.Equal(t, true, b, fmt.Sprintf("yml file not found:%s", ymlFilename))
-		ymlStart, _ := afero.ReadFile(fs, ymlFilename)
-
-		t.Log("testing add ...")
-		errstr, err := pkgrCommand("add", tt, "--install")
-		assert.Equal(t, nil, err, fmt.Sprintf("Package add error. Check state of yml file <%s>. <%s> ", tt.ymlfolder, errstr))
-
-		for _, d := range tt.data {
-			b, _ := afero.FileContainsBytes(fs, filepath.Join(tt.ymlfolder, "pkgr.yml"), []byte(d.name))
-			installed, _ := afero.DirExists(fs, filepath.Join(tt.ymlfolder, "test-library", d.name)) // make sure packages were installed with --install flag
-			assert.Equal(t, true, b, fmt.Sprintf("Package not added:%s", d.name))
-			assert.Equal(t, true, installed, fmt.Sprintf("Package not installed after being added:%s", d.name))
-		}
-
-		t.Log("testing remove ...")
-		errstr, err = pkgrCommand("remove", tt, "")
-		assert.Equal(t, nil, err, fmt.Sprintf("Package remove error. Check state of yml file <%s>. <%s> ", tt.ymlfolder, errstr))
-
-		for _, d := range tt.data {
-			b, _ := afero.FileContainsBytes(fs, filepath.Join(tt.ymlfolder, "pkgr.yml"), []byte(d.name))
-			assert.Equal(t, !true, b, fmt.Sprintf("Package not removed:%s", d.name))
-		}
-
-		t.Log("testing pkgr.yml for difference ...")
-		ymlEnd, _ := afero.ReadFile(fs, ymlFilename)
-		n := bytes.Compare(cleanWs(ymlStart), cleanWs(ymlEnd))
-		assert.Equal(t, 0, n, fmt.Sprintf("Yml file differs"))
-
-		t.Log("restoring yml file ...")
-		fi, _ := os.Stat(ymlFilename)
-		err = afero.WriteFile(fs, ymlFilename, ymlStart, fi.Mode())
-		assert.Equal(t, nil, err, "Error restoring yml file")
-	}
-}
-
-func pkgrCommand(cmd string, test testData, flag string) (string, error) {
-	var stderr bytes.Buffer
-	pkgr := filepath.Join(os.Getenv("HOME"), "/go/bin/pkgr")
-	args := []string{cmd}
-	for _, d := range test.data {
-		args = append(args, d.name)
-	}
-
-	if len(flag) > 0 {
-		args = append(args, flag)
-	}
-
-	command := exec.Command(pkgr, args...)
-	command.Dir = test.ymlfolder
-	command.Stderr = &stderr
-
-	err := command.Run()
-	errstr := string(stderr.Bytes())
-	return errstr, err
-}
+//type pkgData struct {
+//	name   string
+//	folder string
+//}
+//
+//type testData struct {
+//	ymlfolder string
+//	data      []pkgData
+//}
+
+//func Test_rAddAndDelete(t *testing.T) {
+//	type args struct {
+//		ccmd *cobra.Command
+//		args []string
+//	}
+//
+//	tests := []testData{
+//		{
+//			ymlfolder: "testsite/golden/simple",
+//			data: []pkgData{
+//				{
+//					name:   "R6",
+//					folder: "testsite/golden/simple/test-library/shiny",
+//				},
+//				{
+//					name:   "jsonlite",
+//					folder: "testsite/golden//simple/test-library/abc",
+//				},
+//			},
+//		},
+//		// Note: before adding a test, make sure the base test "pkgr install" works before testing "pkgr add --install"
+//	}
+//	fs := afero.NewOsFs()
+//	//fs := afero.NewMemMapFs()
+//	pkgrYamlContent := []byte(`
+//Version: 1
+//
+//Packages:
+//  - fansi
+//Repos:
+//  - MPN: "https://mpn.metworx.com/snapshots/stable/2019-12-02"
+//
+//Library: "test-library"
+//`)
+//
+//	afero.WriteFile(fs, "testsite/golden/simple/pkgr.yml", pkgrYamlContent, 0755)
+//
+//	defer fs.RemoveAll("testsite/golden/simple/test-library")
+//	for _, tt := range tests {
+//
+//		ymlFilename := filepath.Join(tt.ymlfolder, "pkgr.yml")
+//		b, _ := afero.Exists(fs, ymlFilename)
+//		assert.Equal(t, true, b, fmt.Sprintf("yml file not found:%s", ymlFilename))
+//		ymlStart, _ := afero.ReadFile(fs, ymlFilename)
+//
+//		t.Log("testing add ...")
+//		errstr, err := pkgrCommand("add", tt, "--install")
+//		assert.Equal(t, nil, err, fmt.Sprintf("Package add error. Check state of yml file <%s>. <%s> ", tt.ymlfolder, errstr))
+//
+//		for _, d := range tt.data {
+//			b, _ := afero.FileContainsBytes(fs, filepath.Join(tt.ymlfolder, "pkgr.yml"), []byte(d.name))
+//			installed, _ := afero.DirExists(fs, filepath.Join(tt.ymlfolder, "test-library", d.name)) // make sure packages were installed with --install flag
+//			assert.Equal(t, true, b, fmt.Sprintf("Package not added:%s", d.name))
+//			assert.Equal(t, true, installed, fmt.Sprintf("Package not installed after being added:%s", d.name))
+//		}
+//
+//		t.Log("testing remove ...")
+//		errstr, err = pkgrCommand("remove", tt, "")
+//		assert.Equal(t, nil, err, fmt.Sprintf("Package remove error. Check state of yml file <%s>. <%s> ", tt.ymlfolder, errstr))
+//
+//		for _, d := range tt.data {
+//			b, _ := afero.FileContainsBytes(fs, filepath.Join(tt.ymlfolder, "pkgr.yml"), []byte(d.name))
+//			assert.Equal(t, !true, b, fmt.Sprintf("Package not removed:%s", d.name))
+//		}
+//
+//		t.Log("testing pkgr.yml for difference ...")
+//		ymlEnd, _ := afero.ReadFile(fs, ymlFilename)
+//		n := bytes.Compare(cleanWs(ymlStart), cleanWs(ymlEnd))
+//		assert.Equal(t, 0, n, fmt.Sprintf("Yml file differs"))
+//
+//		t.Log("restoring yml file ...")
+//		fi, _ := os.Stat(ymlFilename)
+//		err = afero.WriteFile(fs, ymlFilename, ymlStart, fi.Mode())
+//		assert.Equal(t, nil, err, "Error restoring yml file")
+//	}
+//}
+
+//func pkgrCommand(cmd string, test testData, flag string) (string, error) {
+//	var stderr bytes.Buffer
+//	pkgr := filepath.Join(os.Getenv("HOME"), "/go/bin/pkgr")
+//	args := []string{cmd}
+//	for _, d := range test.data {
+//		args = append(args, d.name)
+//	}
+//
+//	if len(flag) > 0 {
+//		args = append(args, flag)
+//	}
+//
+//	command := exec.Command(pkgr, args...)
+//	command.Dir = test.ymlfolder
+//	command.Stderr = &stderr
+//
+//	err := command.Run()
+//	errstr := string(stderr.Bytes())
+//	return errstr, err
+//}
 
 // cleanWs removes blank lines and leading and trailing white space
 // it makes the above bytes.Compare(..) equivilent to: /usr/bin/diff -wB
-func cleanWs(b []byte) []byte {
-	var cb []byte
-	lines := bytes.Split(b, []byte("\n"))
-	for _, line := range lines {
-		tl := bytes.Trim(line, " ")
-		if len(tl) > 0 {
-			cb = append(cb, line...)
-		}
-	}
-	return cb
-}
+//func cleanWs(b []byte) []byte {
+//	var cb []byte
+//	lines := bytes.Split(b, []byte("\n"))
+//	for _, line := range lines {
+//		tl := bytes.Trim(line, " ")
+//		if len(tl) > 0 {
+//			cb = append(cb, line...)
+//		}
+//	}
+//	return cb
+//}
 
 // // saving in case ...
 // func diff(file1, file2 string) bool {

cmd/install_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -39,12 +40,14 @@ func InitializeGoldenTestSiteWorking(goldenSet string) string {
 
 // Initializes a symlink to "test-library" in the testsite for the goldenSet. Links to the provided LibraryToUse and returns the symlink.
 func InitializeTestLibrary(goldenSet, libraryToUse string) string {
-	fs := &afero.OsFs{}
+	//fs := &afero.OsFs{}
 
-	testLibrary := filepath.Join("testsite", "working", goldenSet, "test-library")
-	err := fs.SymlinkIfPossible(testLibrary, libraryToUse)
+	testLibrary := filepath.Join("testsite", "working", "test-library")
+	err := os.Symlink(libraryToUse, testLibrary)
+	//err := fs.SymlinkIfPossible(testLibrary, libraryToUse)
 	if err != nil {
-		fmt.Errorf("error creating symlink for test library: %s", err)
+		fmt.Sprintf("error creating symlink for test library: %s", err)
+		panic("could not symlink test-library")
 	}
 	return testLibrary
 

cmd/load_test.go

@@ -34,7 +34,14 @@ func TestLoadSucceeds(t *testing.T) {
 
 			// Setup
 			rDir := InitializeGoldenTestSiteWorking("load")
-			libraryPath := InitializeTestLibrary("load", filepath.Join("testsite", "golden", "load", "test-library-4.0"))// set library to "test-library-3.0" if user R 3.X
+
+			// Needed for symlinking library
+			globalPathPrefix, err := filepath.Abs("./")
+			if err != nil {
+				t.Fail()
+			}
+
+			libraryPath := InitializeTestLibrary("load", filepath.Join(globalPathPrefix, "testsite", "golden", "load", "test-library-4.0"))// set library to "test-library-3.0" if user R 3.X
 			InitializeGlobalsForTest()
 
 			localRepoPath := filepath.Join("..", "localrepos", "simple")
@@ -102,7 +109,14 @@ func TestLoadFails(t *testing.T) {
 			// Setup
 			rDir := InitializeGoldenTestSiteWorking("load-fail")
 			InitializeGlobalsForTest()
-			libraryPath := InitializeTestLibrary("load-fail", filepath.Join("testsite", "golden", "load-fail", "test-library-4.0"))// set library to "test-library-3.0" if user R 3.X
+
+			// Needed for symlinking library
+			globalPathPrefix, err := filepath.Abs("./")
+			if err != nil {
+				t.Fail()
+			}
+
+			libraryPath := InitializeTestLibrary("load", filepath.Join(globalPathPrefix, "testsite", "golden", "load-fail", "test-library-4.0"))// set library to "test-library-3.0" if user R 3.X
 			localRepoPath := filepath.Join("..", "localrepos", "simple")
 
 			userPackages := []string{

cmd/root.go

@@ -28,7 +28,7 @@ import (
 )
 
 // VERSION is the current pkgr version
-var VERSION = "2.0.1"
+var VERSION = "2.0.2"
 
 var fs afero.Fs
 var cfg configlib.PkgrConfig

cmd/testsite/golden/load-fail/test-library-4.0/R6/DESCRIPTION

@@ -22,7 +22,7 @@ Maintainer: Winston Chang <winston@stdout.org>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2019-02-14 19:42:14 UTC
-Built: R 4.0.2; ; 2021-01-07 00:21:53 UTC; unix
+Built: R 4.0.2; ; 2021-01-07 00:26:02 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple

cmd/testsite/golden/load-fail/test-library-4.0/R6/Meta/package.rds

@@ -22,7 +22,7 @@ Maintainer: Hadley Wickham <hadley@rstudio.com>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2019-03-21 14:53:46 UTC
-Built: R 4.0.2; ; 2021-01-07 00:21:58 UTC; unix
+Built: R 4.0.2; ; 2021-01-07 00:26:02 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple

cmd/testsite/golden/load-fail/test-library-4.0/R6/help/R6.rdb

@@ -27,7 +27,7 @@ Maintainer: Gábor Csárdi <csardi.gabor@gmail.com>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2019-03-19 10:43:26 UTC
-Built: R 4.0.2; ; 2021-01-07 00:22:02 UTC; unix
+Built: R 4.0.2; ; 2021-01-07 00:26:06 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple

cmd/testsite/golden/load-fail/test-library-4.0/R6/help/R6.rdx

@@ -33,7 +33,7 @@ Maintainer: Gábor Csárdi <csardi.gabor@gmail.com>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2017-09-16 19:49:46 UTC
-Built: R 4.0.2; ; 2021-01-07 00:21:59 UTC; unix
+Built: R 4.0.2; ; 2021-01-07 00:26:04 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple

cmd/testsite/golden/load-fail/test-library-4.0/R6/help/paths.rds

@@ -32,7 +32,7 @@ Maintainer: Brodie Gaslam <brodie.gaslam@yahoo.com>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2018-10-05 05:10:12 UTC
-Built: R 4.0.2; x86_64-apple-darwin17.0; 2021-01-07 00:21:49 UTC; unix
+Built: R 4.0.2; x86_64-apple-darwin17.0; 2021-01-07 00:25:54 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple

cmd/testsite/golden/load-fail/test-library-4.0/assertthat/DESCRIPTION

@@ -33,7 +33,7 @@ Maintainer: Kirill Müller <krlmlr+r@mailbox.org>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2018-12-15 17:00:03 UTC
-Built: R 4.0.2; ; 2021-01-07 00:22:04 UTC; unix
+Built: R 4.0.2; ; 2021-01-07 00:26:08 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple

cmd/testsite/golden/load-fail/test-library-4.0/assertthat/Meta/package.rds

@@ -29,7 +29,7 @@ Maintainer: Lionel Henry <lionel@rstudio.com>
 OriginalRepository: CRAN
 Repository: local
 Date/Publication: 2019-04-07 09:30:15 UTC
-Built: R 4.0.2; x86_64-apple-darwin17.0; 2021-01-07 00:21:50 UTC; unix
+Built: R 4.0.2; x86_64-apple-darwin17.0; 2021-01-07 00:25:54 UTC; unix
 PkgrVersion: v2.0.1
 PkgrInstallType: binary
 PkgrRepositoryURL: ../../../../localrepos/simple