test_diff 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDg5NWQ4MmE3YzUzOGNlZDIwYjdkYTI3YzczNjJhM2VhNmE4NWM2MA==
+    ZjhjNGZlMzgzODhmN2M0ZjMxZTg5NWM5YTEyMGE4ZTMxOTZhMGQzMg==
   data.tar.gz: !binary |-
-    MzJjODhhYjg5MmQ0NzNlMzcwNjA1NDE2MWVmYTY1NWE4ZTVmODNhNQ==
+    NTU0N2FmM2VlOTZiOGU3MWRlMGZjZjU3YmE3YzJiZmQ3MjY4YmZhNw==
 SHA512:
   metadata.gz: !binary |-
-    NGI0MjdlYjVhZWM2NjQ4ZTk5MmI4OGRiMzllOWY5Y2RhZGQ0YzFhY2UzYmMy
-    OTU0MzA3OWZjNzk3NWUwOGY1MjE3ZTYxYmMyMmQwNDU4YjcyMTE0OTI0ZWUz
-    OGVhOGQ4ZTBlZjE4OGEzZmQ5MzJmYWNjMTdiNmRmNjVjOTA1ZjQ=
+    OWZmMTEzMDdmNzcxN2UzOTc2YzdlMDg1MjdmNzVjMDFmNWQwOTg2MjA5MDJm
+    ZTA2MTFiNDk2MWZkZTNlZWVjMGVmNjFkODhlYjgwNGI5OGY0OTQwOTNjNGU2
+    M2RkMjExODFhOWU4M2IxYTgzYTk1NTY0OWJmYTcxMTdhZGRjNmE=
   data.tar.gz: !binary |-
-    OTM0M2EzZmZjZjVlOTk1NTI1NTlkNTdmODA0MjlkYjQyNTQ1MDgxYTI0ODRk
-    OTA5ZmMyNTY0NGYyNmE4Mjk0MGY3NzM1ZWEzODJlZTc5YmExYzBmMWY2NzVm
-    MzlmYWNiYzNhODU4MTQwZTBhNWRjMzZjNjg3OGZmNGIwYzE5NTQ=
+    YmJiOWY1NTIxYjA1NDYzMWZhZTY3ZTNkZjI2MDBkNWRjYjg0ZmI2YjMwNDFi
+    YWJmNzk2NDM2NWY1Y2IwNDAwMjRkOGI3YzZhZjZjNWVlNjI4YTc1NzljNjY4
+    NTJjOTIzYWUzNzg1ZDJkZGIyMTdiMjUxY2Y5OGIwNWFlMDY2M2U=

data/Rakefile

@@ -8,4 +8,4 @@ Rake::TestTask.new do |t|
   t.pattern = 'test/**/*_spec.rb'
 end
 
-task default: %w(rubocop test build)
+task default: %w(test build rubocop)

data/lib/test_diff.rb

@@ -1,5 +1,9 @@
 require 'test_diff/version'
 require 'test_diff/storage'
+require 'test_diff/test_info'
+require 'test_diff/version_control/git'
+require 'test_diff/test_runner/rspec'
+require 'test_diff/config'
 require 'test_diff/build_coverage'
 require 'test_diff/run_diff'
 require 'test_diff/build_coverage_diff'

data/lib/test_diff/build_coverage.rb

@@ -38,7 +38,6 @@ module TestDiff
 
     def run_batch
       puts "Running #{@batch_queue.size} tests"
-      require 'spec'
       timing_thread = start_timing_thread(Time.now, @batch_queue.size)
       start
       timing_thread.join
@@ -76,8 +75,10 @@ module TestDiff
         ActiveRecord::Base.connection.reconnect! if defined?(ActiveRecord::Base)
         Time.zone_default = (Time.zone = 'UTC') if Time.respond_to?(:zone_default) && Time.zone_default.nil?
         # ARGV = ['-b',main_spec_file]
-        if run_tests(main_spec_file)
-          save_coverage_data(main_spec_file)
+        s = Time.now
+        result = run_tests(main_spec_file)
+        if result
+          save_coverage_data(main_spec_file, Time.now - s)
         else
           Coverage.result # disable coverage
           exit!(false) unless @continue
@@ -87,17 +88,21 @@ module TestDiff
     end
 
     def run_tests(main_spec_file)
-      options ||= begin
-        parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
-        parser.order!(['-b', main_spec_file])
-        parser.options
+      if defined?(::RSpec::Core::Runner)
+        ::RSpec::Core::Runner.run([main_spec_file], $stderr, $stdout) == 0
+      else
+        options ||= begin
+          parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
+          parser.order!(['-b', main_spec_file])
+          parser.options
+        end
+        Spec::Runner.use options
+        options.run_examples
       end
-      Spec::Runner.use options
-      options.run_examples
     end
 
