Merge pull request #716 from vaikas-google/master

Offset where the directories and files go from $HELM_HOME to $HELM_HOME/repository

cmd/helm/init.go

@@ -77,7 +77,7 @@ func installTiller() error {
 //
 // If $HELM_HOME does not exist, this function will create it.
 func ensureHome() error {
-	configDirectories := []string{homePath(), cacheDirectory(), localRepoDirectory()}
+	configDirectories := []string{homePath(), repositoryDirectory(), cacheDirectory(), localRepoDirectory()}
 
 	for _, p := range configDirectories {
 		if fi, err := os.Stat(p); err != nil {

cmd/helm/init_test.go

@@ -13,7 +13,7 @@ func TestEnsureHome(t *testing.T) {
 		t.Errorf("%s", err)
 	}
 
-	expectedDirs := []string{homePath(), cacheDirectory(), localRepoDirectory()}
+	expectedDirs := []string{homePath(), repositoryDirectory(), cacheDirectory(), localRepoDirectory()}
 	for _, dir := range expectedDirs {
 		if fi, err := os.Stat(dir); err != nil {
 			t.Errorf("%s", err)

cmd/helm/structure.go

@@ -6,6 +6,7 @@ import (
 )
 
 const (
+	repositoryDir          string = "repository"
 	repositoriesFilePath   string = "repositories.yaml"
 	cachePath              string = "cache"
 	localRepoPath          string = "local"
@@ -16,16 +17,21 @@ func homePath() string {
 	return os.ExpandEnv(helmHome)
 }
 
+// All other directories go under the $HELM_HOME/repository.
+func repositoryDirectory() string {
+	return homePath() + "/" + repositoryDir
+}
+
 func cacheDirectory(paths ...string) string {
-	fragments := append([]string{homePath(), cachePath}, paths...)
+	fragments := append([]string{repositoryDirectory(), cachePath}, paths...)
 	return filepath.Join(fragments...)
 }
 
 func localRepoDirectory(paths ...string) string {
-	fragments := append([]string{homePath(), localRepoPath}, paths...)
+	fragments := append([]string{repositoryDirectory(), localRepoPath}, paths...)
 	return filepath.Join(fragments...)
 }
 
 func repositoriesFile() string {
-	return filepath.Join(homePath(), repositoriesFilePath)
+	return filepath.Join(repositoryDirectory(), repositoriesFilePath)
 }