Release 1.4.2

- fix rare issue in covered lines collector - add code coverage badges
atroxaper · Oct 21, 2021 · c0ac3a8 · c0ac3a8
2 parents dbdaee3 + ee98379
commit c0ac3a8
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 21 deletions.
diff --git a/.github/workflows/macos-dev.yml b/.github/workflows/macos-dev.yml
@@ -0,0 +1,30 @@
+name: MacOS Dev
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  raku:
+    strategy:
+      matrix:
+        os:
+          - macOS-latest
+        raku-version:
+          - 'latest'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Raku/setup-raku@v1
+        with:
+          raku-version: ${{ matrix.raku-version }}
+      - name: Install Dependencies
+        run: zef install --/test --test-depends --deps-only .
+      - name: Install App::Prove6
+        run: zef install --/test App::Prove6
+      - name: Run Tests
+        run: prove6 t xt
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -2,8 +2,6 @@ name: MacOS
 
 on:
   push:
-    branches: [ master, dev ]
-  pull_request:
     branches: [ master ]
 
   workflow_dispatch:
@@ -26,7 +24,22 @@ jobs:
         run: zef install --/test --test-depends --deps-only .
       - name: Install App::Prove6
         run: zef install --/test App::Prove6
-      - name: Run Tests
-        run: prove6 t
-      - name: Run XT Tests
-        run: prove6 xt
+      - name: Run RaCoCo
+        run: raku -Ilib bin/racoco --exec='prove6 t xt'
+      - name: Discover Code Coverage
+        run: |
+          coverage=`head -1 .racoco/report.txt | sed 's/\..*//'`
+          echo $coverage
+          echo "COVERAGE=$coverage%" >> $GITHUB_ENV
+      - name: Create Code Coverage Badge
+        uses: schneegans/[email protected]
+        with:
+          auth: ${{ secrets.GIST_COCO_TOCKEN }}
+          gistID: 3113bf626af5b82ec0917574e638fcf5
+          filename: racoco-macos-coco.json
+          namedLogo: Apple
+          logoColor: 969da4
+          label: Coverage
+          labelColor: 343a41
+          message: ${{ env.COVERAGE }}
+          color: 5cb45a
diff --git a/.github/workflows/ubuntu-dev.yml b/.github/workflows/ubuntu-dev.yml
@@ -0,0 +1,30 @@
+name: Ubuntu Dev
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  raku:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+        raku-version:
+          - 'latest'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Raku/setup-raku@v1
+        with:
+          raku-version: ${{ matrix.raku-version }}
+      - name: Install Dependencies
+        run: zef install --/test --test-depends --deps-only .
+      - name: Install App::Prove6
+        run: zef install --/test App::Prove6
+      - name: Run Tests
+        run: prove6 t xt
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -2,8 +2,6 @@ name: Ubuntu
 
 on:
   push:
-    branches: [ master, dev ]
-  pull_request:
     branches: [ master ]
 
   workflow_dispatch:
@@ -26,7 +24,22 @@ jobs:
         run: zef install --/test --test-depends --deps-only .
       - name: Install App::Prove6
         run: zef install --/test App::Prove6
-      - name: Run Tests
-        run: prove6 t
-      - name: Run XT Tests
-        run: prove6 xt
+      - name: Run RaCoCo
+        run: raku -Ilib bin/racoco --exec='prove6 t xt'
+      - name: Discover Code Coverage
+        run: |
+          coverage=`head -1 .racoco/report.txt | sed 's/\..*//'`
+          echo $coverage
+          echo "COVERAGE=$coverage%" >> $GITHUB_ENV
+      - name: Create Code Coverage Badge
+        uses: schneegans/[email protected]
+        with:
+          auth: ${{ secrets.GIST_COCO_TOCKEN }}
+          gistID: bbe5dc9c78db69d256b11c2ea562a42f
+          filename: racoco-ubuntu-coco.json
+          namedLogo: Ubuntu
+          logoColor: 969da4
+          label: Coverage
+          labelColor: 343a41
+          message: ${{ env.COVERAGE }}
+          color: 5cb45a
diff --git a/.github/workflows/windows-dev.yml b/.github/workflows/windows-dev.yml
@@ -0,0 +1,30 @@
+name: Windows Dev
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  raku:
+    strategy:
+      matrix:
+        os:
+          - windows-latest
+        raku-version:
+          - 'latest'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Raku/setup-raku@v1
+        with:
+          raku-version: ${{ matrix.raku-version }}
+      - name: Install Dependencies
+        run: zef install --/test --test-depends --deps-only .
+      - name: Install App::Prove6
+        run: zef install --/test App::Prove6
+      - name: Run Tests
+        run: prove6 t xt
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -2,8 +2,6 @@ name: Windows
 
 on:
   push:
