stoobly-agent 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.4.0'
+VERSION = '1.4.1'

stoobly_agent/app/cli/scaffold/hosts_file_manager.py

@@ -66,47 +66,120 @@ class HostsFileManager():
   def install_hostnames(self, hostnames: list[str]) -> None:
     hosts_file_path = self.__get_hosts_file_path()
 
-    self.remove_lines_between_markers(
-      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END
+    self.__add_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END, hostnames
     )
 
-    with open(hosts_file_path, 'a+') as f:
-      if SCAFFOLD_HOSTS_DELIMITTER_BEGIN not in f.read():
-        f.write(SCAFFOLD_HOSTS_DELIMITTER_BEGIN)
+  def uninstall_hostnames(self, hostnames: list[str] = []) -> None:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    self.__remove_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END, hostnames
+    ) 
+
+  def __remove_lines_between_markers(self, file_path, start_marker, end_marker, hostnames = []):
+    with open(file_path, "r") as file:
+      lines = file.readlines()
+
+    filtered_lines = []
+    index = 0
 
+    # Continue until we reach start_marker
+    for line in lines:
+      index += 1
+
+      if start_marker in line:
+        break
+
+      filtered_lines.append(line)
+
+    # Continue until we reach end_marker
+    found_hostnames = {}
+    section = []
+    for line in lines[index:]:
+      index += 1
+
+      if end_marker in line:
+        break
+        
+      found = False
       for hostname in hostnames:
-        print(f"Installing hostname {hostname} to {hosts_file_path}")
-        f.write(f"127.0.0.1 {hostname}\n")
-        f.write(f"::1       {hostname}\n")
+        if hostname in line:
+          if hostname not in found_hostnames:
+            print(f"Removing hostname {hostname}")
 
-      if SCAFFOLD_HOSTS_DELIMITTER_END not in f.read():
-        f.write(SCAFFOLD_HOSTS_DELIMITTER_END)
+          found_hostnames[hostname] = True
+          found = True
 
-  def uninstall_hostnames(self) -> None:
-    hosts_file_path = self.__get_hosts_file_path()
+      if not found: 
+        section.append(line)
 
-    self.remove_lines_between_markers(
-      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END
-    ) 
+    # If there are still lines in the section
+    if len(section):
+      filtered_lines.append(start_marker)
+      section.append(end_marker)    
+      filtered_lines += section
+
+    for line in lines[index:]:
+      filtered_lines.append(line)
 
-    print(f"Uninstalled hostnames from {hosts_file_path}")
+    with open(file_path, "w") as file:
+      file.writelines(filtered_lines)
 
-  def remove_lines_between_markers(self, file_path, start_marker, end_marker):
+  def __add_lines_between_markers(self, file_path, start_marker, end_marker, hostnames = []):
     with open(file_path, "r") as file:
       lines = file.readlines()
-    
-    inside_block = False
+
     filtered_lines = []
+    index = 0
 
+    # Continue until we reach start_marker
     for line in lines:
+      index += 1
       if start_marker in line:
-        inside_block = True
-        continue  # Skip the start marker line
+        break
+
+      filtered_lines.append(line)
+
+    # If no empty line before start_marker, add one
+    if len(filtered_lines):
+      last_line = filtered_lines[-1]
+
+      if last_line != "\n":
+        filtered_lines.append("\n")
+
+    filtered_lines.append(start_marker)
+
+    # Continue until we reach end_marker
+    found_hostnames = {}
+    for line in lines[index:]:
+      index += 1
+
       if end_marker in line:
-        inside_block = False
-        continue  # Skip the end marker line
-      if not inside_block:
+        break
+        
+      found = False
+      for hostname in hostnames:
+        if hostname in line:
+          filtered_lines.append(line)
+          found_hostnames[hostname] = True
+          found = True
+
+      if not found:
         filtered_lines.append(line)
+      
+    for hostname in hostnames:
+      if hostname in found_hostnames:
+        continue
+
+      print(f"Installing hostname {hostname}")
+      filtered_lines.append(f"127.0.0.1 {hostname}\n")
+      filtered_lines.append(f"::1       {hostname}\n")
+
+    filtered_lines.append(end_marker)    
+
+    for line in lines[index:]:
+      filtered_lines.append(line)
 
     with open(file_path, "w") as file:
       file.writelines(filtered_lines)

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

@@ -158,12 +158,12 @@ workflow/hostname: stoobly/install
 	if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
 		CURRENT_VERSION=$$(stoobly-agent --version); \
 		REQUIRED_VERSION="1.4.0"; \
-		if [ "$$(printf '%s\n' "$$REQUIRED_VERSION" "$$CURRENT_VERSION" | sort -V | tail -n 1)" = "$$CURRENT_VERSION" ]; then \
+		if [ "$$(printf '%s\n' "$$REQUIRED_VERSION" "$$CURRENT_VERSION" | sort -V | head -n 1)" != "$$REQUIRED_VERSION" ]; then \
 			echo "stoobly-agent version $$REQUIRED_VERSION required. Please run: pipx upgrade stoobly-agent"; \
 			exit 1; \
 		fi; \
-		echo "Running stoobly-agent scaffold hostname $(COMMAND)..."; \
-		stoobly-agent scaffold hostname $(COMMAND) --app-dir-path $(app_dir) --workflow $(WORKFLOW); \
+		echo "Running stoobly-agent scaffold hostname $(COMMAND) $(workflow_service_options)"; \
+		stoobly-agent scaffold hostname $(COMMAND) --app-dir-path $(app_dir) --workflow $(WORKFLOW) $(workflow_service_options); \
 	fi
 workflow/hostname/install: command/install workflow/hostname
 workflow/hostname/uninstall: command/uninstall workflow/hostname  

stoobly_agent/app/cli/scaffold_cli.py

@@ -565,25 +565,37 @@ def install(**kwargs):
     hosts_file_manager.install_hostnames(hostnames)
   except PermissionError:
     print("Permission denied. Please run this command with sudo.", file=sys.stderr)
+    sys.exit(1)
 
 @hostname.command(
   help="Delete from the system hosts file all scaffold service hostnames"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--service', multiple=True, help='Select specific services.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s).')
 def uninstall(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
+  services = __get_workflow_services(app, **kwargs)
+
+  hostnames = []
+  for service_name in services: 
+    service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+
+    service_config = ServiceConfig(service.dir_path)
+    if service_config.hostname:
+      hostnames.append(service_config.hostname)
+
   __elevate_sudo()
 
   try:
     hosts_file_manager = HostsFileManager()
-    hosts_file_manager.uninstall_hostnames()
-  except OSError as e:
-    if e.errno == errno.EACCES or e.errno == errno.EPERM:
-      print("Permission denied. Please run this command with sudo.", file=sys.stderr)
-    else:
-      print(f"An unexpected error occurred: {e}", file=sys.stderr)
+    hosts_file_manager.uninstall_hostnames(hostnames)
+  except PermissionError:
+    print("Permission denied. Please run this command with sudo.", file=sys.stderr)
+    sys.exit(1)
 
 scaffold.add_command(app)
 scaffold.add_command(service)

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

@@ -1 +1 @@
-1.2.3
+1.4.1

{stoobly_agent-1.4.0.dist-info → stoobly_agent-1.4.1.dist-info}/METADATA

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

{stoobly_agent-1.4.0.dist-info → stoobly_agent-1.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=Gxrndj7ajhTOnpDStd-1lwXSm8fcRw31xdLLWBS2qqQ,44
+stoobly_agent/__init__.py,sha256=WY71ZV8dbTRkfHb3ftjHsgTWeLuG9efgIYp8xc2A8Qk,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
@@ -91,7 +91,7 @@ stoobly_agent/app/cli/scaffold/docker/workflow/development_decorator.py,sha256=c
 stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=V9y4RIyEIT8SiGm3U9OcmU1dr22wqpbSbGO_Z2EMYEI,1197
 stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=s1l99Y-2h-sSLVtPhcgaa1YRTbSvb6QdgaUeBLHYc4w,1804
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
-stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=rr1RjO4920kmuhyvdPnLPY8WbQqk7qKZu_UCnSR0yaI,3421
+stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=FiX1hYEWN4cJiCOV4h6wOOlY7t71uwIwe6t2upS65aQ,5006
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
 stoobly_agent/app/cli/scaffold/service.py,sha256=L9K6QE0k5KSEC8_fSwtdwwTSO_DsIpqSPW-AG7Bg76o,501
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=9kIKiFC5Jo425VWYD4NDvUOdMP-pNyq2D5Ip1ZAPj3A,1054
@@ -103,7 +103,7 @@ stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOW
 stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=hF3c6cFRaKH01BfwdrCJdX8SEbsfD5CCG8W_yZU4FK4,9948
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=PRNYTWYYcLfcyrZ5h5u2I7dAJdeFmmxRFpAj_8243Bw,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=Ksv3AHFbeImm2vVfjzxAF4JWEnl_YmQCR-UxxM-l2Pg,7594
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=GSghwhsDq4w9UsZuAc_Ozau5hHrOIJSh9B8yhtSOwH4,7649
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=YblNDTUPndYNxupgZ3X8RP6NS4c0u_QwLklyWrpq_qs,295
 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
@@ -195,7 +195,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=DJNyhPrvvZgOwFnPKi5Z3VdrAWfaZW_XbGfgFcnh5QM,9608
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=hlpAaPIPEDxKwU1KiKVMln0FhwN3oOnmuJrJwYDDoy8,25586
+stoobly_agent/app/cli/scaffold_cli.py,sha256=T6kunIY8hMjBhvOydYRKWBjrmOs4X5FXcf-blOKGvyM,25977
 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
@@ -693,7 +693,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=5IFGVGn3ogvRT0fzZgXzhrYlSfSlr8IR1p_XExaegMQ,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=2C80rpqkG8Sgy1KaGsCJj-0J1rR5-xzETLZsNPFe6E0,6
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=8LZyMhqJSE9NqFn_x0G7_otbaT04f34F-Exd5iWhzGE,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
@@ -730,8 +730,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=x7
 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.4.0.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.4.0.dist-info/METADATA,sha256=EYX5vmQsiiTpcEDvsRZFDkYtcl7dYUq5onTHR-nAYHo,3384
-stoobly_agent-1.4.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-stoobly_agent-1.4.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.4.0.dist-info/RECORD,,
+stoobly_agent-1.4.1.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.4.1.dist-info/METADATA,sha256=LSnoRzku6oP5q5Vy9KIfdSOlYldZLc4wlcvuJYHIbWA,3384
+stoobly_agent-1.4.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+stoobly_agent-1.4.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.4.1.dist-info/RECORD,,