schd 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

schd/__init__.py

@@ -1 +1 @@
-__version__ = '0.0.5'
+__version__ = '0.0.7'

schd/cmds/daemon.py

@@ -7,11 +7,11 @@ from schd import __version__  as schd_version
 
 class DaemonCommand(CommandBase):
     def add_arguments(self, parser):
-        parser.add_argument('--config')
+        parser.add_argument('--config', '-c')
         parser.add_argument('--logfile')
 
     def run(self, args):
-        config_file = args.config or 'conf/schd.yaml'
+        config_file = args.config
         print(f'starting schd, {schd_version}, config_file={config_file}')
 
         if args.logfile:

schd/cmds/jobs.py

@@ -0,0 +1,19 @@
+"""
+list jobs
+"""
+
+from schd.scheduler import read_config
+from .base import CommandBase
+
+
+class JobsCommand(CommandBase):
+    def add_arguments(self, parser):
+        parser.add_argument('--config', '-c', default=None, help='config file')
+
+    def run(self, args):
+        config = read_config(config_file=args.config)
+        for job_name, job_config in config['jobs'].items():
+            job_class_name = job_config.pop('class')
+            job_cron = job_config.pop('cron')
+            # print(f'{job_name} : {job_class_name} {job_cron}')
+            print(job_name)

schd/cmds/run.py

@@ -1,11 +1,10 @@
 import yaml
 from schd.cmds.base import CommandBase
-from schd.scheduler import build_job
+from schd.scheduler import build_job, read_config
 
 
-def run_job(config_filepath, job_name):
-    with open(config_filepath, 'r', encoding='utf8') as f:
-        config = yaml.load(f, Loader=yaml.FullLoader)
+def run_job(config_file, job_name):
+    config = read_config(config_file)
 
     job_config = config['jobs'][job_name]
 
@@ -18,9 +17,9 @@ def run_job(config_filepath, job_name):
 class RunCommand(CommandBase):
     def add_arguments(self, parser):
         parser.add_argument('job')
-        parser.add_argument('--config')
+        parser.add_argument('--config', '-c')
 
     def run(self, args):
         job_name = args.job
-        config_filepath = args.config
-        run_job(config_filepath, job_name)
+        config_file = args.config
+        run_job(config_file, job_name)

schd/cmds/schd.py

@@ -1,5 +1,6 @@
 import argparse
 import sys
+from schd.cmds.jobs import JobsCommand
 from schd.scheduler import main as scheduler_main
 from .daemon import DaemonCommand
 from .run import RunCommand
@@ -8,13 +9,14 @@ from schd import __version__ as schd_version
 commands = {
     'daemon': DaemonCommand(),
     'run': RunCommand(),
+    'jobs': JobsCommand(),
 }
 
 def main():
     sys.path.append('.')
     parser = argparse.ArgumentParser('schd')
     parser.add_argument('--version', action='store_true', default=False)
-    sub_command_parsers = parser.add_subparsers(dest='cmd', required=False)
+    sub_command_parsers = parser.add_subparsers(dest='cmd')
 
     for cmd, cmd_obj in commands.items():
         sub_command_parser = sub_command_parsers.add_parser(cmd)

schd/scheduler.py

@@ -48,11 +48,23 @@ class CommandJob:
         self.logger.info('process output %s', p.stdout)
 
 
-def run_daemon(config_file):
-    sched = BlockingScheduler(executors={'default': ThreadPoolExecutor(10)})
+def read_config(config_file=None):
+    if config_file is None and 'SCHD_CONFIG' in os.environ:
+        config_file = os.environ['SCHD_CONFIG']
+
+    if config_file is None:
+        config_file = 'conf/schd.yaml'
+
     with open(config_file, 'r', encoding='utf8') as f:
         config = yaml.load(f, Loader=yaml.FullLoader)
 
