Merge remote-tracking branch 'origin' into mutator-config

Gemfile.devtools

@@ -1,27 +1,28 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.7'
+  gem 'rake',       '~> 10.1.0'
+  gem 'rspec',      '~> 2.14.1'
+  gem 'rspec-core', '~> 2.14.8'
+  gem 'yard',       '~> 0.8.7'
 
   platform :rbx do
     gem 'rubysl-singleton', '~> 2.0.0'
   end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.3.0'
+  gem 'kramdown', '~> 1.3.2'
 end
 
 group :guard do
-  gem 'guard',         '~> 2.2.4'
+  gem 'guard',         '~> 2.4.0'
   gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.0'
-  gem 'guard-rubocop', '~> 1.0.0'
+  gem 'guard-rspec',   '~> 4.2.6'
+  gem 'guard-rubocop', '~> 1.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 2.4.0'
+  gem 'listen',     '~> 2.5.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -37,17 +38,17 @@ group :metrics do
   gem 'flay',      '~> 2.4.0'
   gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.16.0'
+  gem 'rubocop',   '~> 0.18.1'
   gem 'simplecov', '~> 0.8.2'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'yardstick', '~> 0.9.9'
 
   platforms :ruby_19, :ruby_20 do
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
   platform :rbx do
     gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.10'
+    gem 'racc',               '~> 1.4'
     gem 'rubysl-logger',      '~> 2.0.0'
     gem 'rubysl-open-uri',    '~> 2.0.0'
     gem 'rubysl-prettyprint', '~> 2.0.2'

lib/mutant/cli/classifier/method.rb

@@ -9,7 +9,7 @@ class Method < self
 
         TABLE = {
           '.' => Matcher::Methods::Singleton,
-          '#' => Matcher::Methods::Instance,
+          '#' => Matcher::Methods::Instance
         }.freeze
 
         REGEXP = /

lib/mutant/differ.rb

@@ -24,7 +24,7 @@ def diff
           .diff(:unified) << "\n"
       else
         $stderr.puts(
-          'Mutation resulted in more than one diff, should not happen! ' +
+          'Mutation resulted in more than one diff, should not happen! ' \
           'PLS report a bug!'
         )
         nil

lib/mutant/reporter/cli/printer/mutation.rb

@@ -55,7 +55,7 @@ class Noop < self
               'Parsed subject AST:',
               '%s',
               'Unparsed source:',
-              '%s',
+              '%s'
             ].join("\n")
 
           private

lib/mutant/walker.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Mutant
 
   # Walker for all ast nodes

spec/integration/mutant/rspec_spec.rb

@@ -4,7 +4,7 @@
 
 describe Mutant, 'rspec integration' do
 
-  let(:base_cmd) { "bundle exec mutant -I lib --require test_app --use rspec" }
+  let(:base_cmd) { 'bundle exec mutant -I lib --require test_app --use rspec' }
 
   shared_examples_for 'rspec integration' do
     around do |example|

spec/unit/mutant/runner/config_spec.rb

@@ -75,20 +75,20 @@
       let(:amount_mutations) { 0 }
       let(:amount_kills)     { 0 }
 
-      it { should be(0.0) }
+      it { should eql(0.0) }
     end
 
     context 'with one mutation' do
       let(:amount_mutations) { 1 }
 
       context 'and one kill' do
         let(:amount_kills) { 1 }
-        it { should be(100.0) }
+        it { should eql(100.0) }
       end
 
       context 'and no kills' do
         let(:amount_kills) { 0 }
-        it { should be(0.0) }
+        it { should eql(0.0) }
       end
     end
 
@@ -97,17 +97,17 @@
 
       context 'and no kill' do
         let(:amount_kills) { 0 }
-        it { should be(0.0) }
+        it { should eql(0.0) }
       end
 
       context 'and some kills' do
         let(:amount_kills) { 2 }
-        it { should be(20.0) }
+        it { should eql(20.0) }
       end
 
       context 'and as many kills' do
         let(:amount_kills) { amount_mutations }
-        it { should be(100.0) }
+        it { should eql(100.0) }
       end
     end
   end

spec/unit/mutant/subject_spec.rb

@@ -29,7 +29,7 @@ def match_expression
     double(
       'Context',
       source_path: 'source_path',
-      source_line: 'source_line',
+      source_line: 'source_line'
     )
   end