-    def save_coverage_data(main_spec_file)
-      data = {}
+    def save_coverage_data(main_spec_file, execution_time)
+      data = { '__execution_time__' => execution_time }
       Coverage.result.each do |file_name, stats|
         relative_file_name = file_name.gsub("#{FileUtils.pwd}/", '')
         if file_name.include?(FileUtils.pwd)

data/lib/test_diff/config.rb

@@ -0,0 +1,48 @@
+require 'singleton'
+# TestDiff module
+module TestDiff
+  # Holds all the configuration details
+  class Config
+    include Singleton
+    attr_accessor :working_directory, :map_subfolder,
+                  :current_tracking_filename, :test_pattern
+
+    attr_writer :test_runner, :version_control, :storage
+
+    def initialize
+      self.working_directory = '.'
+      self.map_subfolder = 'test_diff_coverage'
+      self.current_tracking_filename = 'sha'
+      self.test_pattern = /spec.rb\z/
+    end
+
+    def version_control
+      @version_control ||= VersionControl::Git.new(working_directory,
+                                                   File.read(current_tracking_file))
+    end
+
+    def storage
+      @storage ||= Storage.new(map_folder)
+    end
+
+    def test_runner
+      @test_runner ||= TestRunner::Rspec.new
+    end
+
+    def map_folder
+      "#{working_directory}/#{map_subfolder}"
+    end
+
+    def current_tracking_file
+      "#{map_folder}/#{current_tracking_filename}"
+    end
+
+    def self.method_missing(method, *args)
+      if instance.respond_to?(method)
+        instance.send(method, *args)
+      else
+        super
+      end
+    end
+  end
+end

data/lib/test_diff/run_diff.rb

@@ -2,13 +2,11 @@
 module TestDiff
   # Class used to calculate the tests than need to be run
   class RunDiff
-    attr_reader :spec_folder, :sha1, :groups_of, :group
+    attr_reader :tests_folder, :groups_of, :group
 
-    def initialize(spec_folder, groups_of, group)
-      @spec_folder = spec_folder
-      @sha1 = File.read('test_diff_coverage/sha')
-      @specs_to_run = []
-      @storage = Storage.new
+    def initialize(tests_folder, groups_of, group)
+      @tests_folder = tests_folder
+      @tests_to_run = []
       @groups_of = groups_of
       @group = group
     end
@@ -24,46 +22,41 @@ module TestDiff
     private
 
     def run_test_group
-      if @specs_to_run.any?
-        puts "bundle exec spec -fo #{@specs_to_run.join(' ')}"
-        exec "bundle exec spec -fo #{@specs_to_run.join(' ')}"
-      else
-        puts 'no specs found to run'
-      end
+      Config.test_runner.run_tests(@tests_to_run.map(&:filename))
     end
 
     def select_test_group
       return unless groups_of
-      groups_size = (@specs_to_run.length / groups_of.to_f).ceil
-      @specs_to_run = @specs_to_run.slice(group.to_i * groups_size, groups_size) || []
+      groups_size = (@tests_to_run.length / groups_of.to_f).ceil
+      @tests_to_run = @tests_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)
+      @tests_to_run.delete_if do |s|
+        !File.exist?("#{Config.working_directory}/#{s.filename}")
       end
     end
 
     def remove_tests_in_wrong_folder
-      @specs_to_run.delete_if do |s|
-        !s.start_with?("#{spec_folder}/")
+      @tests_to_run.delete_if do |s|
+        !s.filename.start_with?("#{tests_folder}/")
       end
     end
 
     def add_changed_files
-      _build_specs_to_run
+      _build_tests_to_run
 
-      @specs_to_run.flatten!
-      @specs_to_run.sort!
-      @specs_to_run.uniq!
+      @tests_to_run.flatten!
+      @tests_to_run.sort!
+      @tests_to_run.uniq!
     end
 
-    def _build_specs_to_run
+    def _build_tests_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)
+      Config.version_control.changed_files.each do |file_name|
+        if Config.test_pattern.match(file_name)
+          @tests_to_run << Config.storage.test_info_for(file_name)
+        elsif !file_name.start_with?(@tests_folder)
           files << file_name
           _add_rails_view_spec(file_name)
         end
@@ -72,15 +65,15 @@ module TestDiff
     end
 
     def _add_calculated_tests(files)
-      @specs_to_run << @storage.find_for(files, spec_folder)
+      @tests_to_run << Config.storage.select_tests_for(files, tests_folder)
     end
 
     def _add_rails_view_spec(file_name)
       # try and find a matching view spec
       return unless file_name.include?('app/views')
-      view_spec_name = file_name.gsub('app/views', "#{spec_folder}/views").gsub('.erb', '.erb_spec.rb')
+      view_spec_name = file_name.gsub('app/views', "#{tests_folder}/views").gsub('.erb', '.erb_spec.rb')
       return unless  File.exist?(view_spec_name)
