diff options
33 files changed, 124 insertions, 123 deletions
diff --git a/devshell/base/base.py b/devshell/base/base.py index ca3cb8d..3f9d41f 100644 --- a/devshell/base/base.py +++ b/devshell/base/base.py @@ -24,9 +24,9 @@ from collections import deque from os.path import join, dirname -from module import Module -from vars import __description__, __version__, header, prompt -from exceptions import ModuleError, ExecutionException +from devshell.base.module import Module +from devshell.base.vars import __description__, __version__, header, prompt +from devshell.base.exceptions import ModuleError, ExecutionException log = logging.getLogger('devshell') diff --git a/devshell/base/factories.py b/devshell/base/factories.py index fc61307..742939e 100644 --- a/devshell/base/factories.py +++ b/devshell/base/factories.py @@ -22,8 +22,8 @@ from configobj import ConfigObj from os import getcwd from os.path import abspath, exists -from util import pwd, log -from exceptions import ExecutionException +from devshell.base.util import pwd, log +from devshell.base.exceptions import ExecutionException directory_type = dict() diff --git a/devshell/base/profiles.py b/devshell/base/profiles.py index 527ad78..3f26388 100644 --- a/devshell/base/profiles.py +++ b/devshell/base/profiles.py @@ -19,9 +19,9 @@ from os.path import join from subprocess import Popen, PIPE -from base import log -from vars import FEDORA_DIR -from util import flatten +from devshell.base.base import log +from devshell.base.vars import FEDORA_DIR +from devshell.base.util import flatten TARGET = 0 DIST = 1 diff --git a/devshell/base/rpm_utils.py b/devshell/base/rpm_utils.py index 03bdc9f..163f367 100644 --- a/devshell/base/rpm_utils.py +++ b/devshell/base/rpm_utils.py @@ -25,8 +25,9 @@ import time from subprocess import Popen, PIPE from contextlib import contextmanager from functools import partial -from base import log -from awk import * + +from devshell.base.base import log +from devshell.base.awk import * class RPMSpec(object): def __init__(self, spec_file, defines=''): diff --git a/devshell/base/util.py b/devshell/base/util.py index 4b2cd46..ed41416 100644 --- a/devshell/base/util.py +++ b/devshell/base/util.py @@ -28,7 +28,7 @@ from shutil import move as mv from shutil import copytree as cpthree from urllib import urlopen -from base import log +from devshell.base.base import log @contextmanager def pwd(dir): diff --git a/devshell/devshell.py b/devshell/devshell.py index 211eb92..75516af 100755 --- a/devshell/devshell.py +++ b/devshell/devshell.py @@ -33,8 +33,8 @@ import os -from base.base import load_modules, shell, setup_logger, setup_options, log -from base.vars import FEDORA_DIR +from devshell.base.base import load_modules, shell, setup_logger, setup_options, log +from devshell.base.vars import FEDORA_DIR def main(): (opts, args) = setup_options() diff --git a/devshell/modules/audit.py b/devshell/modules/audit.py index 672e431..5a0ec2a 100644 --- a/devshell/modules/audit.py +++ b/devshell/modules/audit.py @@ -15,7 +15,7 @@ # # Authors: Yaakov M. Nemoy <[email protected]> # -from base.module import Module +from devshell.base.module import Module class Audit(Module): """ Perform various code audits on a specified Pkg """ diff --git a/devshell/modules/autotools.py b/devshell/modules/autotools.py index c3dddb1..cd95296 100644 --- a/devshell/modules/autotools.py +++ b/devshell/modules/autotools.py @@ -24,14 +24,14 @@ from re import compile, DOTALL from subprocess import Popen -from base.base import log -from base.exceptions import ExecutionException -from base.factories import DirFactory -from base.util import pwd, one, log_file -from base.vars import orig_src_dir, haskell_compiler - -from modules.buildsystem import BuildSystem -from modules.sourceball import SourceBall +from devshell.base.base import log +from devshell.base.exceptions import ExecutionException +from devshell.base.factories import DirFactory +from devshell.base.util import pwd, one, log_file +from devshell.base.vars import orig_src_dir, haskell_compiler + +from devshell.modules.buildsystem import BuildSystem +from devshell.modules.sourceball import SourceBall class Autotools(BuildSystem): '''A wrapper around common autotools operations diff --git a/devshell/modules/bugs.py b/devshell/modules/bugs.py index d98aa61..043cebd 100644 --- a/devshell/modules/bugs.py +++ b/devshell/modules/bugs.py @@ -16,7 +16,7 @@ # Authors: Luke Macken <[email protected]> # import os -from base.module import Module +from devshell.base.module import Module class Bugs(Module): """ diff --git a/devshell/modules/build.py b/devshell/modules/build.py index c2d5c92..bb609b1 100644 --- a/devshell/modules/build.py +++ b/devshell/modules/build.py @@ -23,17 +23,17 @@ from os.path import join, abspath, isfile from os import listdir, getcwd, walk from subprocess import Popen -from base.base import log -from base.factories import DirFactory -from base.exceptions import ExecutionException -from base.module import Module -from base.profiles import dir_defines, join_defines, dist_defines, Profile -from base.util import pwd, copy, symlink, move, log_file -from base.vars import FEDORA_DIR - -from modules.directory import Directory -from modules.package import Package -from modules.profile import Profile +from devshell.base.base import log +from devshell.base.factories import DirFactory +from devshell.base.exceptions import ExecutionException +from devshell.base.module import Module +from devshell.base.profiles import dir_defines, join_defines, dist_defines, Profile +from devshell.base.util import pwd, copy, symlink, move, log_file +from devshell.base.vars import FEDORA_DIR + +from devshell.modules.directory import Directory +from devshell.modules.package import Package +from devshell.modules.profile import Profile class Build(Directory): '''A wrapper around rpmbuild functions diff --git a/devshell/modules/buildsystem.py b/devshell/modules/buildsystem.py index 32a4194..6712d8d 100644 --- a/devshell/modules/buildsystem.py +++ b/devshell/modules/buildsystem.py @@ -20,11 +20,11 @@ from __future__ import with_statement from os.path import join from contextlib import contextmanager -import base.factories as factories +import devshell.base.factories as factories -from base.factories import DirFactory -from base.module import Module -from base.util import log_file, rm, log +from devshell.base.factories import DirFactory +from devshell.base.module import Module +from devshell.base.util import log_file, rm, log class MetaBuildSystem(type): def __init__(cls, name, bases, attrs): diff --git a/devshell/modules/cabal.py b/devshell/modules/cabal.py index 7034d9f..36748da 100644 --- a/devshell/modules/cabal.py +++ b/devshell/modules/cabal.py @@ -24,14 +24,14 @@ from re import compile, DOTALL from subprocess import Popen -from base.base import log -from base.exceptions import ExecutionException -from base.factories import DirFactory -from base.util import pwd, one, log_file -from base.vars import orig_src_dir, haskell_compiler - -from modules.buildsystem import BuildSystem -from modules.sourceball import SourceBall +from devshell.base.base import log +from devshell.base.exceptions import ExecutionException +from devshell.base.factories import DirFactory +from devshell.base.util import pwd, one, log_file +from devshell.base.vars import orig_src_dir, haskell_compiler + +from devshell.modules.buildsystem import BuildSystem +from devshell.modules.sourceball import SourceBall class Cabal(BuildSystem): '''A wrapper around common cabal operations diff --git a/devshell/modules/darcs.py b/devshell/modules/darcs.py index 7ba506b..3d08452 100644 --- a/devshell/modules/darcs.py +++ b/devshell/modules/darcs.py @@ -26,8 +26,8 @@ from os import getcwd from os.path import join, basename, exists from subprocess import Popen, PIPE -from base.util import pwd, log, rm, log_file, copy, move -from modules.revisioncontrol import RevisionControl +from devshell.base.util import pwd, log, rm, log_file, copy, move +from devshell.modules.revisioncontrol import RevisionControl hash_re = re.compile(r'hash=\'(\w|-|.*?)\'', re.MULTILINE) date_re = re.compile(r'date=\'(\d*?)\'', re.MULTILINE) diff --git a/devshell/modules/directory.py b/devshell/modules/directory.py index 60883b4..2d534d0 100644 --- a/devshell/modules/directory.py +++ b/devshell/modules/directory.py @@ -26,10 +26,10 @@ from os import makedirs, getcwd, listdir from os.path import abspath, join, split, splitext, basename, exists, dirname from contextlib import contextmanager -from base.base import log -from base.factories import DirFactory -from base.module import Module -from base.util import pwd, copytree, close_all +from devshell.base.base import log +from devshell.base.factories import DirFactory +from devshell.base.module import Module +from devshell.base.util import pwd, copytree, close_all class MetaDirectory(type): def __init__(cls, name, bases, attrs): diff --git a/devshell/modules/fedorahostedgitfetcher.py b/devshell/modules/fedorahostedgitfetcher.py index 37daf49..3df8430 100644 --- a/devshell/modules/fedorahostedgitfetcher.py +++ b/devshell/modules/fedorahostedgitfetcher.py @@ -19,7 +19,7 @@ from re import compile, DOTALL from urllib import urlopen, urlretrieve -from modules.fetcher import Fetcher +from devshell.modules.fetcher import Fetcher USER = 'ynemoy' diff --git a/devshell/modules/fedorahostedgitport.py b/devshell/modules/fedorahostedgitport.py index 775e48a..85da712 100644 --- a/devshell/modules/fedorahostedgitport.py +++ b/devshell/modules/fedorahostedgitport.py @@ -17,13 +17,13 @@ # from __future__ import with_statement -from base.module import Module -from base.util import pwd +from devshell.base.module import Module +from devshell.base.util import pwd -from modules.fedorahostedgitfetcher import FedoraHostedGitFetcher -from modules.git import Git -from modules.port import Port -from modules.sourceball import SourceBall +from devshell.modules.fedorahostedgitfetcher import FedoraHostedGitFetcher +from devshell.modules.git import Git +from devshell.modules.port import Port +from devshell.modules.sourceball import SourceBall class Foo(Module): _type = 'foo' diff --git a/devshell/modules/fetcher.py b/devshell/modules/fetcher.py index cbba8c7..52c7a82 100644 --- a/devshell/modules/fetcher.py +++ b/devshell/modules/fetcher.py @@ -16,7 +16,7 @@ # Authors: Yaakov M. Nemoy <[email protected]> # -from base.module import Module +from devshell.base.module import Module class Fetcher(Module): def latest_version(self, pkg): diff --git a/devshell/modules/freejport.py b/devshell/modules/freejport.py index 21b54cf..5ac2925 100644 --- a/devshell/modules/freejport.py +++ b/devshell/modules/freejport.py @@ -17,13 +17,13 @@ # from __future__ import with_statement -# from base.util import pwd +# from devshell.base.util import pwd -from modules.autotools import Autotools -from modules.git import Git -# from modules.hackage import Hackage -from modules.port import Port -from modules.sourceball import SourceBall +from devshell.modules.autotools import Autotools +from devshell.modules.git import Git +# from devshell.modules.hackage import Hackage +from devshell.modules.port import Port +from devshell.modules.sourceball import SourceBall class FreeJPort(Port): sourceball = SourceBall diff --git a/devshell/modules/git.py b/devshell/modules/git.py index 9530e3c..ea31e0d 100644 --- a/devshell/modules/git.py +++ b/devshell/modules/git.py @@ -29,9 +29,9 @@ from os import makedirs from os.path import join, basename, exists from subprocess import Popen, PIPE -from base.util import pwd, log, rm, log_file, copy, move -from modules.revisioncontrol import RevisionControl -from modules.packagesource import PackageSource +from devshell.base.util import pwd, log, rm, log_file, copy, move +from devshell.modules.revisioncontrol import RevisionControl +from devshell.modules.packagesource import PackageSource # hash_re = re.compile(r'hash=\'(\w|-|.*?)\'', re.MULTILINE) # date_re = re.compile(r'date=\'(\d*?)\'', re.MULTILINE) diff --git a/devshell/modules/hackage.py b/devshell/modules/hackage.py index 861f55e..49a909b 100644 --- a/devshell/modules/hackage.py +++ b/devshell/modules/hackage.py @@ -19,7 +19,7 @@ from re import compile, DOTALL from urllib import urlopen, urlretrieve -from modules.fetcher import Fetcher +from devshell.modules.fetcher import Fetcher class Hackage(Fetcher): def latest_version(self, pkg): diff --git a/devshell/modules/haskellport.py b/devshell/modules/haskellport.py index a7c2866..dc2bb89 100644 --- a/devshell/modules/haskellport.py +++ b/devshell/modules/haskellport.py @@ -17,13 +17,13 @@ # from __future__ import with_statement -from base.util import pwd +from devshell.base.util import pwd -from modules.cabal import Cabal -from modules.darcs import Darcs -from modules.hackage import Hackage -from modules.port import Port -from modules.sourceball import SourceBall +from devshell.modules.cabal import Cabal +from devshell.modules.darcs import Darcs +from devshell.modules.hackage import Hackage +from devshell.modules.port import Port +from devshell.modules.sourceball import SourceBall class HaskellPort(Port): sourceball = SourceBall diff --git a/devshell/modules/mail.py b/devshell/modules/mail.py index f401456..b8b7161 100644 --- a/devshell/modules/mail.py +++ b/devshell/modules/mail.py @@ -27,8 +27,8 @@ from os.path import join, exists, dirname, isdir from mailbox import UnixMailbox from datetime import datetime, timedelta -from base.vars import DEVSHELL_DIR -from base.module import Module +from devshell.base.vars import DEVSHELL_DIR +from devshell.base.module import Module log = logging.getLogger(__name__) diff --git a/devshell/modules/mock.py b/devshell/modules/mock.py index 856543e..24b65aa 100644 --- a/devshell/modules/mock.py +++ b/devshell/modules/mock.py @@ -19,14 +19,14 @@ from __future__ import with_statement from subprocess import Popen -from base.base import log -from base.factories import DirFactory -from base.module import Module -from base.util import pwd, log_file +from devshell.base.base import log +from devshell.base.factories import DirFactory +from devshell.base.module import Module +from devshell.base.util import pwd, log_file -from modules.build import Build -from modules.package import Package -from modules.profile import Profile +from devshell.modules.build import Build +from devshell.modules.package import Package +from devshell.modules.profile import Profile class Builder(Module): pass diff --git a/devshell/modules/package.py b/devshell/modules/package.py index dbd8334..c3c1d7a 100644 --- a/devshell/modules/package.py +++ b/devshell/modules/package.py @@ -21,13 +21,13 @@ from __future__ import with_statement from os.path import basename, abspath, join from contextlib import contextmanager -from base.base import log -from base.factories import DirFactory -from base.exceptions import ExecutionException -from base.util import pwd, copy, move, symlink, rm -from base.rpm_utils import RPMSpec +from devshell.base.base import log +from devshell.base.factories import DirFactory +from devshell.base.exceptions import ExecutionException +from devshell.base.util import pwd, copy, move, symlink, rm +from devshell.base.rpm_utils import RPMSpec -from modules.directory import Directory +from devshell.modules.directory import Directory class Package(Directory): # These two methods are here as examples. diff --git a/devshell/modules/packagesource.py b/devshell/modules/packagesource.py index d2e7adb..539e627 100644 --- a/devshell/modules/packagesource.py +++ b/devshell/modules/packagesource.py @@ -21,10 +21,10 @@ from contextlib import contextmanager from os import makedirs from os.path import join -from base.factories import BuildSystemFactory -from base.util import pwd +from devshell.base.factories import BuildSystemFactory +from devshell.base.util import pwd -from modules.directory import Directory +from devshell.modules.directory import Directory class PackageSource(Directory): def make_dir(self, dir): diff --git a/devshell/modules/port.py b/devshell/modules/port.py index 830c1ca..04d49b0 100644 --- a/devshell/modules/port.py +++ b/devshell/modules/port.py @@ -23,17 +23,17 @@ from os import getcwd from tempfile import mkdtemp from contextlib import contextmanager -from base.base import log -from base.exceptions import ExecutionException -from base.factories import DirFactory -from base.util import pwd, close_later, close_all, rm +from devshell.base.base import log +from devshell.base.exceptions import ExecutionException +from devshell.base.factories import DirFactory +from devshell.base.util import pwd, close_later, close_all, rm -from base.module import Module +from devshell.base.module import Module -from modules.sourceball import SourceBall -from modules.build import Build -from modules.profile import Profile -from modules.mock import Mock +from devshell.modules.sourceball import SourceBall +from devshell.modules.build import Build +from devshell.modules.profile import Profile +from devshell.modules.mock import Mock class Port(Module): def __init__(self, package=None): diff --git a/devshell/modules/profile.py b/devshell/modules/profile.py index cc73431..83a8253 100644 --- a/devshell/modules/profile.py +++ b/devshell/modules/profile.py @@ -19,12 +19,12 @@ from __future__ import with_statement from os.path import join -from base.exceptions import ExecutionException -from base.profiles import dist_defines, get_mock_cfg, distro, TARGET, DIST, DISTVAR, DISTVAL -from base.util import pwd, copytree -from base.vars import MOCK_CFG_DIR +from devshell.base.exceptions import ExecutionException +from devshell.base.profiles import dist_defines, get_mock_cfg, distro, TARGET, DIST, DISTVAR, DISTVAL +from devshell.base.util import pwd, copytree +from devshell.base.vars import MOCK_CFG_DIR -from modules.directory import Directory +from devshell.modules.directory import Directory class Profile(Directory): '''a profile module to resemble various architectures, branches, build targets, etc...''' diff --git a/devshell/modules/revisioncontrol.py b/devshell/modules/revisioncontrol.py index e5d200a..2acf3b2 100644 --- a/devshell/modules/revisioncontrol.py +++ b/devshell/modules/revisioncontrol.py @@ -16,7 +16,7 @@ # Authors: Yaakov M. Nemoy <[email protected]> # -from modules.packagesource import PackageSource +from devshell.modules.packagesource import PackageSource class RevisionControl(PackageSource): '''base class for any module that implements a VCS system and wraps it for getting source for packages''' diff --git a/devshell/modules/revisorport.py b/devshell/modules/revisorport.py index 3b14963..73accc9 100644 --- a/devshell/modules/revisorport.py +++ b/devshell/modules/revisorport.py @@ -15,8 +15,8 @@ # # Authors: Yaakov M. Nemoy <[email protected]> # -from modules.sourceball import SourceBall -from modules.fedorahostedgitport import FedoraHostedGitPort +from devshell.modules.sourceball import SourceBall +from devshell.modules.fedorahostedgitport import FedoraHostedGitPort class AutoToolsBuilder(object): pass diff --git a/devshell/modules/rpmcvspackage.py b/devshell/modules/rpmcvspackage.py index c01d5e9..3f3d035 100644 --- a/devshell/modules/rpmcvspackage.py +++ b/devshell/modules/rpmcvspackage.py @@ -27,10 +27,10 @@ from subprocess import Popen from shutil import move from tempfile import mkdtemp -from base.base import log -from base.util import pwd, log_file, copytree +from devshell.base.base import log +from devshell.base.util import pwd, log_file, copytree -from modules.package import Package +from devshell.modules.package import Package CVSROOT = ':pserver:[email protected]:/cvs/pkgs' diff --git a/devshell/modules/source.py b/devshell/modules/source.py index ff3708d..9e4dd68 100644 --- a/devshell/modules/source.py +++ b/devshell/modules/source.py @@ -20,8 +20,8 @@ import os import commands from os.path import isdir, join -from base.vars import FEDORA_DIR -from base.module import Module +from devshell.base.vars import FEDORA_DIR +from devshell.base.module import Module # Hack-filled at the moment. diff --git a/devshell/modules/sourceball.py b/devshell/modules/sourceball.py index a1f8779..efa8b3b 100644 --- a/devshell/modules/sourceball.py +++ b/devshell/modules/sourceball.py @@ -26,12 +26,12 @@ from shutil import copytree from subprocess import Popen, PIPE from tempfile import mkdtemp -from base.base import log -from base.exceptions import ExecutionException -from base.util import pwd, copy, move, base_dir, log_file, rm -from base.vars import DIFF_EXCLUDES_FILE +from devshell.base.base import log +from devshell.base.exceptions import ExecutionException +from devshell.base.util import pwd, copy, move, base_dir, log_file, rm +from devshell.base.vars import DIFF_EXCLUDES_FILE -from modules.packagesource import PackageSource +from devshell.modules.packagesource import PackageSource # 4's what git uses # if we go over 4 digits, then weird stuff will happen diff --git a/devshell/ports.py b/devshell/ports.py index 95c0987..b09962b 100755 --- a/devshell/ports.py +++ b/devshell/ports.py @@ -17,7 +17,7 @@ # Authors: Yaakov M. Nemoy <[email protected]> # -from base.base import setup_options, load_modules, log, do_command, setup_logger +from devshell.base.base import setup_options, load_modules, log, do_command, setup_logger def main(): @@ -33,4 +33,4 @@ def main(): log.info(output) if __name__ == '__main__': - main()
\ No newline at end of file + main() |
