Merge a6d432a into cecbefd

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Install Crystal
         uses: crystal-lang/install-crystal@v1
         with:
-          crystal: 1.7.3
+          crystal: 1.8.1
 
       - run: shards install --production
 
@@ -66,7 +66,7 @@ jobs:
       - name: Install Crystal
         uses: crystal-lang/install-crystal@v1
         with:
-          crystal: 1.7.3
+          crystal: 1.8.1
 
       - name: Install dependencies
         run: shards install --production

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Install Crystal
       uses: crystal-lang/install-crystal@v1
       with:
-        crystal: 1.7.3
+        crystal: 1.8.1
     - name: Install dependencies
       run: shards install
     - name: Run tests
@@ -29,7 +29,7 @@ jobs:
     - name: Install Crystal
       uses: crystal-lang/install-crystal@v1
       with:
-        crystal: 1.7.3
+        crystal: 1.8.1
     - name: Install dependencies
       run: shards install
     - name: Run linter
@@ -42,7 +42,7 @@ jobs:
     - name: Install Crystal
       uses: crystal-lang/install-crystal@v1
       with:
-        crystal: 1.7.3
+        crystal: 1.8.1
     - run: shards install
     - run: make
     - name: Install kcov

Dockerfile

@@ -1,3 +1,4 @@
-FROM crystallang/crystal:1.7.3-alpine
+ARG CRYSTAL_VERSION
+FROM crystallang/crystal:${CRYSTAL_VERSION}-alpine
 
-RUN apk add sqlite-dev sqlite-static
+RUN apk add xz-dev xz-static libxml2-dev libxml2-static sqlite-dev sqlite-static

Makefile

@@ -1,12 +1,12 @@
 UUID := $(shell id -u)
 GUID := $(shell id -g)
-CRYSTAL_VERSION := 1.7.3
+CRYSTAL_VERSION := 1.8.1
 
 compile:
 	crystal build src/cli.cr -o dist/coveralls --progress
 
 release_linux:
-	docker build . --tag coverage-reporter:1.0
+	docker build . --build-arg CRYSTAL_VERSION=$(CRYSTAL_VERSION) --tag coverage-reporter:1.0
 	docker run --rm -t -v $(shell pwd):/app \
 		-w /app --user $(UUID):$(GUID) \
 		coverage-reporter:1.0 \

src/coverage_reporter/parsers/gcov_parser.cr

@@ -3,6 +3,11 @@ require "digest"
 
 module CoverageReporter
   class GcovParser < BaseParser
+    COVERAGE_RE = Regex.new(
+      "^\\s*([0-9]+|-|#####):\\s*([0-9]+):(.*)",
+      Regex::CompileOptions::MATCH_INVALID_UTF # don't raise error against non-UTF chars
+    )
+
     # Use *base_path* to join with paths found in reports.
     def initialize(@base_path : String?)
     end
@@ -24,7 +29,7 @@ module CoverageReporter
       name : String? = nil
       source_digest : String? = nil
       File.each_line(filename, chomp: true) do |line|
-        match = /^\s*([0-9]+|-|#####):\s*([0-9]+):(.*)/.match(line).try(&.to_a)
+        match = COVERAGE_RE.match(line).try(&.to_a)
         next if !match || !match.try(&.size) == 4
 
         count, number, text = match[1..3]

src/coverage_reporter/parsers/golang_parser.cr

@@ -2,7 +2,10 @@ require "./base_parser"
 
 module CoverageReporter
   class GolangParser < BaseParser
-    COVERAGE_RE = /^[\w.-]+\/[\w.-]+\/[\w.-]+\/(?:v\d+\/)?(.*\.go):(\d+)\.\d+,(\d+)\.\d+\s+\d+\s+(\d+)/
+    COVERAGE_RE = Regex.new(
+      "^[\\w.-]+\\/[\\w.-]+\\/[\\w.-]+\\/(?:v\\d+\\/)?(.*\\.go):(\\d+)\\.\\d+,(\\d+)\\.\\d+\\s+\\d+\\s+(\\d+)",
+      Regex::CompileOptions::MATCH_INVALID_UTF # don't raise error agains non-UTF chars
+    )
 
     def globs : Array(String)
       [] of String

src/coverage_reporter/parsers/lcov_parser.cr

@@ -48,14 +48,14 @@ module CoverageReporter
       source_file = nil : String?
       File.each_line(filename, chomp: true) do |line|
         case line
-        when /\ASF:(.+)/
+        when re("\\ASF:(.+)")
           source_file = base_path ? File.join(base_path, $1) : $1
-        when /\ADA:(\d+),(\d+)/
+        when re("\\ADA:(\\d+),(\\d+)")
           line_no = $1.to_i64
           count = $2.to_i64
           coverage = info[source_file].coverage
           coverage[line_no] = (coverage[line_no]? || 0.to_i64) + count
-        when /\ABRDA:(\d+),(\d+),(\d+),(\d+|-)/
+        when re("\\ABRDA:(\\d+),(\\d+),(\\d+),(\\d+|-)")
           line_no = $1.to_i64
           block_no = $2.to_i64
           branch_no = $3.to_i64
@@ -67,7 +67,7 @@ module CoverageReporter
           branches_block = branches_line[block_no] =
             branches_line[block_no]? || {} of Int64 => Int64
           branches_block[branch_no] = (branches_block[branch_no]? || 0.to_i64) + hits
-        when /\Aend_of_record/
+        when re("\\Aend_of_record")
           source_file = nil
         end
       end
@@ -108,5 +108,11 @@ module CoverageReporter
         format: self.class.name,
       )
     end
+
+    # Returns a regular expression that doesn't raise an error when string
+    # contains non-UTF characters.
+    private def re(regex : String) : Regex
+      Regex.new(regex, Regex::CompileOptions::MATCH_INVALID_UTF)
+    end
   end
 end