+    return config
+
+
+def run_daemon(config_file=None):
+    config = read_config(config_file=config_file)
+    sched = BlockingScheduler(executors={'default': ThreadPoolExecutor(10)})
+
     for job_name, job_config in config['jobs'].items():
         job_class_name = job_config.pop('class')
         job_cron = job_config.pop('cron')
@@ -68,7 +80,7 @@ def main():
     parser.add_argument('--logfile')
     parser.add_argument('--config', '-c')
     args = parser.parse_args()
-    config_file = args.config or 'conf/schd.yaml'
+    config_file = args.config
 
     print(f'starting schd, {schd_version}, config_file={config_file}')
 

{schd-0.0.5.dist-info → schd-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: schd
-Version: 0.0.5
+Version: 0.0.7
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

schd-0.0.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+schd/__init__.py,sha256=o2tGYREXqDG1xawirGQcKQH9jzwhG8BDzpSJ7CU7jJw,23
+schd/scheduler.py,sha256=bdyherr29aag4VC1c_CQX76I3s3uK9CbywMYaTdM_HA,3178
+schd/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+schd/cmds/base.py,sha256=ZnNcJozQFLbpYyNp8dhHzm3BzFQa0hm6KyCC6URfueY,122
+schd/cmds/daemon.py,sha256=Nze0xR0YwfOP2myFgL2kfT6qubtdfEjWWegtYtoHgD0,851
+schd/cmds/jobs.py,sha256=843M6rcMjqmm8yevHF4QsJxc0fw8LQfSX7OEA_OH0Dg,590
+schd/cmds/run.py,sha256=sJxXtUdnV1SW523E9L6e2u_2nUEHtWBqQ91P9lI1new,675
+schd/cmds/schd.py,sha256=vOlfQCQT81KhLMvlP3tlymEWpxmqlBOa5vnJoeFXVlw,996
+schd-0.0.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+schd-0.0.7.dist-info/METADATA,sha256=_Q4HQ_C9Y3DfuICYJN8jLEqwyVKn9_TsEJ8sUGNZpS4,238
+schd-0.0.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+schd-0.0.7.dist-info/entry_points.txt,sha256=iVyQSrYOYw0BclgHg9SUeNg9hDg_jeDuUxhvKIcKeSY,46
+schd-0.0.7.dist-info/top_level.txt,sha256=Vojim8xSOsYyQHrZBNhx7n0F7WqbEJ2SeBFAvEnrJ_U,5
+schd-0.0.7.dist-info/RECORD,,

schd-0.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-schd/__init__.py,sha256=oedSZad_JDN4BR_mI8rvEHJyWG4WRSq4bXQcl3dfcYk,23
-schd/scheduler.py,sha256=tocH0r5w-1TRnlu3UwOaKSKIkuViDsr-I3z6F551VIQ,2898
-schd/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-schd/cmds/base.py,sha256=ZnNcJozQFLbpYyNp8dhHzm3BzFQa0hm6KyCC6URfueY,122
-schd/cmds/daemon.py,sha256=5qLwzJwmWhZ6IzY-5mgatft4gKaohoJUCdGodW3Klcc,865
-schd/cmds/run.py,sha256=gjk2Q74rFmaR2jBNQMZA-oSllbhc4-vXWd-JC49roc4,744
-schd/cmds/schd.py,sha256=VPw-wkMNRKL-M983Y6PrzFWQZTHWhq1ZweBqTZfi1L0,944
-schd-0.0.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-schd-0.0.5.dist-info/METADATA,sha256=nXleCw14k0gUSlsITLlpo6DOcCZiQmzgdr4SX5evdq8,238
-schd-0.0.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-schd-0.0.5.dist-info/entry_points.txt,sha256=iVyQSrYOYw0BclgHg9SUeNg9hDg_jeDuUxhvKIcKeSY,46
-schd-0.0.5.dist-info/top_level.txt,sha256=Vojim8xSOsYyQHrZBNhx7n0F7WqbEJ2SeBFAvEnrJ_U,5
-schd-0.0.5.dist-info/RECORD,,