Merge pull request #642 from mbj/upgrade/devtools

Upgrade to latest devtools

lib/mutant/env/bootstrap.rb

@@ -56,17 +56,22 @@ module Mutant
         Env.new(
           actor_env:        Actor::Env.new(Thread),
           config:           config,
-          integration:      @integration,
+          integration:      integration,
           matchable_scopes: matchable_scopes,
           mutations:        subjects.flat_map(&:mutations),
           parser:           parser,
-          selector:         Selector::Expression.new(@integration),
+          selector:         Selector::Expression.new(integration),
           subjects:         subjects
         )
       end
 
     private
 
+      # Configured mutant integration
+      #
+      # @return [Mutant::Integration]
+      attr_reader :integration
+
       # Scope name from scoping object
       #
       # @param [Class, Module] scope

lib/mutant/reporter/cli.rb

@@ -9,6 +9,8 @@ module Mutant
       # @param [IO] output
       #
       # @return [Reporter::CLI]
+      #
+      # :reek:ManualDispatch
       def self.build(output)
         tput = Tput.detect
         tty = output.respond_to?(:tty?) && output.tty?

lib/mutant/zombifier.rb

@@ -38,6 +38,11 @@ module Mutant
 
   private
 
+    # Original require method
+    #
+    # @return [Method]
+    attr_reader :original
+
     # Run zombifier
     #
     # @return [undefined]
@@ -61,7 +66,7 @@ module Mutant
     #   true if successful and false if feature already loaded
     def require(logical_name)
       logical_name = logical_name.to_s
-      loaded = @original.call(logical_name)
+      loaded = original.call(logical_name)
       return loaded unless include?(logical_name)
       @zombified << logical_name
       zombify(find(logical_name))

mutant.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1'
 
-  gem.add_runtime_dependency('parser',        '~> 2.3.0', '>= 2.3.0.2')
+  gem.add_runtime_dependency('parser',        '~> 2.3.1', '>= 2.3.1.4')
   gem.add_runtime_dependency('ast',           '~> 2.2')
   gem.add_runtime_dependency('diff-lcs',      '~> 1.2')
   gem.add_runtime_dependency('parallel',      '~> 1.3')
@@ -37,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('concord',       '~> 0.1.5')
   gem.add_runtime_dependency('regexp_parser', '~> 0.3.6')
 
-  gem.add_development_dependency('devtools', '~> 0.1.4')
+  gem.add_development_dependency('devtools', '~> 0.1.12')
   gem.add_development_dependency('bundler',  '~> 1.10')
   gem.add_development_dependency('ffi',      '~> 1.9.6')
 end

spec/support/warnings.yml

@@ -1,4 +1,4 @@
 ---
-- 'lib/parser/lexer.rb:10791: warning: assigned but unused variable - testEof'
+- 'lib/parser/lexer.rb:10922: warning: assigned but unused variable - testEof'
 - 'lib/parser/source/rewriter.rb:392: warning: assigned but unused variable - begin_pos'
 - 'lib/regexp_parser/scanner.rb:1646: warning: assigned but unused variable - testEof'

spec/unit/mutant/ast/regexp_spec.rb

@@ -70,9 +70,9 @@ module RegexpSpec
 
         include_context 'regexp transformation'
 
-        return if regexp.encoding.name.eql?('ASCII-8BIT')
-
-        include_context 'regexp round trip'
+        unless regexp.encoding.name.eql?('ASCII-8BIT')
+          include_context 'regexp round trip'
+        end
       end
     end
   end