mutant 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 064e05498cecb534a1466bfe3ff858ff0487acf3
-  data.tar.gz: 585a00d32574fdabf20943a96d4ee48c6ec9408f
+  metadata.gz: 9aa6cee93941cfb9307169023bb523bdc18c290a
+  data.tar.gz: 3130e644fa7c02db1ed0adef9300d711269e7323
 SHA512:
-  metadata.gz: 97ffbc8174e5027a924037359084af1f49bf9fe8c14f8408ba25b28444a9822d145f59c8d90255c27fabfe744d6b609db12cf3e201fa460c955fca5c7e60ecbb
-  data.tar.gz: 2d0bdcd5a5c974d6a9504cd6f8bbfa6b45bdef56526ce054cded8b98f1e53071063afe05e7a72cf68bee9752ba7b24be827365d28390985658ba099023f0009b
+  metadata.gz: eba0e605c2fd699c0bd22b08d65332701c14a190da37e017d400fadc8a7869b54dbfefb577c537d329da487039046e3868529a9ec88847d4c3f7a17cab0c1845
+  data.tar.gz: 3ff08e6ca56e920894f440e90084599116731914c662f61780a09d800db505794207c79919ffb3dc945d1a3f9780280523527598932f0ef7f5e077e8d499c771

data/.travis.yml

@@ -4,12 +4,13 @@ script: "bundle exec rake ci"
 env:
   - TRAVIS=true
 rvm:
+  - '1.9'
   - '2.0'
   - '2.1'
-  - rbx-2
+  - rbx
 matrix:
   allow_failures:
-    - rvm: rbx-2 # travis does not maintain rbx setup correctly
+    - rvm: rbx
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,7 +1,11 @@
+# v0.7.5 2015-01-14
+
+* Bump deps to support MRI 2.2.
+
 # v0.7.4 2014-12-22
 
