rbx.cp 0.5.0__tar.gz → 0.5.2__tar.gz

{rbx_cp-0.5.0 → rbx_cp-0.5.2}/PKG-INFO

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

{rbx_cp-0.5.0 → rbx_cp-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.0"
+version = "0.5.2"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.0 → rbx_cp-0.5.2}/rbx/box/contest/main.py

@@ -37,7 +37,6 @@ app.add_typer(
 
 
 @app.command('create, c', help='Create a new contest package.')
-@within_contest
 def create(
     name: str,
     preset: Annotated[

{rbx_cp-0.5.0 → rbx_cp-0.5.2}/rbx/box/main.py

@@ -233,7 +233,6 @@ def irun(
 
 
 @app.command('create, c', help='Create a new problem package.')
-@package.within_problem
 def create(
     name: str,
     preset: Annotated[
@@ -350,7 +349,6 @@ def stress(
 
 
 @app.command('environment, env', help='Set or show the current box environment.')
-@package.within_problem
 def environment_command(
     env: Annotated[Optional[str], typer.Argument()] = None,
     install_from: Annotated[
@@ -365,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))
@@ -420,7 +421,6 @@ def activate():
 
 
 @app.command('languages', help='List the languages available in this environment')
-@package.within_problem
 def languages():
     env = environment.get_environment()
 
@@ -437,7 +437,7 @@ def languages():
 
 
 @app.command('clear, clean', help='Clears cache and build directories.')
-@package.within_problem
+@cd.within_closest_package
 def clear():
     console.console.print('Cleaning cache and build directories...')
     shutil.rmtree('.box', ignore_errors=True)

{rbx_cp-0.5.0 → rbx_cp-0.5.2}/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_cp-0.5.0 → rbx_cp-0.5.2}/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_cp-0.5.0 → rbx_cp-0.5.2}/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