affected_tests 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f592851e15e03100476ea65886d785a8baf5c8fa954beb0c628c3b4db99fa5
-  data.tar.gz: a25451d7b286eeed185ea9dee6783512364252607efbc5b26055f687811bdc6d
+  metadata.gz: dcc672116e5bb9b0e2da893b7210c77f11e5b95e3c64fc4c217edb1f06f2e7d2
+  data.tar.gz: 1f03fe6932d5f970ee5606501412f30cc397163e86b3a543fe1e95c2d04c3dbd
 SHA512:
-  metadata.gz: 27bd7c5b5b591a7f082a849830350621b24a178db62b338862ed609332e79618a26c6a3c8e8409c3c5573840bb7f6c84475f47ec5a3bfeb61a2cc397601ca0c7
-  data.tar.gz: 98dc67e1439bb8a7cc6bc10700028dd99e6e6ea7ddf0c0c59a510b73cee33f1fe0ee50404d1de6cd729003a55f30dbef4a9834c9d5bfc5b81914f7a049e885fc
+  metadata.gz: 2f92a2f7dd2d2f322d27ca90ebeeaffb18d765145d51efcd6b2df571dd95ffe6a67ba27b3a16e25736853cc148f07f3d064fee1b28f843cbfe43150872757d8e
+  data.tar.gz: ac127737a5b1555e35d18eb3ce9b0cde6adfd679b8bb852482934296e0ec371ed9f14027c1614af98e436f52896c59053094be5b6016c296a481f3b45ffd5078

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    affected_tests (0.1.0)
+    affected_tests (0.3.0)
       rotoscope
 
 GEM
@@ -11,7 +11,7 @@ GEM
     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/version.rb

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

data/lib/affected_tests.rb

@@ -10,10 +10,11 @@ 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
     @rotoscope = Rotoscope.new do |call|
       next if self == call.receiver
 
@@ -54,7 +55,7 @@ module AffectedTests
   end
 
   def dump
-    data = { revision: revision, map: cache.transform_values(&:to_a) }
+    data = { revision: @revision || build_revision, map: cache.transform_values(&:to_a) }
     File.write(@output_path, JSON.dump(data))
   ensure
     @rotoscope.stop_trace if @rotoscope.tracing?
@@ -73,10 +74,14 @@ 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

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: affected_tests
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Shia
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotoscope
@@ -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