devopsdriver 0.1.40__tar.gz → 0.1.42__tar.gz

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devopsdriver
-Version: 0.1.40
+Version: 0.1.42
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -47,8 +47,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML==6.0.1
-Requires-Dist: keyring==25.0.0
-Requires-Dist: setuptools==69.0.2
+Requires-Dist: keyring==25.1.0
+Requires-Dist: setuptools==69.2.0
 Requires-Dist: azure-devops==7.1.0b4
 Requires-Dist: Mako==1.3.2
 Provides-Extra: dev
@@ -60,7 +60,7 @@ Requires-Dist: coverage>=7.4.4; extra == "test"
 Provides-Extra: doc
 
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.40&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.40/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.42&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.42/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/README.md

@@ -1,5 +1,5 @@
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.40&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.40/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.42&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.42/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver/__init__.py

@@ -6,6 +6,6 @@ from .template import Template
 from .azdo.clients import Azure
 
 
-__version__ = "0.1.40"
+__version__ = "0.1.42"
 __author__ = "Marc Page"
 __credits__ = ""

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver/azdo/__init__.py

@@ -1,11 +1,11 @@
 """ initialize azure module """
 
 # re export symbols for easier use
+from .azureobject import AzureObject
 from .clients import Azure
 from .timestamp import Timestamp
 
-from .workitem.workitem import WorkItem
 from .workitem.wiql import Wiql, Value, Field
-from .workitem.wiql import Ascending, Descending, And, Or
+from .workitem.wiql import Ascending, Descending, And, Or, In, NotIn
 from .workitem.wiql import Equal, NotEqual, LessThanOrEqual, GreaterThanOrEqual
 from .workitem.wiql import IsEmpty, IsNotEmpty, LessThan, GreaterThan

devopsdriver-0.1.42/devopsdriver/azdo/azureobject.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+
+""" An Azure Devops WorkItem """
+
+
+from msrest.serialization import Model
+
+from devopsdriver.azdo.timestamp import Timestamp
+from devopsdriver.dataobject import DataObject
+
+
+class AzureObject(DataObject):  # pylint: disable=too-few-public-methods
+    """Azure WorkItem"""
+
+    def __init__(self, azure_object: Model):
+        self.raw = azure_object
+        super().__init__(self.raw.as_dict())
+
+    def _parse_value(self, data: any) -> any:
+        if isinstance(data, str) and Timestamp.is_timestamp(data):
+            return Timestamp(data)
+
+        return super()._parse_value(data)
+
+    def _get_field(self, name: str, data: dict) -> any:
+        value = super()._get_field(name, data)
+
+        if value is None and "fields" in data:
+            return self._get_field(name, data["fields"])
+
+        return value

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver/azdo/clients.py

@@ -13,6 +13,7 @@ from msrest.authentication import BasicAuthentication as MSBasicAuthentication
 
 from devopsdriver.settings import Settings
 from devopsdriver.azdo.workitem.client import Client as WIClient
+from devopsdriver.azdo.pipeline.client import Client as PLClient
 
 
 # for testing
@@ -44,9 +45,11 @@ class Azure:  # pylint: disable=too-few-public-methods
         token = settings["azure.token"] if token is None else token
         self.connection = CONNECTION(base_url=url, creds=AUTHENTICATION("", token))
         client_calls = {
-            "workitem": self.connection.clients_v7_1.get_work_item_tracking_client
+            "workitem": self.connection.clients_v7_1.get_work_item_tracking_client,
+            "pipeline": self.connection.clients_v7_1.get_pipelines_client,
         }
         self.workitem = WIClient(Azure.__client("workitem", clients, client_calls))
+        self.pipeline = PLClient(Azure.__client("pipeline", clients, client_calls))
 
     @staticmethod
     def __client(name: str, clients: dict, calls: dict) -> any:

devopsdriver-0.1.42/devopsdriver/azdo/pipeline/client.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+
+""" Pipeline client """
+
+
+from azure.devops.v7_1.pipelines import PipelinesClient
+
+from .pipeline import Pipeline
+
+
+class Client:  # pylint: disable=too-few-public-methods
+    """Pipeline Client wrapper"""
+
+    def __init__(self, client: PipelinesClient):
+        self.client = client
+
+    def list(self, project: str) -> list[Pipeline]:
+        """List the pipelines
+
+        Args:
+            project (str): The project to list
+
+        Returns:
+            list[Pipeline]: The list of pipeline objects
+        """
+        return [
+            Pipeline(self.client, project, p)
+            for p in self.client.list_pipelines(project)
+        ]

