stoobly-agent 1.4.0__tar.gz → 1.4.1__tar.gz

{stoobly_agent-1.4.0 → stoobly_agent-1.4.1}/PKG-INFO

@@ -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 → stoobly_agent-1.4.1}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "1.4.0"
+version = "1.4.1"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.4.0 → stoobly_agent-1.4.1}/stoobly_agent/__init__.py

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

stoobly_agent-1.4.1/stoobly_agent/app/cli/scaffold/hosts_file_manager.py

@@ -0,0 +1,185 @@
+import os
+import pdb
+import sys
+
+from dataclasses import dataclass
+from typing import Union
+
+SCAFFOLD_HOSTS_DELIMITTER_BEGIN = "##### STOOBLY SCAFFOLD HOSTS BEGIN #####\n"
+SCAFFOLD_HOSTS_DELIMITTER_END = "##### STOOBLY SCAFFOLD HOSTS END #####\n"
+
+class HostsFileManager():
+
+  @dataclass
+  class IpAddressToHostnames:
+    ip_address: str
+    hostnames: list[str]
+
+  def __get_hosts_file_path(self) -> str:
+    file_path = '/etc/hosts'
+    if not os.path.exists(file_path):
+      print(f"Error: File {file_path} not found.", file=sys.stderr)
+      sys.exit(1)
+    return file_path
+
+  # Split IP address and hostnames. Don't include inline comments
+  def __split_hosts_line(self, line: str) -> list[str]:
+    ip_addr_hosts_split = line.split('#')[0].split()
+    return ip_addr_hosts_split
+
+  # Parses hosts file and returns a mapping of IP address to hostnames in a list.
+  def get_hosts(self) -> list[IpAddressToHostnames]:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    if not hosts_file_path:
+      return []
+
+    with open(hosts_file_path, 'r') as f:
+      hostlines = f.readlines()
+
+    # Skip comments and empty lines
+    hostlines = [line.strip() for line in hostlines
+                 if not line.startswith('#') and line.strip() != '']
+
+    hosts = []
+    for line in hostlines:
+      ip_addr_hosts_split = self.__split_hosts_line(line)
+      ip_address = ip_addr_hosts_split[0]
+      hostnames = ip_addr_hosts_split[1:]
+      ipAddressToHostnames = self.IpAddressToHostnames(ip_address, hostnames)
+
+      hosts.append(ipAddressToHostnames)
+
+    return hosts
+
+  def find_host(self, hostname) -> Union[IpAddressToHostnames, None]:
+    hosts = self.get_hosts()
+
+    for mapping in hosts:
+      if ((mapping.ip_address == '0.0.0.0' or mapping.ip_address == '127.0.0.1') and
+        hostname in mapping.hostnames):
+
+        return mapping
+
+    return None
+
+  def install_hostnames(self, hostnames: list[str]) -> None:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    self.__add_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END, hostnames
+    )
+
+  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:
+        if hostname in line:
+          if hostname not in found_hostnames:
+            print(f"Removing hostname {hostname}")
+
+          found_hostnames[hostname] = True
+          found = True
+
+      if not found: 
+        section.append(line)
+
+    # 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)
+
+    with open(file_path, "w") as file:
+      file.writelines(filtered_lines)
+
+  def __add_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)
+
+    # 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:
+        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-1.4.0 → stoobly_agent-1.4.1}/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-1.4.0 → stoobly_agent-1.4.1}/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-1.4.1/stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -0,0 +1 @@
+1.4.1

stoobly_agent-1.4.0/stoobly_agent/app/cli/scaffold/hosts_file_manager.py

@@ -1,112 +0,0 @@
-import os
-import pdb
-import sys
-
-from dataclasses import dataclass
-from typing import Union
-
-SCAFFOLD_HOSTS_DELIMITTER_BEGIN = "##### STOOBLY SCAFFOLD HOSTS BEGIN #####\n"
-SCAFFOLD_HOSTS_DELIMITTER_END = "##### STOOBLY SCAFFOLD HOSTS END #####\n"
-
-class HostsFileManager():
-
-  @dataclass
-  class IpAddressToHostnames:
-    ip_address: str
-    hostnames: list[str]
-
-  def __get_hosts_file_path(self) -> str:
-    file_path = '/etc/hosts'
-    if not os.path.exists(file_path):
-      print(f"Error: File {file_path} not found.", file=sys.stderr)
-      sys.exit(1)
-    return file_path
-
-  # Split IP address and hostnames. Don't include inline comments
-  def __split_hosts_line(self, line: str) -> list[str]:
-    ip_addr_hosts_split = line.split('#')[0].split()
-    return ip_addr_hosts_split
-
-  # Parses hosts file and returns a mapping of IP address to hostnames in a list.
-  def get_hosts(self) -> list[IpAddressToHostnames]:
-    hosts_file_path = self.__get_hosts_file_path()
-
-    if not hosts_file_path:
-      return []
-
-    with open(hosts_file_path, 'r') as f:
-      hostlines = f.readlines()
-
-    # Skip comments and empty lines
-    hostlines = [line.strip() for line in hostlines
-                 if not line.startswith('#') and line.strip() != '']
-
-    hosts = []
-    for line in hostlines:
-      ip_addr_hosts_split = self.__split_hosts_line(line)
-      ip_address = ip_addr_hosts_split[0]
-      hostnames = ip_addr_hosts_split[1:]
-      ipAddressToHostnames = self.IpAddressToHostnames(ip_address, hostnames)
-
-      hosts.append(ipAddressToHostnames)
-
-    return hosts
-
-  def find_host(self, hostname) -> Union[IpAddressToHostnames, None]:
-    hosts = self.get_hosts()
-
-    for mapping in hosts:
-      if ((mapping.ip_address == '0.0.0.0' or mapping.ip_address == '127.0.0.1') and
-        hostname in mapping.hostnames):
-
-        return mapping
-
-    return None
-
-  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
-    )
-
-    with open(hosts_file_path, 'a+') as f:
-      if SCAFFOLD_HOSTS_DELIMITTER_BEGIN not in f.read():
-        f.write(SCAFFOLD_HOSTS_DELIMITTER_BEGIN)
-
-      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 SCAFFOLD_HOSTS_DELIMITTER_END not in f.read():
-        f.write(SCAFFOLD_HOSTS_DELIMITTER_END)
-
-  def uninstall_hostnames(self) -> 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
-    ) 
-
-    print(f"Uninstalled hostnames from {hosts_file_path}")
-
-  def remove_lines_between_markers(self, file_path, start_marker, end_marker):
-    with open(file_path, "r") as file:
-      lines = file.readlines()
-    
-    inside_block = False
-    filtered_lines = []
-
-    for line in lines:
-      if start_marker in line:
-        inside_block = True
-        continue  # Skip the start marker line
-      if end_marker in line:
-        inside_block = False
-        continue  # Skip the end marker line
-      if not inside_block:
-        filtered_lines.append(line)
-
-    with open(file_path, "w") as file:
-      file.writelines(filtered_lines)

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

@@ -1 +0,0 @@
-1.2.3