diff --git a/build.py b/build.py index c7591f0..8c7f489 100644 --- a/build.py +++ b/build.py @@ -33,7 +33,7 @@ default_task = "dev" name = "ddadevops" MODULE = "not-used" PROJECT_ROOT_PATH = "." -version = "4.0.4-SNAPSHOT" +version = "4.0.6-dev" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" description = __doc__ authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")] diff --git a/src/main/python/ddadevops/domain/build_file.py b/src/main/python/ddadevops/domain/build_file.py index b154b2a..c4056a0 100644 --- a/src/main/python/ddadevops/domain/build_file.py +++ b/src/main/python/ddadevops/domain/build_file.py @@ -61,7 +61,8 @@ class BuildFile(Validateable): version_line = re.search("\nversion = .*\n", self.content) version_line_group = version_line.group() version_string = re.search( - "[0-9]*\\.[0-9]*\\.[0-9]*(-SNAPSHOT)?(-dev)?[0-9]*", version_line_group + "[0-9]*\\.[0-9]*\\.[0-9]*(-SNAPSHOT)?(-dev)?[0-9]*", + version_line_group, ) version_str = version_string.group() case BuildFileType.JAVA_CLOJURE: diff --git a/src/test/python/domain/test_build_file.py b/src/test/python/domain/test_build_file.py index 308ac90..001d901 100644 --- a/src/test/python/domain/test_build_file.py +++ b/src/test/python/domain/test_build_file.py @@ -68,10 +68,13 @@ def test_sould_parse_and_set_js(): """, ) sut.set_version(Version.from_str("1.1.5-SNAPSHOT").create_major()) - assert """{ + assert ( + """{ "name": "c4k-jira", "version": "2.0.0" -}""" == sut.content +}""" + == sut.content + ) def test_sould_parse_and_set_version_for_gradle(): @@ -93,6 +96,7 @@ version = "1.1.5-SNAPSHOT" sut.set_version(Version.from_str("1.1.5-SNAPSHOT").create_major()) assert '\nversion = "2.0.0"\n' == sut.content + def test_sould_parse_and_set_version_for_py(): sut = BuildFile( Path("./build.py"), @@ -138,6 +142,7 @@ version = "1.1.5-SNAPSHOT" sut.set_version(Version.from_str("1.1.5-SNAPSHOT").create_major()) assert '\nversion = "2.0.0"\n' == sut.content + def test_sould_parse_and_set_version_for_clj(): sut = BuildFile( Path("./project.clj"), @@ -159,15 +164,21 @@ def test_sould_parse_and_set_version_for_clj(): """, ) sut.set_version(Version.from_str("1.1.5-SNAPSHOT").create_major()) - assert '\n(defproject org.domaindrivenarchitecture/c4k-jira "2.0.0"\n :description "jira c4k-installation package"\n)\n' == sut.content + assert ( + '\n(defproject org.domaindrivenarchitecture/c4k-jira "2.0.0"\n :description "jira c4k-installation package"\n)\n' + == sut.content + ) sut = BuildFile( - Path("./project.clj"), - """ + Path("./project.clj"), + """ (defproject org.domaindrivenarchitecture/c4k-jira "1.1.5-SNAPSHOT" :dependencies [[org.clojure/clojure "1.11.0"]] ) """, - ) + ) sut.set_version(Version.from_str("1.1.5-SNAPSHOT").create_major()) - assert '\n(defproject org.domaindrivenarchitecture/c4k-jira "2.0.0"\n:dependencies [[org.clojure/clojure "1.11.0"]]\n)\n ' == sut.content + assert ( + '\n(defproject org.domaindrivenarchitecture/c4k-jira "2.0.0"\n:dependencies [[org.clojure/clojure "1.11.0"]]\n)\n ' + == sut.content + )