-      @specs_to_run << view_spec_name
+      @tests_to_run << view_spec_name
     end
   end
 end

data/lib/test_diff/storage.rb

@@ -41,6 +41,27 @@ module TestDiff
       results
     end
 
+    def select_tests_for(files, sub_folder = nil)
+      results = []
+      root_folder = @folder
+      root_folder += "/#{sub_folder}" if sub_folder
+      Dir["#{root_folder}/**/*.yml"].each do |storage_file|
+        select_tests_for_storage_file(results, storage_file, files)
+      end
+      results
+    end
+
+    def test_info_for(file)
+      result = TestInfo.new(file, nil)
+      YAML::Store.new("#{file}.yml").transaction(true) do |store|
+        result = TestInfo.new(file, store['__execution_time__'])
+      end
+      result
+    rescue PStore::Error => e
+      STDERR.puts e.message
+      result
+    end
+
     def clear
       Dir["#{@folder}/**/*.yml"].each do |storage_file|
         File.delete(storage_file)
@@ -60,6 +81,19 @@ module TestDiff
       end
     end
 
+    def select_tests_for_storage_file(results, storage_file, files)
+      YAML::Store.new(storage_file).transaction(true) do |store|
+        found_files = files & store.roots
+        found_files.each do |file|
+          next unless _active_file?(store[file])
+          results << TestInfo.new(
+            storage_file.gsub('.yml', '').gsub("#{@folder}/", ''),
+            store['__execution_time__']
+          )
+        end
+      end
+    end
+
     def _active_file?(file)
       !file.to_s.split(',').delete_if { |s| s == '' || s == '0' }.empty?
     end

data/lib/test_diff/test_info.rb

@@ -0,0 +1,26 @@
+# TestDiff module
+module TestDiff
+  # class used to hold infomation about the test
+  class TestInfo
+    include Comparable
+    attr_reader :execution_time, :filename
+    FIXNUM_MAX = (2**(0.size * 8 - 2) - 1)
+
+    def initialize(f, et)
+      @filename = f
+      @execution_time = et
+    end
+
+    def compare_execution_time
+      @execution_time || FIXNUM_MAX
+    end
+
+    def <=>(other)
+      if compare_execution_time == other.compare_execution_time
+        filename <=> other.filename
+      else
+        compare_execution_time <=> other.compare_execution_time
+      end
+    end
+  end
+end

data/lib/test_diff/test_runner/rspec.rb

@@ -0,0 +1,18 @@
+require 'git'
+# TestDiff module
+module TestDiff
+  # module for test runners
+  module TestRunner
+    # class to run rspec tests
+    class Rspec
+      def run_tests(specs)
+        if specs.any?
+          puts "bundle exec rspec #{specs.join(' ')}"
+          exec "bundle exec rspec #{specs.join(' ')}"
+        else
+          puts 'no specs found to run'
+        end
+      end
+    end
+  end
+end

data/lib/test_diff/test_runner/spec.rb

@@ -0,0 +1,18 @@
+require 'git'
+# TestDiff module
+module TestDiff
+  # module for test runners
+  module TestRunner
+    # class to run rspec tests
+    class Spec
+      def run_tests(specs)
+        if specs.any?
+          puts "bundle exec spec #{specs.join(' ')}"
+          exec "bundle exec spec #{specs.join(' ')}"
+        else
+          puts 'no specs found to run'
+        end
+      end
+    end
+  end
+end

data/lib/test_diff/version.rb

@@ -1,4 +1,4 @@
 # version number
 module TestDiff
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/test_diff/version_control/git.rb

@@ -0,0 +1,19 @@
+require 'git'
+# TestDiff module
+module TestDiff
+  # module for version control adapters
+  module VersionControl
+    # class to find changed files for git
+    class Git
+      def initialize(wd, last_tracked, current = 'HEAD')
+        @git = ::Git.open(wd)
+        @last_tracked = last_tracked
+        @current = current
+      end
+
+      def changed_files
+        @git.diff(@last_tracked, @current).map(&:path)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_diff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Grant Speelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -131,10 +131,15 @@ files:
 - lib/test_diff.rb
 - lib/test_diff/build_coverage.rb
 - lib/test_diff/build_coverage_diff.rb
+- lib/test_diff/config.rb
 - lib/test_diff/run_diff.rb
 - lib/test_diff/storage.rb
+- lib/test_diff/test_info.rb
+- lib/test_diff/test_runner/rspec.rb
+- lib/test_diff/test_runner/spec.rb
 - lib/test_diff/track_build.rb
 - lib/test_diff/version.rb
+- lib/test_diff/version_control/git.rb
 - test_diff.gemspec
 homepage: https://github.com/grantspeelman/test_diff
 licenses: