ruby_ci 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e283124f28472dd77c422d918d1add1900eb6b6f220975feca638fd30ec9d17e
-  data.tar.gz: 44b1948327549780caf7dfac69d65cc4838acca1e7f84890ff410b420d85ebe9
+  metadata.gz: a7c35bb0aa43fb15f11e288bdc246e8790f0a74346e55f341340e53b700de31a
+  data.tar.gz: 2cdd3f26da2bf5655f49175a5d2e4163942cd47ab4dd4a8ca4c90ac02996146b
 SHA512:
-  metadata.gz: 81016f3033727cbb53fdb989924e62d4f5f8a8f9963cff8f935b656a08b9582b53329f798324d8427e4522540982947c3dc76d58fbdfae40492b60297c08141f
-  data.tar.gz: c499ce521bdc3e5c7a401fb7aa2494df109c0dc9a4796776330c68ad6ffc3bfc5f22d0dc1ecd371c8c2a693116a36f42a5f11e18ec005a42a9e600be62fe7179
+  metadata.gz: 3162b05df9bc862155874dddd44b645523629ff14d1eb0467221c0684443efa4534bf973dccca5dc589157b4d9f59bca863d8fe424c9e504ed15caf231a2d132
+  data.tar.gz: d38b4b7cec3187fa0fc538daa6a2fab7b27faf398b6077679cccbfee95eaaf452076893af88e3ea175da92b1edf89e32607a67fd804c5eb76e850405ed2c2c31

data/bin/rubyci_rubycritic

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Always look in the lib directory of this gem
+# first when searching the load path
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
+require 'ruby_ci/ruby_critic/cli/application'
+
+exit RubyCI::RubyCritic::Cli::Application.new(ARGV + ["--format", "json"]).execute

data/lib/ruby_ci/ruby_critic/cli/application.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'rubycritic/cli/application'
+require 'ruby_ci'
+require 'base64'
+require 'zlib'
+
+module RubyCI
+  module RubyCritic
+    module Cli
+      class Application < ::RubyCritic::Cli::Application
+        def execute
+          status = super
+
+          content = File.read('tmp/rubycritic/report.json')
+          report = JSON.load(content)
+          modules = report['analysed_modules']
+          report['analysed_modules'] = {}
+          modules.each do |mod|
+            report['analysed_modules'][ mod['path'] ] = mod
+            mod['smells'].each do |smell|
+              location = smell['locations'].first
+              start_line = location['line'] - 1
+              end_line = start_line + 3
+              lines = File.readlines(location['path'])[start_line..end_line]
+              location['src'] = lines.join
+              smell['locations'][0] = location
+            end
+          end
+
+          compressed_data = ::Base64.strict_encode64(Zlib::Deflate.deflate(report.to_json, 9))
+          RubyCI.report_ruby_critic(compressed_data, 'passed')
+
+          return status
+        end
+      end
+    end
+  end
+end

data/lib/ruby_ci/simple_cov/reporting.rb

@@ -3,7 +3,7 @@ module RubyCI
     module Reporting
       def self.included base
         base.instance_eval do
-          if ENV['RUBY_CI_SECRET_KEY'].present?
+          unless (ENV['RUBY_CI_SECRET_KEY'] || '').empty?
             def write_last_run(result)
               ::SimpleCov::LastRun.write(result:
                 result.coverage_statistics.transform_values do |stats|

data/lib/ruby_ci/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCI
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/ruby_ci.rb

@@ -7,6 +7,7 @@ require_relative "ruby_ci/exceptions"
 require "async"
 require "async/http/endpoint"
 require "async/websocket/client"
+require "net/http"
 
 module RubyCI
   class Error < StandardError; end
@@ -29,16 +30,13 @@ module RubyCI
     end
 
     def report_simplecov(results)
-      data = {
-        build_id: RubyCI.configuration.build_id,
-        run_key: 'simplecov',
-        secret_key: RubyCI.configuration.secret_key,
-        branch: RubyCI.configuration.branch,
-        commit: RubyCI.configuration.commit,
-        commit_msg: RubyCI.configuration.commit_msg,
-        author: RubyCI.configuration.author.to_json,
-        content: results
-      }
+      uri = URI('https://fast.ruby.ci/api/runs')
+      res = Net::HTTP.post_form(uri, report_options('simplecov', results))
+    end
+
+    def report_ruby_critic(compressed_data, status)
+      data = report_options('ruby_critic', compressed_data)
+      data[:status] = status
 
       uri = URI('https://fast.ruby.ci/api/runs')
       res = Net::HTTP.post_form(uri, data)
@@ -55,6 +53,19 @@ module RubyCI
     def debug(msg)
       puts "\n\e[36mDEBUG: \e[0m #{msg}\n" if ENV["RUBY_CI_DEBUG"]
     end
+
+    def report_options(run_key, content)
+      {
+        build_id: RubyCI.configuration.build_id,
+        run_key: run_key,
+        secret_key: RubyCI.configuration.secret_key,
+        branch: RubyCI.configuration.branch,
+        commit: RubyCI.configuration.commit,
+        commit_msg: RubyCI.configuration.commit_msg,
+        author: RubyCI.configuration.author.to_json,
+        content: content
+      }
+    end
   end
 
   class WebSocket

data/ruby_ci.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.executables   = ["rubyci_rubycritic"]
   spec.require_paths = ["lib"]
 
   spec.add_dependency "console", "~> 1.15.0"
   spec.add_dependency "async-websocket", '<= 0.20.0'
+  spec.add_dependency "rubycritic", "~> 4.8.0"
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ci
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ale ∴
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -38,6 +38,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 0.20.0
+- !ruby/object:Gem::Dependency
+  name: rubycritic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +69,8 @@ dependencies:
 description: Ruby wrapper for creating RubyCI integrations
 email:
 - ale@alexvko.com
-executables: []
+executables:
+- rubyci_rubycritic
 extensions: []
 extra_rdoc_files: []
 files:
@@ -70,6 +85,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rubyci_rubycritic
 - bin/setup
 - lib/minitest/reporters/rubyci_reporter.rb
 - lib/minitest/rubyci_plugin.rb
@@ -78,6 +94,7 @@ files:
 - lib/ruby_ci/exceptions.rb
 - lib/ruby_ci/extract_definitions.rb
 - lib/ruby_ci/rspec_formatter.rb
+- lib/ruby_ci/ruby_critic/cli/application.rb
 - lib/ruby_ci/runner_prepend.rb
 - lib/ruby_ci/simple_cov.rb
 - lib/ruby_ci/simple_cov/reporting.rb