devopsdriver-0.1.42/devopsdriver/azdo/pipeline/log.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+
+""" Azure Pipeline Run Log """
+
+
+from azure.devops.v7_1.pipelines.models import Log as AzureLog
+
+from requests import get as get_url
+
+from devopsdriver.azdo.azureobject import AzureObject
+
+
+GET_URL = get_url
+
+
+class Log(AzureObject):  # pylint: disable=too-few-public-methods
+    """Log fields:
+    created_on ("2024-04-08T23:00:59.020Z")
+    id (8)
+    last_changed_on ("2024-04-08T23:00:59.160Z")
+    line_count (4)
+    url ("https://dev.azure.com/Org/<guid>/_apis/pipelines/1/runs/10/logs/8")
+    """
+
+    def __init__(self, log: AzureLog):
+        self.text = GET_URL(log.signed_content.url, timeout=1).text
+        super().__init__(log)

devopsdriver-0.1.42/devopsdriver/azdo/pipeline/pipeline.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+
+""" Azure Pipeline """
+
+
+from azure.devops.v7_1.pipelines.models import Pipeline as AzurePipeline
+from azure.devops.v7_1.pipelines import PipelinesClient
+
+from devopsdriver.azdo import AzureObject
+
+from .run import Run
+
+
+class Pipeline(AzureObject):  # pylint: disable=too-few-public-methods
+    """Pipeline fields:
+    folder ("\\")
+    id (1)
+    name (DevOps)
+    revision (1),
+    _links ({}),
+    url (https://dev.azure.com/Org/<guid>/_apis/pipelines/1?revision=1)
+    """
+
+    def __init__(self, client: PipelinesClient, project: str, pipeline: AzurePipeline):
+        self.client = client
+        self.project = project
+        super().__init__(pipeline)
+
+    def get_runs(self):
+        """Gets the top 10,000 runs for this pipeline"""
+        return [
+            Run(self.client, self.project, self.raw, r)
+            for r in self.client.list_runs(self.project, self.id)
+        ]

devopsdriver-0.1.42/devopsdriver/azdo/pipeline/run.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+
+
+""" Pipeline Run """
+
+
+from azure.devops.v7_1.pipelines.models import Pipeline
+from azure.devops.v7_1.pipelines.models import Run as AzureRun
+from azure.devops.v7_1.pipelines import PipelinesClient
+
+from devopsdriver.azdo import AzureObject
+
+from .log import Log
+
+
+class Run(AzureObject):  # pylint: disable=too-few-public-methods
+    """Run fields:
+    id (1)
+    name ("20240325.1")
+    _links ({})
+    created_date ("2024-03-25T23:53:38.503126Z")
+    finished_date ("2024-03-25T23:53:43.467565Z")
+    pipeline (see Pipeline)
+    result ("failed")
+    state ("completed")
+    template_parameters ({})
+    url ("https://dev.azure.com/Org/<guid>/_apis/pipelines/1/runs/1")
+    """
+
+    def __init__(
+        self, client: PipelinesClient, project: str, pipeline: Pipeline, run: AzureRun
+    ):
+        self.client = client
+        self.project = project
+        self.pipeline = pipeline
+        super().__init__(run)
+
+    def logs(self):
+        """Get Logs for the run"""
+        return [
+            Log(l)
+            for l in self.client.list_logs(
+                self.project, self.pipeline.id, self.raw.id, expand="signedContent"
+            )
+        ]

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver/azdo/workitem/client.py

@@ -8,7 +8,7 @@ from azure.devops.v7_1.work_item_tracking.models import Wiql as AzureWiql
 from azure.devops.v7_1.work_item_tracking.models import WorkItem as AzureWorkItem
 from azure.devops.v7_1.work_item_tracking.models import TeamContext
 from azure.devops.v7_1.work_item_tracking.models import WorkItemQueryResult
-from devopsdriver.azdo.workitem.workitem import WorkItem
+from devopsdriver.azdo.azureobject import AzureObject
 from devopsdriver.azdo.workitem.wiql import Wiql
 
 
@@ -75,7 +75,7 @@ class Client:
         # columns: list of name, reference_name, url
         return [i.id for i in found.work_items]
 