-* Fix rspec example visibility on duplicate metadata examples
-* Add naked if/else body emitter
+* Fix rspec example visibility on duplicate metadata examples [#279](https://github.com/mbj/mutant/issues/279).
+* Add naked if/else body emitter [#280](https://github.com/mbj/mutant/issues/280).
 
 # v0.7.3 2014-12-09
 

data/Gemfile

@@ -5,3 +5,4 @@ source 'https://rubygems.org'
 gemspec name: 'mutant'
 
 gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
+eval_gemfile 'Gemfile.devtools'

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 1198
+total_score: 1220

data/config/reek.yml

@@ -47,7 +47,7 @@ NestedIterators:
   - Mutant::Mutator::Node::Arguments#emit_argument_mutations
   - Mutant::RequireHighjack#infect
   - Mutant::RequireHighjack#disinfect
-  - Mutant::Subject#tests
+  - Mutant::Selector::Expression#call
   - Mutant::Parallel::Master#run
   - Parser::Lexer#self.new
   max_allowed_nesting: 1

data/lib/mutant.rb

@@ -95,6 +95,7 @@ end # Mutant
 
 require 'mutant/version'
 require 'mutant/env'
+require 'mutant/env/bootstrap'
 require 'mutant/ast'
 require 'mutant/ast/sexp'
 require 'mutant/ast/types'
@@ -202,6 +203,8 @@ require 'mutant/expression/methods'
 require 'mutant/expression/namespace'
 require 'mutant/test'
 require 'mutant/integration'
+require 'mutant/selector'
+require 'mutant/selector/expression'
 require 'mutant/cli'
 require 'mutant/color'
 require 'mutant/diff'
@@ -215,7 +218,6 @@ require 'mutant/reporter/cli'
 require 'mutant/reporter/cli/printer'
 require 'mutant/reporter/cli/tput'
 require 'mutant/reporter/cli/format'
-require 'mutant/line_trace'
 require 'mutant/zombifier'
 require 'mutant/zombifier/file'
 
@@ -228,14 +230,13 @@ module Mutant
       debug:             false,
       fail_fast:         false,
       integration:       Integration::Null.new,
-      matcher_config:    Matcher::Config::DEFAULT,
+      matcher:           Matcher::Config::DEFAULT,
       includes:          EMPTY_ARRAY,
       requires:          EMPTY_ARRAY,
       isolation:         Mutant::Isolation::Fork,
       reporter:          Reporter::CLI.build($stdout),
       zombie:            false,
       jobs:              Mutant.ci? ? CI_DEFAULT_PROCESSOR_COUNT : ::Parallel.processor_count,
-      actor_env:         Mutant::Actor::Env.new(Thread),
       expected_coverage: 100.0
     )
   end # Config

data/lib/mutant/cli.rb

@@ -22,7 +22,7 @@ module Mutant
     # @api private
     #
     def self.run(arguments)
-      Runner.call(Env.new(call(arguments))).success? ? EXIT_SUCCESS : EXIT_FAILURE
+      Runner.call(Env::Bootstrap.call(call(arguments))).success? ? EXIT_SUCCESS : EXIT_FAILURE
     rescue Error => exception
       $stderr.puts(exception.message)
       EXIT_FAILURE
@@ -235,7 +235,7 @@ module Mutant
     # @api private
     #
     def add_matcher(attribute, value)
-      update(matcher_config: config.matcher_config.add(attribute, value))
+      update(matcher: config.matcher.add(attribute, value))
     end
 
   end # CLI

data/lib/mutant/config.rb

@@ -4,7 +4,7 @@ module Mutant
     include Adamantium::Flat, Anima::Update, Anima.new(
       :debug,
       :integration,
-      :matcher_config,
+      :matcher,
       :includes,
       :requires,
       :reporter,
@@ -12,8 +12,7 @@ module Mutant
       :fail_fast,
       :jobs,
       :zombie,
-      :expected_coverage,
-      :actor_env
+      :expected_coverage
     )
 
     [:fail_fast, :zombie, :debug].each do |name|

data/lib/mutant/env.rb

@@ -1,39 +1,20 @@
 module Mutant
   # Abstract base class for mutant environments
   class Env
-    include Adamantium::Flat, Concord::Public.new(:config, :cache)
+    include Adamantium::Flat, Anima::Update, Anima.new(
+      :config,
+      :actor_env,
+      :cache,
+      :subjects,
+      :matchable_scopes,
+      :selector,
+      :mutations
+    )
 
     SEMANTICS_MESSAGE =
       "Fix your lib to follow normal ruby semantics!\n" \
       '{Module,Class}#name should return resolvable constant name as String or nil'.freeze
 
-    # Return new env
-    #
-    # @param [Config] config
-    #
-    # @return [Env]
-    #
-    # @api private
-    #
-    def self.new(config, cache = Cache.new)
-      super(config, cache)
-    end
-
-    # Initialize env
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def initialize(*)
-      super
-
-      infect
-      initialize_matchable_scopes
-      initialize_subjects
-      initialize_mutations
-    end
-
     # Print warning message
     #
     # @param [String]
@@ -47,30 +28,6 @@ module Mutant
       self
     end
 
-    # Return subjects
-    #
-    # @return [Array<Subject>]
-    #
-    # @api private
-    #
-    attr_reader :subjects
-
-    # Return mutations
-    #
-    # @return [Array<Mutation>]
-    #
-    # @api private
-    #
-    attr_reader :mutations
-
-    # Return all usable match scopes
-    #
-    # @return [Array<Matcher::Scope>]
-    #
-    # @api private
-    #
-    attr_reader :matchable_scopes
-
     # Kill mutation
     #
     # @param [Mutation] mutation
@@ -79,8 +36,8 @@ module Mutant
     #
     # @api private
     #
-    def kill_mutation(mutation)
-      test_result = mutation.kill(config.isolation, config.integration)
+    def kill(mutation)
+      test_result = run_mutation_tests(mutation)
       Result::Mutation.new(
         mutation:    mutation,
         test_result: test_result
@@ -89,92 +46,32 @@ module Mutant
 
   private
 
-    # Return scope name
-    #
-    # @param [Class, Module] scope
+    # Kill mutation under isolation with integration
     #
-    # @return [String]
-    #   if scope has a name and does not raise exceptions obtaining it
+    # @param [Isolation] isolation
+    # @param [Integration] integration
     #
-    # @return [nil]
-    #   otherwise
+    # @return [Result::Test]
     #
     # @api private
     #
-    # rubocop:disable LineLength
-    #
-    def scope_name(scope)
-      scope.name
-    rescue => exception
-      warn("#{scope.class}#name from: #{scope.inspect} raised an error: #{exception.inspect}. #{SEMANTICS_MESSAGE}")
-      nil
-    end
-
-    # Try to turn scope into expression
-    #
-    # @param [Class, Module] scope
-    #
-    # @return [Expression]
-    #   if scope can be represented in an expression
-    #
-    # @return [nil]
-    #   otherwise
+    # rubocop:disable MethodLength
     #
-    # @api private
-    #
-    def expression(scope)
-      name = scope_name(scope) or return
+    def run_mutation_tests(mutation)
+      start = Time.now
+      tests = selector.call(mutation.subject)
 
-      unless name.instance_of?(String)
-        warn("#{scope.class}#name from: #{scope.inspect} returned #{name.inspect}. #{SEMANTICS_MESSAGE}")
-        return
+      config.isolation.call do
+        mutation.insert
+        config.integration.call(tests)
       end
-
-      Expression.try_parse(name)
-    end
-
-    # Initialize subjects
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def initialize_subjects
-      @subjects = Matcher::Compiler.call(self, config.matcher_config).to_a
-    end
-
-    # Initialize mutations
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def initialize_mutations
-      @mutations = subjects.flat_map(&:mutations)
-    end
-
-    # Infect environment
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def infect
-      config.includes.each(&$LOAD_PATH.method(:<<))
-      config.requires.each(&method(:require))
-    end
-
-    # Initialize matchable scopes
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def initialize_matchable_scopes
-      @matchable_scopes = ObjectSpace.each_object(Module).each_with_object([]) do |scope, aggregate|
-        expression = expression(scope)
-        aggregate << Matcher::Scope.new(self, scope, expression) if expression
-      end.sort_by(&:identification)
+    rescue Isolation::Error => error
+      Result::Test.new(
+        tests:   tests,
+        output:  error.message,
+        runtime: Time.now - start,
+        passed:  false
+      )
     end
 
   end # Env

data/lib/mutant/env/bootstrap.rb

@@ -0,0 +1,155 @@
+module Mutant
+  class Env
+    # Boostrap environment
+    class Bootstrap
+      include Adamantium::Flat, Concord::Public.new(:config, :cache), Procto.call(:env)
+
+      SEMANTICS_MESSAGE =
+        "Fix your lib to follow normal ruby semantics!\n" \
+        '{Module,Class}#name should return resolvable constant name as String or nil'.freeze
+
+      # Return scopes that are eligible for mnatching
+      #
+      # @return [Enumerable<Matcher::Scope>]
+      #
+      # @api private
+      #
+      attr_reader :matchable_scopes
+
+      # Return new bootstrap env
+      #
+      # @return [Env]
+      #
+      # @api private
+      #
+      def self.new(_config, _cache = Cache.new)
+        super
+      end
+
+      # Initialize object
+      #
+      # @return [Object]
+      #
+      # @api private
+      #
+      def initialize(*)
+        super
+        infect
+        initialize_matchable_scopes
+      end
+
+      # Print warning message
+      #
+      # @param [String]
+      #
+      # @return [self]
+      #
+      # @api private
+      #
+      def warn(message)
+        config.reporter.warn(message)
+        self
+      end
+
+      # Return environment after bootstraping
+      #
+      # @return [Env]
+      #
+      # @api private
+      #
+      def env
+        subjects = matched_subjects
+
+        Env.new(
+          actor_env:        Actor::Env.new(Thread),
+          config:           config,
+          cache:            cache,
+          subjects:         subjects,
+          matchable_scopes: matchable_scopes,
+          selector:         Selector::Expression.new(config.integration),
+          mutations:        subjects.flat_map(&:mutations)
+        )
+      end
+
+    private
+
+      # Return scope name
+      #
+      # @param [Class, Module] scope
+      #
+      # @return [String]
+      #   if scope has a name and does not raise exceptions obtaining it
+      #
+      # @return [nil]
+      #   otherwise
+      #
+      # @api private
+      #
+      # rubocop:disable LineLength
+      #
+      def scope_name(scope)
+        scope.name
+      rescue => exception
+        warn("#{scope.class}#name from: #{scope.inspect} raised an error: #{exception.inspect}. #{SEMANTICS_MESSAGE}")
+        nil
+      end
+
+      # Infect environment
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def infect
+        config.includes.each(&$LOAD_PATH.method(:<<))
+        config.requires.each(&method(:require))
+      end
+
+      # Try to turn scope into expression
+      #
+      # @param [Class, Module] scope
+      #
+      # @return [Expression]
+      #   if scope can be represented in an expression
+      #
+      # @return [nil]
+      #   otherwise
+      #
+      # @api private
+      #
+      def expression(scope)
+        name = scope_name(scope) or return
+
+        unless name.instance_of?(String)
+          warn("#{scope.class}#name from: #{scope.inspect} returned #{name.inspect}. #{SEMANTICS_MESSAGE}")
+          return
+        end
+
+        Expression.try_parse(name)
+      end
+
+      # Return matched subjects
+      #
+      # @return [Enumerable<Subject>]
+      #
+      # @api private
+      #
+      def matched_subjects
+        Matcher::Compiler.call(self, config.matcher).to_a
+      end
+
+      # Initialize matchable scopes
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def initialize_matchable_scopes
+        @matchable_scopes = ObjectSpace.each_object(Module).each_with_object([]) do |scope, aggregate|
+          expression = expression(scope)
+          aggregate << Matcher::Scope.new(self, scope, expression) if expression
+        end.sort_by(&:identification)
+      end
+    end # Boostrap
+  end # Env
+end # Mutant