affected_tests 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af75eb73948c85a496715e0ea5f27610a1edb9ad9db22ddf1529122bc9129fcf
-  data.tar.gz: 812ebcd3b665254bfc365e10537896bec4d84bbca4efd17b5de46bfa73ed0346
+  metadata.gz: fbb2179c4fffe41e99f31697dc10b161f5d0063776a4e844b88591013c33a97c
+  data.tar.gz: 1c4b1596a80fea2d05dc754d4ddc7219843dacb53b022afd0ddab06acc663c31
 SHA512:
-  metadata.gz: 90130e1a9102afb5afae71d4b0f14bb024c35ae44f807fd8c3fc75d7f143d14636854c84bb67bebfbd5970bc7326b2968cd2f2997345d86d5be41897ec312ab7
-  data.tar.gz: e4d4f3879148330499743228daf4facabd030a4cd799c3a92bb95f99886bb86760d5f77385037fd5b3982c5d7e3546462fc1f4def93eb7ec048e047a2dc52f3b
+  metadata.gz: 58d176dc48c68f09fa0ff3a610879e1c3c90d6d360eb33cc2b48306810996a7dd762b7490dc47fd63c9bddee22a44005bfbce7262c88043ab4352e41ead236bc
+  data.tar.gz: 484bade7034e6ccf3259dd84419b2c80cac33f17a0171f842d59d1cad5d2db252dbaf487ec6082cead83bca000ea2540ee718963d6562c7ba4b8a336f7a5d28b

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    affected_tests (0.1.0)
-      calleree
+    affected_tests (0.3.0)
+      rotoscope
 
 GEM
   remote: https://rubygems.org/
   specs:
-    calleree (0.1.0)
     rake (13.0.6)
+    rotoscope (0.3.0)
 
 PLATFORMS
-  arm64-darwin-21
+  ruby
 
 DEPENDENCIES
   affected_tests!

data/README.md

@@ -29,10 +29,28 @@ require "affected_tests/rspec"
 AffectedTests.setup(
   project_path: File.expand_path("../../", __FILE__),
   test_dir_path: "spec/",
-  output_path: "log/affected-tests-map.json"
+  output_path: "log/affected-tests-map.json",
+  revision: "1cf22fdb86e2b2d6107" # or git rev-parse HEAD > REVISION
 )
 ```
 
+this will write associated test files per file on `log/affected-tests-map.json`:
+
+```json
+{
+  "revision": "1cf22fdb86e2b2d6107",
+  "map": {
+    "app/controllers/comments_controller.rb": [
+      "spec/requests/comments_spec.rb"
+    ],
+    "app/views/comments/index.html.erb": [
+      "spec/requests/comments_spec.rb",
+      "spec/views/comments/index.html.erb_spec.rb"
+    ]
+  }
+}
+```
+
 ### Get Diff
 
 #### Schema
@@ -76,6 +94,17 @@ pp target_tests
 
 See also: `scripts/calculate-target-tests`
 
+#### Merge results from parallel test
+
+```
+require "affected_tests/map_merger"
+
+AffectedTests::MapMerger.run(
+  map_file_paths: %w[node1-result.json node2-result.json node3-result.json],
+  output_path: "merged-result.json"
+)
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/affected_tests/map_merger.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "json"
+require "set"
+
+module AffectedTests
+  module MapMerger
+    module_function
+
+    def run(map_file_paths:, output_path:)
+      map_infos = map_file_paths.map do |map_file_path|
+        JSON.parse(File.read(map_file_path))
+      end
+
+      revisions = map_infos.map { |map_info| map_info["revision"] }.uniq
+      raise "map files weren't generated by same revision" if revisions.size != 1
+
+      keys = map_infos.flat_map { |map_info| map_info["map"].keys }.uniq
+
+      result_map = {}
+      keys.each do |key|
+        map_infos.each do |map_info|
+          map = map_info["map"]
+          next if map[key].nil?
+
+          result_map[key] ||= Set.new
+          map[key].each do |test_file_path|
+            result_map[key] << test_file_path
+          end
+        end
+      end
+
+      result = {
+        revision: revisions.first,
+        map: result_map.transform_values(&:to_a)
+      }
+
+      File.write(output_path, JSON.dump(result))
+    end
+  end
+end

data/lib/affected_tests/rspec.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.before(:suite) do
-    AffectedTests.start
+  config.prepend_before(:each) do
+    AffectedTests.start_trace
   end
 
-  config.after(:each) do
+  config.append_after(:each) do
+    AffectedTests.stop_trace
     target_spec = self.class.declaration_locations.last[0]
-    AffectedTests.emit(target_spec)
+    AffectedTests.checkpoint(target_spec)
   end
 
   config.after(:suite) do

data/lib/affected_tests/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AffectedTests
-  VERSION = "0.1.0"
+  VERSION = "0.4.0"
 end