-    def find(self, wiql: Wiql | str, top: int = None) -> list[list[WorkItem]]:
+    def find(self, wiql: Wiql | str, top: int = None) -> list[list[AzureObject]]:
         """Gets the full history of items found in a WIQL search
 
         Args:
@@ -86,5 +86,5 @@ class Client:
             list[list[WorkItem]]: List of work items, each is a history of work items
         """
         return [
-            [WorkItem(e) for e in self.history(i)] for i in self.find_ids(wiql, top)
+            [AzureObject(e) for e in self.history(i)] for i in self.find_ids(wiql, top)
         ]

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver/azdo/workitem/wiql.py

@@ -133,15 +133,50 @@ class Compare:  # pylint: disable=too-few-public-methods
         field: Field | str,
         value: Value | str | date | datetime | int | float,
         operator: str,
+        value_is_computed=False,
     ):
         self.left = field if isinstance(field, Field) else Field(field)
-        self.right = value if isinstance(value, Value) else Value(value)
+        self.right = (
+            value if value_is_computed or isinstance(value, Value) else Value(value)
+        )
         self.operator = operator
 
     def __str__(self) -> str:
         return f"{str(self.left)} {self.operator} {str(self.right)}"
 
 
+class In(Compare):  # pylint: disable=too-few-public-methods
+    """checks for field in a list of values"""
+
+    def __init__(
+        self,
+        field: Field | str,
+        *values: list[Value | str | date | datetime | int | float],
+    ):
+        super().__init__(
+            field,
+            f"({', '.join(str(v if isinstance(v, Value) else Value(v)) for v in values)})",
+            "IN",
+            value_is_computed=True,
+        )
+
+
+class NotIn(Compare):  # pylint: disable=too-few-public-methods
+    """checks for field in a list of values"""
+
+    def __init__(
+        self,
+        field: Field | str,
+        *values: list[Value | str | date | datetime | int | float],
+    ):
+        super().__init__(
+            field,
+            f"({', '.join(str(v if isinstance(v, Value) else Value(v)) for v in values)})",
+            "NOT IN",
+            value_is_computed=True,
+        )
+
+
 class Equal(Compare):  # pylint: disable=too-few-public-methods
     """checks for equality"""
 

devopsdriver-0.1.42/devopsdriver/dataobject.py

@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+
+""" Data Objects """
+
+
+class DataObject:  # pylint: disable=too-few-public-methods
+    """dict like object with fuzzy field matching"""
+
+    def __init__(self, data: dict):
+        self.data = data
+
+    def _matches_field(self, name: str, field: str) -> bool:
+        name = name.lower()
+        field = field.lower()
+
+        if name == field:
+            return True
+
+        if name == field.replace(".", "_"):
+            return True
+
+        if name == field.split(".")[-1]:
+            return True
+
+        return False
+
+    def _parse_value(self, data: any) -> any:
+        if isinstance(data, dict):
+            return DataObject._Dict(self, data)
+
+        if isinstance(data, list):
+            return [self._parse_value(d) for d in data]
+
+        return data
+
+    def _get_field(self, name: str, data: dict) -> any:
+        assert name and data, f"name = {name} data = {data}"
+        found = [f for f in data if self._matches_field(name, f)]
+        assert len(found) in {0, 1}, found
+
+        if len(found) == 1:
+            return self._parse_value(data[found[0]])
+
+        return None
+
+    def __getattr__(self, name: str) -> any:
+        return self._get_field(name, self.data)
+
+    class _Dict(dict):
+        def __init__(self, dataobject, data: dict):
+            self.dataobject = dataobject
+            super().__init__(data)
+
+        def __getattr__(self, name: str) -> any:
+            return self.dataobject._get_field(name, self)

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devopsdriver
-Version: 0.1.40
+Version: 0.1.42
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -47,8 +47,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML==6.0.1
-Requires-Dist: keyring==25.0.0
-Requires-Dist: setuptools==69.0.2
+Requires-Dist: keyring==25.1.0
+Requires-Dist: setuptools==69.2.0
 Requires-Dist: azure-devops==7.1.0b4
 Requires-Dist: Mako==1.3.2
 Provides-Extra: dev
@@ -60,7 +60,7 @@ Requires-Dist: coverage>=7.4.4; extra == "test"
 Provides-Extra: doc
 
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.40&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.40/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.42&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.42/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 devopsdriver/__init__.py
+devopsdriver/dataobject.py
 devopsdriver/manage_settings.py
 devopsdriver/sendmail.py
 devopsdriver/settings.py
