mutant 0.10.9 → 0.10.10

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mutant/cli/command/run.rb +1 -1
  3. data/lib/mutant/config.rb +2 -2
  4. data/lib/mutant/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e2d4849ffe2057370e38c3718afe4cbbfcbfaf76b058c4c5364ff2a7475a3122
4
- data.tar.gz: 6e9abc09f95b929c6ee5b1f09745aa7ce01cc66ab70aaa3e044f2da5b897ce25
3
+ metadata.gz: d336eb88315a70aeeced6841c99718700ebb0694bb524d9428a31c0486c7444e
4
+ data.tar.gz: e2ad192ce138f10cf6e45aea0c11ea3d5cb83b5fa5608703c78b9421269b4e7d
5
5
  SHA512:
6
- metadata.gz: '050159a447e4f328e9283cea9785dc08bd51d6132995ff9ecda4cdfbda08f665f8294607f5eeaf390e9b3a069ae69dab675fc2767b1300973ec9bfa2b918b70a'
7
- data.tar.gz: 582384118f7e8df7091280f6bc78e6d6f95f612f28a0892637d1e1a845c93754df29f5e463e8a1a69ca5f85ed95e666f82ab4ac957bf3a896d3f34fb26a5693b
6
+ metadata.gz: b8557df3118320ad1a2b0dc661d78dde58655f164c902f6c07a4657919980cfcc4ddd8e57c2a303b9ecd1c460549a9953e72dcc12d9df34fbbbcfc23a4458d6f
7
+ data.tar.gz: 0404212caaba99c3836db6c59930ba857fc554f9a02af7d8d0c6bace9732337cab0b2ecd3df258ab802c18f99546941eaec888125c5bbbe7fc59bf1c9f79059b
data/lib/mutant/cli/command/run.rb CHANGED
@@ -49,7 +49,7 @@ module Mutant
49
49
  end
50
50
 
51
51
  def expand(file_config)
52
- @config = @config.merge(file_config)
52
+ @config = file_config.merge(@config)
53
53
  end
54
54
 
55
55
  def soft_fail(result)
data/lib/mutant/config.rb CHANGED
@@ -71,12 +71,12 @@ module Mutant
71
71
  def merge(other)
72
72
  other.with(
73
73
  fail_fast: fail_fast || other.fail_fast,
74
- includes: other.includes + includes,
74
+ includes: includes + other.includes,
75
75
  jobs: other.jobs || jobs,
76
76
  integration: other.integration || integration,
77
77
  mutation_timeout: other.mutation_timeout || mutation_timeout,
78
78
  matcher: matcher.merge(other.matcher),
79
- requires: other.requires + requires,
79
+ requires: requires + other.requires,
80
80
  zombie: zombie || other.zombie
81
81
  )
82
82
  end
data/lib/mutant/version.rb CHANGED
@@ -2,5 +2,5 @@
2
2
 
3
3
  module Mutant
4
4
  # Current mutant version
5
- VERSION = '0.10.9'
5
+ VERSION = '0.10.10'
6
6
  end # Mutant
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mutant
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.9
4
+ version: 0.10.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Markus Schirp
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-11-29 00:00:00.000000000 Z
11
+ date: 2020-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: abstract_type