New runtime context

yourbase · May 15, 2020 · f6ce924 · f6ce924
1 parent 16af1ae
commit f6ce924
Show file tree

Hide file tree

Showing 50 changed files with 2,390 additions and 1,517 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ yb
 .DS_Store
 release
 .vscode
+.env
+.vscode
diff --git a/.yourbase.yml b/.yourbase.yml
@@ -1,6 +1,6 @@
 dependencies:
   build:
-    - go:1.13.4
+    - go:1.14.2
     - python:3.6
 
 build_targets:

diff --git a/buildpacks/anaconda.go b/buildpacks/anaconda.go
@@ -7,6 +7,7 @@ import (
 
 	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
+	"github.com/yourbase/yb/runtime"
 	. "github.com/yourbase/yb/types"
 )
 
@@ -50,6 +51,7 @@ func (bt AnacondaBuildTool) InstallDir() string {
 func (bt AnacondaBuildTool) Install() error {
 	anacondaDir := bt.InstallDir()
 	setupDir := bt.spec.PackageDir
+	t := bt.spec.InstallTarget
 
 	if _, err := os.Stat(anacondaDir); err == nil {
 		log.Infof("anaconda installed in %s", anacondaDir)
@@ -59,7 +61,7 @@ func (bt AnacondaBuildTool) Install() error {
 		downloadUrl := bt.DownloadUrl()
 
 		log.Infof("Downloading Miniconda from URL %s...", downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := t.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v\n", err)
 			return err
@@ -69,7 +71,7 @@ func (bt AnacondaBuildTool) Install() error {
 			fmt.Sprintf("bash %s -b -p %s", localFile, anacondaDir),
 		} {
 			log.Infof("Running: '%v' ", cmd)
-			ExecToStdout(cmd, setupDir)
+			runtime.ExecToStdout(cmd, setupDir)
 		}
 
 	}
@@ -133,7 +135,7 @@ func (bt AnacondaBuildTool) Setup() error {
 		fmt.Sprintf("conda update -q conda"),
 	} {
 		log.Infof("Running: '%v' ", cmd)
-		ExecToStdout(cmd, setupDir)
+		runtime.ExecToStdout(cmd, setupDir)
 	}
 
 	return nil

diff --git a/buildpacks/android_ndk.go b/buildpacks/android_ndk.go
@@ -2,11 +2,10 @@ package buildpacks
 
 import (
 	"fmt"
+	"github.com/yourbase/yb/runtime"
 	"os"
 	"path/filepath"
 
-	"github.com/johnewart/archiver"
-	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
 	. "github.com/yourbase/yb/types"
 )
@@ -63,7 +62,7 @@ func (bt AndroidNdkBuildTool) Version() string {
 }
 
 func (bt AndroidNdkBuildTool) InstallDir() string {
-	return filepath.Join(ToolsDir(), "android-ndk")
+	return filepath.Join(bt.spec.InstallTarget.ToolsDir(), "android-ndk")
 }
 
 func (bt AndroidNdkBuildTool) NdkDir() string {
@@ -74,7 +73,7 @@ func (bt AndroidNdkBuildTool) Setup() error {
 	ndkDir := bt.NdkDir()
 
 	log.Infof("Setting ANDROID_NDK_HOME to %s", ndkDir)
-	os.Setenv("ANDROID_NDK_HOME", ndkDir)
+	runtime.SetEnv("ANDROID_NDK_HOME", ndkDir)
 
 	return nil
 }
@@ -91,12 +90,12 @@ func (bt AndroidNdkBuildTool) Install() error {
 		downloadUrl := bt.DownloadUrl()
 
 		log.Infof("Downloading Android NDK v%s from URL %s...", bt.Version(), downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := bt.spec.InstallTarget.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v", err)
 			return err
 		}
-		err = archiver.Unarchive(localFile, installDir)
+		err = bt.spec.InstallTarget.Unarchive(localFile, installDir)
 		if err != nil {
 			log.Errorf("Unable to decompress: %v", err)
 			return err

diff --git a/buildpacks/android_sdk.go b/buildpacks/android_sdk.go
@@ -2,11 +2,11 @@ package buildpacks
 
 import (
 	"fmt"
+	"github.com/yourbase/yb/runtime"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/johnewart/archiver"
 	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
 	. "github.com/yourbase/yb/types"
@@ -74,7 +74,7 @@ func (bt AndroidBuildTool) Version() string {
 }
 
 func (bt AndroidBuildTool) InstallDir() string {
-	return filepath.Join(ToolsDir(), "android", fmt.Sprintf("android-%s", bt.Version()))
+	return filepath.Join(bt.spec.InstallTarget.ToolsDir(), "android", fmt.Sprintf("android-%s", bt.Version()))
 }
 
 func (bt AndroidBuildTool) AndroidDir() string {
@@ -121,25 +121,18 @@ func (bt AndroidBuildTool) WriteAgreements() bool {
 
 func (bt AndroidBuildTool) Setup() error {
 	androidDir := bt.AndroidDir()
-
-	binPath := fmt.Sprintf("%s/tools/bin", androidDir)
-	toolsPath := fmt.Sprintf("%s/tools", androidDir)
-	currentPath := os.Getenv("PATH")
-	newPath := fmt.Sprintf("%s:%s", binPath, currentPath)
-	newPath = fmt.Sprintf("%s:%s", toolsPath, newPath)
-	log.Infof("Setting PATH to %s", newPath)
-	os.Setenv("PATH", newPath)
-
-	//fmt.Printf("Setting ANDROID_HOME to %s\n", androidHomeDir)
-	//os.Setenv("ANDROID_HOME", androidHomeDir)
+	t := bt.spec.InstallTarget
 
 	log.Infof("Setting ANDROID_SDK_ROOT to %s", androidDir)
-	os.Setenv("ANDROID_SDK_ROOT", androidDir)
-	os.Setenv("ANDROID_HOME", androidDir)
+	runtime.SetEnv("ANDROID_SDK_ROOT", androidDir)
+	runtime.SetEnv("ANDROID_HOME", androidDir)
 
 	log.Infof("Writing agreement hashes...")
 	bt.WriteAgreements()
 
+	t.PrependToPath(filepath.Join(androidDir, "tools"))
+	t.PrependToPath(filepath.Join(androidDir, "tools", "bin"))
+
 	return nil
 }
 
@@ -155,12 +148,12 @@ func (bt AndroidBuildTool) Install() error {
 		downloadUrl := bt.DownloadUrl()
 
 		log.Infof("Downloading Android from URL %s...", downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := bt.spec.InstallTarget.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v", err)
 			return err
 		}
-		err = archiver.Unarchive(localFile, installDir)
+		err = bt.spec.InstallTarget.Unarchive(localFile, installDir)
 		if err != nil {
 			log.Errorf("Unable to decompress: %v", err)
 			return err

diff --git a/buildpacks/ant.go b/buildpacks/ant.go
@@ -6,8 +6,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/johnewart/archiver"
-	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
 	. "github.com/yourbase/yb/types"
 )
@@ -66,12 +64,9 @@ func (bt AntBuildTool) InstallDir() string {
 
 func (bt AntBuildTool) Setup() error {
 	antDir := bt.AntDir()
+	t := bt.spec.InstallTarget
 
-	cmdPath := filepath.Join(antDir, "bin")
-	currentPath := os.Getenv("PATH")
-	newPath := fmt.Sprintf("%s:%s", cmdPath, currentPath)
-	log.Infof("Setting PATH to %s", newPath)
-	os.Setenv("PATH", newPath)
+	t.PrependToPath(filepath.Join(antDir, "bin"))
 
 	return nil
 }
@@ -88,12 +83,12 @@ func (bt AntBuildTool) Install() error {
 		downloadUrl := bt.DownloadUrl()
 
 		log.Infof("Downloading Ant from URL %s...", downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := bt.spec.InstallTarget.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v", err)
 			return err
 		}
-		err = archiver.Unarchive(localFile, installDir)
+		err = bt.spec.InstallTarget.Unarchive(localFile, installDir)
 		if err != nil {
 			log.Errorf("Unable to decompress: %v", err)
 			return err

diff --git a/buildpacks/dart.go b/buildpacks/dart.go
@@ -5,7 +5,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/johnewart/archiver"
 	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
 	. "github.com/yourbase/yb/types"
@@ -98,12 +97,12 @@ func (bt DartBuildTool) Install() error {
 		downloadUrl := bt.DownloadUrl()
 
 		log.Infof("Downloading Dart from URL %s...", downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := bt.spec.InstallTarget.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v", err)
 			return err
 		}
-		err = archiver.Unarchive(localFile, installDir)
+		err = bt.spec.InstallTarget.Unarchive(localFile, installDir)
 		if err != nil {
 			log.Errorf("Unable to decompress: %v", err)
 			return err

diff --git a/buildpacks/flutter.go b/buildpacks/flutter.go
@@ -6,10 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/johnewart/archiver"
 	"golang.org/x/mod/semver"
 
-	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
 	. "github.com/yourbase/yb/types"
 )
@@ -96,12 +94,9 @@ func (bt FlutterBuildTool) FlutterDir() string {
 
 func (bt FlutterBuildTool) Setup() error {
 	flutterDir := bt.FlutterDir()
+	t := bt.spec.InstallTarget
 
-	cmdPath := filepath.Join(flutterDir, "bin")
-	currentPath := os.Getenv("PATH")
-	newPath := fmt.Sprintf("%s:%s", cmdPath, currentPath)
-	log.Infof("Setting PATH to %s", newPath)
-	os.Setenv("PATH", newPath)
+	t.PrependToPath(filepath.Join(flutterDir, "bin"))
 
 	return nil
 }
@@ -118,12 +113,12 @@ func (bt FlutterBuildTool) Install() error {
 		downloadUrl := bt.DownloadUrl()
 
 		log.Infof("Downloading Flutter from URL %s...", downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := bt.spec.InstallTarget.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v", err)
 			return err
 		}
-		err = archiver.Unarchive(localFile, installDir)
+		err = bt.spec.InstallTarget.Unarchive(localFile, installDir)
 		if err != nil {
 			log.Errorf("Unable to decompress: %v", err)
 			return err

diff --git a/buildpacks/glide.go b/buildpacks/glide.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/johnewart/archiver"
 	. "github.com/yourbase/yb/plumbing"
 	"github.com/yourbase/yb/plumbing/log"
 	. "github.com/yourbase/yb/types"
@@ -44,11 +43,11 @@ func (bt GlideBuildTool) GlideDir() string {
 
 func (bt GlideBuildTool) Setup() error {
 	glideDir := bt.GlideDir()
-	cmdPath := fmt.Sprintf("%s/%s-%s", glideDir, OS(), Arch())
-	currentPath := os.Getenv("PATH")
-	newPath := fmt.Sprintf("%s:%s", cmdPath, currentPath)
-	log.Infof("Setting PATH to %s", newPath)
-	os.Setenv("PATH", newPath)
+
+	t := bt.spec.InstallTarget
+	cmdPath := filepath.Join(glideDir, fmt.Sprintf("%s-%s", OS(), Arch()))
+
+	t.PrependToPath(cmdPath)
 
 	return nil
 }
@@ -74,7 +73,7 @@ func (bt GlideBuildTool) Install() error {
 		}
 
 		log.Infof("Downloading from URL %s ...", downloadUrl)
-		localFile, err := DownloadFileWithCache(downloadUrl)
+		localFile, err := bt.spec.InstallTarget.DownloadFile(downloadUrl)
 		if err != nil {
 			log.Errorf("Unable to download: %v", err)
 			return err
@@ -83,7 +82,7 @@ func (bt GlideBuildTool) Install() error {
 		extractDir := bt.GlideDir()
 		MkdirAsNeeded(extractDir)
 		log.Infof("Extracting glide %s to %s...", bt.Version(), extractDir)
-		err = archiver.Unarchive(localFile, extractDir)
+		err = bt.spec.InstallTarget.Unarchive(localFile, extractDir)
 		if err != nil {
 			log.Errorf("Unable to decompress: %v", err)
 			return err