test_diff 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDViODIxNjRmYWI0NmYzZjVhYTdhNzA5MzBkYzQ0YjJjMzg0NDAyYw==
+    MWVkMDZlMTVhZWIwMDYzMjk1ZTM1MTc4N2ZlMDQwZjFlZWM4Mzc3Nw==
   data.tar.gz: !binary |-
-    YjI4MmM3YzBhMzdmZTU5MjgxMDdjYjFiMWNkM2Q4N2MyMWE5MWE5MQ==
+    ZTAzOGEwOTNkNTRjZGYwM2Q4YTZhODdjN2I4ZGQ1Y2QyZDJkZThkOA==
 SHA512:
   metadata.gz: !binary |-
-    Mzc3ZWVjYzZkN2JkZmVjYjllMTkxNjcwNGIyZGZmYWJkZTE4MDQ3ZjRiNGQw
-    NjlmYTIwODdiZGI0NTVlMGM4ZThjODBjOTQzNWZiZGVmODk3OWY4YmZhYjJi
-    ZGViMDQwNDU3N2IyZjZmMTQxMGNlNDI1NjNkODhjN2UzMjlmMjI=
+    ZTEyNzk0OTBkZjRkNGIxM2ExOTM2YzRlZmZlZDZlY2NmZmIzNzIyOTFlZmEw
+    ODUxZTdjYzhlOGJjZGQ2ZDNmZWE3Y2VmNjI5ZjViZmExZWQ1OTM1OGQ5YjI4
+    OTljNjRmZWVkN2FjYTVlMWEzZGNjNjcyODlkODMyZGE4MjNjMGY=
   data.tar.gz: !binary |-
-    OTk5MTA1MjUzNGVmN2RkMGEyYTI0OGFmYjMwMWQ4NzBkMzM0ZGNiYWFlNTZk
-    ZTVjYTE0YzA1NjQ0NzY4NzMwMWQxODk3NTA2ZjdlMjdlZDQxNjk3YTdmYTQy
-    OTFjNzZlMjczMTcxMWQ4MTBlN2I5NjNiNTYxM2MwMDI1ZjVmMGI=
+    NGFhYzA4MjU2MmZkZjAyZGFlYWUwZDNlYTY0YmRhNjMwNzExNGRjZmU0Y2M3
+    NTlmOWE1MzMyYjM3NjM0OGZiNTQ0NWEyMzg2NDRhNTdiMDFmOGJiMzRlN2I4
+    NWMxZmNiNjI4MzgyOTg3OWY4NGU5ZDU3MzBlMjMwZDdjN2VkYWQ=

data/lib/test_diff/run_diff.rb

@@ -15,6 +15,7 @@ module TestDiff
 
     def run
       add_changed_files
+      remove_tests_that_do_not_exist
       remove_tests_in_wrong_folder
       select_test_group
       run_test_group
@@ -37,6 +38,12 @@ module TestDiff
       @specs_to_run = @specs_to_run.slice(group.to_i * groups_size, groups_size)
     end
 
+    def remove_tests_that_do_not_exist
+      @specs_to_run.delete_if do |s|
+        !File.exist?(s)
+      end
+    end
+
     def remove_tests_in_wrong_folder
       @specs_to_run.delete_if do |s|
         !s.start_with?("#{spec_folder}/")
@@ -44,22 +51,28 @@ module TestDiff
     end
 
     def add_changed_files
-      cmd = "git diff --name-only #{sha1} HEAD"
-      `#{cmd}`.split("\n").each do |file_name|
+      _build_specs_to_run
+
+      @specs_to_run.flatten!
+      @specs_to_run.sort!
+      @specs_to_run.uniq!
+    end
+
+    def _build_specs_to_run
+      files = []
+      `git diff --name-only #{sha1} HEAD`.split("\n").each do |file_name|
         if file_name.end_with?('spec.rb') || file_name.end_with?('test.rb')
           @specs_to_run << file_name
         elsif !file_name.start_with?(@storage.folder)
-          _add_calculated_tests(file_name)
+          files << file_name
           _add_rails_view_spec(file_name)
         end
       end
-
-      @specs_to_run.flatten!
-      @specs_to_run.sort!
+      _add_calculated_tests(files)
     end
 
-    def _add_calculated_tests(file_name)
-      @specs_to_run << @storage.find_for(file_name)
+    def _add_calculated_tests(files)
+      @specs_to_run << @storage.find_for(files, spec_folder)
     end
 
     def _add_rails_view_spec(file_name)

data/lib/test_diff/storage.rb

@@ -31,10 +31,12 @@ module TestDiff
       end
     end
 
-    def find_for(file)
+    def find_for(files, sub_folder = nil)
       results = []
-      Dir["#{@folder}/**/*.yml"].each do |storage_file|
-        find_for_storage_file(results, storage_file, file)
+      root_folder = @folder
+      root_folder += "/#{sub_folder}" if sub_folder
+      Dir["#{root_folder}/**/*.yml"].each do |storage_file|
+        find_for_storage_file(results, storage_file, files)
       end
       results
     end
@@ -47,14 +49,21 @@ module TestDiff
 
     private
 
-    def find_for_storage_file(results, storage_file, file)
+    def find_for_storage_file(results, storage_file, files)
       YAML::Store.new(storage_file).transaction(true) do |store|
-        unless store[file].to_s.split(',').delete_if { |s| s == '' || s == '0' }.empty?
-          results << storage_file.gsub('.yml', '').gsub("#{@folder}/", '')
+        found_files = files & store.roots
+        found_files.each do |file|
+          if _active_file?(store[file])
+            results << storage_file.gsub('.yml', '').gsub("#{@folder}/", '')
+          end
         end
       end
     end
 
+    def _active_file?(file)
+      !file.to_s.split(',').delete_if { |s| s == '' || s == '0' }.empty?
+    end
+
     def get_store(file)
       dir = File.dirname("#{@folder}/#{file}")
       filename = File.basename(file) + '.yml'

data/lib/test_diff/version.rb

@@ -1,4 +1,4 @@
 # version number
 module TestDiff
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_diff
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Grant Speelman