mutiny 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b90916fcddcbfd2b6d6b373927154110c8d1a0
-  data.tar.gz: f8d277e9dc277bdde93a449e8a10018be5c96859
+  metadata.gz: ca31e6c61eac704333513e20a7ba33416eacb370
+  data.tar.gz: 2c08a4a4337d1d6c9a842f995baa993c9f7ea460
 SHA512:
-  metadata.gz: 74a0c7772807505bc0d79f386fcd958d53ff1466cef6bb6053fe6ba2d978bf07b9fbfe17bb6db1c8243bf30a1750bcc9d8f8273fe902ab5360f62f305d45f7d8
-  data.tar.gz: 3180029d832460442147ff1623b4f535318a1226b1312d41232a736546475fce1f793827a0f16a4ae12e354a7f77d0ad3099f487f0fd21700b048c9a0f60e218
+  metadata.gz: deb63bad6550131c72454459b7eafd301f7ad5b4641498e42b262a17dacf7f77636a790daa15addb55bf749f410845eea82843f5cacc5e8324606505d400988a
+  data.tar.gz: 649fdc273f4e3ab181e7cb0f806b78996754d08f9beb2e98627a7dbca59aae5f9cafde975e6351c9ecc2d97e1c94d8c5b968ec90287b043e631ba746c4aa61d1

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
     - Gemfile
     - Rakefile
   Exclude:
-    - vendor/*
+    - vendor/**/*
 
 StringLiterals:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mutiny (0.2.4)
+    mutiny (0.2.5)
       gli (~> 2.13.0)
       metamorpher (~> 0.2.2)
       parser (~> 2.2.2)

data/RELEASES.md

@@ -1,5 +1,10 @@
 # Release History
 
+## v0.2.5 (16 February 2016)
+* Fix bug in the --cached switch of the score command, which was preventing mutants being correctly loaded from disk on Linux.
+* Fix bug in the --cached switch of the score command, which was causing mutiny to report the incorrect path to subject files.
+* Improve extensibility by supporting different implementations of the analyser. This has removed the need to have test selection as an extension point (for now).
+
 ## v0.2.4 (10 February 2016)
 * Add --cached switch to the score command, which loads mutants from disk rather than generating them anew.
 * Various changes to improve extensibility (i.e., mutant storage, test selection) and capabilities (i.e., mutant location and test hooks).

data/lib/mutiny/analysis/analyser/default.rb

@@ -0,0 +1,13 @@
+require_relative "../analyser"
+
+module Mutiny
+  module Analysis
+    class Analyser
+      class Default < self
+        def select_tests(mutant)
+          integration.tests.for(mutant.subject) # TODO: is this correctly minimal?
+        end
+      end
+    end
+  end
+end

data/lib/mutiny/analysis/analyser.rb

@@ -1,18 +1,20 @@
+require_relative "../isolation"
 require_relative "results"
 
 module Mutiny
   module Analysis
     class Analyser
-      attr_reader :mutant_set, :integration
+      attr_reader :integration
 
-      def initialize(mutant_set:, integration:)
-        @mutant_set = mutant_set
+      def initialize(integration:)
         @integration = integration
       end
 
-      def call
+      def call(mutant_set)
         results = Results.new
 
+        before_all(mutant_set)
+
         mutant_set.mutants.each do |mutant|
           results.add(mutant, analyse(mutant))
         end
@@ -20,11 +22,26 @@ module Mutiny
         results
       end
 
+      protected
+
+      def before_all(_mutant_set)
+      end
+
+      def select_tests(_mutant)
+        fail "No implementation has been provided for select_tests"
+      end
+
       private
 
       def analyse(mutant)
         mutant.apply
-        mutant.stillborn? ? nil : integration.test(mutant)
+        mutant.stillborn? ? nil : run_tests(select_tests(mutant))
+      end
+
+      def run_tests(test_set)
+        Isolation.call do
+          integration.run(test_set, fail_fast: true)
+        end
       end
     end
   end

data/lib/mutiny/configuration.rb

@@ -1,13 +1,14 @@
 require_relative 'pattern'
 require_relative 'reporter/stdout'
-require_relative 'tests/selection/default'
 require_relative 'integration/rspec'
 require_relative 'mutants/ruby'
 require_relative 'mutants/storage'
+require_relative 'analysis/analyser/default'
 
 module Mutiny
   class Configuration
-    attr_reader :loads, :requires, :patterns, :reporter, :mutants, :tests
+    attr_reader :loads, :requires, :patterns
+    attr_reader :reporter, :integration, :mutator, :mutant_storage, :analyser
 
     def initialize(loads: [], requires: [], patterns: [])
       @loads = loads
@@ -16,8 +17,10 @@ module Mutiny
       @patterns.map!(&Pattern.method(:new))
 
       @reporter = Reporter::Stdout.new