@@ -13,18 +14,27 @@ devopsdriver.egg-info/entry_points.txt
 devopsdriver.egg-info/requires.txt
 devopsdriver.egg-info/top_level.txt
 devopsdriver/azdo/__init__.py
+devopsdriver/azdo/azureobject.py
 devopsdriver/azdo/clients.py
 devopsdriver/azdo/timestamp.py
+devopsdriver/azdo/pipeline/__init__.py
+devopsdriver/azdo/pipeline/client.py
+devopsdriver/azdo/pipeline/log.py
+devopsdriver/azdo/pipeline/pipeline.py
+devopsdriver/azdo/pipeline/run.py
 devopsdriver/azdo/workitem/__init__.py
 devopsdriver/azdo/workitem/client.py
 devopsdriver/azdo/workitem/wiql.py
-devopsdriver/azdo/workitem/workitem.py
 devopsdriver/templates/manage_settings.txt.mako
+tests/test_azure_azureobject.py
 tests/test_azure_clients.py
+tests/test_azure_pipeline.py
+tests/test_azure_pipeline_client.py
+tests/test_azure_pipeline_run.py
 tests/test_azure_timestamp.py
-tests/test_azure_workitem.py
 tests/test_azure_workitem_client.py
 tests/test_azure_workitem_wiql.py
+tests/test_dataobject.py
 tests/test_manage_settings.py
 tests/test_sendmail.py
 tests/test_settings.py

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/devopsdriver.egg-info/requires.txt

@@ -1,6 +1,6 @@
 PyYAML==6.0.1
-keyring==25.0.0
-setuptools==69.0.2
+keyring==25.1.0
+setuptools==69.2.0
 azure-devops==7.1.0b4
 Mako==1.3.2
 

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/pyproject.toml

@@ -7,8 +7,8 @@ dynamic = ["version"]
 requires-python = ">= 3.10"
 dependencies = [
   "PyYAML==6.0.1",
-  "keyring==25.0.0",
-  "setuptools==69.0.2",  # neded for azure-devops to use 7.1 API
+  "keyring==25.1.0",
+  "setuptools==69.2.0",  # neded for azure-devops to use 7.1 API
   "azure-devops==7.1.0b4",
   "Mako==1.3.2",
 ]
@@ -34,6 +34,9 @@ settings = "devopsdriver.manage_settings:main"
 [tool.setuptools.package-data]
 "*" = ["*.mako"]
 
