added import (wip), small refactor

DamnWidget · Dec 3, 2014 · 01ced12 · 01ced12
1 parent 555891a
commit 01ced12
Show file tree

Hide file tree

Showing 14 changed files with 293 additions and 110 deletions.
diff --git a/applications/export/main.go b/applications/export/main.go
@@ -48,7  48,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	// build the list object based on the given options
 	// build the list value based on the given options
 	options := buildCommandListOptions()
 	// set the environment if any
 	env := flag.Args()

diff --git a/applications/install/main.go b/applications/install/main.go
@@ -48,7  48,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	// build the list object based on the given options
 	// build the list value based on the given options
 	options := buildCommandListOptions()
 	// set the version
 	options = append(options, func(i *commands.Install) {

diff --git a/applications/lsenvs/main.go b/applications/lsenvs/main.go
@@ -45,7  45,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	// build the list object based on the given options
 	// build the list value based on the given options
 	options := buildCommandListOptions()
 	nel := commands.NewEnvironmentsList(options...)
 	data, err := nel.Run()

diff --git a/applications/mkenv/main.go b/applications/mkenv/main.go
@@ -48,7  48,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	// build the list object based on the given options
 	// build the list value based on the given options
 	options := buildCommandListOptions()
 	options = append(options, func(m *commands.Mkenv) {
 		m.Name = name[0]

diff --git a/cache/cache.go b/cache/cache.go
@@ -0,0  1,110 @@
 /*
    Copyright (C) 2014  Oscar Campos <[email protected]>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
    See LICENSE file for more details.
 */
 
 package cache
 
 import (
 	"fmt"
 	"os"
 	"path"
 	"path/filepath"
 	"sort"
 	"strings"
 )
 
 // return a list of installed go versions
 func GetInstalled(tags, sources, binaries []string) ([]string, error) {
 	files, err := filepath.Glob(filepath.Join(CacheDirectory(), "*"))
 	if err != nil {
 		fmt.Println("while getting installed versions:", err)
 		return nil, err
 	}
 	versions := []string{}
 	for _, file := range files {
 		filename := path.Base(file)
 		if filename != "mercurial" && filename != "logs" {
 			stat, err := os.Stat(file)
 			if err != nil {
 				fmt.Println("while getting installed versions:", err)
 				return nil, err
 			}
 			if stat.IsDir() {
 				if isValidVersion(filename, tags, sources, binaries) {
 					versions = append(versions, filename)
 				}
 			}
 		}
 	}
 
 	return versions, nil
 }
 
 // return a list of non installed go versions
 func GetNonInstalled(v, tags, sources, binaries []string) []string {
 	var versions = make([]string, len(tags) len(sources) len(binaries))
 	installed_versions := make([]string, len(v))
 	copy(installed_versions, v)
 	c := 0
 	for _, ver := range append(binaries, append(tags, sources...)...) {
 		found := false
 		for i, installed := range installed_versions {
 			if strings.TrimSpace(installed) == strings.TrimSpace(ver) {
 				// skip this element and reduce v
 				installed_versions = append(
 					installed_versions[:i], installed_versions[i 1:]...)
 				found = true
 				continue
 			}
 		}
 		if found {
 			continue
 		}
 		versions[c] = fmt.Sprintf("    %s", ver)
 		c  
 	}
 
 	return versions
 }
 
 // check if a given version is valid in all the possible containers
 func isValidVersion(file string, tags, sources, binaries []string) bool {
 	// tip is always a valid version
 	if file == "tip" {
 		return true
 	}
 	// look on the sources first that is the smaller collection
 	for _, ver := range sources {
 		if file == ver {
 			return true
 		}
 	}
 	// now look on the binaries collection using binary search
 	index := sort.SearchStrings(binaries, file)
 	if len(binaries) > index && binaries[index] == file {
 		return true
 	}
 	// now look in the mercurial tags using binary search
 	index = sort.SearchStrings(tags, file)
 	if len(tags) > index && tags[index] == file {
 		return true
 	}
 
 	return false
 }
diff --git a/commands/commands_test.go b/commands/commands_test.go
@@ -200,7  200,7 @@ var _ = Describe("Commands", func() {
 						Ω(len(splitVers)).Should(BeNumerically(">", 100))
 					})
 
-					It("Should return a Json object with 4 elements in installed", func() {
 					It("Should return a Json value with 4 elements in installed", func() {
 						jsonFormat := func(l *commands.List) {
 							l.DisplayAs = commands.Json
 						}

diff --git a/commands/import.go b/commands/import.go
@@ -0,0  1,75 @@
 /*
    Copyright (C) 2014  Oscar Campos <[email protected]>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
    See LICENSE file for more details.
 */
 
 package commands
 
 import (
 	"fmt"
 
 	"github.com/DamnWidget/VenGO/env"
 	"github.com/DamnWidget/VenGO/utils"
 )
 
 type Import struct {
 	Manifest string
 	Prompt   string
 	Verbose  bool
 	Force    bool
 }
 
 // create a new import command and return back it's address
 func NewImport(options ...func(i *Import)) *Import {
 	imp := new(Import)
 	for _, option := range options {
 		option(imp)
 	}
 	if imp.Prompt == "" {
 		imp.Prompt = fmt.Sprintf("[%s]", imp.Manifest)
 	}
 	return imp
 }
 
 // implements the Runner interface importing and recreating an exported env
 func (i *Import) Run() (string, error) {
 	return i.envImport()
 }
 
 // import the given manifest and create a new environment based on it
 func (i *Import) envImport() (string, error) {
 	fmt.Printf("Loading manifest file %s... ", i.Manifest)
 	manifest, err := env.LoadManifest(i.Manifest)
 	if err != nil {
 		fmt.Println(utils.Fail("✖"))
 		return "", err
 	}
 	fmt.Println(utils.Ok("✔"))
 	fmt.Printf(
 		"Creating %s environment (this may take a while) ...", manifest.Path)
 	err = manifest.GenerateEnvironment(i.Verbose, i.Prompt)
 	if err != nil {
 		fmt.Println(utils.Fail("✖"))
 		return "", err
 	}
 	fmt.Println(utils.Ok("✔"))
 	return fmt.Sprintf(
 		"%s has been created into %s use vengo activate %s to active it",
 		manifest.Name, manifest.Path,
 	), nil
 }
diff --git a/commands/list.go b/commands/list.go
@@ -24,9  24,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
-	"sort"
 	"strings"
 
 	"github.com/DamnWidget/VenGO/cache"
@@ -71,15  69,15 @@ func (l *List) Run() (string, error) {
 		"installed": []string{},
 		"available": []string{},
 	}
-	installed, err := l.getInstalled(tags, sources, binaries)
 	installed, err := cache.GetInstalled(tags, sources, binaries)
 	if err != nil {
 		fmt.Println("while running List command:", err)
 		return "error while running the command", err
 	}
 	versions["installed"] = append(versions["installed"], installed...)
 	versions["available"] = append(
 		versions["available"],
-		l.getNonInstalled(installed, tags, sources, binaries)...,
 		cache.GetNonInstalled(installed, tags, sources, binaries)...,
 	)
 
 	return l.display(versions)
@@ -128,83  126,3 @@ func (l *List) display(versions map[string][]string) (string, error) {
 
 	return "", fmt.Errorf("List.DisplayAs is not set to a valid value!")
 }
-
-// return a list of installed go versions
-func (l *List) getInstalled(tags, sources, binaries []string) ([]string, error) {
-	files, err := filepath.Glob(filepath.Join(cache.CacheDirectory(), "*"))
-	if err != nil {
-		fmt.Println("while getting installed versions:", err)
-		return nil, err
-	}
-	versions := []string{}
-	for _, file := range files {
-		filename := path.Base(file)
-		if filename != "mercurial" && filename != "logs" {
-			stat, err := os.Stat(file)
-			if err != nil {
-				fmt.Println("while getting installed versions:", err)
-				return nil, err
-			}
-			if stat.IsDir() {
-				if l.isValidVersion(filename, tags, sources, binaries) {
-					versions = append(versions, filename)
-				}
-			}
-		}
-	}
-
-	return versions, nil
-}
-
-// return a list of non installed go versions
-func (l *List) getNonInstalled(v, tags, sources, binaries []string) []string {
-	var versions = make([]string, len(tags) len(sources) len(binaries))
-	installed_versions := make([]string, len(v))
-	copy(installed_versions, v)
-	c := 0
-	for _, ver := range append(binaries, append(tags, sources...)...) {
-		found := false
-		for i, installed := range installed_versions {
-			if strings.TrimSpace(installed) == strings.TrimSpace(ver) {
-				// skip this element and reduce v
-				installed_versions = append(
-					installed_versions[:i], installed_versions[i 1:]...)
-				found = true
-				continue
-			}
-		}
-		if found {
-			continue
-		}
-		versions[c] = fmt.Sprintf("    %s", ver)
-		c  
-	}
-
-	return versions
-}
-
-// check if a given version is valid in all the possible containers
-func (l *List) isValidVersion(file string, tags, sources, binaries []string) bool {
-	// tip is always a valid version
-	if file == "tip" {
-		return true
-	}
-	// look on the sources first that is the smaller collection
-	for _, ver := range sources {
-		if file == ver {
-			return true
-		}
-	}
-	// now look on the binaries collection using binary search
-	index := sort.SearchStrings(binaries, file)
-	if len(binaries) > index && binaries[index] == file {
-		return true
-	}
-	// now look in the mercurial tags using binary search
-	index = sort.SearchStrings(tags, file)
-	if len(tags) > index && tags[index] == file {
-		return true
-	}
-
-	return false
-}
diff --git a/commands/mkenv.go b/commands/mkenv.go
@@ -21,7  21,6 @@
 package commands
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -83,22  82,8 @@ func (m *Mkenv) Run() (string, error) {
 // check if the Go version used to generate the virtual environment is
 // installed or not, if is not, return a NotIntalled error type
 func (m *Mkenv) checkInstalled() error {
-	l := NewList(func(l *List) {
-		l.DisplayAs = Json
-	})
-	result, err := l.Run()
-	if err != nil {
-		return err
 	if !env.LookupInstalledVersion(m.Version) {
 		return ErrNotInstalled
 	}
-	jsonData := new(BriefJSON)
-	if err := json.Unmarshal([]byte(result), jsonData); err != nil {
-		return err
-	}
-	for _, v := range jsonData.Installed {
-		if v == m.Version {
-			return nil
-		}
-	}
-
-	return ErrNotInstalled
 	return nil
 }
diff --git a/env/env.go b/env/env.go
@@ -102,7  102,7 @@ func (e *Environment) Generate() error {
 }
 
 // checks if the environment path exists, and create it if doesn't
-// returns a file object or error if fails
 // returns a file value or error if fails
 func (e *Environment) checkPath() (*os.File, error) {
 	fileName := filepath.Join(e.VenGO_PATH, "bin", "activate")
 	return e.createFile(fileName)