rbx.cp 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

rbx/box/main.py

@@ -363,6 +363,9 @@ def environment_command(
     if env is None:
         cfg = config.get_config()
         console.console.print(f'Current environment: [item]{cfg.boxEnvironment}[/item]')
+        console.console.print(
+            f'Location: {environment.get_environment_path(cfg.boxEnvironment)}'
+        )
         return
     if install_from is not None:
         environment.install_environment(env, pathlib.Path(install_from))

rbx/box/packaging/boca/extension.py

@@ -14,9 +14,9 @@ class BocaExtension(BaseModel):
 
     def flags_with_defaults(self) -> typing.Dict[BocaLanguage, str]:
         res: typing.Dict[BocaLanguage, str] = {
-            'c': '-std=gnu11 -O2 -static -lm',
-            'cpp': '-O2 -static -lm',
-            'cc': '-std=c++20 -O2 -static -lm',
+            'c': '-std=gnu11 -O2 -lm -static',
+            'cpp': '-O2 -lm -static',
+            'cc': '-std=c++20 -O2 -lm -static',
         }
         res.update(self.flags)
         return res

rbx/box/packaging/boca/packager.py

@@ -48,13 +48,13 @@ class BocaPackager(BasePackager):
 
     def _get_problem_name(self) -> str:
         pkg = package.find_problem_package_or_die()
-        return pkg.name
+        # BOCA forces Java class names to be the name of the problem.
+        return pkg.name.replace('-', '_')
 
     def _get_problem_info(self) -> str:
-        pkg = package.find_problem_package_or_die()
         statement = self._get_main_statement()
         return (
-            f'basename={pkg.name}\n'
+            f'basename={self._get_problem_name()}\n'
             f'fullname={statement.title}\n'
             f'descfile={self._get_problem_name()}.pdf\n'
         )
@@ -128,6 +128,8 @@ class BocaPackager(BasePackager):
         return compare_path.read_text()
 
     def _get_checker(self) -> str:
+        extension = get_extension_or_default('boca', BocaExtension)
+
         checker_path = get_default_app_path() / 'packagers' / 'boca' / 'checker.sh'
         if not checker_path.exists():
             console.console.print(
@@ -137,8 +139,10 @@ class BocaPackager(BasePackager):
         checker_text = checker_path.read_text()
         testlib = get_testlib().read_text()
         checker = package.get_checker().path.read_text()
-        return checker_text.replace('{{testlib_content}}', testlib).replace(
-            '{{checker_content}}', checker
+        return (
+            checker_text.replace('{{rbxFlags}}', extension.flags_with_defaults()['cc'])
+            .replace('{{testlib_content}}', testlib)
+            .replace('{{checker_content}}', checker)
         )
 
     def _get_compile(self, language: BocaLanguage) -> str:
@@ -165,6 +169,33 @@ class BocaPackager(BasePackager):
             compile_text = compile_text.replace('{{rbxFlags}}', flags[language])
         return compile_text
 
+    def _copy_solutions(self, into_path: pathlib.Path):
+        for solution in package.get_solutions():
+            dest_path = (
+                into_path
+                / solution.path.stem
+                / pathlib.Path(self._get_problem_name()).with_suffix(
+                    solution.path.suffix
+                )
+            )
+            dest_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy(str(solution.path), dest_path)
+
+            if solution.path.suffix == '.java':
+                java_content = dest_path.read_text()
+                if (
+                    'class Main ' not in java_content
+                    and f'class {self._get_problem_name()} ' not in java_content
+                ):
+                    console.console.print(
+                        '[error]For BOCA packaging, Java solutions must be named `class Main` or `class <ProblemName>`.[/error]'
+                    )
+                dest_path.write_text(
+                    java_content.replace(
+                        'class Main ', f'class {self._get_problem_name()} '
+                    )
+                )
+
     def name(self) -> str:
         return 'boca'
 
@@ -223,6 +254,11 @@ class BocaPackager(BasePackager):
             (description_path / self._get_problem_name()).with_suffix('.pdf'),
         )
 
+        # Copy solutions
+        solutions_path = into_path / 'solutions'
+        solutions_path.mkdir(parents=True, exist_ok=True)
+        self._copy_solutions(solutions_path)
+
         # Prepare IO
         inputs_path = into_path / 'input'
         inputs_path.mkdir(parents=True, exist_ok=True)

rbx/resources/packagers/boca/checker.sh

@@ -29,7 +29,7 @@ if [ -f "$checker_cache" ]; then
     cp "$checker_cache" $CHECKER_OUT -f
 else
     echo "Compiling polygon checker: $CHECKER_PATH"
-    $cc {{stdcpp}} -static -O2 -lm $CHECKER_PATH -o $CHECKER_OUT
+    $cc {{rbxFlags}} $CHECKER_PATH -o $CHECKER_OUT
     
     if [ $? -ne 0 ]; then
         echo "Checker could not be compiled"
@@ -40,4 +40,4 @@ else
 fi
 
 chmod 0755 $CHECKER_OUT
-### END OF CHECKER COMPILATION
+### END OF CHECKER COMPILATION

{rbx_cp-0.5.1.dist-info → rbx_cp-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.1
+Version: 0.5.2
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.1.dist-info → rbx_cp-0.5.2.dist-info}/RECORD

@@ -21,10 +21,10 @@ rbx/box/environment.py,sha256=HiufDkaXJeZk9gWvt27UMmyzaknnODu8flGerrwnNhE,10851
 rbx/box/extensions.py,sha256=p0iLaU28KswOBDX2HGVO_dR2gk-JSAWb6sXC6GZ1d0w,738
 rbx/box/generators.py,sha256=UJNyvwbY4JBVpmdMoVsYi16O3oodMgguH_dmZAoOFm4,16104
 rbx/box/generators_test.py,sha256=mQqHepAMYa6zV_PseQALI0nIX6AdQktt6lh94muFhNw,1758
-rbx/box/main.py,sha256=PoEg0BtfXJy3p1WMAqWgBJ7QvCJrCm1bXoQWfGY6zQI,13392
+rbx/box/main.py,sha256=pGw9D3iBD9CgaDbJXxMAwWOHf27SH7nE3jPzYSWpnnY,13513
 rbx/box/package.py,sha256=8JqavlW6cF_TtflrNLdd39P6iecFVTxTDNRP_mQ8jP8,10067
-rbx/box/packaging/boca/extension.py,sha256=7xaLzccFtHeoLwlr0cyfJtsBsWvVyMixzrmWohyCS7Y,852
-rbx/box/packaging/boca/packager.py,sha256=quuTg5WQFjL7p4U_7rzKk1OeA-wJYhw4rjSpDwKEm4o,9159
+rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
+rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJHOtxpo,10673
 rbx/box/packaging/contest_main.py,sha256=ypiBS8dd0yCqoFJIqiK1Fo02dQmUB_G-Z7G926jomrk,2746
 rbx/box/packaging/main.py,sha256=CyjfuvwmRsJGk4lKVp2LT_WCQ5jZ5L_7NfZQEC40nuY,2228
 rbx/box/packaging/packager.py,sha256=suCT_SLnWa915rV2j8VFqzH43HGKRTr9mGGlrvj45aw,3267
@@ -92,7 +92,7 @@ rbx/resources/checkers/boilerplate.cpp,sha256=vj1Qjy59JKEzb4ZpaX_MkL1FaZn_tTLZXj
 rbx/resources/default_config.json,sha256=8GZVHns4nci0-e5ALk9C1lfO6TO9W2ZlmZtxHkL6ibA,949
 rbx/resources/envs/default.rbx.yml,sha256=8gl4DXc5mVISx__1libPQfmuHYdW32xjysfqpNESIAo,853
 rbx/resources/envs/isolate.rbx.yml,sha256=VZAJ-Mu-A5Rt4m0VtMygOXA7eLLvCCmoorv_0acDmXQ,870
-rbx/resources/packagers/boca/checker.sh,sha256=wFMYnvvB2Hjq2sGDFNxIcChpbtaZmdVmV9jzpQPFSjo,1046
+rbx/resources/packagers/boca/checker.sh,sha256=c7EBnKZXJKNDv_HxBv62Jt2bLV-GIOJ8FgxJisMJ1Ys,1033
 rbx/resources/packagers/boca/compare,sha256=2c7PR_loHNgRm-kszK7NQWvRb5hutXoqdj4HMmq7mbw,1849
 rbx/resources/packagers/boca/compile/c,sha256=lHLvxzkG_he5jmxWrix0WT80ipMWWUZdOgOQMSpj8oo,4507
 rbx/resources/packagers/boca/compile/cc,sha256=B_18QkUGcjUg6yrTFlTQuMWnHpTWUKPZmFuk7Y0l1VA,4561
@@ -157,8 +157,8 @@ rbx/testdata/caching/executable.py,sha256=WKRHNf_fprFJd1Fq1ubmQtR3mZzTYVNwKPLWuZ
 rbx/testdata/compatible,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/testing_utils.py,sha256=ZZLKMUHlZ4HwsuNY50jqSBJ9HhpnFdba7opjDsvXE1U,2084
 rbx/utils.py,sha256=OkOLjNG8Pq7y2ylqhXQyAOVDfUsva_4Mfjd8OmII55E,4145
-rbx_cp-0.5.1.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.1.dist-info/METADATA,sha256=uz86FlpgJk2X-0IwbvRDDhDE1beBMGNW-flCYGSv93A,3253
-rbx_cp-0.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.1.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.1.dist-info/RECORD,,
+rbx_cp-0.5.2.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.2.dist-info/METADATA,sha256=fiqGkYBfzJBTozxW_9jKubvmcVyVioblqa4iREtVUVI,3253
+rbx_cp-0.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rbx_cp-0.5.2.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.2.dist-info/RECORD,,