fast_ci 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 100456fb3e49ce9d12c4b8b12946e6e061e49e288bc304799d2c3d67d087c9d6
-  data.tar.gz: 5ce5a82834b0b7e0b832cf42f380de6d957c37608833feae45f3832f10434fec
+  metadata.gz: 5d1b77a32be5c6217b8638a34cb4b56e71f70264772fb4ff3bb80a950a5e5f30
+  data.tar.gz: e2c37846aa46613428f39f27de80a0b9396aac514231ee2b1d6818d74ed0e2be
 SHA512:
-  metadata.gz: 0617d4163115c25dbe16561982bc145ee867354643070aa7cc40925f1bbaf5b7638464691125d418a5c77660bfd4d486a9cc29c8eebe7b0125c678c1e443ee93
-  data.tar.gz: 95c554a2fff6a99e11820c5cdc83c87d27fed0731847725f99e9176cb5907a5a269d19558e4ba40f0bce3db4db56ec02877dca19a5f6132b43acd0aa8ff29b3a
+  metadata.gz: 9747a1992088ae124fdee45dac860f31e5bfdafb7bd3d53ee32b5470116db2596774d439d89684487951bc01f3cea3d68e2682fba4b738f3882e3294e045596e
+  data.tar.gz: 2db8c9d842cf3c3d7ab4fe4992de6153d3ba5d709d5d7690bb1cef1d25040213b69e9bd092457aa50d1945daa13dfce48bf8c7ea4946866348b92d5741dd4d69