-      @mutants = Mutants.new
-      @tests = Tests.new
+      @integration = Integration::RSpec.new
+      @mutator = Mutants::Ruby.new
+      @mutant_storage = Mutants::Storage.new
+      @analyser = Analysis::Analyser::Default.new(integration: @integration)
     end
 
     def load_paths
@@ -27,23 +30,5 @@ module Mutiny
     def can_load?(source_path)
       load_paths.any? { |load_path| source_path.start_with?(load_path) }
     end
-
-    class Mutants
-      attr_reader :mutator, :storage
-
-      def initialize
-        @mutator = Mutiny::Mutants::Ruby.new
-        @storage = Mutiny::Mutants::Storage.new
-      end
-    end
-
-    class Tests
-      attr_reader :selection, :integration
-
-      def initialize
-        @selection = Mutiny::Tests::Selection::Default.new
-        @integration = Mutiny::Integration::RSpec.new(@selection)
-      end
-    end
   end
 end

data/lib/mutiny/mode/check.rb

@@ -51,11 +51,11 @@ module Mutiny
       end
 
       def test_set
-        @test_set ||= configuration.tests.integration.tests.for_subjects(environment.subjects)
+        @test_set ||= configuration.integration.tests.for_all(environment.subjects)
       end
 
       def test_run
-        @test_run ||= configuration.tests.integration.run(test_set)
+        @test_run ||= configuration.integration.run(test_set)
       end
     end
   end

data/lib/mutiny/mode/mutate.rb

@@ -22,11 +22,11 @@ module Mutiny
       end
 
       def mutant_set
-        @mutant_set ||= configuration.mutants.mutator.mutants_for(environment.subjects)
+        @mutant_set ||= configuration.mutator.mutants_for(environment.subjects)
       end
 
       def mutant_storage
-        @store ||= configuration.mutants.storage
+        @store ||= configuration.mutant_storage
       end
     end
   end

data/lib/mutiny/mode/score.rb

@@ -1,4 +1,3 @@
-require_relative "../analysis/analyser"
 require_relative "../output/table"
 
 module Mutiny
@@ -54,14 +53,7 @@ module Mutiny
       end
 
       def results
-        @results ||= analyser.call
-      end
-
-      def analyser
-        Analysis::Analyser.new(
-          mutant_set: mutant_set,
-          integration: configuration.tests.integration
-        )
+        @results ||= configuration.analyser.call(mutant_set)
       end
 
       def mutant_set
@@ -70,9 +62,9 @@ module Mutiny
 
       def initialize_mutant_set
         if options[:cached]
-          configuration.mutants.storage.load
+          configuration.mutant_storage.load_for(environment.subjects)
         else
-          configuration.mutants.mutator.mutants_for(environment.subjects)
+          configuration.mutator.mutants_for(environment.subjects)
         end
       end
     end

data/lib/mutiny/mutants/mutant_set.rb

@@ -13,6 +13,10 @@ module Mutiny
         @mutants = mutants
       end
 
+      def subjects
+        mutants.map(&:subject).uniq
+      end
+
       def group_by_subject
         mutants.group_by(&:subject).dup
       end

data/lib/mutiny/mutants/storage/file_store.rb

@@ -19,7 +19,7 @@ module Mutiny
 
         def load_all
           absolute_paths = Dir.glob(File.join(mutant_directory, "**", "*.rb"))
-          absolute_paths.map { |path| strategy.load(path) }
+          absolute_paths.sort.map { |path| strategy.load(path) }
         end
       end
     end

data/lib/mutiny/mutants/storage/mutant_file.rb

@@ -15,9 +15,7 @@ module Mutiny
 
         def load(absolute_path)
           path = Path.from_absolute(path: absolute_path, root: mutant_directory)
-          deserialise
-            .merge(deserialised_contents(path)) { |_, left, right| left.merge(right) }
-            .merge(deserialised_filename(path)) { |_, left, right| left.merge(right) }
+          deep_merge(deserialised_contents(path), deserialised_filename(path))
         end
 
         def store(mutant)
@@ -28,10 +26,8 @@ module Mutiny
 
         private
 
-        def deserialise
-          {
-            subject: { root: mutant_directory }
-          }
+        def deep_merge(hash1, hash2)
+          hash1.merge(hash2) { |_, h1_member, h2_member| h1_member.merge(h2_member) }
         end
 
         def deserialised_filename(path)

data/lib/mutiny/mutants/storage.rb

@@ -13,15 +13,20 @@ module Mutiny
         store.save_all(mutants)
       end
 
