Updated butterfly to work with OF1706+

There has been a change in the naming structure of the image. This is
now fixed.

Resolved #269

butterfly/runmanager.py

@@ -51,7 +51,8 @@ def __init__(self, projectName):
         self.__projectName = projectName
         self.__separator = '&'
         self.isUsingDockerMachine = True \
-            if hasattr(Version, 'isUsingDockerMachine') and Version.isUsingDockerMachine \
+            if hasattr(Version, 'isUsingDockerMachine') and \
+            Version.isUsingDockerMachine \
             else False
 
         self.dockerPath = r'"C:\Program Files\Docker Toolbox"' \
@@ -94,8 +95,9 @@ def getShellinit(self):
         err = '\n'.join(process.stderr)
         if err:
             if err.find('Error checking TLS connection: Host is not running') != -1:
-                msg = ' Docker machine is not running! Run Oracle VM VirtualBox Manager ' \
-                    'as administrator and make sure "default" machine is "running".'
+                msg = ' Docker machine is not running! Run Oracle VM ' \
+                    'VirtualBox Manager as administrator and make sure ' \
+                    '"default" machine is "running".'
             else:
                 msg = ''
 
@@ -123,7 +125,7 @@ def getContainerId(self):
             return
 
         for count, line in enumerate(p.stdout):
-            if line.find('of_plus') > -1:
+            if line.find('of_') > -1:
                 # find container
                 _id = line.split()[0]
                 print('container id: {}'.format(_id))
@@ -253,7 +255,7 @@ def __command(self, cmd, args=None, decomposeParDict=None, includeHeader=True):
         """
         tee = 'tee'
         res = namedtuple('log', 'cmd logfiles errorfiles')
-        _msg = 'Failed to find container id.' \
+        _msg = 'Failed to find container id. ' \
             'Do you have the OpenFOAM container running?\n' \
             'You can initiate OpenFOAM container by running start_OF.bat:\n{}' \
             .format(self.__ofBatchFile)

butterfly/version.py

@@ -9,9 +9,9 @@ class Version(object):
 
     BFVer = "0.0.4"
     OFVer = "4.0"
-    OFFullVer = "v1612+"
+    OFFullVer = "v1706+"
     isUsingDockerMachine = True  # useful to run OpenFOAM container
-    lastUpdated = datetime(year=2017, month=5, day=11, hour=9, minute=44)
+    lastUpdated = datetime(year=2017, month=8, day=24, hour=13, minute=40)
 
     def duplicate(self):
         """Return a copy of this object."""