fast_ci 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1b77a32be5c6217b8638a34cb4b56e71f70264772fb4ff3bb80a950a5e5f30
-  data.tar.gz: e2c37846aa46613428f39f27de80a0b9396aac514231ee2b1d6818d74ed0e2be
+  metadata.gz: 88ff9bc4e8535b44f8a75083d9f2e6e498a180eb579e59576deba2a78587e161
+  data.tar.gz: 5236dba1f25ad3776050e25482c4ce1a1810c90f051b59b5274d57ad7deee5e6
 SHA512:
-  metadata.gz: 9747a1992088ae124fdee45dac860f31e5bfdafb7bd3d53ee32b5470116db2596774d439d89684487951bc01f3cea3d68e2682fba4b738f3882e3294e045596e
-  data.tar.gz: 2db8c9d842cf3c3d7ab4fe4992de6153d3ba5d709d5d7690bb1cef1d25040213b69e9bd092457aa50d1945daa13dfce48bf8c7ea4946866348b92d5741dd4d69
+  metadata.gz: 9509a523d124226ba2e495bf4683a7d0f409fb0a99e5b1f6653e1c27d47329905bb07dd2ee3de1233aae2be9ebc3f3256c1ea9da9f2e15452ea373b175b90632
+  data.tar.gz: 66ba3bc4ac0b3862c58e8cd0ca0ee803ce17dbacd0d08602343bf9d015d1eeacc1cbc0f82dae5ac0f327dc9c8c34f728b79b1fe1260963832382ba476ead3495

data/.github/workflows/release.yml

@@ -0,0 +1,23 @@
+name: Release
+concurrency:
+  group: production
+  cancel-in-progress: true
+on:
+  push:
+    branches:
+      - release
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: 3.0.0
+      - uses: rubygems/release-gem@v1

data/Gemfile.lock

@@ -11,19 +11,21 @@ GIT
 PATH
   remote: .
   specs:
-    fast_ci (1.0.2)
+    fast_ci (1.0.7)
       async-websocket (<= 0.20.0)
       brakeman (>= 5.4.1)
-      console (~> 1.21.0)
-      minitest-rails (>= 5.1)
+      console (>= 1.10.0)
+      minitest-rails (>= 2.2.1)
+      rspec-core (>= 3.6.0)
       rubycritic (>= 4.1.0)
+      simplecov (>= 0.22.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.4)
-      actionview (= 7.1.4)
-      activesupport (= 7.1.4)
+    actionpack (7.1.4.2)
+      actionview (= 7.1.4.2)
+      activesupport (= 7.1.4.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -31,13 +33,13 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.4)
-      activesupport (= 7.1.4)
+    actionview (7.1.4.2)
+      activesupport (= 7.1.4.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.4)
+    activesupport (7.1.4.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -72,7 +74,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    brakeman (6.2.1)
+    brakeman (6.2.2)
       racc
     builder (3.3.0)
     childprocess (5.1.0)
@@ -115,7 +117,7 @@ GEM
       addressable (~> 2.8)
       childprocess (~> 5.0)
     logger (1.6.1)
-    loofah (2.22.0)
+    loofah (2.23.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     method_source (1.0.0)
@@ -150,7 +152,7 @@ GEM
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -165,9 +167,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.4)
-      actionpack (= 7.1.4)
-      activesupport (= 7.1.4)
+    railties (7.1.4.2)
+      actionpack (= 7.1.4.2)
+      activesupport (= 7.1.4.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -183,7 +185,7 @@ GEM
       rainbow (>= 2.0, < 4.0)
     reline (0.5.10)
       io-console (~> 0.5)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)

data/Rakefile

@@ -5,8 +5,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]
+task default: %i[spec]

data/lib/fast_ci/configuration.rb

@@ -48,7 +48,7 @@ module FastCI
       %w[FSCI_COMMIT _COMMIT _SHA1 _SHA].find do |keyword|
         key = ENV.keys.find { |k| k[keyword] }
         break ENV[key] if key && ENV[key]
-      end || `git rev-parse --short HEAD`.chomp
+      end || `git rev-parse HEAD`.chomp
     end
 
     def guess_branch

data/lib/fast_ci/simple_cov/reporting.rb

@@ -5,35 +5,70 @@ module FastCI
         base.instance_eval do
           unless (ENV['FAST_CI_SECRET_KEY'] || '').empty?
             def write_last_run(result)
-              ::SimpleCov::LastRun.write(result:
-                result.coverage_statistics.transform_values do |stats|
-                  round_coverage(stats.percent)
-                end)
+              file_coverage = {}
 
-              source = {}
+              result.files.each do |file|
+                missed_lines = file.missed_lines.map { |missed| missed.line_number }.sort
 
-              result.source_files.each do |source_file|
-                source[source_file.filename.gsub(root, '')] = source_file.src
+                file_coverage[file.filename.gsub(root, '.')] = {
+                  coverage: file.coverage_statistics[:line].percent,
+                  missed_line_count: missed_lines.count,
+                  missed_lines: ::FastCI::SimpleCov::Reporting.join_consecutive_numbers(missed_lines),
+                  covered_lines_count: file.covered_lines.map { |missed| missed.line_number }.count
+                }
               end
 
-              result_json = {}
+              folder_coverage = {}
 
-              result.as_json.each do |command, data|
-                result_json[command] = data
-                data['coverage'].clone.each do |src, file_data|
-                  result_json[command]['coverage'].delete(src)
+              file_coverage.each do |path, data|
+                parent_folders = File.dirname(path).split('/').drop(1)
 
-                  file_data['src'] = source[src.gsub(root, '')]
+                (0..(parent_folders.size - 1)).each do |path_index|
+                  path = './' + parent_folders[0..path_index].join('/')
 
-                  result_json[command]['coverage'][src.gsub(root, '')] = file_data
+                  folder_coverage[path] ||= {}
+
+                  folder_coverage[path][:missed_line_count] =
+                    (folder_coverage.dig(path, :missed_line_count) || 0) + data[:missed_line_count]
+                  folder_coverage[path][:covered_line_count] =
+                    (folder_coverage.dig(path, :covered_line_count) || 0) + data[:covered_lines_count]
                 end
               end
 
-              FastCI.report_simplecov(result_json.to_json)
+              folder_coverage.keys.each do |path|
+                folder_coverage[path][:coverage] =
+                  (100 - folder_coverage[path][:missed_line_count] * 100.0 / (folder_coverage[path][:covered_line_count] + folder_coverage[path][:missed_line_count])).round(2)
+              end
+
+              results = {
+                file_coverage: file_coverage,
+                folder_coverage: folder_coverage,
+                coverage: result.coverage_statistics[:line].percent.round(2)
+              }
+
+              FastCI.report_simplecov(results.to_json)
             end
           end
         end
       end
+
+      def self.join_consecutive_numbers(arr)
+        result = []
+        consecutive_group = []
+      
+        arr.each_with_index do |num, index|
+          if index == 0 || num == arr[index - 1] + 1
+            consecutive_group << num
+          else
+            result << (consecutive_group.size > 1 ? "#{consecutive_group.first}..#{consecutive_group.last}" : consecutive_group.first.to_s)
+            consecutive_group = [num]
+          end
+        end
+      
+        result << (consecutive_group.size > 1 ? "#{consecutive_group.first}..#{consecutive_group.last}" : consecutive_group.first.to_s)
+      
+        result.compact
+      end
     end
   end
 end

data/lib/fast_ci/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastCI
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_ci
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Nesha Zoric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -133,6 +133,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -187,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for creating FastCI integrations