data/fast_ci.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Ruby wrapper for creating FastCI integrations"
   spec.homepage      = "https://github.com/RubyCI/fast_ci_gem"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -26,10 +26,12 @@ Gem::Specification.new do |spec|
   spec.executables   = ["fastci_rubycritic", "fastci_brakeman", "fastci_bundle_audit"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "console", "~> 1.21.0"
+  spec.add_dependency "console", ">= 1.10.0"
   spec.add_dependency "async-websocket", '<= 0.20.0'
+  spec.add_dependency "rspec-core", ">= 3.6.0"
+  spec.add_dependency "simplecov", ">= 0.22.0"
   spec.add_dependency "rubycritic", ">= 4.1.0"
   spec.add_dependency "brakeman", ">= 5.4.1"
-  spec.add_dependency "minitest-rails", ">= 5.1"
+  spec.add_dependency "minitest-rails", ">= 2.2.1"
   spec.add_development_dependency "pry"
 end

data/lib/fast_ci/rspec_formatter.rb

@@ -4,57 +4,9 @@ module FastCI
   class RspecFormatter
     attr_reader :current_test_key
 
-    def initialize(output)
-      @output = output
-      @event_output = {}
+    def initialize
+      @output = {}
       @is_failed = false
-      @current_path = []
-      @current_path_started_at = []
-      @max_heap_live_num = 0
-      @dup_stdout = STDOUT.clone
-      @events = []
-
-      $stdout = StringIO.new()
-
-      @log_thread = Thread.new do
-        loop do
-          sleep 10
-          check_heap_live_num
-          @should_send_events = true
-        end
-      end
-    end
-
-    def time_now
-      time_frozen? ? Timecop.return { Time.now } : Time.now
-    end
-
-    def time_frozen?
-      return unless defined?(Timecop)
-      Timecop.frozen?
-    end
-
-    def rspec_runner_index
-      ENV["TEST_ENV_NUMBER"]
-    end
-
-    def send_events
-      @should_send_events = false
-  
-      if @events.length > 0
-        json_events = {
-          build_id: FastCI.configuration.orig_build_id,
-          compressed_data: Base64.strict_encode64(Zlib::Deflate.deflate(JSON.fast_generate(@events), 9)),
-        }
-
-        FastCI.send_events(json_events)
-
-        @events = []
-      end
-    end
-  
-    def check_heap_live_num
-      @max_heap_live_num = [@max_heap_live_num, GC.stat[:heap_live_slots] || GC.stat[:heap_live_num]].max
     end
 
     def passed?
@@ -65,100 +17,13 @@ module FastCI
       @current_test_key = value
     end
 
-    def start(start_notification)
-      # $stderr = $stdout
-  
-      data = {
-        load_time: start_notification.load_time,
-        example_count: start_notification.count,
-        started_at: time_now.to_s
-      }
-  
-      return if running_only_failed? ||
-        running_gem_or_engine? ||
-        ENV["EXTRA_SLOWER_RUN"]
-  
-      msg(:start, data)
-    end
-  
-    def close(null_notification)
-      # check_heap_live_num
-      msg(:gc_stat, GC.stat.merge(max_heap_live_num: @max_heap_live_num))
-      unless running_only_failed? || ENV["EXTRA_SLOWER_RUN"] || running_gem_or_engine?
-        msg(:close, {final_output: get_output})
-      end
-      send_events
-      $stdout = @dup_stdout
-    end
-  
-    def example_group_started(group_notification)
-      metadata = group_notification.group.metadata
-      @current_path_started_at << time_now
-  
-      if @current_path.size == 0
-        @example_failed_index = 0
-        file_path = metadata[:file_path].gsub("./".freeze, "".freeze)
-        file_path = [ENV["DIR_PREFIX"], file_path].join("/") if ENV["DIR_PREFIX"]
-        @current_path << file_path
-      end
-  
-      @current_path << id(metadata)
-  
-      msg(:group_started, [
-        path_with_file(group_notification.group),
-        {
-          line_number: metadata[:line_number],
-          description: metadata[:description],
-        }
-      ])
-    end
-  
-    def example_started(example_notification)
-      @output_before = get_output
-    end
-  
-    def example_passed(example_notification)
-      metadata = example_notification.example.metadata
-      broadcast_example_finished(serialize_example(metadata, "passed".freeze), example_notification.example)
-    end
-  
-    def example_failed(example_notification)
-      @example_failed_index += 1
-      metadata = example_notification.example.metadata
-      fully_formatted = example_notification.fully_formatted(@example_failed_index, ::RSpec::Core::Formatters::ConsoleCodes)
-  
-      broadcast_example_finished(
-        serialize_example(metadata, "failed".freeze, fully_formatted),
-        example_notification.example
-      )
-    end
-  
-    def example_pending(example_notification)
-      metadata = example_notification.example.metadata
-      broadcast_example_finished(
-        serialize_example(metadata, "pending".freeze),
-        example_notification.example
-      )
-    end
-
-    def example_group_finished(group_notification)
-      run_time = time_now - @current_path_started_at.pop
-      if (run_time < 0) || (run_time > 2400)
-        run_time = 0.525
-      end
-        msg(:group_finished, [path_with_file(group_notification.group), {run_time: run_time}])
-        # msg(:group_finished, [@current_path.map(&:to_s), {run_time: run_time}])
-      @current_path.pop
-      @current_path.pop if @current_path.size == 1 # Remove the file_path at the beggining
-    end
-
     def example_finished(notification)
       example =  notification.example
       metadata = example.metadata
 
       *example_group_ids, example_id = metadata[:scoped_id].split(":")
 
-      file_output = @event_output[current_test_key] ||= {}
+      file_output = @output[current_test_key] ||= {}
 
       example_group = example_group_ids.reduce(file_output) do |output, scope_id|
         output[scope_id] ||= {}
@@ -184,91 +49,9 @@ module FastCI
     end
 
     def dump_and_reset
-      event_output = @event_output
-      @event_output = {}
-      event_output
-    end
-
-    def path_with_file(group)
-      file_path = group.parent_groups.last.file_path.gsub("./".freeze, "".freeze)
-  
-      group.metadata[:scoped_id].split(":").unshift(file_path)
-    end
-
-    private
-
-    def running_gem_or_engine?
-      !!ENV["DIR_PREFIX"]
-    end
-  
-    def running_only_failed?
-      !!ENV["RERUN_FAILED_FILES"]
-    end
-  
-    def serialize_example(metadata, status, fully_formatted = nil)
-      run_time = metadata[:execution_result].run_time
-      if (run_time < 0) || (run_time > 2400)
-        run_time = 0.525
-      end
-  
-      result = {
-        id: id(metadata),
-        status: status,
-        line_number: metadata[:line_number].to_s,
-        description: metadata[:description],
-        run_time: run_time,
-        fully_formatted: fully_formatted,
-        scoped_id: metadata[:scoped_id],
-      }.compact
-  
-      result[:gem_or_engine] = true if running_gem_or_engine?
-  
-      if running_only_failed?
-        result[:reruned] = true
-      elsif status == "failed" && !running_gem_or_engine?
-        File.write('tmp/rspec_failures', "#{@current_path.first}[#{metadata[:scoped_id]}]", mode: 'a+')
-      end
-  
-      if status == "failed"
-        img_path = metadata.dig(:screenshot, :image) ||
-          fully_formatted&.scan(/\[Screenshot Image\]: (.*)$/).flatten.first&.strip&.chomp ||
-          fully_formatted&.scan(/\[Screenshot\]: (.*)$/).flatten.first&.strip&.chomp
-  
-        if img_path && File.exist?(img_path)
-          STDOUT.puts "SCREENSHOT!"
-          result[:screenshots_base64] ||= []
-          result[:screenshots_base64] << Base64.strict_encode64(File.read(img_path))
-        end
-      end
-      @last_example_finished_at = time_now
-      # TODO annalyze this: run_time: metadata[:execution_result].run_time,
-      result
-    end
-
-    def msg(event, data)
-      @events << ["rspec_#{event}".upcase, [rspec_runner_index, data]]
-    end
-
-    def id(metadata)
-      metadata[:scoped_id].split(":").last || raise("No scoped id")
-    end
-
-    def broadcast_example_finished(data, example)
-      msg(:example_finished, [
-        path_with_file(example.example_group),
-        data.merge(output_inside: get_output, output_before: @output_before)
-      ])
-  
-      send_events if @should_send_events
-    end
-
-    def get_output
-      return if $stdout.pos == 0
-      $stdout.rewind
-      res = $stdout.read
-      $stdout.flush
-      $stdout.rewind
-      res
+      output = @output
+      @output = {}
+      output
     end
   end
 end

data/lib/fast_ci/runner_prepend.rb

@@ -6,11 +6,13 @@ module FastCI
   module RunnerPrepend
     def run_specs(example_groups)
       @rspec_started_at = Time.now
-      json_events = {
-        build_id: FastCI.configuration.orig_build_id,
-        compressed_data: Base64.strict_encode64(Zlib::Deflate.deflate(JSON.fast_generate([['RSPEC_RUN', { started_at: @rspec_started_at, test_env_number: ENV["TEST_ENV_NUMBER"] }]]), 9)),
-      }
-      FastCI.send_events(json_events)
+      if ENV['FSCI_REMOTE_TESTS'] == 'true'
+        json_events = {
+          build_id: FastCI.configuration.orig_build_id,
+          compressed_data: Base64.strict_encode64(Zlib::Deflate.deflate(JSON.fast_generate([['RSPEC_RUN', { started_at: @rspec_started_at, test_env_number: ENV["TEST_ENV_NUMBER"] }]]), 9)),
+        }
+        FastCI.send_events(json_events)
+      end
 
       examples_count = @world.example_count(example_groups)
 
@@ -50,19 +52,9 @@ module FastCI
             return @configuration.failure_exit_code
           end
 
-          formatter = FastCI::RspecFormatter.new(STDOUT)
+          formatter = FastCI::RspecFormatter.new
 
           reporter.register_listener(formatter, :example_finished)
-          if ENV['FSCI_REMOTE_TESTS'] == 'true'
-            reporter.register_listener(formatter, :start)
-            reporter.register_listener(formatter, :example_group_started)
-            reporter.register_listener(formatter, :example_started)
-            reporter.register_listener(formatter, :example_passed)
-            reporter.register_listener(formatter, :example_failed)
-            reporter.register_listener(formatter, :example_pending)
-            reporter.register_listener(formatter, :example_group_finished)
-            reporter.register_listener(formatter, :close)
-          end
 
           FastCI.rspec_ws.on(:deq) do |tests|
             tests.each do |test|

data/lib/fast_ci/version.rb

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

data/lib/fast_ci.rb

@@ -55,7 +55,7 @@ module FastCI
     end
 
     def debug(msg)
-      puts "\n\e[36mDEBUG: \e[0m #{msg}\n" if ENV["fast_ci_DEBUG"]
+      puts "\n\e[36mDEBUG: \e[0m #{msg}\n" if ENV["FAST_CI_DEBUG"]
     end
 
     def report_options(run_key, content)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fast_ci
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Nesha Zoric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 0.20.0
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: rubycritic
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="