RubyGems - delta_test - Versions diffs - 0.1.0 → 0.2.0 - Mend

delta_test 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +32 -0
data/README.md +63 -14
data/Rakefile +16 -3
data/circle.yml +8 -1
data/delta_test.gemspec +4 -3
data/ext/delta_test/delta_test_native.c +154 -0
data/ext/delta_test/delta_test_native.h +15 -0
data/ext/delta_test/extconf.rb +12 -0
data/lib/delta_test.rb +8 -2
data/lib/delta_test/cli.rb +108 -21
data/lib/delta_test/configuration.rb +91 -35
data/lib/delta_test/dependencies_table.rb +15 -1
data/lib/delta_test/generator.rb +42 -29
data/lib/delta_test/profiler.rb +5 -0
data/lib/delta_test/related_spec_list.rb +67 -8
data/lib/delta_test/spec_helpers.rb +9 -7
data/lib/delta_test/version.rb +1 -1
data/spec/lib/delta_test/cli_spec.rb +26 -5
data/spec/lib/delta_test/configuration_spec.rb +12 -0
data/spec/lib/delta_test/dependencies_table_spec.rb +35 -0
data/spec/lib/delta_test/generator_spec.rb +34 -17
data/spec/lib/delta_test/profiler_spec.rb +121 -0
data/spec/lib/delta_test/related_spec_list_spec.rb +150 -34
data/spec/lib/delta_test/spec_helpers_spec.rb +11 -5
data/spec/rails/Gemfile +8 -2
data/spec/rails/Gemfile.lock +37 -3
data/spec/rails/app/models/category.rb +14 -0
data/spec/rails/app/models/comment.rb +20 -0
data/spec/rails/app/models/post.rb +23 -0
data/spec/rails/app/models/post_categorizing.rb +14 -0
data/spec/rails/app/models/user.rb +15 -0
data/spec/rails/db/migrate/20150518052022_create_users.rb +9 -0
data/spec/rails/db/migrate/20150518052057_create_posts.rb +11 -0
data/spec/rails/db/migrate/20150518052332_create_comments.rb +11 -0
data/spec/rails/db/migrate/20150518052523_create_categories.rb +9 -0
data/spec/rails/db/migrate/20150518052604_create_post_categorizings.rb +10 -0
data/spec/rails/db/schema.rb +59 -0
data/spec/rails/spec/factories/categories.rb +5 -0
data/spec/rails/spec/factories/comments.rb +8 -0
data/spec/rails/spec/factories/post_categorizings.rb +6 -0
data/spec/rails/spec/factories/posts.rb +7 -0
data/spec/rails/spec/factories/users.rb +5 -0
data/spec/rails/spec/models/category_spec.rb +3 -0
data/spec/rails/spec/models/comment_spec.rb +3 -0
data/spec/rails/spec/models/post_categorizing_spec.rb +3 -0
data/spec/rails/spec/models/post_spec.rb +3 -0
data/spec/rails/spec/models/user_spec.rb +20 -0
data/spec/rails/spec/spec_helper.rb +53 -9
data/spec/spec_helper.rb +2 -0
metadata +79 -19
data/lib/delta_test/analyzer.rb +0 -47
data/spec/lib/delta_test/analyzer_spec.rb +0 -126

data/lib/delta_test/cli.rb CHANGED Viewed

@@ -1,5 +1,7 @@
 require 'open3'
 require 'shellwords'
+require 'thread'
+require 'thwait'
 require_relative 'related_spec_list'
@@ -12,6 +14,10 @@ module DeltaTest
       'verbose' => false,
     }.freeze
