From 9049d97820ed2d3cdad0ac36d5c60a96785ca7b3 Mon Sep 17 00:00:00 2001
From: Deluan <github@deluan.com>
Date: Tue, 29 Mar 2016 18:27:14 -0400
Subject: [PATCH] Moving code away from conf package.

This is necessary, as the conf package will hold only configuration, and cannot have dependencies on other packages
---
 api/api_test.go                      |  5 +++--
 controllers/main_test.go             |  9 +++++----
 glide.lock                           | 12 +++++++-----
 glide.yaml                           |  3 ++-
 {conf => init}/inject_definitions.go |  2 +-
 {conf => init}/mime_types.go         |  2 +-
 {conf => init}/router.go             |  2 +-
 main.go                              |  2 +-
 8 files changed, 21 insertions(+), 16 deletions(-)
 rename {conf => init}/inject_definitions.go (99%)
 rename {conf => init}/mime_types.go (98%)
 rename {conf => init}/router.go (99%)

diff --git a/api/api_test.go b/api/api_test.go
index a54ceb2f4..ff34fe55f 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -2,11 +2,12 @@ package api_test
 
 import (
 	"fmt"
-	"github.com/astaxie/beego"
-	_ "github.com/deluan/gosonic/conf"
 	"net/http"
 	"net/http/httptest"
 	"strings"
+
+	"github.com/astaxie/beego"
+	_ "github.com/deluan/gosonic/init"
 )
 
 const (
diff --git a/controllers/main_test.go b/controllers/main_test.go
index bcac7f093..7b1a5a6bd 100644
--- a/controllers/main_test.go
+++ b/controllers/main_test.go
@@ -2,13 +2,14 @@ package controllers_test
 
 import (
 	"fmt"
-	"github.com/astaxie/beego"
-	_ "github.com/deluan/gosonic/conf"
-	"github.com/deluan/gosonic/tests"
-	. "github.com/smartystreets/goconvey/convey"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/astaxie/beego"
+	_ "github.com/deluan/gosonic/init"
+	"github.com/deluan/gosonic/tests"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestErrorHandler(t *testing.T) {
diff --git a/glide.lock b/glide.lock
index 3f23a71e2..a9799e089 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 74a8fca679ed86ccc4a42a35d772bdf0f918993c198a90ea0dbbae9e4d43a146
-updated: 2016-03-27T17:25:48.459693003-04:00
+hash: a5cbc7366656c70b744e5eff395de78872a0d6fee5932036e8efc03e5193154d
+updated: 2016-03-29T18:13:23.845465378-04:00
 imports:
 - name: github.com/astaxie/beego
   version: 92d0b9ae95662d04e1d32eeffa52b4697b01ae37
@@ -36,7 +36,7 @@ imports:
 - name: github.com/golang/snappy
   version: 723cc1e459b8eea2dea4583200fd60757d40097a
 - name: github.com/gopherjs/gopherjs
-  version: 14ba2f52062a79512bbb6768908c95032395ce94
+  version: 64858154c27789453689ac91041a736c89abd49d
   subpackages:
   - js
 - name: github.com/jtolds/gls
@@ -45,6 +45,8 @@ imports:
   version: fe06da2f020c637f82e23c3a2b5e8d9e711baf2b
 - name: github.com/kennygrant/sanitize
   version: ce9fd1f6ce32afaa38b51feea32320fc8875e8e4
+- name: github.com/koding/multiconfig
+  version: 40c0feeebcc24712305f55b63dcf4ac6e77b10ff
 - name: github.com/nfnt/resize
   version: 4d93a29130b1b6aba503e2aa8b50f516213ea80e
 - name: github.com/siddontang/go
@@ -80,7 +82,7 @@ imports:
   - internal/go-render/render
   - internal/oglematchers
 - name: github.com/smartystreets/goconvey
-  version: 101844423e4188895b52ec7fcb5689d014f32c30
+  version: 55d548bcbd33d0fdfbd8844ede638af868cdf23e
   subpackages:
   - convey
   - convey/reporting
@@ -101,7 +103,7 @@ imports:
   - leveldb/memdb
   - leveldb/table
 - name: golang.org/x/net
-  version: 1600a4cd699d70009ec28edfd69d3568f6bd757d
+  version: 31df19d69da8728e9220def59b80ee577c3e48bf
   subpackages:
   - html
   - html/atom
diff --git a/glide.yaml b/glide.yaml
index fe096e1e4..44616cff9 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,6 +20,7 @@ import:
 - package: github.com/nfnt/resize
 - package: github.com/deluan/itl
 - package: github.com/deluan/gomate
+- package: github.com/koding/multiconfig
 
 devImport:
-- package: github.com/smartystreets/goconvey
\ No newline at end of file
+- package: github.com/smartystreets/goconvey
diff --git a/conf/inject_definitions.go b/init/inject_definitions.go
similarity index 99%
rename from conf/inject_definitions.go
rename to init/inject_definitions.go
index c10f60d0f..8985218ff 100644
--- a/conf/inject_definitions.go
+++ b/init/inject_definitions.go
@@ -1,4 +1,4 @@
-package conf
+package init
 
 import (
 	"github.com/deluan/gomate"
diff --git a/conf/mime_types.go b/init/mime_types.go
similarity index 98%
rename from conf/mime_types.go
rename to init/mime_types.go
index e0bac8e40..0c8af14e9 100644
--- a/conf/mime_types.go
+++ b/init/mime_types.go
@@ -1,4 +1,4 @@
-package conf
+package init
 
 import "mime"
 
diff --git a/conf/router.go b/init/router.go
similarity index 99%
rename from conf/router.go
rename to init/router.go
index 09ff1bf7c..9c0caba2d 100644
--- a/conf/router.go
+++ b/init/router.go
@@ -1,4 +1,4 @@
-package conf
+package init
 
 import (
 	"github.com/deluan/gosonic/api"
diff --git a/main.go b/main.go
index afcace0b1..5a46622e1 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/astaxie/beego"
-	_ "github.com/deluan/gosonic/conf"
+	_ "github.com/deluan/gosonic/init"
 	_ "github.com/deluan/gosonic/tasks"
 )