-      def load
-        mutants = store.load_all.map do |mutant_specification|
-          subject = Subjects::Subject.new(**mutant_specification[:subject])
-          mutant_specification[:subject] = subject
-          Mutant.new(**mutant_specification)
+      def load_for(subjects)
+        mutants = store.load_all.map do |mutant_spec|
+          mutant_spec[:subject] = resolve_subject(subjects, **mutant_spec[:subject])
+          Mutant.new(**mutant_spec)
         end
 
         MutantSet.new(*mutants)
       end
+
+      private
+
+      def resolve_subject(subjects, name:, path:)
+        subjects.find { |subject| subject.name == name && subject.relative_path == path }
+      end
     end
   end
 end

data/lib/mutiny/tests/test_set.rb

@@ -18,12 +18,12 @@ module Mutiny
         tests.map(&:location)
       end
 
-      def for_subject(subject)
-        subset { |test| subject.name == test.expression }
+      def for_all(subject_set)
+        subset { |test| subject_set.names.include?(test.expression) }
       end
 
-      def for_subjects(subjects)
-        subset { |test| subjects.names.include?(test.expression) }
+      def for(subject)
+        subset { |test| subject.name == test.expression }
       end
 
       def subset(&block)

data/lib/mutiny/version.rb

@@ -1,3 +1,3 @@
 module Mutiny
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/mutiny.rb

@@ -1,5 +1,4 @@
 require_relative "mutiny/version"
-require_relative "mutiny/integration"
 require_relative "mutiny/configuration"
 require_relative "mutiny/subjects"
 require_relative "mutiny/tests"

data/spec/unit/mutants/storage_spec.rb

@@ -5,42 +5,41 @@ module Mutiny
         store = instance_double(Storage::FileStore)
         allow(store).to receive(:load_all).and_return(loaded_data)
 
+        first_subject  = Subjects::Subject.new(name: "Two", path: "two.rb", root: ".")
+        second_subject = Subjects::Subject.new(name: "Four", path: "four.rb", root: ".")
+        subjects = Subjects::SubjectSet.new([first_subject, second_subject])
+
+        expected_mutant_set = MutantSet.new(
+          Mutant.new(subject: first_subject, code: "2 - 2", index: 0),
+          Mutant.new(subject: first_subject, code: "2 * 2", index: 1),
+          Mutant.new(subject: second_subject, code: "4 - 4", index: 2)
+        )
+
         storage = Storage.new(store: store)
-        expect(storage.load).to eq(expected_mutant_set)
+        expect(storage.load_for(subjects)).to eq(expected_mutant_set)
       end
 
       # rubocop:disable MethodLength
       def loaded_data
         [
           {
-            subject: { name: "Two", path: "two.rb", root: "~/Code/sums" },
+            subject: { name: "Two", path: "two.rb" },
             code: "2 - 2",
             index: 0
           },
           {
-            subject: { name: "Two", path: "two.rb", root: "~/Code/sums" },
+            subject: { name: "Two", path: "two.rb" },
             code: "2 * 2",
             index: 1
           },
           {
-            subject: { name: "Four", path: "four.rb", root: "~/Code/sums" },
+            subject: { name: "Four", path: "four.rb" },
             code: "4 - 4",
             index: 0
           }
         ]
       end
       # rubocop:enable MethodLength
-
-      def expected_mutant_set
-        first_subject  = Subjects::Subject.new(name: "Two", path: "two.rb", root: "~/Code/sums")
-        second_subject = Subjects::Subject.new(name: "Four", path: "four.rb", root: "~/Code/sums")
-
-        MutantSet.new(
-          Mutant.new(subject: first_subject, code: "2 - 2", index: 0),
-          Mutant.new(subject: first_subject, code: "2 * 2", index: 1),
-          Mutant.new(subject: second_subject, code: "4 - 4", index: 2)
-        )
-      end
     end
   end
 end

data/spec/unit/{tests → subjects}/test_set_spec.rb

@@ -33,84 +33,42 @@ module Mutiny
         end
       end
 
-      context "for all" do
+      context "for" do
         it "should return only those tests (whose expression) matches a subject" do
           subjects = subject_set_for("Max", "Min")
           test_set = test_set_for("Subtract", "Min", "Add")
-          selected = test_set.for_subjects(subjects)
 
-          expect(selected).to eq(test_set.subset { |t| t.expression == "Min" })
+          expect(test_set.for_all(subjects)).to eq(test_set.subset { |t| t.expression == "Min" })
         end
 
         it "should return multiple tests for a single subject" do
           subjects = subject_set_for("Min")
           test_set = test_set_for("Min", "Max", "Min", "Max", "Min")
-          selected = test_set.for_subjects(subjects)
 
-          expect(selected).to eq(test_set.subset { |t| t.expression == "Min" })
+          expect(test_set.for_all(subjects)).to eq(test_set.subset { |t| t.expression == "Min" })
         end
 
         it "should return no tests when there are no tests" do
           subjects = subject_set_for("Max", "Min")
           test_set = TestSet.empty
