cmdbox 0.6.3__tar.gz → 0.6.3.1__tar.gz

{cmdbox-0.6.3/cmdbox.egg-info → cmdbox-0.6.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.3
+Version: 0.6.3.1
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox

{cmdbox-0.6.3 → cmdbox-0.6.3.1}/cmdbox/app/app.py

@@ -18,7 +18,9 @@ class CmdBoxApp:
     @staticmethod
     def getInstance(appcls=None, ver=version, cli_features_packages:List[str]=None, cli_features_prefix:List[str]=None):
         if CmdBoxApp._instance is None:
-            CmdBoxApp._instance = CmdBoxApp(appcls=appcls, ver=ver, cli_features_packages=cli_features_packages, cli_features_prefix=cli_features_prefix)
+            _self = appcls.__new__(appcls)
+            _self.__init__(appcls=appcls, ver=ver, cli_features_packages=cli_features_packages, cli_features_prefix=cli_features_prefix)
+            CmdBoxApp._instance = _self
         return CmdBoxApp._instance
 
     def __init__(self, appcls=None, ver=version, cli_features_packages:List[str]=None, cli_features_prefix:List[str]=None):
@@ -145,12 +147,12 @@ class CmdBoxApp:
             if logger.level == logging.DEBUG:
                 logger.debug(f"args.mode={args.mode}, args.cmd={args.cmd}")
                 # 警告出力時にスタックを出力する
-                #import warnings
-                #def custom_warning_handler(message, category, filename, lineno, file=None, line=None):
-                #    import traceback
-                #    print(f"Warning: {message}, Category: {category}, File: {filename}, Line: {lineno}")
-                #    traceback.print_stack()
-                #warnings.showwarning = custom_warning_handler
+                import warnings
+                def custom_warning_handler(message, category, filename, lineno, file=None, line=None):
+                    import traceback
+                    logger.warning(f"Warning: {message}, Category: {category}, File: {filename}, Line: {lineno}", exc_info=True)
+                    traceback.print_stack()
+                warnings.showwarning = custom_warning_handler
 
             #scmdexectime = time.perf_counter()
             feat = self.options.get_cmd_attr(args.mode, args.cmd, 'feature')

{cmdbox-0.6.3 → cmdbox-0.6.3.1}/cmdbox/app/common.py

@@ -3,9 +3,8 @@ from cmdbox.app import feature, options
 from cmdbox.app.commons import convert, module, loghandler
 from cryptography.fernet import Fernet
 from pathlib import Path
-from pkg_resources import resource_string
-from rich.logging import RichHandler
 from rich.console import Console
+from rich.logging import RichHandler
 from tabulate import tabulate
 from typing import List, Tuple, Dict, Any
 import argparse
@@ -133,10 +132,11 @@ def reset_logger(name:str, stderr:bool=False, fmt:str='[%(asctime)s] %(levelname
         level (int, optional): ログレベル. Defaults to logging.INFO.
     """
     logger = logging.getLogger(name)
+    #colorful = [h for h in logger.handlers if isinstance(h, loghandler.ColorfulStreamHandler) or isinstance(h, RichHandler)]
     logger.handlers.clear()
     logger.propagate = False
     logger.setLevel(level)
-    logger.addHandler(create_log_handler(stderr, fmt, datefmt, level))
+    logger.addHandler(create_log_handler(stderr, fmt, datefmt, level, colorful=True))
     if get_common_value('webcall', False):
         # webcallの場合はStreamHandlerを削除
         for handler in logger.handlers:
@@ -144,7 +144,7 @@ def reset_logger(name:str, stderr:bool=False, fmt:str='[%(asctime)s] %(levelname
             if issubclass(hc, logging.StreamHandler) and not issubclass(hc, logging.FileHandler):
                 logger.removeHandler(handler)
 
-def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S', level:int=logging.INFO) -> logging.Handler:
+def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S', level:int=logging.INFO, colorful:bool=True) -> logging.Handler:
     """
     ログハンドラを生成します。
 
@@ -152,13 +152,18 @@ def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s -
         stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
         fmt (str, optional): ログフォーマット. Defaults to '[%(asctime)s] %(levelname)s - %(message)s'.
         datefmt (str, optional): 日時フォーマット. Defaults to '%Y-%m-%d %H:%M:%S'.
+        level (int, optional): ログレベル. Defaults to logging.INFO.
+        colorful (bool, optional): カラフルなログを使用するかどうか. Defaults to True.
     Returns:
         logging.Handler: ログハンドラ
     """
     formatter = logging.Formatter(fmt, datefmt)
     #handler = RichHandler(console=Console(stderr=stderr), show_path=False, omit_repeated_times=False,
     #                      tracebacks_word_wrap=False, log_time_format='[%Y-%m-%d %H:%M]')
-    handler = loghandler.ColorfulStreamHandler(sys.stdout if not stderr else sys.stderr)
+    if colorful:
+        handler = loghandler.ColorfulStreamHandler(sys.stdout if not stderr else sys.stderr)
+    else:
+        handler = logging.StreamHandler(sys.stdout if not stderr else sys.stderr)
     handler.setFormatter(formatter)
     handler.setLevel(level)
     return handler
@@ -180,7 +185,7 @@ def create_console(stderr:bool=False, file=None) -> Console:
     #console = Console(soft_wrap=True, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
     return console
 
-def console_log(console:Console, message:Any, **kwargs) -> None:
+def console_log(console:Console, message:Any, highlight:bool=True, **kwargs) -> None:
     """
     コンソールにログを出力します。
 
@@ -190,7 +195,7 @@ def console_log(console:Console, message:Any, **kwargs) -> None:
         **kwargs: その他のキーワード引数
     """
     dtstr = datetime.datetime.now().strftime('[%Y-%m-%d %H:%M:%S]')
-    console.print(f"{dtstr} {message}", highlight=True, **kwargs)
+    console.print(f"{dtstr} {message}", highlight=highlight, **kwargs)
 
 def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging.Logger:
     """
@@ -269,8 +274,7 @@ def load_config(mode:str, debug:bool=False, data=HOME_DIR, webcall:bool=False, v
     logging.config.dictConfig(log_config)
     logger = logging.getLogger(log_name)
     set_debug(logger, debug)
-    config = yaml.safe_load(resource_string(version.__appid__, "config.yml"))
-    return logger, config
+    return logger, {}
 
 def set_debug(logger:logging.Logger, debug:bool=False) -> None:
     """

{cmdbox-0.6.3 → cmdbox-0.6.3.1}/cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -182,7 +182,7 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
             console = common.create_console(file=old_stdout)
 
             try:
-                common.console_log(console, f'EXEC  - {opt_list}\n'[:logsize])
+                common.console_log(console, message=f'EXEC  - {opt_list}\n'[:logsize], highlight=(len(opt_list)<logsize-10))
                 status, ret_main, obj = cmdbox_app.main(args_list=[common.chopdq(o) for o in opt_list], file_dict=file_dict, webcall=True)
                 if isinstance(obj, server.Server):
                     cmdbox_app.sv = obj
@@ -209,11 +209,11 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                             output = [dict(warn=f'The captured stdout was discarded because its size was larger than {capture_maxsize} bytes.')]
                 else:
                     output = [dict(warn='capture_stdout is off.')]
-                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]) # コマンド実行時のアウトプットはカラーリングしない
+                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]+'\n') # コマンド実行時のアウトプットはカラーリングしない
             except Exception as e:
                 web.logger.disabled = False # ログ出力を有効にする
                 msg = f'exec_cmd error. {traceback.format_exc()}'
-                common.console_log(console, f'EXEC  - {msg}'[:logsize])
+                common.console_log(console, message=f'EXEC  - {msg}'[:logsize], highlight=(len(msg)<logsize-10))
                 web.logger.warning(msg)
                 output = [dict(warn=f'<pre>{html.escape(traceback.format_exc())}</pre>')]
             sys.stdout = old_stdout

{cmdbox-0.6.3 → cmdbox-0.6.3.1}/cmdbox/version.py

@@ -1,10 +1,10 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 7, 28)
+dt_now = datetime.datetime(2025, 7, 29)
 days_ago = (datetime.datetime.now() - dt_now).days
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.3'
+__version__ = '0.6.3.1'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

{cmdbox-0.6.3 → cmdbox-0.6.3.1/cmdbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.3
+Version: 0.6.3.1
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox

{cmdbox-0.6.3 → cmdbox-0.6.3.1}/cmdbox.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ setup.py
 cmdbox/__init__.py
 cmdbox/__main__.py
 cmdbox/autoload.py
-cmdbox/config.yml
 cmdbox/logconf_audit.yml
 cmdbox/logconf_client.yml
 cmdbox/logconf_cmdbox.yml

cmdbox-0.6.3/cmdbox/config.yml

@@ -1,3 +0,0 @@
-cmdbox:
-    common:
-        boot_path: /index.html