v2 to brew

docker-library · May 28, 2014 · 8ec6a5d · 8ec6a5d
1 parent 27c45a8
commit 8ec6a5d
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 614 deletions.
diff --git a/stackbrew/app.py b/stackbrew/app.py
@@ -3,12 +3,10 @@
 
 import flask
 
-sys.path.append('./lib')
-
-import brew.v2 as brew
-import db
-import periodic
-import utils
+import brew
+import lib.db as db
+import lib.periodic as periodic
+import lib.utils as utils
 
 app = flask.Flask('stackbrew')
 config = None

diff --git a/stackbrew/brew-cli b/stackbrew/brew-cli
@@ -55,9 +55,9 @@ if __name__ == '__main__':
     )
     args = parser.parse_args()
     if args.debug:
-        brew.v2.set_loglevel('DEBUG')
-    sb_library = brew.v2.StackbrewLibrary(args.repository, args.b)
-    builder = brew.v2.LocalBuilder(sb_library, args.n.split(','), args.targets)
+        brew.set_loglevel('DEBUG')
+    sb_library = brew.StackbrewLibrary(args.repository, args.b)
+    builder = brew.LocalBuilder(sb_library, args.n.split(','), args.targets)
     builder.build_repo_list()
     builder.build_all()
     if args.push:

diff --git a/stackbrew/brew/__init__.py b/stackbrew/brew/__init__.py
@@ -1,2 +1 @@
-from brew import build_library, DEFAULT_REPOSITORY, DEFAULT_BRANCH
-from . import v2
+from .brew import *