util: move processDefines into new helper module

The function is only used by commands. Create a new module where all
command related helpers should be located.

Author: jkloetzke

pym/bob/cmds/build/build.py

@@ -12,7 +12,8 @@
 from ...layers import updateLayers
 from ...share import getShare
 from ...tty import setVerbosity, setTui, Warn
-from ...utils import copyTree, processDefines, EventLoopWrapper, SandboxMode
+from ...utils import copyTree, EventLoopWrapper, SandboxMode
+from ..helpers import processDefines
 import argparse
 import datetime
 import re

pym/bob/cmds/build/clean.py

@@ -9,7 +9,8 @@
 from ...share import getShare
 from ...state import BobState
 from ...tty import colorize, ERROR, WARNING, EXECUTED, DEFAULT, Warn
-from ...utils import removePath, processDefines
+from ...utils import removePath
+from ..helpers import processDefines
 import argparse
 import os
 

pym/bob/cmds/build/project.py

@@ -8,7 +8,8 @@
 from ...generators import generators as defaultGenerators
 from ...input import RecipeSet
 from ...tty import colorize
-from ...utils import processDefines, SandboxMode
+from ...utils import SandboxMode
+from ..helpers import processDefines
 import argparse
 import os
 

pym/bob/cmds/build/query.py

@@ -6,7 +6,7 @@
 from ...builder import LocalBuilder
 from ...errors import ParseError
 from ...input import RecipeSet
-from ...utils import processDefines
+from ..helpers import processDefines
 from string import Formatter
 import argparse
 import os

pym/bob/cmds/build/status.py

@@ -9,7 +9,8 @@
 from ...state import BobState
 from ...tty import colorize, ERROR, WARNING, EXECUTED, DEFAULT, SKIPPED, \
     IMPORTANT, NORMAL, INFO, DEBUG, TRACE, HEADLINE
-from ...utils import joinLines, processDefines
+from ...utils import joinLines
+from ..helpers import processDefines
 from textwrap import indent
 import argparse
 import os

pym/bob/cmds/graph.py

@@ -6,7 +6,8 @@
 from .. import BOB_VERSION
 from ..input import RecipeSet
 from ..tty import colorize
-from ..utils import processDefines, runInEventLoop
+from ..utils import runInEventLoop
+from .helpers import processDefines
 import argparse
 import asyncio
 import json

pym/bob/cmds/helpers.py

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+def processDefines(defs):
+    """Convert a list of 'KEY=VALUE' strings into a dict"""
+    defines = {}
+    for define in defs:
+        key, _sep, value = define.partition('=')
+        defines[key] = value
+    return defines

pym/bob/cmds/jenkins/jenkins.py

@@ -10,8 +10,9 @@
 from ...languages import StepSpec
 from ...state import BobState, JenkinsConfig
 from ...tty import WarnOnce
-from ...utils import processDefines, runInEventLoop, sslNoVerifyContext, quoteCmdExe, \
+from ...utils import runInEventLoop, sslNoVerifyContext, quoteCmdExe, \
     getPlatformString, SandboxMode, compareVersion
+from ..helpers import processDefines
 from .intermediate import getJenkinsVariantId, PartialIR
 from pathlib import PurePosixPath
 from shlex import quote

pym/bob/cmds/layers.py

@@ -2,8 +2,9 @@
 
 from ..layers import Layers, updateLayers
 from ..tty import NORMAL, setVerbosity
-from ..utils import EventLoopWrapper, processDefines
+from ..utils import EventLoopWrapper
 from .build.status import PackagePrinter
+from .helpers import processDefines
 
 def doLayersStatus(argv):
     parser = argparse.ArgumentParser(prog="bob layers status", description='Query layers SCM status')

pym/bob/cmds/misc.py

@@ -7,7 +7,7 @@
 
 from ..input import RecipeSet
 from ..errors import ParseError, BuildError
-from ..utils import processDefines
+from .helpers import processDefines
 import argparse
 import codecs
 import sys