+    BUNDLE_EXEC = ['bundle', 'exec'].freeze
+    SPLITTER = '--'
     attr_reader *%i[
       args
       command
@@ -54,6 +60,8 @@ module DeltaTest
           do_table
         when 'exec'
           do_exec
+        when 'clear'
+          do_clear
         when '-v', '--version'
           do_version
         else
@@ -111,8 +119,8 @@ module DeltaTest
     #
     # @return {Boolean}
     ###
-    def run_full_tests?
-      Git.same_commit?(@options['base'], @options['head'])
+    def profile_mode?
+      @profile_mode ||= Git.same_commit?(@options['base'], @options['head'])
     end
     ###
@@ -148,24 +156,53 @@ module DeltaTest
       spec_files = nil
       args = []
-      if run_full_tests?
-        args << ('%s=%s' % [VERBOSE_FLAG, true]) if DeltaTest.verbose?
-        args << ('%s=%s' % [ACTIVE_FLAG, true])
-      else
-        args << 'cat'
-        args << '|'
-        args << 'xargs'
+      begin
+        unless profile_mode?
+          @list.load_table!
+          @list.retrive_changed_files!(@options['base'], @options['head'])
+          spec_files = @list.related_spec_files.to_a
+          if spec_files.empty?
+            exit_with_message(0, 'Nothing to test')
+          end
+        end
+      rescue TableNotFoundError
+        # force profile mode cuz we don't have a table
+        @profile_mode = true
+      end
-        @list.load_table!
-        @list.retrive_changed_files!(@options['base'], @options['head'])
+      @args.map! { |arg| Shellwords.escape(arg) }
-        spec_files = @list.related_spec_files.to_a
+      if (splitter = @args.index(SPLITTER))
+        files = @args.drop(splitter + 1)
+        @args = @args.take(splitter)
-        if spec_files.empty?
-          exit_with_message(0, 'Nothing to test')
+        if files && files.any?
+          if spec_files
+            pattern = files.map { |file| Regexp.escape(file) }
+            pattern = '^(%s)' % pattern.join('|')
+            spec_files = spec_files.grep(pattern)
+          else
+            spec_files = files
+          end
         end
       end
+      if profile_mode?
+        args << ('%s=%s' % [VERBOSE_FLAG, true]) if DeltaTest.verbose?
+        args << ('%s=%s' % [ACTIVE_FLAG, true])
+      end
+      if spec_files
+        args.unshift('cat', '|')
+        args << 'xargs'
+      end
+      if bundler_enabled? && BUNDLE_EXEC != @args.take(2)
+        args += BUNDLE_EXEC
+      end
       args += @args
       args = args.join(' ')
@@ -174,11 +211,32 @@ module DeltaTest
       Open3.popen3(args) do |i, o, e, w|
         i.write(spec_files.join("\n")) if spec_files
         i.close
-        o.each { |l| puts l }
-        e.each { |l| $stderr.puts l }
+        threads = []
+        threads << Thread.new { o.each { |l| puts l } }
+        threads << Thread.new { e.each { |l| $stderr.puts l } }
+        ThreadsWait.all_waits(*threads)
+        exit w.value.exitstatus
       end
     end
+    ###
+    # Clean up tables and caches
+    ###
+    def do_clear
+      table_file_path = DeltaTest.config.table_file_path('')
+      return unless table_file_path
+      args = [
+        'rm',
+        '%s*' % Shellwords.escape(table_file_path),
+      ]
+      Open3.capture3(args.join(' ')) rescue nil
+    end
     ###
     # Show version
     ###
@@ -194,9 +252,9 @@ module DeltaTest
         puts "Command not found: #{@command}"
       end
-      puts <<-HELP
+      puts <<HELP
 usage: delta_test <command> [--base=<base>] [--head=<head>] [--verbose] [<args>]
-                  [-v]
+                  [-v|--version]
 options:
     --base=<base>  A branch or a commit id to diff from.
@@ -215,9 +273,38 @@ commands:
     table          Show dependencies table.
-    exec <script>  Rxecute test script using delta_test.
-                   Run command something like `delta_test list | xargs script'.
-      HELP
+    exec <script> [-- <files>]
+                   Execute test script using delta_test.
+                   if <base> and <head> is the same commit or no dependencies table is found,
+                   it'll run full test cases with a profile mode to create a table.
+                   Otherwise, it'll run test script with only related spec files
+                   passed by its arguments, like `delta_test list | xargs script'.
+    clear          Clean up tables and caches.
+HELP
+    end
+  private
+    ###
+    # Check bundler existance
+    #
+    # @see http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
+    ###
+    def bundler_enabled?
+      return true if Object.const_defined?(:Bundler)
+      previous = nil
+      current = File.expand_path(Dir.pwd)
+      until !File.directory?(current) || current == previous
+        filename = File.join(current, 'Gemfile')
+        return true if File.exist?(filename)
+        current, previous = File.expand_path('..', current), current
+      end
+      false
     end
   end

data/lib/delta_test/configuration.rb CHANGED Viewed

@@ -8,11 +8,46 @@ require_relative 'utils'
 module DeltaTest
   class Configuration
+    module Validator
+      def self.included(base)
+        base.include(InstanceMethods)
+        base.extend(ClassMethods)
+      end
+      module ClassMethods
+        def _validators
+          @_validators ||= []
+        end
+        def validate(attr, message, &block)
+          _validators << [attr, message, block]
+        end
+      end
+      module InstanceMethods
+        def validate!
+          self.class._validators.each do |attr, message, block|
+            raise ValidationError.new(attr, message) unless self.instance_eval(&block)
+          end
+        end
+      end
+    end
+    include Validator
     CONFIG_FILES = [
       'delta_test.yml',
       'delta_test.yaml',
     ].freeze
+    PART_FILE_EXT = '.part-%s'
     attr_accessor *%i[
       base_path
       files
@@ -20,6 +55,7 @@ module DeltaTest
       table_file
       patterns
       exclude_patterns
+      full_test_patterns
       custom_mappings
     ]
@@ -29,14 +65,43 @@ module DeltaTest
       table_file_path
     ]
