Merge pull request #135 from mbj/upgrade/dependencies-july-2016

Upgrade flay, rubocop, rspec, mutant
mbj · Aug 1, 2016 · 47fa411 · 47fa411
2 parents 8b287e0 + 62a7ce9
commit 47fa411
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/devtools.gemspec b/devtools.gemspec
@@ -19,17 +19,17 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'anima',        '~> 0.3.0'
   gem.add_runtime_dependency 'concord',      '~> 0.1.5'
   gem.add_runtime_dependency 'adamantium',   '~> 0.2.0'
-  gem.add_runtime_dependency 'rspec',        '=  3.4.0'  # blocked by mutant-rspec
-  gem.add_runtime_dependency 'rspec-core',   '=  3.4.4'  # blocked by mutant-rspec
+  gem.add_runtime_dependency 'rspec',        '~> 3.5.0'
+  gem.add_runtime_dependency 'rspec-core',   '~> 3.5.2'
   gem.add_runtime_dependency 'rspec-its',    '~> 1.2.0'
   gem.add_runtime_dependency 'rake',         '~> 11.2.2'
   gem.add_runtime_dependency 'yard',         '~> 0.9.1'
-  gem.add_runtime_dependency 'flay',         '=  2.7.0'  # blocked by interface changes
+  gem.add_runtime_dependency 'flay',         '~> 2.8.0'
   gem.add_runtime_dependency 'flog',         '~> 4.4.0'
   gem.add_runtime_dependency 'reek',         '~> 4.2.0'
-  gem.add_runtime_dependency 'rubocop',      '~> 0.41.2'
+  gem.add_runtime_dependency 'rubocop',      '~> 0.42.0'
   gem.add_runtime_dependency 'simplecov',    '~> 0.12.0'
   gem.add_runtime_dependency 'yardstick',    '~> 0.9.9'
-  gem.add_runtime_dependency 'mutant',       '~> 0.8.10'
-  gem.add_runtime_dependency 'mutant-rspec', '~> 0.8.8'
+  gem.add_runtime_dependency 'mutant',       '~> 0.8.11'
+  gem.add_runtime_dependency 'mutant-rspec', '~> 0.8.11'
 end
diff --git a/lib/devtools/config.rb b/lib/devtools/config.rb
@@ -157,14 +157,12 @@ class Mutant < self
       FILE             = 'mutant.yml'.freeze
       DEFAULT_NAME     = ''.freeze
       DEFAULT_STRATEGY = 'rspec'.freeze
-      DEFAULT_COVERAGE = '1/1'.freeze
 
       attribute :name,            [String],                default: DEFAULT_NAME
       attribute :strategy,        [String],                default: DEFAULT_STRATEGY
       attribute :zombify,         [TrueClass, FalseClass], default: false
       attribute :since,           [String, NilClass],      default: nil
       attribute :ignore_subjects, [Array],                 default: []
-      attribute :expect_coverage, [String],                default: DEFAULT_COVERAGE
       attribute :namespace,       [String]
     end # Mutant
 

diff --git a/lib/devtools/flay.rb b/lib/devtools/flay.rb
@@ -46,6 +46,8 @@ def flay
     class FileList
       include Procto.call, Concord.new(:includes, :excludes)
 
+      GLOB = '**/*.{rb,erb}'.freeze
+
       # Expand includes and filter by excludes
       #
       # @return [Set<Pathname>]
@@ -87,7 +89,7 @@ def include_set
       #
       # @api private
       def flay_includes
-        ::Flay.expand_dirs_to_files(includes)
+        PathExpander.new(includes.dup, GLOB).process
       end
     end
   end

diff --git a/spec/unit/devtools/flay/file_list/call_spec.rb b/spec/unit/devtools/flay/file_list/call_spec.rb
@@ -1,5 +1,5 @@
 describe Devtools::Flay::FileList, '.call' do
-  subject(:output) { described_class.call([tmpdir.to_s], [exclude]) }
+  subject(:output) { described_class.call([tmpdir.to_s].freeze, [exclude]) }
 
   let(:tmpdir)     { Dir.mktmpdir                     }
   let(:one)        { Pathname(tmpdir).join('1.rb')    }

diff --git a/tasks/metrics/mutant.rake b/tasks/metrics/mutant.rake
@@ -31,7 +31,6 @@ namespace :metrics do
     arguments  = %W[
       --include lib
       --require #{config.name}
-      --expect-coverage #{config.expect_coverage}
       --use #{config.strategy}
     ].concat(ignore_subjects).concat(namespaces).concat(since).concat(jobs)