fix: allow version strings of the format m.n.o-dev.p

Author: dschwartz-ftadvisory

src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLI.java

@@ -63,9 +63,11 @@
  * to every generated namespace (e.g. {@code finos} turns {@code cdm.x.y} into
  * {@code finos.cdm.x.y})</li>
  * <li><b>-v, --version &lt;version&gt;</b>: Version for the generated Python
- * package, in <code>#.#.#</code> format (e.g. {@code 1.2.3}). Defaults to
+ * package, in <code>#.#.#</code> (e.g. {@code 1.2.3}) or
+ * <code>#.#.#-dev.#</code> (e.g. {@code 1.2.3-dev.4}) format. The dev form is
+ * converted to PEP 440 format (e.g. {@code 1.2.3.dev4}). Defaults to
  * {@code 0.0.0} when omitted. An error is raised if the supplied value does not
- * match the required format.</li>
+ * match either required format.</li>
  * <li><b>-e, --allow-errors</b>: Continue generation even if Rosetta
  * validation errors occur</li>
  * <li><b>-w, --fail-on-warnings</b>: Treat Rosetta validation warnings as
@@ -95,6 +97,7 @@
 public class PythonCodeGeneratorCLI {
     private static final Logger LOGGER = LoggerFactory.getLogger(PythonCodeGeneratorCLI.class);
     private static final Pattern VALID_VERSION_PATTERN = Pattern.compile("\\d+\\.\\d+\\.\\d+");
+    private static final Pattern DEV_VERSION_PATTERN = Pattern.compile("(\\d+\\.\\d+\\.\\d+)-dev\\.(\\d+)");
     static final String DEFAULT_VERSION = "0.0.0";
 
     public static void main(String[] args) {
@@ -149,9 +152,14 @@ public int execute(String[] args) {
             String namespacePrefix = cmd.getOptionValue("x");
             String versionInput = cmd.getOptionValue("v");
 
-            if (versionInput != null && !VALID_VERSION_PATTERN.matcher(versionInput).matches()) {
-                System.err.println("Invalid version format '" + versionInput + "': must be #.#.# (e.g. 1.2.3)");
-                return 1;
+            if (versionInput != null) {
+                java.util.regex.Matcher devMatcher = DEV_VERSION_PATTERN.matcher(versionInput);
+                if (devMatcher.matches()) {
+                    versionInput = devMatcher.group(1) + ".dev" + devMatcher.group(2);
+                } else if (!VALID_VERSION_PATTERN.matcher(versionInput).matches()) {
+                    System.err.println("Invalid version format '" + versionInput + "': must be #.#.# (e.g. 1.2.3) or #.#.#-dev.# (e.g. 1.2.3-dev.4)");
+                    return 1;
+                }
             }
 
             if (cmd.hasOption("s")) {

src/main/java/com/regnosys/rosetta/generator/python/util/PythonCodeGeneratorUtil.java

@@ -119,6 +119,9 @@ public static String cleanVersion(String version) {
         }
 
         String[] versionParts = version.split("\\.");
+        if (versionParts.length == 4 && versionParts[3].matches("dev\\d+")) {
+            return version;
+        }
         if (versionParts.length > 2) {
             String thirdPart = versionParts[2].replaceAll("[^\\d]", "");
             return versionParts[0] + "." + versionParts[1] + "." + thirdPart;

src/test/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLITest.java

@@ -114,6 +114,51 @@ void testInvalidVersionFormatWithSnapshotSuffixReturnsError() {
         assertEquals(1, exitCode, "Should return 1 when version has a non-numeric suffix");
     }
 
+    @Test
+    void testDevVersionFormatIsAcceptedAndConverted() throws IOException {
+        Path validFile = createValidRosettaFile(tempDir);
+        Path outputDir = tempDir.resolve("python");
+        TestCLI cli = new TestCLI();
+
+        int exitCode = cli.execute(new String[] {
+                "-f", validFile.toString(),
+                "-t", outputDir.toString(),
+                "-v", "1.2.3-dev.4"
+        });
+
+        assertEquals(0, exitCode, "Should return 0 when version is in m.n.o-dev.p format");
+        Path toml = outputDir.resolve("pyproject.toml");
+        assertTrue(Files.exists(toml), "pyproject.toml should be written to the output directory");
+        String tomlContent = Files.readString(toml);
+        assertTrue(tomlContent.contains("version = \"1.2.3.dev4\""),
+                "pyproject.toml should contain the converted PEP 440 dev version");
+    }
+
+    @Test
+    void testDevVersionWithZeroPatchIsAccepted() throws IOException {
+        Path validFile = createValidRosettaFile(tempDir);
+        Path outputDir = tempDir.resolve("python");
+        TestCLI cli = new TestCLI();
+
+        int exitCode = cli.execute(new String[] {
+                "-f", validFile.toString(),
+                "-t", outputDir.toString(),
+                "-v", "1.2.3-dev.0"
+        });
+
+        assertEquals(0, exitCode, "Should return 0 when dev counter is 0");
+        String tomlContent = Files.readString(outputDir.resolve("pyproject.toml"));
+        assertTrue(tomlContent.contains("version = \"1.2.3.dev0\""),
+                "pyproject.toml should contain the converted version with dev0");
+    }
+
+    @Test
+    void testDevVersionWithNonNumericDevCounterReturnsError() {
+        PythonCodeGeneratorCLI cli = new PythonCodeGeneratorCLI();
+        int exitCode = cli.execute(new String[] { "-s", ".", "-v", "1.2.3-dev.abc" });
+        assertEquals(1, exitCode, "Should return 1 when dev counter is not numeric");
+    }
+
     @Test
     void testValidVersionAppearsInToml() throws IOException {
         Path validFile = createValidRosettaFile(tempDir);