+[tool.setuptools.packages.find]
+include = ["devopsdriver*"]
+
 [project.optional-dependencies]
 dev = [
     "black>=24.3.0",

devopsdriver-0.1.40/tests/test_azure_workitem.py → devopsdriver-0.1.42/tests/test_azure_azureobject.py

@@ -2,10 +2,10 @@
 
 """ Test work item """
 
-from devopsdriver.azdo import WorkItem
+from devopsdriver.azdo import AzureObject
 
 
-class MockAzureWorkItem:
+class MockAzureWorkItem:  # pylint: disable=too-few-public-methods
     """mock out work item"""
 
     def as_dict(self):
@@ -76,7 +76,7 @@ class MockAzureWorkItem:
 
 def test_workitem() -> None:
     """test basic work item"""
-    wi = WorkItem(MockAzureWorkItem())
+    wi = AzureObject(MockAzureWorkItem())
     assert wi.id == 5, wi.id
     assert wi.ID == 5, wi.ID
     assert wi.workitemtype == "User Story", wi.workitemtype
@@ -87,7 +87,7 @@ def test_workitem() -> None:
 
 def test_timestamp() -> None:
     """test timestamps"""
-    wi = WorkItem(MockAzureWorkItem())
+    wi = AzureObject(MockAzureWorkItem())
     assert wi.StateChangeDate.to_string() == "2023-11-16T03:12:32.94Z"
     assert wi.CreatedDate.to_string() == "2023-11-16T03:12:32.94Z"
     assert wi.ChangedDate.to_string() == "2023-11-16T03:12:32.94Z"

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/tests/test_azure_clients.py

@@ -28,6 +28,10 @@ class MockConnection:  # pylint: disable=too-few-public-methods
                 """fakes getting work item client"""
                 return "work_item_tracking_client"
 
+            def get_pipelines_client(self) -> str:
+                """mocks getting pipeline client"""
+                return "get_pipelines_client"
+
         self.clients_v7_1 = Clients71()
 
 

devopsdriver-0.1.42/tests/test_azure_pipeline.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+""" Test Pipeline """
+
+from devopsdriver.azdo.pipeline.pipeline import Pipeline
+
+
+class MockRun:  # pylint: disable=too-few-public-methods
+    """moc out a run"""
+
+    def __init__(self, value: str):
+        self.value = value
+
+    def as_dict(self):
+        """mock out list_runs method"""
+        return {"id": self.value}
+
+
+class MockPipelineClient:
+    """mock pipeline client"""
+
+    def as_dict(self):
+        """mock out as_dict method"""
+        return {}
+
+    def list_runs(self, project: str, pipeline_id: int):
+        """mock out list_runs method"""
+        return [MockRun(project), MockRun(pipeline_id)]
+
+
+class MockPipeline:  # pylint: disable=too-few-public-methods
+    """mock out Azure pipeline object"""
+
+    def as_dict(self):
+        """mock out list_runs method"""
+        return {"id": 5}
+
+
+def test_pipeline() -> None:
+    """tests basic pipeline functionality"""
+    pipeline = Pipeline(MockPipelineClient(), "project", MockPipeline())
+    runs = pipeline.get_runs()
+    assert len(runs) == 2, runs
+
+
+if __name__ == "__main__":
+    test_pipeline()

devopsdriver-0.1.42/tests/test_azure_pipeline_client.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+""" Test Pipeline Client"""
+
+from devopsdriver.azdo.pipeline.client import Client
+
+
+class MockAzurePipeline:  # pylint: disable=too-few-public-methods
+    """mock azure pipeline object"""
+
+    def __init__(self, project: str):
+        self.project = project
+
+    def as_dict(self):
+        """mock as_dict"""
+        return {"project": self.project}
+
+
+class MockAzurePipelinesClient:  # pylint: disable=too-few-public-methods
+    """mock pipelines client"""
+
+    def list_pipelines(self, project: str):
+        """mock list_pipelines"""
+        return [MockAzurePipeline(f"{project} 1"), MockAzurePipeline(f"{project} 2")]
+
+
+def test_client() -> None:
+    """tests the pipeline client"""
+    client = Client(MockAzurePipelinesClient())
+    pipelines = client.list("project")
+    assert len(pipelines) == 2, pipelines
+
+
+if __name__ == "__main__":
+    test_client()

devopsdriver-0.1.42/tests/test_azure_pipeline_run.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+""" Test pipeline run """
+
+from types import SimpleNamespace
+
+from devopsdriver.azdo.pipeline.run import Run
+from devopsdriver.azdo.pipeline import log
+
+
+class MockAzureRun:  # pylint: disable=too-few-public-methods
+    """Mock azure run object"""
+
+    def __init__(self, run_id):
+        self.id = run_id
+
+    def as_dict(self):
+        """mock as_dict"""
+        return {"id": 48}
+
+
+class MockLog:  # pylint: disable=too-few-public-methods
+    """mock azure log object"""
+
+    def __init__(self, text):
+        self.text = text
+        self.signed_content = SimpleNamespace(url=SimpleNamespace(text="some dumb url"))
+
+    def as_dict(self):
+        """mock as_dict"""
+        return {"id": 22}
+
+
+class MockPipelineClient:  # pylint: disable=too-few-public-methods
+    """mock azure pipelines client"""
+
+    def __init__(self):
+        self.project = None
+        self.pipeline_id = None
+        self.run_id = None
+        self.expand = None
+
+    def list_logs(self, project, pipeline_id, run_id, expand):
+        """mock list_logs"""
+        self.project = project
+        self.pipeline_id = pipeline_id
+        self.run_id = run_id
+        self.expand = expand
+        return [MockLog("log 1"), MockLog("log 2")]
+
+
+class MockPipeline:  # pylint: disable=too-few-public-methods
+    """mock pipeline object"""
+
+    def __init__(self, pipeline_id):
+        self.id = pipeline_id
+
+
+def test_basic() -> None:
+    """test basic run and log"""
+    log.GET_URL = lambda x, timeout: x
+    run = Run(MockPipelineClient(), "project", MockPipeline(5), MockAzureRun(83))
+    logs = run.logs()
+    assert len(logs) == 2, logs
+
+
+if __name__ == "__main__":
+    test_basic()

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/tests/test_azure_timestamp.py

@@ -287,6 +287,7 @@ def test_math() -> None:
     now2 = now1 + timedelta(days=7)
     assert (now2 - now1).days == 7
     assert now2 - timedelta(days=7) == now1
+    assert not Timestamp.is_timestamp(5)
 
     try:
         assert now1 - 5 is False

{devopsdriver-0.1.40 → devopsdriver-0.1.42}/tests/test_azure_workitem_wiql.py

@@ -6,7 +6,7 @@ from datetime import date, datetime
 
 from devopsdriver.azdo import Wiql
 from devopsdriver.azdo import Ascending, Descending, Value
-from devopsdriver.azdo import IsEmpty, IsNotEmpty, And, Or
+from devopsdriver.azdo import IsEmpty, IsNotEmpty, And, Or, In, NotIn
 from devopsdriver.azdo import GreaterThan, LessThan, Equal, NotEqual
 from devopsdriver.azdo import GreaterThanOrEqual, LessThanOrEqual
 
@@ -65,7 +65,21 @@ def test_invalid_value_type() -> None:
         pass
 
 
+def test_in_and_not_in() -> None:
+    """Test in and not in operators"""
+    builder = Wiql().where(
+        And(In("State", "New", "Ready for Development"), NotIn("Priority", 1, 2))
+    )
+    expected = (
+        """SELECT [System.Id] FROM workitems WHERE [System.State] """
+        + """IN ("New", "Ready for Development") AND [Microsoft.VSTS.Common.Priority] """
+        + """NOT IN (1, 2)"""
+    )
+    assert str(builder) == expected, str(builder)
+
+
 if __name__ == "__main__":
+    test_in_and_not_in()
     test_invalid_value_type()
     test_expressions()
     test_no_params()

devopsdriver-0.1.42/tests/test_dataobject.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+""" Testing dataobject """
+
+
+from devopsdriver.dataobject import DataObject
+
+
+def test_dataobject_basic() -> None:
+    """tests the basic dataobject"""
+    data = DataObject(
+        {
+            "Test": 5,
+            "system.Go": 12,
+            "fields": {"harry": 16, "people": [{"name": "john"}, 5, "test"]},
+        }
+    )
+    assert data.test == 5, data.test
+    assert data.go == 12, data.go
+    assert data.system_go == 12, data.system_go
+    assert data.fields.Harry == 16, data.fields.Harry
+    assert data.Harry is None, data.Harry
+    assert data.fields.people[0].Name == "john", data.fields.people[0].Name
+    assert data.fields.people[1] == 5, data.fields.people[1]
+    assert data.fields.people[2] == "test", data.fields.people[2]
+
+
+if __name__ == "__main__":
+    test_dataobject_basic()

devopsdriver-0.1.40/devopsdriver/azdo/workitem/workitem.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-
-
-""" An Azure Devops WorkItem """
-
-
-from typing import Any
-
-from azure.devops.v7_1.work_item_tracking.models import WorkItem as AzureWorkItem
-
-from devopsdriver.azdo.timestamp import Timestamp
-
-
-class WorkItem:  # pylint: disable=too-few-public-methods
-    """Azure WorkItem"""
-
-    def __init__(self, work_item: AzureWorkItem):
-        self.raw = work_item
-
-    @staticmethod
-    def __matches_field(name: str, field: str) -> bool:
-        name = name.lower()
-        field = field.lower()
-
-        if name == field:
-            return True
-
-        if name == field.replace(".", "_"):
-            return True
-
-        if name == field.split(".")[-1]:
-            return True
-
-        return False
-
-    @staticmethod
-    def _parse_field(name: str, data: dict) -> any:
-        assert name and data
-        found = [f for f in data if WorkItem.__matches_field(name, f)]
-
-        if len(found) == 1:
-            return (
-                WorkItem._Dict(data[found[0]])
-                if isinstance(data[found[0]], dict)
-                else data[found[0]]
-            )
-
-        if "fields" in data:
-            return WorkItem._parse_field(name, data["fields"])
-
-        return None
-
-    class _Dict(dict):
-        def __getattr__(self, name: str) -> Any:
-            value = WorkItem._parse_field(name, self)
-
-            if Timestamp.is_timestamp(value):
-                return Timestamp(value)
-
-            return value
-
-    def __getattr__(self, name: str) -> Any:
-        value = WorkItem._parse_field(name, self.raw.as_dict())
-
-        if Timestamp.is_timestamp(value):
-            return Timestamp(value)
-
-        return value