Merge pull request #122 from ipbus/bugfix/utils_import

Bugfix: utils import

src/ipbb/cmds/common.py

@@ -7,7 +7,7 @@
 from click import echo, secho, style, confirm
 from os.path import join, split, exists, abspath, splitext, relpath, basename
 from ..defaults import kProjAreaFile, kProjUserFile
-from ._utils import DirSentry, formatDictTable
+from ..utils import DirSentry, formatDictTable
 from ..tools.common import which
 
 

src/ipbb/cmds/dep.py

@@ -22,7 +22,7 @@
     isdir,
 )
 from ..tools.common import which, SmartOpen
-from .formatters import DepFormatter
+from ..depparser import DepFormatter
 from ..utils import DirSentry, printDictTable, printAlienTable
 from click import echo, secho, style, confirm
 from texttable import Texttable

src/ipbb/cmds/ipbus.py

@@ -8,7 +8,7 @@
 from os.path import join, split, exists, abspath, splitext, relpath, basename
 from ..defaults import kProjAreaFile, kProjUserFile
 from ..tools.common import which, DEFAULT_ENCODING
-from ._utils import DirSentry, formatDictTable
+from ..utils import DirSentry, formatDictTable
 from .common import addrtab
 
 # ------------------------------------------------------------------------------

src/ipbb/cmds/repo.py

@@ -15,7 +15,7 @@
 from ..depparser import Pathmaker
 from ..tools.common import mkdir
 from ..utils import DirSentry, findFileInParents, raiseError, formatDictTable
-from .formatters import DepFormatter
+from ..depparser import DepFormatter
 from .proj import info as proj_info
 from urllib.parse import urlparse
 from distutils.dir_util import mkpath

src/ipbb/cmds/sim.py

@@ -29,7 +29,7 @@
 from click import echo, secho, style, confirm
 
 # Tools imports
-from ._utils import (
+from ..utils import (
     DirSentry,
     ensureNoMissingFiles,
     echoVivadoConsoleError,

src/ipbb/cmds/vivadohls.py

@@ -7,7 +7,7 @@
 from click import echo, secho, style, confirm
 
 from ..tools.common import which, SmartOpen
-from ._utils import ensureNoParsingErrors, ensureNoMissingFiles, echoVivadoConsoleError
+from ..utils import ensureNoParsingErrors, ensureNoMissingFiles, echoVivadoConsoleError
 
 from ..generators.vivadohlsproject import VivadoHlsProjectGenerator
 from ..tools.xilinx import VivadoHLSSession, VivadoHLSConsoleError

src/ipbb/depparser/__init__.py

@@ -1,4 +1,5 @@
 
 from ._fileparser import DepFileParser, DepFormatter, depfiletypes
 from ._pathmaker import Pathmaker
-from ._definitions import *
+from ._definitions import *
+from ._formatters import *

src/ipbb/cmds/formatters.py → src/ipbb/depparser/_formatters.py

@@ -150,3 +150,19 @@ def drawParsingErrors(self):
 
         return lErrTable.draw()
 
+    # -----------------------------------------------------------------------------
+    def drawSummary(self):
+
+        lOutTxt = ''
+        lOutTxt += self.drawDeptreeCommandsSummary()
+
+        lOutTxt += '\n'
+        lOutTxt += self.drawPackages()
+
+        if self.parser.unresolved:
+            lOutTxt += '\n'
+            lOutTxt += self.drawUnresolvedSummary()
+            return lOutTxt
+
+        return lOutTxt
+    # -----------------------------------------------------------------------------

src/ipbb/scripts/builder.py

@@ -11,7 +11,6 @@
 from click import echo, style, secho
 
 from ..context import Context
-from ..cmds.formatters import DepFormatter
 
 from .._version import __version__
 
@@ -32,9 +31,9 @@
 @click.pass_context
 @click.version_option()
 def climain(ctx, aExcStack):
-    env = ctx.obj
+    ictx = ctx.obj
 
-    env.printExceptionStack = aExcStack
+    ictx.printExceptionStack = aExcStack
 
 
 # ------------------------------------------------------------------------------

src/ipbb/utils.py

@@ -8,6 +8,7 @@
 from texttable import Texttable
 from os.path import join, relpath, exists, split, realpath
 from .tools.alien import AlienBranch
+from .depparser import DepFormatter
 
 # ------------------------------------------------------------------------------
 class DirSentry:
@@ -104,7 +105,6 @@ def ensureNoParsingErrors(aCurrentProj, aDepFileParser):
     if not aDepFileParser.errors:
         return
 
-    from .cmds.formatters import DepFormatter
     fmt = DepFormatter(aDepFileParser)
     secho("ERROR: Project '{}' contains {} parsing error{}.".format(
         aCurrentProj,
@@ -127,7 +127,6 @@ def ensureNoMissingFiles(aCurrentProj, aDepFileParser):
     if not aDepFileParser.unresolved:
         return
 
-    from .cmds.formatters import DepFormatter
     fmt = DepFormatter(aDepFileParser)
     secho("ERROR: Project '{}' contains unresolved dependencies: {} unresolved file{}.".format(
         aCurrentProj,

tests/scripts/generate-ipbb-repo.py

@@ -61,7 +61,7 @@ def cli(repofile, dest):
         pprint.pprint(dp.unresolved)
 
         df = DepFormatter(dp)
-        print(df.summary())
+        print(df.drawSummary())
 
 
 def main():
@@ -72,7 +72,7 @@ def main():
         echo()
         secho(hline, fg='red')
         secho("FATAL ERROR: Caught '" + type(e).__name__ + "' exception:", fg='red')
-        secho(e.message, fg='red')
+        secho(e, fg='red')
         secho(hline, fg='red')
         import StringIO