stoobly-agent 1.5.6__py3-none-any.whl → 1.5.7__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.6'
+VERSION = '1.5.7'

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -22,7 +22,7 @@ context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
 user_id_option=--user-id $(USER_ID)
-stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
+stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p "$(shell echo $(context_dir) | md5sum | awk '{print $$1}')"
 workflow_run_options=--script-path $(workflow_script) $(workflow_service_options)
 workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) $(user_id_option)
 
@@ -30,14 +30,15 @@ app_data_dir=$(app_dir)/.stoobly
 app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
 dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
-docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
+exec_docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
 workflow_script=.stoobly/tmp/$(WORKFLOW).sh
 
 # Commands
 docker_command=docker
 docker_compose_command=$(docker_command) compose
+exec_down=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) down
 exec_env=APP_DIR="$(app_dir)" CA_CERTS_DIR="$(ca_certs_dir)" USER_ID="$(USER_ID)"
-exec_up=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
+exec_up=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
 source_env=set -a; [ -f .env ] && source .env; set +a
 
 # Build base image
@@ -74,6 +75,8 @@ command/install:
 	$(eval COMMAND=install)
 command/uninstall:
 	$(eval COMMAND=uninstall)
+exec/down:
+	@$(stoobly_exec_env) EXEC_COMMAND=- EXEC_ARGS=- EXEC_OPTIONS=- $(exec_down)
 nameservers: tmpdir
 	@if [ -f /etc/resolv.conf ]; then \
 		nameserver=$$(grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' /etc/resolv.conf) && \
@@ -96,7 +99,7 @@ intercept/enable:
 mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
 mock/services: workflow/mock workflow/services
 mock/logs: workflow/mock workflow/logs
-mock/down: workflow/mock workflow/down workflow/hostname/uninstall
+mock/down: workflow/mock workflow/down workflow/hostname/uninstall exec/down
 pipx/install:
 	@if ! command -v pipx >/dev/null 2>&1; then \
 		echo "pipx is not installed. Installing pipx..."; \
@@ -108,7 +111,7 @@ python/validate:
 		exit 1; \
 	fi
 record: workflow/record ca-cert/install workflow/hostname/install nameservers workflow/up
-record/down: workflow/record workflow/down workflow/hostname/uninstall
+record/down: workflow/record workflow/down workflow/hostname/uninstall exec/down
 record/services: workflow/record workflow/services
 record/logs: workflow/record workflow/logs
 scenario/create:
@@ -148,7 +151,7 @@ stoobly/install: python/validate pipx/install
 test: workflow/test workflow/up
 test/services: workflow/test workflow/services
 test/logs: workflow/test workflow/logs
-test/down: workflow/test workflow/down
+test/down: workflow/test workflow/down exec/down
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down:

stoobly_agent/app/cli/scaffold_cli.py

@@ -619,6 +619,10 @@ def __build_script(**kwargs):
   if not script_path:
     script_file_name = f"{kwargs['workflow_name']}.sh"
     script_path = os.path.join(data_dir.tmp_dir_path, script_file_name)
+  else:
+    script_dir = os.path.dirname(script_path)
+    if not os.path.exists(script_dir):
+      os.makedirs(script_dir, exist_ok=True)
 
   # Truncate
   with open(script_path, 'w'):

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

{stoobly_agent-1.5.6.dist-info → stoobly_agent-1.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.5.6
+Version: 1.5.7
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.5.6.dist-info → stoobly_agent-1.5.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=69eeJOFdZIj_u7CdBLLEJH5aoH4EApq0KmNGYpvoPMc,44
+stoobly_agent/__init__.py,sha256=QQ26UYHSVovORpLIwzWQZGhlGVUQhgnP_QjBmhuRNYg,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=ZgCfmdr5um-OFAiuRHdBxFqPIeph9WqYkVg-oVQWw-E,5543
@@ -104,7 +104,7 @@ stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOW
 stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=iORyPZEQurgWVxrdMgkdD3VsCz3ar2D15dmyY3RoeKw,9904
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=EVoSqGJH_H7Xw1Ktan5GH2SWaOXIr916NUpptr2hkiA,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=iVlTpP0I8nbgO1EBhsomGrUFqIDdlhIEJEdD_aCeXRs,8083
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=PbpL5VeWc7BkGb2pVHyZXfzEnlk8hAAd9a5hoe_JwxU,8352
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=6tFqXh3ine8vaD0FCL5TMoY5NjKx2wLUR8XpW3tJtew,245
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
@@ -196,7 +196,7 @@ stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=GXteRAgco7NCb0Ov1B2_xs1DMyLg8vdDsCvH7whrlcE,9854
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=_qpeTzctvqeQ7TxSbiizKYUp7zKTLXzTPmhSjIN2jdc,28163
+stoobly_agent/app/cli/scaffold_cli.py,sha256=9Z90MKOjrGMmr41vcaU-V1LVhM7ekaVlfN0OZ3v-cfw,28301
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=cpCjxFYBuVwLuq_b2lIUu-5zWqupRlrp4xWgDytirSM,10047
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -696,7 +696,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=a1SFLyEyRRLuADvAw6ckQQKORFXvyK1lyrbkaLWx8oU,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=WtHxF9tp4oUNGG9uaT9BVwB0t1KF7YkB7wiElV_Nk9k,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=U64CeiKwcHiAkwm9Ydvs-muoYUYz_BreFl8F1NvLnf8,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -737,8 +737,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=_t
 stoobly_agent/test/mock_data/scaffold/index.html,sha256=qJwuYajKZ4ihWZrJQ3BNObV5kf1VGnnm_vqlPJzdqLE,258
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.5.6.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.5.6.dist-info/METADATA,sha256=ai5e5H-gA0lrsFe4TNmSiBI_SaPqdNfvKo27G9v0C3s,3087
-stoobly_agent-1.5.6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.5.6.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.5.6.dist-info/RECORD,,
+stoobly_agent-1.5.7.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.5.7.dist-info/METADATA,sha256=iULPsaTRrBQleIHGDWRvRlYa-97WKWJEHzmEYyGrXLU,3087
+stoobly_agent-1.5.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+stoobly_agent-1.5.7.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.5.7.dist-info/RECORD,,