-    branches: [ master, dev ]
-  pull_request:
     branches: [ master ]
 
   workflow_dispatch:
@@ -26,7 +24,23 @@ jobs:
         run: zef install --/test --test-depends --deps-only .
       - name: Install App::Prove6
         run: zef install --/test App::Prove6
-      - name: Run Tests
-        run: prove6 t
-      - name: Run XT Tests
-        run: prove6 xt
+      - name: Run RaCoCo
+        run: raku -Ilib bin/racoco --exec='prove6 t xt'
+      - name: Discover Code Coverage
+        run: |
+          coverage=`head -1 .racoco/report.txt | sed 's/\..*//'`
+          echo $coverage
+          echo "COVERAGE=$coverage%" >> $GITHUB_ENV
+        shell: bash
+      - name: Create Code Coverage Badge
+        uses: schneegans/[email protected]
+        with:
+          auth: ${{ secrets.GIST_COCO_TOCKEN }}
+          gistID: ab8fd9f770291f542eec3245a756e7c8
+          filename: racoco-windows-coco.json
+          namedLogo: Windows
+          logoColor: 969da4
+          label: Coverage
+          labelColor: 343a41
+          message: ${{ env.COVERAGE }}
+          color: 5cb45a
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Version history:
 
+1.4.2		2021-10-22	'Bugfix release'
+	- fix rare issue in covered lines collector
+	- add code coverage badges
+
 1.4.1		2021-10-21	'Second public release'
 	- add --fix-compunit flag
 	- fix tests for all three platforms

diff --git a/META6.json b/META6.json
@@ -1,7 +1,7 @@
 {
 	"name": "App::RaCoCo",
 	"description": "Raku Code Coverage tool.",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"perl": "6.*",
 	"authors": [
 		"Mikhail Khorkov"

diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 [![Ubuntu](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/ubuntu.yml)
 [![MacOS](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/macos.yml/badge.svg)](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/macos.yml)
-[![Windows](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/windows.yml/badge.svg)](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/windows.yml)
+[![Windows](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/windows.yml/badge.svg)](https://github.com/atroxaper/raku-RaCoCo/actions/workflows/windows.yml)<br/>
+![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/atroxaper/bbe5dc9c78db69d256b11c2ea562a42f/raw/racoco-ubuntu-coco.json)
+![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/atroxaper/3113bf626af5b82ec0917574e638fcf5/raw/racoco-macos-coco.json)
+![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/atroxaper/ab8fd9f770291f542eec3245a756e7c8/raw/racoco-windows-coco.json)
+
 # NAME
 
 `App::RaCoCo` - Raku Code Coverage tool.

diff --git a/lib/App/Racoco/Cli.rakumod b/lib/App/Racoco/Cli.rakumod
@@ -130,5 +130,6 @@ sub USAGE() is export {
 		--append                       do not clean coverage data before run tests and append its result to the previous one
 		--html                         produce simple html page to visualize results
 		--color-blind                  use more readable colors than green/red pare
+		--fix-compunit                 erase <library>/.precomp directory before run tests
 	END
 }
diff --git a/lib/App/Racoco/CoveredLinesCollector.rakumod b/lib/App/Racoco/CoveredLinesCollector.rakumod
@@ -48,7 +48,7 @@ class CoveredLinesCollector is export {
       .unique
       .map(-> $h { .[0] => .[2] with $h.words})
       .classify({ $_.key })
-      .map({ $_.key => $_.value.map(*.value.Int).Set })
+      .map({ $_.key => $_.value.map({$_.value.Int or -1}).grep(* ne -1).Set })
       .Hash
   }
 }