+    validate :base_path, 'need to be an absolute path' do
+      self.base_path.absolute?
+    end
+    validate :files, 'need to be an array' do
+      self.files.is_a?(Array)
+    end
+    validate :patterns, 'need to be an array' do
+      self.patterns.is_a?(Array)
+    end
+    validate :exclude_patterns, 'need to be an array' do
+      self.exclude_patterns.is_a?(Array)
+    end
+    validate :full_test_patterns, 'need to be an array' do
+      self.full_test_patterns.is_a?(Array)
+    end
+    validate :custom_mappings, 'need to be a hash' do
+      self.custom_mappings.is_a?(Hash)
+    end
+    validate :custom_mappings, 'need to have an array in the contents' do
+      self.custom_mappings.values.all? { |v| v.is_a?(Array) }
+    end
     def initialize
       update do |c|
-        c.base_path        = File.expand_path('.')
-        c.table_file       = 'tmp/.delta_test_dt'
-        c.files            = []
-        c.patterns         = []
-        c.exclude_patterns = []
-        c.custom_mappings  = {}
+        c.base_path          = File.expand_path('.')
+        c.table_file         = 'tmp/.delta_test_dt'
+        c.files              = []
+        c.patterns           = []
+        c.exclude_patterns   = []
+        c.full_test_patterns = []
+        c.custom_mappings    = {}
       end
     end
@@ -64,6 +129,26 @@ module DeltaTest
     end
+    #  Override getters
+    #-----------------------------------------------
+    ###
+    # Returns file path for the table
+    #
+    # @params {String} part
+    #
+    # @return {Pathname}
+    ###
+    def table_file_path(part = nil)
+      return unless @table_file_path
+      if part
+        @table_file_path.sub_ext(PART_FILE_EXT % part)
+      else
+        @table_file_path
+      end
+    end
     #  Update
     #-----------------------------------------------
     ###
@@ -77,35 +162,6 @@ module DeltaTest
       precalculate!
     end
-    ###
-    # Validate option values
-    ###
-    def validate!
-      if self.base_path.relative?
-        raise ValidationError.new(:base_path, 'need to be an absolute path')
-      end
-      unless self.files.is_a?(Array)
-        raise ValidationError.new(:files, 'need to be an array')
-      end
-      unless self.patterns.is_a?(Array)
-        raise ValidationError.new(:patterns, 'need to be an array')
-      end
-      unless self.exclude_patterns.is_a?(Array)
-        raise ValidationError.new(:exclude_patterns, 'need to be an array')
-      end
-      unless self.custom_mappings.is_a?(Hash)
-        raise ValidationError.new(:custom_mappings, 'need to be a hash')
-        unless self.custom_mappings.values.all? { |v| v.is_a?(Array) }
-          raise ValidationError.new(:custom_mappings, 'need to have an array in the contents')
-        end
-      end
-    end
     ###
     # Precalculate some values
     ###

