Merge pull request #4 from chrismaille/develop

Release 2.2.1

cabrita/__init__.py

@@ -1,2 +1,2 @@
 """Cabrita initialization."""
-__version__ = "2.1.0.rc1"
+__version__ = "2.2.1"

cabrita/components/box.py

@@ -197,6 +197,14 @@ def includes(self) -> list:
         """
         return self.data.get('includes', [])
 
+    @property
+    def show_not_found(self) -> bool:
+        """Return if cabrita will display services when containers not found.
+
+        :return: bool
+        """
+        return bool(self.data.get('show_not_found', False))
+
     @property
     def background_color(self) -> BoxColor:
         """Return the Box Color Enum.
@@ -298,7 +306,7 @@ def run(self) -> None:
 
             can_skip = self.includes != []
             for include in self.includes:
-                if include in service:
+                if include.lower() in service:
                     can_skip = False
 
             if can_skip:
@@ -309,6 +317,9 @@ def run(self) -> None:
             service_name = self._append_ports_in_field("name")
             service_status = self._append_ports_in_field("status")
 
+            if service_status.lower() == "not found" and not self.show_not_found:
+                continue
+
             table_data = [
                 format_color(service_name, self.data_inspected_from_service['style'],
                              self.data_inspected_from_service['theme']),
@@ -417,15 +428,19 @@ def format_revision(table_lines: list) -> list:
 
         :return: list
         """
-        largest_tag = max([
+        largest_tag = [
             len(line[2].split("@")[0] if "@" in line[2] else "")
             for line in table_lines
-        ])
+        ]
+        if largest_tag:
+            largest_tag = max(largest_tag)  # type: ignore
+        else:
+            return table_lines
 
         new_lines = []
         for line in table_lines:
             tag = line[2].split("@")[0] if "@" in line[2] else ""
-            tag = tag.ljust(largest_tag + 1)
+            tag = tag.ljust(largest_tag + 1)  # type: ignore
             tag = formatStr.info(tag, use_prefix=False)
             commit_hash = line[2].split("@")[1] if "@" in line[2] else line[2]
             commit_hash = formatStr.info(commit_hash, use_prefix=False, theme="dark")

cabrita/components/docker.py

@@ -179,7 +179,6 @@ def _get_container_name(self, service: str, index: int = 1) -> str:
         if not name:
             # Generate default_name
             name = os.path.basename(os.path.dirname(self.compose.full_path))
-            name = re.sub(r'[^A-Za-z0-9]+', '', name)
             name = "{}_{}_{}".format(name.lower(), service.lower(), index)
         return name
 

requirements.txt

@@ -7,7 +7,7 @@ certifi==2018.4.16
 chardet==3.0.4
 click==6.7
 colorama==0.3.9
-coverage==4.5.1
+coverage==4.0.3
 decorator==4.3.0
 docopt==0.6.2
 docutils==0.14
@@ -38,6 +38,7 @@ pydashing==1.0.0
 pydocstyle==2.1.1
 Pygments==2.2.0
 pyparsing==2.2.0
+python-coveralls==2.9.1
 pytz==2018.4
 PyYAML==3.12
 raven==6.8.0
@@ -62,4 +63,3 @@ Unidecode==1.0.22
 urllib3==1.22
 virtualenv==16.0.0
 wcwidth==0.1.7
-python-coveralls