data/lib/affected_tests.rb

@@ -3,61 +3,62 @@
 require "set"
 require "json"
 
-require "calleree"
+require "rotoscope"
 
 require_relative "affected_tests/version"
 
 module AffectedTests
   module_function
 
-  def setup(project_path:, test_dir_path:, output_path:)
+  def setup(project_path:, test_dir_path:, output_path:, revision: nil)
     @project_path = project_path
     @test_dir_path = test_dir_path
     @output_path = output_path
+    @revision = revision || build_revision
+    @rotoscope = Rotoscope.new do |call|
+      next if self == call.receiver
+
+      if call.caller_path && target_path?(call.caller_path)
+        buffer << call.caller_path
+      end
+    end
   end
 
-  def start
-    Calleree.start
+  def start_trace
+    @rotoscope.start_trace
   end
 
-  def import_from_calleree(target_test_path, result)
-    caller_in_project = result.select do |(caller_info, _callee_info, _count)|
-      caller_path = caller_info.first
-      target_path?(caller_path)
-    end.map do |(caller_info, _callee_info, _count)|
-      format_path(caller_info.first)
-    end
+  def stop_trace
+    @rotoscope.stop_trace
+  end
 
-    called_in_project = result.select do |(_caller_info, callee_info, _count)|
-      callee_path = callee_info.first
-      target_path?(callee_path)
-    end.map do |(_caller_info, callee_info, _count)|
-      format_path(callee_info.first)
+  def import_from_rotoscope(target_test_path, result)
+    all_related_paths = result.uniq.map do |caller_path|
+      format_path(caller_path)
     end
 
-    all_related_paths = (called_in_project + caller_in_project).uniq
-
-    target_test_file_path = format_path(target_test_path)
+    formatted_target_test_path = format_path(target_test_path)
 
     all_related_paths.each do |path|
       next if path.start_with?(@test_dir_path)
 
-      if path != target_test_file_path
-        add(target_test_file_path, path)
+      if path != formatted_target_test_path
+        add(formatted_target_test_path, path)
       end
     end
   end
 
-  def emit(target_test_path)
-    res = Calleree.result(clear: true)
-    import_from_calleree(target_test_path, res)
+  def checkpoint(target_test_path)
+    diff = buffer
+    import_from_rotoscope(target_test_path, diff)
+    buffer.clear
   end
 
   def dump
-    data = { revision: revision, map: cache.transform_values(&:to_a) }
+    data = { revision: @revision, map: cache.transform_values(&:to_a) }
     File.write(@output_path, JSON.dump(data))
   ensure
-    Calleree.stop
+    @rotoscope.stop_trace if @rotoscope.tracing?
   end
 
   def format_path(path)
@@ -73,17 +74,25 @@ module AffectedTests
     cache[callee].add(caller)
   end
 
-  def revision
-    revision_path = File.expand_path("../../REVISION", __FILE__)
-    if File.exist?(revision_path)
-      File.read(revision_path).strip
+  def build_revision
+    if defined? Rails
+      path = Rails.root.join("REVISION")
+      if path.exist?
+        path.read.chomp
+      else
+        "UNKNOWN"
+      end
     else
       "UNKNOWN"
     end
   end
 
+  def buffer
+    Thread.current[:buffer] ||= []
+  end
+
   def cache
-    @cache ||= {}
+    Thread.current[:cache] ||= {}
   end
 
   def bundler_path

data/scripts/generate-diff-files-from-github

@@ -15,11 +15,23 @@ target_sha = ARGV.shift
 
 client = Octokit::Client.new(access_token: ENV["GITHUB_TOKEN"])
 
-targets = client.compare(repository, base_sha, target_sha).files.map do |info|
-  {
-    filename: info.filename,
-    status: info.status
-  }
+targets = client.compare(repository, base_sha, target_sha).files.each_with_object([]) do |info, arr|
+  # https://docs.github.com/en/rest/commits/commits#get-a-commit
+  case info.status
+  when "modified", "added", "removed"
+    arr << { filename: info.filename, status: info.status }
+  when "renamed"
+    arr << { filename: info.filename, status: "added" }
+    arr << { filename: info.previous_filename, status: "removed" }
+  when "copied"
+    arr << { filename: info.filename, status: "added" }
+  when "changed"
+    arr << { filename: info.filename, status: "modified" }
+  when "unchanged"
+    # do nothing
+  else
+    raise "Unknown status: #{info.status}"
+  end
 end
 
 puts JSON.dump(targets)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: affected_tests
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shia
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: calleree
+  name: rotoscope
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,6 +39,7 @@ files:
 - Rakefile
 - lib/affected_tests.rb
 - lib/affected_tests/differ.rb
+- lib/affected_tests/map_merger.rb
 - lib/affected_tests/rspec.rb
 - lib/affected_tests/version.rb
 - scripts/calculate-target-tests