Skip to content

Commit

Permalink
Merge branch '31-change-file-naming-scheme' into 'master'
Browse files Browse the repository at this point in the history
Change file naming scheme (#31)

Closes #31

See merge request ShellLogger/ShellLogger!24
  • Loading branch information
jmgate committed Feb 2, 2022
2 parents 79e5adc + e6ecedd commit aa564f2
Show file tree
Hide file tree
Showing 19 changed files with 79 additions and 78 deletions.
5 changes: 0 additions & 5 deletions doc/source/AbstractMethod.rst

This file was deleted.

5 changes: 0 additions & 5 deletions doc/source/Shell.rst

This file was deleted.

26 changes: 0 additions & 26 deletions doc/source/StatsCollector.rst

This file was deleted.

20 changes: 0 additions & 20 deletions doc/source/Trace.rst

This file was deleted.

5 changes: 5 additions & 0 deletions doc/source/abstract_method.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
AbstractMethod
==============

.. autoexception:: shelllogger.abstract_method.AbstractMethod
:noindex:
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
HTMLUtilities
=============
HTML Utilities
==============

The following are a number of utility functions used to generate the HTML log
file produced by :class:`ShellLogger`.

.. automodule:: shelllogger.HTMLUtilities
.. automodule:: shelllogger.html_utilities
:noindex:
15 changes: 8 additions & 7 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ shelllogger
:maxdepth: 3
:caption: Contents

ShellLogger
Shell
AbstractMethod
StatsCollector
Trace
HTMLUtilities
shell_logger
shell
abstract_method
stats_collector
trace
html_utilities
todo

The ``shelllogger`` Python module allows you to interact with the shell, while
Expand Down Expand Up @@ -222,4 +222,5 @@ You can view the generated HTML log file `here
More Details
------------

For more detailed usage information, see the :doc:`ShellLogger`.
For more detailed usage information, see the :doc:`shell_logger` class
reference.
5 changes: 5 additions & 0 deletions doc/source/shell.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Shell
=====

.. automodule:: shelllogger.shell
:noindex:
File renamed without changes.
26 changes: 26 additions & 0 deletions doc/source/stats_collector.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
StatsCollector
==============

.. autoclass:: shelllogger.stats_collector.StatsCollector
:noindex:

.. automethod:: shelllogger.stats_collector::stats_collectors
:noindex:

DiskStatsCollector
------------------

.. autoclass:: shelllogger.stats_collector.DiskStatsCollector
:noindex:

CPUStatsCollector
-----------------

.. autoclass:: shelllogger.stats_collector.CPUStatsCollector
:noindex:

MemoryStatsCollector
--------------------

.. autoclass:: shelllogger.stats_collector.MemoryStatsCollector
:noindex:
20 changes: 20 additions & 0 deletions doc/source/trace.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Trace
=====

.. autoclass:: shelllogger.trace.Trace
:noindex:

.. automethod:: shelllogger.trace::trace_collector
:noindex:

STrace
------

.. autoclass:: shelllogger.trace.STrace
:noindex:

LTrace
------

.. autoclass:: shelllogger.trace.LTrace
:noindex:
2 changes: 1 addition & 1 deletion src/shelllogger/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .ShellLogger import ShellLogger, ShellLoggerDecoder, ShellLoggerEncoder
from .shell_logger import ShellLogger, ShellLoggerDecoder, ShellLoggerEncoder

__all__ = ["ShellLogger", "ShellLoggerDecoder", "ShellLoggerEncoder"]
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ def child_logger_card(log) -> Iterator[str]:
Todo:
* The type hinting for ``log`` is done in the docstring instead
of the function signature, because to put it in the signature
would create a circular dependency between ``ShellLogger.py``
and ``HTMLUtilities.py``. This function needs to be reworked
would create a circular dependency between ``shell_logger.py``
and ``html_utilities.py``. This function needs to be reworked
such that there's no longer a dependency on ``ShellLogger``.
"""
child_html = log.to_html()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env python3

from __future__ import annotations
from .Shell import Shell
from .StatsCollector import stats_collectors
from .Trace import trace_collector
from .HTMLUtilities import (nested_simplenamespace_to_dict, opening_html_text,
closing_html_text, append_html, html_message_card,
message_card, command_card, child_logger_card,
parent_logger_card_html)
from .shell import Shell
from .stats_collector import stats_collectors
from .trace import trace_collector
from .html_utilities import (nested_simplenamespace_to_dict, opening_html_text,
closing_html_text, append_html, html_message_card,
message_card, command_card, child_logger_card,
parent_logger_card_html)
from collections.abc import Iterable, Mapping
from datetime import datetime, timedelta
from typing import Iterator, List, Optional, Union
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

from __future__ import annotations
from .AbstractMethod import AbstractMethod
from .abstract_method import AbstractMethod
from abc import abstractmethod
from multiprocessing import Process
from multiprocessing.managers import SyncManager
Expand Down
2 changes: 1 addition & 1 deletion src/shelllogger/Trace.py → src/shelllogger/trace.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

from __future__ import annotations
from .AbstractMethod import AbstractMethod
from .abstract_method import AbstractMethod
from abc import abstractmethod
from pathlib import Path

Expand Down
File renamed without changes.

0 comments on commit aa564f2

Please sign in to comment.