lockss-turtles 0.6.0.dev11__py3-none-any.whl → 0.6.0.dev13__py3-none-any.whl

lockss/turtles/__init__.py

@@ -5,7 +5,7 @@ Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin
 registries.
 """
 
-__version__ = '0.6.0-dev11'
+__version__ = '0.6.0-dev13'
 
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University

lockss/turtles/plugin_registry.py

@@ -132,11 +132,11 @@ class DirectoryPluginRegistryLayout(BasePluginRegistryLayout):
     file_naming_convention: Optional[PluginRegistryLayoutFileNamingConvention] = Field(BasePluginRegistryLayout.FILE_NAMING_CONVENTION_DEFAULT, **BasePluginRegistryLayout.FILE_NAMING_CONVENTION_FIELD)
 
     def _copy_jar(self, src_path: Path, dst_path: Path, interactive: bool=False) -> None:
-        basename = dst_path.name
-        subprocess.run(['cp', str(src_path), str(dst_path)], check=True, cwd=self.get_path())
+        dst_dir, basename = dst_path.parent, dst_path.name
+        subprocess.run(['cp', str(src_path), str(dst_path)], check=True, cwd=dst_dir)
         if subprocess.run('command -v selinuxenabled > /dev/null && selinuxenabled && command -v chcon > /dev/null', shell=True).returncode == 0:
             cmd = ['chcon', '-t', 'httpd_sys_content_t', basename]
-            subprocess.run(cmd, check=True, cwd=self.get_path())
+            subprocess.run(cmd, check=True, cwd=dst_dir)
 
 
 class RcsPluginRegistryLayout(DirectoryPluginRegistryLayout):
@@ -144,13 +144,13 @@ class RcsPluginRegistryLayout(DirectoryPluginRegistryLayout):
     file_naming_convention: Optional[PluginRegistryLayoutFileNamingConvention] = Field(BasePluginRegistryLayout.FILE_NAMING_CONVENTION_DEFAULT, **BasePluginRegistryLayout.FILE_NAMING_CONVENTION_FIELD)
 
     def _copy_jar(self, src_path: Path, dst_path: Path, interactive: bool=False) -> None:
-        basename = dst_path.name
+        dst_dir, basename = dst_path.parent, dst_path.name
         plugin = Plugin.from_jar(src_path)
-        rcs_path = self.get_path().joinpath('RCS', f'{basename},v')
+        rcs_path = dst_path.joinpath('RCS', f'{basename},v')
         # Maybe do co -l before the parent's copy
         if dst_path.exists() and rcs_path.is_file():
             cmd = ['co', '-l', basename]
-            subprocess.run(cmd, check=True, cwd=self.get_path())
+            subprocess.run(cmd, check=True, cwd=dst_dir)
         # Do the parent's copy
         super()._copy_jar(src_path, dst_path)
         # Do ci -u after the parent's copy
@@ -158,7 +158,7 @@ class RcsPluginRegistryLayout(DirectoryPluginRegistryLayout):
         if not rcs_path.is_file():
             cmd.append(f'-t-{plugin.get_name()}')
         cmd.append(basename)
-        subprocess.run(cmd, check=True, cwd=self.get_path())
+        subprocess.run(cmd, check=True, cwd=dst_dir)
 
 
 PluginRegistryLayout = Annotated[Union[DirectoryPluginRegistryLayout, RcsPluginRegistryLayout], Field(discriminator='type')]
@@ -178,7 +178,7 @@ class PluginRegistryLayer(BaseModel, ABC):
     _plugin_registry: Optional[PluginRegistry]
 
     def deploy_plugin(self, plugin_id: PluginIdentifier, src_path: Path, interactive: bool=False) -> Optional[tuple[Path, Plugin]]:
-        self.get_plugin_registry().get_layout().deploy_plugin(plugin_id, self, src_path, interactive)
+        return self.get_plugin_registry().get_layout().deploy_plugin(plugin_id, self, src_path, interactive)
 
     def get_id(self) -> PluginRegistryLayerIdentifier:
         return self.id

{lockss_turtles-0.6.0.dev11.dist-info → lockss_turtles-0.6.0.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.6.0.dev11
+Version: 0.6.0.dev13
 Summary: Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin

{lockss_turtles-0.6.0.dev11.dist-info → lockss_turtles-0.6.0.dev13.dist-info}/RECORD

@@ -1,15 +1,15 @@
-lockss/turtles/__init__.py,sha256=PwM8A-DGDcbfRxT5F8E6F_LQvwn9FgpvAEe6DoyFTzY,1744
+lockss/turtles/__init__.py,sha256=4XdDDkFOphHi3A4NDRksCjp0n68iUeEcdS6WlQKSvGY,1744
 lockss/turtles/__main__.py,sha256=825geLIwXS0LKRqxifJXlLaAZrY8nllXfHzw5ch5ysM,1624
 lockss/turtles/app.py,sha256=7jC9fhVxfG9RDM8_yLxWzZ2cx_9HOzFZX3aJ9Np2hbg,13410
 lockss/turtles/cli.py,sha256=pLZAG1hmYarCp0R4vHSJcTs3G1umk2esvaLhM5JX7rg,18435
 lockss/turtles/plugin.py,sha256=re44YVlzXVU8azDshxn7oHw1GdTQLLQgYwkvZlur-60,5384
-lockss/turtles/plugin_registry.py,sha256=8_pSMhFDYhxUxi1JC-76ao9F32Winv-ijpYyb-EDraY,11901
+lockss/turtles/plugin_registry.py,sha256=M7mBFAccn1IVBIZ3yFbV2ljF7tbJqOFIEHxqr9PVsZ4,11921
 lockss/turtles/plugin_set.py,sha256=hKUXOSRyhHxxcMWE3I69Wykod32Ig871oeJsMTvbXfU,11291
 lockss/turtles/util.py,sha256=wGCrw_YySvyqaCzT0PItzXpkLHOCMMC_DQHhGU7zudI,2500
 unittest/lockss/turtles/__init__.py,sha256=hrgWx4GaP-hhPBuRlbLndJnOQmZicKCLaP-dQTCu1sQ,3162
 unittest/lockss/turtles/test_plugin_set.py,sha256=i-VM8mvrPuW2KqUlh2HPVRtgh3-F7RhmRAwcvhwpoDA,3354
-lockss_turtles-0.6.0.dev11.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_turtles-0.6.0.dev11.dist-info/METADATA,sha256=bQIbBFelD0ka3joMIU2PgZ9xnlMvyaLUyq1VYo35tJ0,39611
-lockss_turtles-0.6.0.dev11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_turtles-0.6.0.dev11.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
-lockss_turtles-0.6.0.dev11.dist-info/RECORD,,
+lockss_turtles-0.6.0.dev13.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_turtles-0.6.0.dev13.dist-info/METADATA,sha256=vKitUPeHBz-NVzlVs0aFsybuTxNRQwdeqgmUCvGRBVo,39611
+lockss_turtles-0.6.0.dev13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_turtles-0.6.0.dev13.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
+lockss_turtles-0.6.0.dev13.dist-info/RECORD,,