Merge pull request #23 from ooyala/better_package_names

move everything under atlantis/builder
ooyala · Mar 20, 2014 · 58850c7 · 58850c7
2 parents 579aea8 + 68fa090
commit 58850c7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/builder.go b/builder.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"build"
-	"docker"
+	"atlantis/builder/build"
+	"atlantis/builder/docker"
 	"flag"
 	"fmt"
 	"io/ioutil"

diff --git a/src/build/app.go → src/atlantis/builder/build/app.go b/src/build/app.go → src/atlantis/builder/build/app.go
@@ -1,22 +1,22 @@
 package build
 
 import (
-	"docker"
+	"atlantis/builder/docker"
+	"atlantis/builder/git"
+	"atlantis/builder/manifest"
+	"atlantis/builder/template"
+	"atlantis/builder/util"
 	"encoding/json"
 	"fmt"
-	"git"
 	"io"
 	"io/ioutil"
-	"manifest"
 	"os"
 	"os/exec"
 	"os/user"
 	"path"
 	"path/filepath"
 	"strings"
-	"template"
 	"time"
-	"util"
 )
 
 // NOTE(manas) This programs panics in places you'd expect it to call log.Fatal(). The panic allows

diff --git a/src/build/boot.go → src/atlantis/builder/build/boot.go b/src/build/boot.go → src/atlantis/builder/build/boot.go
@@ -1,7 +1,7 @@
 package build
 
 import (
-	"docker"
+	"atlantis/builder/docker"
 	"errors"
 	"fmt"
 	"path"

diff --git a/src/docker/client.go → src/atlantis/builder/docker/client.go b/src/docker/client.go → src/atlantis/builder/docker/client.go
diff --git a/src/git/client.go → src/atlantis/builder/git/client.go b/src/git/client.go → src/atlantis/builder/git/client.go
@@ -1,10 +1,10 @@
 package git
 
 import (
+	"atlantis/builder/util"
 	"os"
 	"os/exec"
 	"strings"
-	"util"
 )
 
 type Info struct {

diff --git a/src/manifest/manifest.go → src/atlantis/builder/manifest/manifest.go b/src/manifest/manifest.go → src/atlantis/builder/manifest/manifest.go
diff --git a/src/template/template.go → src/atlantis/builder/template/template.go b/src/template/template.go → src/atlantis/builder/template/template.go
diff --git a/src/util/exec.go → src/atlantis/builder/util/exec.go b/src/util/exec.go → src/atlantis/builder/util/exec.go