Fix pex3 scie create --dest-dir handling. (#3076)

Fixes #3075

Author: jsirois

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 2.82.1
+
+This release fixes `pex3 scie create --dest-dir` to work when the specified PEX is a local file
+path. Previously `--dest-dir` only worked when the specified PEX was an URL.
+
+* Fix `pex3 scie create --dest-dir` handling. (#3076)
+
 ## 2.82.0
 
 This release adds support for resource path bindings to plain PEXes as a follow-on to adding

pex/cli/commands/scie.py

@@ -6,6 +6,7 @@
 import hashlib
 import io
 import os
+import shutil
 from argparse import ArgumentParser
 
 from pex import scie, specifier_sets
@@ -26,7 +27,7 @@
 from pex.util import CacheHelper
 
 if TYPE_CHECKING:
-    from typing import Optional, Union
+    from typing import Optional, Tuple, Union
 
     import attr  # vendor:skip
 else:
@@ -188,6 +189,30 @@ def _fetch(
     return dest
 
 
+def _extract_pex_info(path):
+    # type: (str) -> Union[Tuple[str, PexInfo], Error]
+
+    pex_info_or_error = catch(PexInfo.from_pex, path)
+    if isinstance(pex_info_or_error, Error):
+        return Error(
+            "The path {path} does not appear to be a PEX: {err}".format(
+                path=path, err=pex_info_or_error
+            )
+        )
+
+    raw_pex_version = pex_info_or_error.build_properties.get("pex_version")
+    if raw_pex_version and Version(raw_pex_version) < Version("2.1.25"):
+        return Error(
+            "Can only create scies from PEXes built by Pex 2.1.25 (which was released on "
+            "January 21st, 2021) or newer.\n"
+            "The PEX at {path} was built by Pex {pex_version}.".format(
+                path=path, pex_version=raw_pex_version
+            )
+        )
+
+    return path, pex_info_or_error
+
+
 class Scie(OutputMixin, BuildTimeCommand):
     """Manipulate scies."""
 
@@ -240,40 +265,38 @@ def _create(self):
 
         resolver_configuration = resolver_options.configure(self.options)
         if os.path.exists(self.options.pex[0]):
-            pex_file = self.options.pex[0]
-        else:
-            pex_file = try_(
-                _fetch(
-                    url=ArtifactURL.parse(self.options.pex[0]),
-                    fetcher=URLFetcher(
-                        network_configuration=resolver_configuration.network_configuration,
-                        handle_file_urls=True,
-                        password_entries=resolver_configuration.repos_configuration.password_entries,
-                    ),
-                    dest_dir=self.options.dest_dir,
-                )
-            )
-
-        pex_info_or_error = catch(PexInfo.from_pex, pex_file)
-        if isinstance(pex_info_or_error, Error):
-            return Error(
-                "The path {pex_file} does not appear to be a PEX: {err}".format(
-                    pex_file=pex_file, err=pex_info_or_error
+            pex_file, pex_info = try_(_extract_pex_info(self.options.pex[0]))
+            if self.options.dest_dir and os.path.realpath(
+                self.options.dest_dir
+            ) != os.path.realpath(os.path.dirname(pex_file)):
+                pex_dest = os.path.join(
+                    safe_mkdir(self.options.dest_dir), os.path.basename(pex_file)
                 )
-            )
-        raw_pex_version = pex_info_or_error.build_properties.get("pex_version")
-        if raw_pex_version and Version(raw_pex_version) < Version("2.1.25"):
-            return Error(
-                "Can only create scies from PEXes built by Pex 2.1.25 (which was released on "
-                "January 21st, 2021) or newer.\n"
-                "The PEX at {pex_file} was built by Pex {pex_version}.".format(
-                    pex_file=pex_file, pex_version=raw_pex_version
+                if os.path.isfile(pex_file):
+                    shutil.copy(pex_file, pex_dest)
+                else:
+                    shutil.copytree(pex_file, pex_dest)
+                pex_file = pex_dest
+        else:
+            pex_file, pex_info = try_(
+                _extract_pex_info(
+                    try_(
+                        _fetch(
+                            url=ArtifactURL.parse(self.options.pex[0]),
+                            fetcher=URLFetcher(
+                                network_configuration=resolver_configuration.network_configuration,
+                                handle_file_urls=True,
+                                password_entries=resolver_configuration.repos_configuration.password_entries,
+                            ),
+                            dest_dir=self.options.dest_dir,
+                        )
+                    )
                 )
             )
 
         targets = try_(
             _resolve_targets(
-                pex_interpreter_constraints=pex_info_or_error.interpreter_constraints,
+                pex_interpreter_constraints=pex_info.interpreter_constraints,
                 target_configuration=target_options.configure(
                     self.options, pip_configuration=resolver_configuration.pip_configuration
                 ),
@@ -313,6 +336,9 @@ def _create(self):
             if scie_configuration.options.scie_only and os.path.realpath(
                 pex_file
             ) != os.path.realpath(scie_info.file):
-                os.unlink(pex_file)
+                if os.path.isfile(pex_file):
+                    os.unlink(pex_file)
+                else:
+                    shutil.rmtree(pex_file)
 
         return Ok()

pex/version.py

@@ -1,4 +1,4 @@
 # Copyright 2015 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = "2.82.0"
+__version__ = "2.82.1"

tests/integration/cli/commands/test_scie_create.py

@@ -10,9 +10,12 @@
 import subprocess
 import sys
 
+import pytest
+
 from pex.common import safe_delete
 from pex.fetcher import URLFetcher
 from pex.interpreter import PythonInterpreter
+from pex.layout import Layout
 from pex.pep_440 import Version
 from pex.typing import TYPE_CHECKING
 from pex.util import CacheHelper
@@ -292,3 +295,35 @@ def test_pex_url(tmpdir):
         "2.80.0"
         == subprocess.check_output(args=[os.path.join(dest, "pex"), "-V"]).decode("utf-8").strip()
     )
+
+
+@skip_if_no_provider
+@pytest.mark.parametrize(
+    "layout", [pytest.param(layout, id=str(layout)) for layout in Layout.values()]
+)
+def test_pex_file_path_dest(
+    tmpdir,  # type: Tempdir
+    layout,  # type: Layout.Value
+):
+    pex = tmpdir.join("cowsay.pex")
+    run_pex_command(
+        args=["cowsay<6", "-c", "cowsay", "-o", pex, "--layout", str(layout)]
+    ).assert_success()
+
+    dest = tmpdir.join("dest")
+    run_pex3("scie", "create", "--style", "eager", "-d", dest, pex).assert_success()
+
+    assert b"| Moo! |" in subprocess.check_output(args=[sys.executable, pex, "Moo!"])
+    assert not os.path.exists(tmpdir.join("cowsay"))
+    assert b"| Foo! |" in subprocess.check_output(
+        args=[sys.executable, os.path.join(dest, "cowsay.pex"), "Foo!"]
+    )
+    assert b"| Boo! |" in subprocess.check_output(args=[os.path.join(dest, "cowsay"), "Boo!"])
+
+    dest2 = tmpdir.join("dest2")
+    run_pex3("scie", "create", "--style", "eager", "--scie-only", "-d", dest2, pex).assert_success()
+
+    assert b"| Zoo! |" in subprocess.check_output(args=[sys.executable, pex, "Zoo!"])
+    assert not os.path.exists(tmpdir.join("cowsay"))
+    assert not os.path.exists(os.path.join(dest2, "cowsay.pex"))
+    assert b"| Goo! |" in subprocess.check_output(args=[os.path.join(dest2, "cowsay"), "Goo!"])