-          selected = test_set.for_subjects(subjects)
 
-          expect(selected).to eq(TestSet.empty)
+          expect(test_set.for_all(subjects)).to eq(TestSet.empty)
         end
 
         it "should return no tests when there are no relevant subjects" do
           subjects = subject_set_for("Max", "Min")
           test_set = test_set_for("Subtract", "Add")
-          selected = test_set.for_subjects(subjects)
 
-          expect(selected).to eq(TestSet.empty)
+          expect(test_set.for_all(subjects)).to eq(TestSet.empty)
         end
 
         def subject_set_for(*names)
           Subjects::SubjectSet.new(names.map { |n| Subjects::Subject.new(name: n) })
         end
-      end
-
-      context "for" do
-        it "should return only those tests (whose expression) matches the mutant's subject" do
-          subject = subject_for("Min")
-          test_set = test_set_for("Subtract", "Min", "Add")
-          selected = test_set.for_subject(subject)
-
-          expect(selected).to eq(test_set.subset { |t| t.expression == "Min" })
-        end
-
-        it "should return multiple tests for a single mutant" do
-          subject = subject_for("Min")
-          test_set = test_set_for("Min", "Max", "Min", "Max", "Min")
-          selected = test_set.for_subject(subject)
-
-          expect(selected).to eq(test_set.subset { |t| t.expression == "Min" })
-        end
 
-        it "should return no tests when there are no tests" do
-          subject = subject_for("Min")
-          test_set = TestSet.empty
-          selected = test_set.for_subject(subject)
-
-          expect(selected).to eq(TestSet.empty)
+        def test_set_for(*expressions)
+          TestSet.new(expressions.map { |e| Test.new(expression: e) })
         end
-
-        it "should return no tests when mutant is irrelevant" do
-          subject = subject_for("Min")
-          test_set = test_set_for("Subtract", "Add")
-          selected = test_set.for_subject(subject)
-
-          expect(selected).to eq(TestSet.empty)
-        end
-
-        def subject_for(name)
-          Subjects::Subject.new(name: name)
-        end
-      end
-
-      def test_set_for(*expressions)
-        TestSet.new(expressions.map { |e| Test.new(expression: e) })
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutiny
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Louis Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -191,9 +191,9 @@ files:
 - examples/untested_calculator/spec/spec_helper.rb
 - lib/mutiny.rb
 - lib/mutiny/analysis/analyser.rb
+- lib/mutiny/analysis/analyser/default.rb
 - lib/mutiny/analysis/results.rb
 - lib/mutiny/configuration.rb
-- lib/mutiny/integration.rb
 - lib/mutiny/integration/hook.rb
 - lib/mutiny/integration/rspec.rb
 - lib/mutiny/integration/rspec/context.rb
@@ -245,7 +245,6 @@ files:
 - lib/mutiny/subjects/subject.rb
 - lib/mutiny/subjects/subject_set.rb
 - lib/mutiny/tests.rb
-- lib/mutiny/tests/selection/default.rb
 - lib/mutiny/tests/test.rb
 - lib/mutiny/tests/test_run.rb
 - lib/mutiny/tests/test_set.rb
@@ -286,7 +285,7 @@ files:
 - spec/unit/subjects/environment/type_spec.rb
 - spec/unit/subjects/environment_spec.rb
 - spec/unit/subjects/subject_spec.rb
-- spec/unit/tests/test_set_spec.rb
+- spec/unit/subjects/test_set_spec.rb
 homepage: https://github.com/mutiny/mutiny
 licenses:
 - MIT
@@ -347,4 +346,4 @@ test_files:
 - spec/unit/subjects/environment/type_spec.rb
 - spec/unit/subjects/environment_spec.rb
 - spec/unit/subjects/subject_spec.rb
-- spec/unit/tests/test_set_spec.rb
+- spec/unit/subjects/test_set_spec.rb

data/lib/mutiny/integration.rb

@@ -1,19 +0,0 @@
-require_relative "tests/selection/default"
-require_relative "isolation"
-
-module Mutiny
-  class Integration
-    attr_reader :test_selection
-
-    def initialize(test_selection = Tests::Selection::Default.new)
-      @test_selection = test_selection
-    end
-
-    def test(mutant)
-      Isolation.call do
-        selected_tests = test_selection.for(mutant, from: tests)
-        run(selected_tests, fail_fast: true)
-      end
-    end
-  end
-end

data/lib/mutiny/tests/selection/default.rb

@@ -1,11 +0,0 @@
-module Mutiny
-  module Tests
-    module Selection
-      class Default
-        def for(mutant, from:)
-          from.for_subject(mutant.subject) # TODO: is this correctly minimal?
-        end
-      end
-    end
-  end
-end