data/lib/delta_test/dependencies_table.rb CHANGED Viewed

@@ -41,6 +41,21 @@ module DeltaTest
       self[spec_file] << source_file if DeltaTest.config.filtered_files.include?(source_file)
     end
+    ###
+    # Reverse merge other table
+    #
+    # @params {DependenciesTable} other
+    ###
+    def reverse_merge!(other)
+      raise TypeError unless other.is_a?(self.class)
+      other.each do |spec_file, source_files|
+        self[spec_file] |= source_files
+      end
+      nil
+    end
     ###
     # Temporary disable default_proc
     # Because Marshal can't dump Hash with default_proc
@@ -70,7 +85,6 @@ module DeltaTest
     # @params {String|Pathname} file
     ###
     def dump(file)
-      # Marshal can't dump hash with default proc
       without_default_proc do
         cleanup!
         data = Marshal.dump(self)

data/lib/delta_test/generator.rb CHANGED Viewed

@@ -1,4 +1,6 @@
-require_relative 'analyzer'
+require 'singleton'
+require_relative 'profiler'
 require_relative 'dependencies_table'
 require_relative 'utils'
@@ -12,11 +14,9 @@ module DeltaTest
     ]
     ###
-    # Setup analyzer and table
-    #
-    # @params {Boolean} _auto_teardown
+    # Setup table
     ###
-    def setup!(_auto_teardown = true)
+    def setup!
       return unless DeltaTest.active?
       return if @_setup
@@ -24,16 +24,13 @@ module DeltaTest
       DeltaTest.log('--- setup!')
-      @analyzer = Analyzer.new
-      @table    = DependenciesTable.load(DeltaTest.config.table_file_path)
+      @table = DependenciesTable.load(DeltaTest.config.table_file_path)
       @current_spec_file = nil
-      hook_on_exit { teardown! } if _auto_teardown
     end
     ###
-    # Start analyzer for the spec file
+    # Start profiler for the spec file
     #
     # @params {String} spec_file
     ###
@@ -43,27 +40,30 @@ module DeltaTest
       DeltaTest.log('--- start!(%s)' % spec_file)
       @current_spec_file = Utils.regulate_filepath(spec_file, DeltaTest.config.base_path).to_s
-      @analyzer.start
+      Profiler.start!
     end
     ###
-    # Stop analyzer and update table
+    # Stop profiler and update table
     ###
     def stop!
       return unless DeltaTest.active?
+      Profiler.stop!
       DeltaTest.log('--- stop!')
       spec_file = @current_spec_file
       @current_spec_file = nil
-      @analyzer.stop
       if spec_file
-        @analyzer.related_source_files.each do |file|
+        Profiler.last_result.each do |file|
           @table.add(spec_file, file)
         end
       end
+      DeltaTest::Profiler.clean!
     end
     ###
@@ -76,26 +76,39 @@ module DeltaTest
       DeltaTest.log('--- teardown!')
-      @analyzer.stop
-      @table.dump(DeltaTest.config.table_file_path)
-    end
+      Profiler.clean!
+      if defined?(ParallelTests)
+        if ParallelTests.first_process?
+          ParallelTests.wait_for_other_processes_to_finish
-  private
+          table_file_path = DeltaTest.config.table_file_path('*')
-    ###
-    # Handle exit event
-    ###
-    def hook_on_exit(&block)
-      at_exit do
-        if defined?(ParallelTests)
-          break unless ParallelTests.first_process?
-          ParallelTests.wait_for_other_processes_to_finish
-        end
+          Dir.glob(table_file_path).each do |part_file|
+            part_table = DependenciesTable.load(part_file)
+            @table.reverse_merge!(part_table)
+          end
+        else
+          table_file_path = DeltaTest.config.table_file_path(ENV['TEST_ENV_NUMBER'])
-        block.call
+          @table.dump(table_file_path)
+          return
+        end
       end
+      @table.dump(DeltaTest.config.table_file_path)
     end
+    ###
+    # Hook teardown! on exit
+    ###
+    def hook_on_exit
+      at_exit { teardown! }
+    end
+  end
+  class GeneratorSingleton < Generator
+    include Singleton
   end
 end