cicada 0.8.3__tar.gz → 0.9.0__tar.gz

{cicada-0.8.3 → cicada-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cicada
-Version: 0.8.3
+Version: 0.9.0
 Summary: Lightweight, agent-based, distributed scheduler
 Home-page: https://github.com/transferwise/cicada
 Author: Wise
@@ -10,9 +10,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg2-binary==2.9.*
 Requires-Dist: pyyaml==6.0.*
-Requires-Dist: croniter==2.0.*
+Requires-Dist: croniter<3.1,>=2.0
 Requires-Dist: tabulate==0.9.*
-Requires-Dist: slack-sdk==3.31.*
+Requires-Dist: slack-sdk==3.37.*
 Requires-Dist: backoff==2.2.*
 Provides-Extra: dev
 Requires-Dist: pytest==8.2.*; extra == "dev"
@@ -21,6 +21,15 @@ Requires-Dist: pytest-mock==3.14.*; extra == "dev"
 Requires-Dist: black==24.4.*; extra == "dev"
 Requires-Dist: flake8==7.1.*; extra == "dev"
 Requires-Dist: freezegun==1.5.*; extra == "dev"
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Cicada scheduler
 
@@ -58,7 +67,7 @@ Requires-Dist: freezegun==1.5.*; extra == "dev"
 
 ## Setup Central Database
 
-Verified on **PostgreSQL** versions *9.6* to *12.9*
+Verified on **PostgreSQL** versions *12.9* to *15.14*
 
 1. Execute as **postgres** user [setup/db_and_user.sql](setup/db_and_user.sql)
 2. Change **cicada** user password
@@ -69,7 +78,7 @@ Verified on **PostgreSQL** versions *9.6* to *12.9*
 
 ## Setup Node
 
-Verified on *Ubuntu 18.04 and 20.04 LTS*
+Verified on *Ubuntu 18.04, 20.04 LTS and 22.04 LTS*
 
 Prerequisites
 

{cicada-0.8.3 → cicada-0.9.0}/README.md

@@ -34,7 +34,7 @@
 
 ## Setup Central Database
 
-Verified on **PostgreSQL** versions *9.6* to *12.9*
+Verified on **PostgreSQL** versions *12.9* to *15.14*
 
 1. Execute as **postgres** user [setup/db_and_user.sql](setup/db_and_user.sql)
 2. Change **cicada** user password
@@ -45,7 +45,7 @@ Verified on **PostgreSQL** versions *9.6* to *12.9*
 
 ## Setup Node
 
-Verified on *Ubuntu 18.04 and 20.04 LTS*
+Verified on *Ubuntu 18.04, 20.04 LTS and 22.04 LTS*
 
 Prerequisites
 

{cicada-0.8.3 → cicada-0.9.0}/cicada/commands/exec_schedule.py

@@ -155,11 +155,9 @@ def main(schedule_id, dbname=None):
     command = str(row[0])
     parameters = str(row[1])
 
-    full_command = []
-    full_command.extend(command.split())
-    full_command.extend(parameters.split())
+    full_command = scheduler.get_full_command(command, parameters)
 
-    human_full_command = str(" ".join(full_command))
+    human_full_command = str(command + " " + parameters)
 
     # Check to see that schedule is not already running
     if get_is_running(db_cur, schedule_id) == 0:

{cicada-0.8.3 → cicada-0.9.0}/cicada/lib/scheduler.py

@@ -11,6 +11,7 @@ import sys
 import os
 import datetime
 import socket
+import shlex
 from croniter import croniter
 
 from cicada.lib import postgres
@@ -252,6 +253,14 @@ def get_schedule_executable(db_cur, schedule_id):
     return obj_schedule_executable
 
 
+def get_full_command(command, parameters):
+    """Generate Full Command"""
+    full_command = []
+    full_command.extend(shlex.split(command))
+    full_command.extend(shlex.split(parameters))
+    return full_command
+
+
 def get_all_schedules(db_cur, server_id, is_async):
     """Extract all candidate schedules for a server
     +--------- minute (0 - 59)

{cicada-0.8.3 → cicada-0.9.0}/cicada.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cicada
-Version: 0.8.3
+Version: 0.9.0
 Summary: Lightweight, agent-based, distributed scheduler
 Home-page: https://github.com/transferwise/cicada
 Author: Wise
@@ -10,9 +10,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg2-binary==2.9.*
 Requires-Dist: pyyaml==6.0.*
-Requires-Dist: croniter==2.0.*
+Requires-Dist: croniter<3.1,>=2.0
 Requires-Dist: tabulate==0.9.*
-Requires-Dist: slack-sdk==3.31.*
+Requires-Dist: slack-sdk==3.37.*
 Requires-Dist: backoff==2.2.*
 Provides-Extra: dev
 Requires-Dist: pytest==8.2.*; extra == "dev"
@@ -21,6 +21,15 @@ Requires-Dist: pytest-mock==3.14.*; extra == "dev"
 Requires-Dist: black==24.4.*; extra == "dev"
 Requires-Dist: flake8==7.1.*; extra == "dev"
 Requires-Dist: freezegun==1.5.*; extra == "dev"
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Cicada scheduler
 
@@ -58,7 +67,7 @@ Requires-Dist: freezegun==1.5.*; extra == "dev"
 
 ## Setup Central Database
 
-Verified on **PostgreSQL** versions *9.6* to *12.9*
+Verified on **PostgreSQL** versions *12.9* to *15.14*
 
 1. Execute as **postgres** user [setup/db_and_user.sql](setup/db_and_user.sql)
 2. Change **cicada** user password
@@ -69,7 +78,7 @@ Verified on **PostgreSQL** versions *9.6* to *12.9*
 
 ## Setup Node
 
-Verified on *Ubuntu 18.04 and 20.04 LTS*
+Verified on *Ubuntu 18.04, 20.04 LTS and 22.04 LTS*
 
 Prerequisites
 

{cicada-0.8.3 → cicada-0.9.0}/cicada.egg-info/requires.txt

@@ -1,8 +1,8 @@
 psycopg2-binary==2.9.*
 pyyaml==6.0.*
-croniter==2.0.*
+croniter<3.1,>=2.0
 tabulate==0.9.*
-slack-sdk==3.31.*
+slack-sdk==3.37.*
 backoff==2.2.*
 
 [dev]

{cicada-0.8.3 → cicada-0.9.0}/setup.py

@@ -7,7 +7,7 @@ with open("README.md") as f:
 
 setup(
     name="cicada",
-    version="0.8.3",
+    version="0.9.0",
     description="Lightweight, agent-based, distributed scheduler",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -20,9 +20,9 @@ setup(
     install_requires=[
         "psycopg2-binary==2.9.*",
         "pyyaml==6.0.*",
-        "croniter==2.0.*",
+        "croniter>=2.0,<3.1",
         "tabulate==0.9.*",
-        "slack-sdk==3.31.*",
+        "slack-sdk==3.37.*",
         "backoff==2.2.*",
     ],
     extras_require={

cicada-0.9.0/tests/test_lib_scheduler.py

@@ -0,0 +1,218 @@
+"""test_lib_scheduler.py"""
+
+import socket
+
+from cicada.lib import scheduler
+
+
+def test_get_host_details():
+    """test_get_host_details"""
+    hostname = socket.gethostname()
+    if hostname.find(".") != -1:
+        hostname = hostname[: hostname.find(".")]
+
+    fqdn = socket.getfqdn()
+
+    ip4_address = socket.gethostbyname(fqdn)
+
+    host_details = scheduler.get_host_details()
+
+    assert (
+        hostname == host_details["hostname"]
+        and fqdn == host_details["fqdn"]
+        and ip4_address == host_details["ip4_address"]
+    )
+
+
+def test_generate_exec_schedule_command():
+    """test_generate_exec_schedule_command"""
+    full_command = scheduler.generate_exec_schedule_command("test_schedule_id")
+
+    assert full_command == [
+        "/opt/cicada/venv/bin/cicada",
+        "exec_schedule",
+        "--schedule_id=test_schedule_id",
+    ]
+
+
+def test_generate_exec_schedule_command_no_dbname():
+    """test_generate_exec_schedule_command_no_dbname"""
+    full_command = scheduler.generate_exec_schedule_command("test_schedule_id", None)
+
+    assert full_command == [
+        "/opt/cicada/venv/bin/cicada",
+        "exec_schedule",
+        "--schedule_id=test_schedule_id",
+    ]
+
+
+def test_generate_exec_schedule_command_with_dbname():
+    """test_generate_exec_schedule_command_with_dbname"""
+    full_command = scheduler.generate_exec_schedule_command("test_schedule_id", "test_db")
+
+    assert full_command == [
+        "/opt/cicada/venv/bin/cicada",
+        "exec_schedule",
+        "--schedule_id=test_schedule_id",
+        "test_db",
+    ]
+
+
+def test_get_full_command_simple():
+    """test_get_full_command with simple command and parameters"""
+    command = "sleep"
+    parameters = "0.5"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["sleep", "0.5"]
+
+
+def test_get_full_command_no_parameters():
+    """test_get_full_command with command only, no parameters"""
+    command = "echo"
+    parameters = ""
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo"]
+
+
+def test_get_full_command_multiple_parameters():
+    """test_get_full_command with multiple space-separated parameters"""
+    command = "echo"
+    parameters = "hello world test"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "hello", "world", "test"]
+
+
+def test_get_full_command_quoted_parameters():
+    """test_get_full_command with quoted parameters containing spaces"""
+    command = "echo"
+    parameters = '"hello world" "foo bar"'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "hello world", "foo bar"]
+
+
+def test_get_full_command_single_quotes():
+    """test_get_full_command with single-quoted parameters"""
+    command = "echo"
+    parameters = "'hello world' 'test value'"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "hello world", "test value"]
+
+
+def test_get_full_command_mixed_quotes():
+    """test_get_full_command with mixed single and double quotes"""
+    command = "echo"
+    parameters = "\"double quoted\" 'single quoted' unquoted"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "double quoted", "single quoted", "unquoted"]
+
+
+def test_get_full_command_with_special_characters():
+    """test_get_full_command with special shell characters in quoted strings"""
+    command = "echo"
+    parameters = '"test$var" "path/to/file" "value&more"'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "test$var", "path/to/file", "value&more"]
+
+
+def test_get_full_command_with_escaped_quotes():
+    """test_get_full_command with escaped quotes inside quoted strings"""
+    command = "echo"
+    parameters = r'"she said \"hello\""'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", 'she said "hello"']
+
+
+def test_get_full_command_with_equals_signs():
+    """test_get_full_command with equals signs in parameters (common in env vars)"""
+    command = "env"
+    parameters = "VAR1=value1 VAR2=value2"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["env", "VAR1=value1", "VAR2=value2"]
+
+
+def test_get_full_command_with_flags():
+    """test_get_full_command with command flags and parameters"""
+    command = "python3"
+    parameters = "-m pytest --verbose"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["python3", "-m", "pytest", "--verbose"]
+
+
+def test_get_full_command_with_path_spaces():
+    """test_get_full_command with file paths containing spaces"""
+    command = "cat"
+    parameters = '"/path/with spaces/file.txt"'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["cat", "/path/with spaces/file.txt"]
+
+
+def test_get_full_command_command_with_path():
+    """test_get_full_command with full path in command"""
+    command = "/usr/bin/python3"
+    parameters = "script.py arg1 arg2"
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["/usr/bin/python3", "script.py", "arg1", "arg2"]
+
+
+def test_get_full_command_whitespace_handling():
+    """test_get_full_command properly handles extra whitespace"""
+    command = "echo"
+    parameters = "  hello    world  "
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "hello", "world"]
+
+
+def test_get_full_command_semicolon_in_quotes():
+    """test_get_full_command with semicolon in quotes (should not execute as separate command)"""
+    command = "echo"
+    parameters = '"command1; command2"'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "command1; command2"]
+
+
+def test_get_full_command_pipe_in_quotes():
+    """test_get_full_command with pipe character in quotes (should not pipe)"""
+    command = "echo"
+    parameters = '"value1 | value2"'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "value1 | value2"]
+
+
+def test_get_full_command_ampersand_in_quotes():
+    """test_get_full_command with ampersand in quotes (should not background)"""
+    command = "echo"
+    parameters = '"command & background"'
+
+    result = scheduler.get_full_command(command, parameters)
+
+    assert result == ["echo", "command & background"]

cicada-0.8.3/tests/test_lib_scheduler.py

@@ -1,58 +0,0 @@
-"""test_lib_scheduler.py"""
-
-import socket
-
-from cicada.lib import scheduler
-
-
-def test_get_host_details():
-    """test_get_host_details"""
-    hostname = socket.gethostname()
-    if hostname.find(".") != -1:
-        hostname = hostname[: hostname.find(".")]
-
-    fqdn = socket.getfqdn()
-
-    ip4_address = socket.gethostbyname(fqdn)
-
-    host_details = scheduler.get_host_details()
-
-    assert (
-        hostname == host_details["hostname"]
-        and fqdn == host_details["fqdn"]
-        and ip4_address == host_details["ip4_address"]
-    )
-
-
-def test_generate_exec_schedule_command():
-    """test_generate_exec_schedule_command"""
-    full_command = scheduler.generate_exec_schedule_command("test_schedule_id")
-
-    assert full_command == [
-        "/opt/cicada/venv/bin/cicada",
-        "exec_schedule",
-        "--schedule_id=test_schedule_id",
-    ]
-
-
-def test_generate_exec_schedule_command_no_dbname():
-    """test_generate_exec_schedule_command_no_dbname"""
-    full_command = scheduler.generate_exec_schedule_command("test_schedule_id", None)
-
-    assert full_command == [
-        "/opt/cicada/venv/bin/cicada",
-        "exec_schedule",
-        "--schedule_id=test_schedule_id",
-    ]
-
-
-def test_generate_exec_schedule_command_with_dbname():
-    """test_generate_exec_schedule_command_with_dbname"""
-    full_command = scheduler.generate_exec_schedule_command("test_schedule_id", "test_db")
-
-    assert full_command == [
-        "/opt/cicada/venv/bin/cicada",
-        "exec_schedule",
-        "--schedule_id=test_schedule_id",
-        "test_db",
-    ]