thoreau 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732fd064266fbd5f93dab80bee925ea5a61031de4cfdc82a9015ce5ac0e16c0d
-  data.tar.gz: 82a1e6dabb420fce9d2260c07a7913ecc996838b3f4e0d98f2f5a8938cafcdaa
+  metadata.gz: c492a383143335b6073d8677862b0228568e00977882f2c8483a8f6a78851a14
+  data.tar.gz: de415989640870528ad0f031c694173893600327d0f563d429339660c09a5b55
 SHA512:
-  metadata.gz: ac549caf454efbc7d6e5806176897dd10a93177c34bea768f27030a49ed1c2da3bf8ad63ee86deb45ee4f5148a48f136f04ad24cacc63b921c03cdcd0912be37
-  data.tar.gz: 1acaf812da2937c14ae7b509fcdd96bf0c3211b4eeaa06eabe97ce032c1d50401915e316bfa3a39558e78895646fb11186c18fa0c730e45dd9f5a3c04f7a7577
+  metadata.gz: 65a16a5f32ff2a33717c675b0d6128212b93ce93a5eafff87ea7ea949deff1925fd2844ddd7b67dae1da74a3af18a8eb9d9146efaccfeaed3b71f16a5d1338ff
+  data.tar.gz: 567112f783bdd3ccc730378c3b89f4492869916302f5face9b2602f144d4ce55afe65997b506e0e5f3adaed8e759b38b23254b1376d6919e58b37141f0294427

data/lib/thoreau/auto_run.rb

@@ -1,5 +1,6 @@
+require_relative '../thoreau'
 require_relative './dsl'
 
 at_exit do
-  Thoreau::TestSuite.run_all!
+  Thoreau::Model::TestSuite.run_all!
 end

data/lib/thoreau/case/case_builder.rb

@@ -38,45 +38,30 @@ module Thoreau
 
       private
 
-      def setup_key_to_inputs key
-        setup = @appendix.setups[key.to_s]
-        raise "Unrecognized setup context '#{key}'. Available: #{@appendix.setups.keys.to_sentence}" if setup.nil?
-        logger.debug("   setup_key_to_inputs `#{key}`: #{setup}")
-        return setup.values if setup.block.nil?
-
-        result = Class.new.new.instance_eval(&setup.block)
-        logger.error "Setup #{key} did not return a hash object" unless result.is_a?(Hash)
-        result
-      end
-
       def build_family_cases fam
         # We have "specs" for the inputs. These may be actual
         # values, or they may be enumerables that need to execute.
         # So we need to "explode" (or enumerate) the values,
         # generating a single test for each combination.
         #
-        setup_values = fam.setups
-                          .map { |key| setup_key_to_inputs key }
-                          .reduce(Hash.new) { |m, h| m.merge(h) }
+        setup_values = @appendix.setup_values fam.setups
+
+        # calculate the inputs, expanded from the setup values above
+        input_hashes = build_input_hashes fam.input_specs, setup_values
+
         logger.debug("   -> setup_values = #{setup_values}")
         logger.debug("   -> fam.input_specs = #{fam.input_specs}")
-        input_sets = fam.input_specs
-                        .map { |is| setup_values.merge(is) }
-                        .flat_map do |input_spec|
-          explode_input_specs(input_spec.keys, input_spec)
-        end
-        input_sets = [{}] if input_sets.size == 0
-        logger.debug("   -> input_sets: #{input_sets}")
-        logger.debug("   build cases for '#{fam.desc}', #{setup_values.size} setups, #{input_sets.size} input sets, build_family_cases")
+        logger.debug("   -> input_sets: #{input_hashes}")
+        logger.debug("   build cases for '#{fam.desc}', #{setup_values.size} setups, #{input_hashes.size} input sets, build_family_cases")
 
-        input_sets.map do |input_set|
+        input_hashes.map do |input_hash|
           expectation = fam.use_legacy_snapshot ?
                           :use_legacy_snapshot :
-                          Models::Outcome.new(output:    fam.expected_output,
+                          Model::Outcome.new(output:    fam.expected_output,
                                               exception: fam.expected_exception)
 
-          Thoreau::Models::TestCase.new family_desc:  "#{fam.kind.to_s.ljust(10).capitalize} #{fam.desc}",
-                                        input:        input_set,
+          Thoreau::Model::TestCase.new family_desc:  "#{fam.kind.to_s.ljust(10).capitalize} #{fam.desc}",
+                                        input:        input_hash,
                                         action_block: @action_block,
                                         expectation:  expectation,
                                         asserts:      fam.asserts,
@@ -85,6 +70,17 @@ module Thoreau
 
       end
 
+
+      def build_input_hashes input_specs, setup_values
+        sets = input_specs
+                 .map { |is| setup_values.merge(is) }
+                 .flat_map do |input_spec|
+          explode_input_specs(input_spec.keys, input_spec)
+        end
+        sets = [{}] if sets.size == 0
+        sets
+      end
+
       # Expand any values that are enumerators (Thoreau::DSL::Expanded),
       # creating a list of objects, where all the combinations
       # of enumerated values are present.

data/lib/thoreau/case/suite_runner.rb

@@ -7,8 +7,8 @@ module Thoreau
 
       include Logging
 
-      def initialize(name)
-        @suite_name = name
+      def initialize(suite_name)
+        @suite_name = suite_name
       end
 
       def run_test_cases! cases, skipped

data/lib/thoreau/configuration.rb

@@ -3,7 +3,7 @@ module Thoreau
     attr_accessor :legacy_outcome_path
 
     def initialize
-      @legacy_outcome_path = './tmp/legacy-outcomes.pstore'
+      @legacy_outcome_path = './spec/legacy-outcomes.pstore'
     end
   end
 end

data/lib/thoreau/dsl/context/appendix.rb

@@ -0,0 +1,17 @@
+module Thoreau
+  module DSL
+    module Context
+      class Appendix
+        def initialize(appendix_model, &appendix_block)
+          @model = appendix_model
+          self.instance_eval(&appendix_block)
+        end
+
+        def setup name, values = {}, &block
+          @model.add_setup(name, values, block)
+        end
+
+      end
+    end
+  end
+end

data/lib/thoreau/dsl/context/clan.rb

@@ -0,0 +1,96 @@
+require_relative '../../model/test_family'
+require_relative '../expanded'
+require_relative '../../service/util'
+require 'active_support/core_ext/array/conversions'
+
+module Thoreau
+  module DSL
+    module Context
+
+      SPEC_FAMILY_NAMES = %i[happy sad spec test edge edges boundary corner gigo]
+      # gigo = garbage in / garbage out
+      #
+      PROPS               = {
+        asserts:            %i[assert asserts post post_condition],
+        expected_exception: %i[raises],
+        expected_output:    %i[equals equal expected expect expects output],
+        failure_expected:   %i[fails pending],
+        input_specs:        %i[input inputs],
+        setups:             %i[setup setups assemble]
+      }
+      ALL_PROPS           = PROPS.values.flatten.map(&:to_s)
+      PROPS_SPELL_CHECKER = DidYouMean::SpellChecker.new(dictionary: ALL_PROPS)
+
+      module Clan
+
+        # Note: requires `@test_clan_model`.
+
+        def action(&block)
+          logger.debug "   + Adding subject block"
+          @test_clan_model.action_block = block
+        end
+
+        alias act action
+        alias testing action
+        alias subject action
+
+        def self.def_family_methods_for(sym)
+          define_method sym do |*args|
+            desc = args.shift if args.size > 1 && args.first.is_a?(String)
+            raise "Too many arguments to #{sym}!" if args.size > 1
+
+            spec = args.first&.stringify_keys || {}
+            spec.keys
+                .reject { |k| ALL_PROPS.include? k }
+                .each do |k|
+              suggestions = PROPS_SPELL_CHECKER.correct(k)
+              logger.error "Ignoring unrecognized property '#{k}'."
+              logger.info "    Did you mean #{suggestions.to_sentence}?" if suggestions.size > 0
+              logger.info "    Available properties: #{ALL_PROPS.to_sentence}"
+            end
+
+            params = HashUtil.normalize_props(spec.symbolize_keys, PROPS).tap { |props|
+              # These two props are easier to deal with downstream as empty arrays
+              props[:input_specs] = [props[:input_specs]].flatten.compact
+              props[:setups]      = [props[:setups]].flatten.compact
+            }.merge kind: sym,
+                    desc: desc
+
+            family = Model::TestFamily.new **params
+
+            yield family if block_given?
+
+            logger.debug "   * Created new family #{params.inspect}"
+            @test_clan_model.add_test_family family
+          end
+
+          define_method "#{sym}!" do |*args|
+            family       = self.send(sym, *args)
+            family.focus = true
+            family
+          end
+        end
+
+        SPEC_FAMILY_NAMES.each do |sym|
+          def_family_methods_for sym
+        end
+
+        def_family_methods_for :legacy do |r|
+          r.use_legacy_snapshot = true
+        end
+
+        alias legacy_spec legacy
+        alias legacy_test legacy
+        alias legacy_code legacy
+        alias legacy_spec! legacy!
+        alias legacy_test! legacy!
+        alias legacy_code! legacy!
+
+        def expanded(a)
+          Thoreau::DSL::Expanded.new(a)
+        end
+
+      end
+    end
+  end
+end

data/lib/thoreau/dsl/{suite_context.rb → context/suite.rb}

@@ -1,10 +1,10 @@
-require_relative '../test_suite_data'
 require 'active_support/core_ext/module/delegation'
 
 module Thoreau
   module DSL
+  module Context
 
-    class SuiteContext
+    class Suite
 
       include Thoreau::Logging
 
@@ -32,15 +32,8 @@ module Thoreau
         @suite_data.appendix_block = block
       end
 
-      def context
-        self
-      end
-
-      def add_test_family family
-        suite_data.add_test_family family
-      end
-
     end
 
   end
 end
+end

data/lib/thoreau/dsl/context/test_cases.rb

@@ -0,0 +1,21 @@
+module Thoreau
+  module DSL
+    module Context
+      class TestCases
+
+        include Thoreau::Logging
+
+        attr_reader :test_clan_model
+
+        def initialize(clan_model, &context)
+          @test_clan_model = clan_model
+
+          self.instance_eval(&context)
+        end
+
+        include Thoreau::DSL::Context::Clan
+
+      end
+    end
+  end
+end

data/lib/thoreau/dsl/test_suite_data.rb

@@ -0,0 +1,29 @@
+require_relative '../model/setup'
+
+module Thoreau
+  module DSL
+    class TestSuiteData
+
+      include Thoreau::Logging
+
+      attr_accessor :appendix_block
+      attr_reader :test_cases_blocks
+
+      attr_reader :name
+      attr_reader :test_clans
+
+      def initialize name, appendix:, test_clan:
+        @name              = name
+        @appendix          = appendix
+        @test_clans        = [test_clan]
+        @test_cases_blocks = []
+      end
+
+      def add_setup(name, values, block)
+        logger.debug "   Adding setup block #{name}"
+        @appendix.add_setup Thoreau::Model::Setup.new(name, values, block)
+      end
+
+    end
+  end
+end

data/lib/thoreau/dsl.rb

@@ -1,13 +1,14 @@
-require 'thoreau/logging'
-require 'thoreau/test_suite'
-require 'thoreau/models/test_case'
-require 'thoreau/models/test_clan'
+require 'thoreau/service/logging'
+require 'thoreau/model/test_suite'
+require 'thoreau/model/test_case'
+require 'thoreau/model/test_clan'
 require 'thoreau/case/case_builder'
 require 'thoreau/case/suite_runner'
-require 'thoreau/dsl/clan'
-require 'thoreau/dsl/suite_context'
-require 'thoreau/dsl/test_cases'
-require 'thoreau/dsl/appendix'
+require 'thoreau/dsl/test_suite_data'
+require 'thoreau/dsl/context/clan'
+require 'thoreau/dsl/context/suite'
+require 'thoreau/dsl/context/test_cases'
+require 'thoreau/dsl/context/appendix'
 require_relative './errors'
 
 module Thoreau
@@ -21,33 +22,33 @@ module Thoreau
     def test_suite name = nil, focus: false, &block
       logger.debug("# Processing keyword `test_suite`")
 
-      appendix        = Models::Appendix.new
-      top_level_clan_model = Thoreau::Models::TestClan.new name, appendix: appendix
-      @suite_data     = TestSuiteData.new name, test_clan: top_level_clan_model, appendix: appendix
+      appendix        = Model::Appendix.new
+      top_level_clan_model = Thoreau::Model::TestClan.new name, appendix: appendix
+      @suite_data     = Thoreau::DSL::TestSuiteData.new name, test_clan: top_level_clan_model, appendix: appendix
 
       # Evaluate all the top-level keywords: test_cases, appendix
-      @suite_context = Thoreau::DSL::SuiteContext.new suite_data:      @suite_data,
+      @suite_context = Thoreau::DSL::Context::Suite.new suite_data:      @suite_data,
                                                       test_clan_model: top_level_clan_model
       logger.debug("## Evaluating suite")
       @suite_context.instance_eval(&block)
 
       logger.debug("## Evaluating appendix block")
       appendix_block = @suite_data.appendix_block
-      Thoreau::DSL::Appendix.new(@suite_data, &appendix_block) unless appendix_block.nil?
+      Thoreau::DSL::Context::Appendix.new(@suite_data, &appendix_block) unless appendix_block.nil?
 
       logger.debug("## Evaluating test_cases blocks")
       @suite_data.test_cases_blocks.each do |name, cases_block|
 
         raise TestCasesAtMultipleLevelsError unless @suite_data.test_clans.first.empty?
 
-        test_clan_model = Thoreau::Models::TestClan.new name,
+        test_clan_model = Thoreau::Model::TestClan.new name,
                                                         appendix: appendix,
                                                         action_block: top_level_clan_model.action_block
-        Thoreau::DSL::TestCases.new(test_clan_model, &cases_block)
+        Thoreau::DSL::Context::TestCases.new(test_clan_model, &cases_block)
         @suite_data.test_clans << test_clan_model
       end
 
-      TestSuite.new(data: @suite_data, focus: focus)
+      Model::TestSuite.new(data: @suite_data, focus: focus)
     end
 
     def xtest_suite name = nil, &block
@@ -62,7 +63,7 @@ module Thoreau
 
     alias suite! test_suite!
 
-    include Thoreau::DSL::Clan
+    include Thoreau::DSL::Context::Clan
 
   end
 end

data/lib/thoreau/model/appendix.rb

@@ -0,0 +1,37 @@
+module Thoreau
+  module Model
+    class Appendix
+
+      attr_reader :setups
+
+      def initialize setups: {}
+        @setups = setups
+      end
+
+      def add_setup setup
+        raise "Duplicate setup block #{setup.name}" unless setups[setup.name].nil?
+        @setups[setup.name] = setup
+      end
+
+      def setup_values keys
+        keys
+          .map { |key| self.setup_key_to_inputs key }
+          .reduce(Hash.new) { |m, h| m.merge(h) }
+      end
+
+      private
+
+      def setup_key_to_inputs key
+        setup = self.setups[key.to_s]
+        raise "Unrecognized setup context '#{key}'. Available: #{self.setups.keys.to_sentence}" if setup.nil?
+        logger.debug("   setup_key_to_inputs `#{key}`: #{setup}")
+        return setup.values if setup.block.nil?
+
+        result = Class.new.new.instance_eval(&setup.block)
+        logger.error "Setup #{key} did not return a hash object" unless result.is_a?(Hash)
+        result
+      end
+
+    end
+  end
+end

data/lib/thoreau/{models → model}/outcome.rb

@@ -1,5 +1,5 @@
 module Thoreau
-  module Models
+  module Model
     class Outcome
       # Reprents the outcome of a given test case.
       # It can either be successful and have an `output`,

data/lib/thoreau/{models → model}/setup.rb

@@ -1,5 +1,5 @@
 module Thoreau
-  module Models
+  module Model
 
     class Setup
 

data/lib/thoreau/{models → model}/test_case.rb

@@ -1,10 +1,10 @@
 require 'active_support/core_ext/module/delegation'
 require_relative '../case/context_builder'
 require_relative './outcome'
-require_relative '../legacy_expected_outcomes'
+require_relative '../service/legacy_expected_outcomes'
 
 module Thoreau
-  module Models
+  module Model
     class TestCase
 
       include Thoreau::Logging
@@ -39,7 +39,7 @@ module Thoreau
         "#{@family_desc} #{(@input == {} ? nil : @input.sort.to_h) || @expectation.exception || "(no args)"}"
       end
 
-      def problem
+      def result_analysis
 
         run unless @ran
 
@@ -47,7 +47,10 @@ module Thoreau
 
           logger.debug " -> Expected Exception #{@expectation.exception} @actual.exception:#{@actual.exception}"
 
-          if @actual.exception.to_s == @expectation.exception.to_s
+          if @expectation.exception.is_a?(Class) &&
+            @actual.exception.class == @expectation.exception
+            nil
+          elsif @actual.exception.to_s == @expectation.exception.to_s
             nil
           elsif @actual.exception.nil?
             "Expected exception, but none raised"
@@ -61,7 +64,12 @@ module Thoreau
 
           logger.debug " -> Assert Proc result=#{@assert_result}"
 
-          @assert_result ? nil : "Assertion failed. (got #{@assert_result})"
+          if @actual.exception.nil?
+            @assert_result ? nil : "Assertion failed. (got '#{@assert_result}', result='#{@actual.output}')"
+          else
+            "Expected assertion, but raised exception '#{@actual.exception}'"
+          end
+
         else
 
           logger.debug " -> Result expected: result=#{@actual.output} expected_output: #{@expectation.output} @actual.exception:#{@actual.exception}"
@@ -76,8 +84,20 @@ module Thoreau
         end
       end
 
+      def problem
+        if failure_expected?
+          if result_analysis.nil?
+            "Failure expected but didn't. Is this implemented already?"
+          else
+            nil
+          end
+        else
+          result_analysis
+        end
+      end
+
       def ok?
-        failure_expected? ^ !!problem.nil?
+        problem.nil?
       end
 
       def failed?
@@ -89,13 +109,13 @@ module Thoreau
         context_builder = Case::ContextBuilder.new(input: @input)
         context         = context_builder.create_context
         begin
-          # Only capture exceptions around the action itself.
+          # Only capture exceptions around the subject itself.
           output  = context.instance_exec(&(@action_block))
-          @actual = Models::Outcome.new output: output
+          @actual = Model::Outcome.new output: output
         rescue Exception => e
           logger.debug("** Exception: #{e.class.name} #{e}")
           logger.debug("Available local variables: #{@input.keys.empty? ? '(none)' : @input.keys.to_sentence}") if e.is_a? NameError
-          @actual = Models::Outcome.new exception: e
+          @actual = Model::Outcome.new exception: e
           return
         ensure
           @ran = true

data/lib/thoreau/{models → model}/test_clan.rb

@@ -3,7 +3,7 @@ require_relative '../errors'
 
 module Thoreau
 
-  module Models
+  module Model
     class TestClan # set of TestFamilies
 
       include Thoreau::Logging

data/lib/thoreau/{models → model}/test_family.rb

@@ -1,5 +1,5 @@
 module Thoreau
-  module Models
+  module Model
 
     class TestFamily
       attr_reader :asserts,

data/lib/thoreau/model/test_suite.rb

@@ -0,0 +1,49 @@
+require 'active_support/core_ext/module/delegation'
+require_relative './appendix'
+require_relative '../case/multi_clan_case_builder'
+
+module Thoreau
+  module Model
+    class TestSuite
+
+      @@suites = []
+
+      def initialize(data:, focus:)
+        @data  = data
+        @focus = focus
+        @@suites << self
+
+        # @builder = Thoreau::Case::CaseBuilder.new test_clan: @data.test_clan
+        @builder = Thoreau::Case::MultiClanCaseBuilder.new test_clans: @data.test_clans
+      end
+
+      delegate :name, to: :@data
+
+      def build_and_run
+        logger.debug("## build_and_run")
+        cases = @builder.build_test_cases!
+        logger.debug("   ... built #{cases.size} cases")
+
+        runner = Thoreau::Case::SuiteRunner.new @data.name
+        runner.run_test_cases! cases,
+                               @builder.skipped_count # for reporting
+      end
+
+      def focused?
+        @focus || @builder.any_focused?
+      end
+
+      def self.run_all!
+        logger.debug("# run_all! ############")
+        run_all = !@@suites.any?(&:focused?)
+        @@suites.each do |suite|
+          if suite.focused? || run_all
+            suite.build_and_run
+          else
+            logger.info("   Suite '#{suite.name}' skipped (unfocused)")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thoreau/version.rb

@@ -1,3 +1,3 @@
 module Thoreau
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thoreau
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Peterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -129,26 +123,26 @@ files:
 - lib/thoreau/case/suite_runner.rb
 - lib/thoreau/configuration.rb
 - lib/thoreau/dsl.rb
-- lib/thoreau/dsl/appendix.rb
-- lib/thoreau/dsl/clan.rb
+- lib/thoreau/dsl/context/appendix.rb
+- lib/thoreau/dsl/context/clan.rb
+- lib/thoreau/dsl/context/suite.rb
+- lib/thoreau/dsl/context/test_cases.rb
 - lib/thoreau/dsl/expanded.rb
-- lib/thoreau/dsl/suite_context.rb
-- lib/thoreau/dsl/test_cases.rb
+- lib/thoreau/dsl/test_suite_data.rb
 - lib/thoreau/errors.rb
-- lib/thoreau/legacy_expected_outcomes.rb
-- lib/thoreau/logging.rb
-- lib/thoreau/models/appendix.rb
-- lib/thoreau/models/outcome.rb
-- lib/thoreau/models/setup.rb
-- lib/thoreau/models/test_case.rb
-- lib/thoreau/models/test_clan.rb
-- lib/thoreau/models/test_family.rb
+- lib/thoreau/model/appendix.rb
+- lib/thoreau/model/outcome.rb
+- lib/thoreau/model/setup.rb
+- lib/thoreau/model/test_case.rb
+- lib/thoreau/model/test_clan.rb
+- lib/thoreau/model/test_family.rb
+- lib/thoreau/model/test_suite.rb
 - lib/thoreau/rspec.rb
 - lib/thoreau/rspec/configuration.rb
 - lib/thoreau/rspec/example_helpers.rb
-- lib/thoreau/test_suite.rb
-- lib/thoreau/test_suite_data.rb
-- lib/thoreau/util.rb
+- lib/thoreau/service/legacy_expected_outcomes.rb
+- lib/thoreau/service/logging.rb
+- lib/thoreau/service/util.rb
 - lib/thoreau/version.rb
 homepage: https://github.com/ndp/thoreau
 licenses: []

data/lib/thoreau/dsl/appendix.rb

@@ -1,18 +0,0 @@
-require_relative '../models/setup'
-
-module Thoreau
-  module DSL
-    class Appendix
-      def initialize(appendix_model, &appendix_block)
-        @model = appendix_model
-        self.instance_eval(&appendix_block)
-      end
-
-      def setup name, values = {}, &block
-        @model.add_setup(name, values, block)
-      end
-
-    end
-
-  end
-end

data/lib/thoreau/dsl/clan.rb

@@ -1,94 +0,0 @@
-require_relative '../models/test_family'
-require_relative './expanded'
-require_relative '../util'
-require 'active_support/core_ext/array/conversions'
-
-module Thoreau
-  module DSL
-
-    SPEC_FAMILY_NAMES = %i[happy sad spec test edge edges boundary corner gigo]
-    # gigo = garbage in / garbage out
-    #
-    PROPS               = {
-      asserts:            %i[assert asserts post post_condition],
-      expected_exception: %i[raises],
-      expected_output:    %i[equals equal expected expect expects output],
-      failure_expected:   %i[fails pending],
-      input_specs:        %i[input inputs],
-      setups:             %i[setup setups]
-    }
-    ALL_PROPS           = PROPS.values.flatten.map(&:to_s)
-    PROPS_SPELL_CHECKER = DidYouMean::SpellChecker.new(dictionary: ALL_PROPS)
-
-    module Clan
-
-      # Note: requires `@test_clan_model`.
-
-      def action(&block)
-        logger.debug "   + Adding action block"
-        @test_clan_model.action_block = block
-      end
-      alias testing action
-      alias subject action
-
-
-      def self.def_family_methods_for(sym)
-        define_method sym do |*args|
-          desc = args.shift if args.size > 1 && args.first.is_a?(String)
-          raise "Too many arguments to #{sym}!" if args.size > 1
-
-          spec = args.first&.stringify_keys || {}
-          spec.keys
-              .reject { |k| ALL_PROPS.include? k }
-              .each do |k|
-            suggestions = PROPS_SPELL_CHECKER.correct(k)
-            logger.error "Ignoring unrecognized property '#{k}'."
-            logger.info "    Did you mean #{suggestions.to_sentence}?" if suggestions.size > 0
-            logger.info "    Available properties: #{ALL_PROPS.to_sentence}"
-          end
-
-          params = HashUtil.normalize_props(spec.symbolize_keys, PROPS).tap { |props|
-            # These two props are easier to deal with downstream as empty arrays
-            props[:input_specs] = [props[:input_specs]].flatten.compact
-            props[:setups]      = [props[:setups]].flatten.compact
-          }.merge kind: sym,
-                  desc: desc
-
-          family = Models::TestFamily.new **params
-
-          yield family if block_given?
-
-          logger.debug "   * Created new family #{params.inspect}"
-          @test_clan_model.add_test_family family
-        end
-
-        define_method "#{sym}!" do |*args|
-          family       = self.send(sym, *args)
-          family.focus = true
-          family
-        end
-      end
-
-      SPEC_FAMILY_NAMES.each do |sym|
-        def_family_methods_for sym
-      end
-
-      def_family_methods_for :legacy do |r|
-        r.use_legacy_snapshot = true
-      end
-
-      alias legacy_spec legacy
-      alias legacy_test legacy
-      alias legacy_code   legacy
-      alias legacy_spec! legacy!
-      alias legacy_test! legacy!
-      alias legacy_code! legacy!
-
-      def expanded(a)
-        Thoreau::DSL::Expanded.new(a)
-      end
-
-    end
-
-  end
-end

data/lib/thoreau/dsl/test_cases.rb

@@ -1,20 +0,0 @@
-module Thoreau
-  module DSL
-    class TestCases
-
-      include Thoreau::Logging
-
-      attr_reader :test_clan_model
-
-      def initialize(clan_model, &context)
-        @test_clan_model = clan_model
-
-        self.instance_eval(&context)
-      end
-
-      include Thoreau::DSL::Clan
-
-    end
-
-  end
-end

data/lib/thoreau/models/appendix.rb

@@ -1,17 +0,0 @@
-module Thoreau
-  module Models
-    class Appendix
-
-      attr_reader :setups
-
-      def initialize setups: {}
-        @setups = setups
-      end
-
-      def add_setup setup
-        raise "Duplicate setup block #{setup.name}" unless setups[setup.name].nil?
-        @setups[setup.name] = setup
-      end
-    end
-  end
-end

data/lib/thoreau/test_suite.rb

@@ -1,47 +0,0 @@
-require_relative './models/appendix'
-require_relative './case/multi_clan_case_builder'
-require 'active_support/core_ext/module/delegation'
-
-module Thoreau
-  class TestSuite
-
-    @@suites = []
-
-    def initialize(data:, focus:)
-      @data  = data
-      @focus = focus
-      @@suites << self
-
-      # @builder = Thoreau::Case::CaseBuilder.new test_clan: @data.test_clan
-      @builder = Thoreau::Case::MultiClanCaseBuilder.new test_clans: @data.test_clans
-    end
-
-    delegate :name, to: :@data
-
-    def build_and_run
-      logger.debug("## build_and_run")
-      cases = @builder.build_test_cases!
-      logger.debug("   ... built #{cases.size} cases")
-
-      runner = Thoreau::Case::SuiteRunner.new @data.name
-      runner.run_test_cases! cases,
-                             @builder.skipped_count # for reporting
-    end
-
-    def focused?
-      @focus || @builder.any_focused?
-    end
-
-    def self.run_all!
-      logger.debug("# run_all! ############")
-      run_all = !@@suites.any?(&:focused?)
-      @@suites.each do |suite|
-        if suite.focused? || run_all
-          suite.build_and_run
-        else
-          logger.info("   Suite '#{suite.name}' skipped (unfocused)")
-        end
-      end
-    end
-  end
-end

data/lib/thoreau/test_suite_data.rb

@@ -1,27 +0,0 @@
-require_relative './models/test_clan'
-
-module Thoreau
-  class TestSuiteData
-
-    include Thoreau::Logging
-
-    attr_accessor :appendix_block
-    attr_reader :test_cases_blocks
-
-    attr_reader :name
-    attr_reader :test_clans
-
-    def initialize name, appendix:, test_clan:
-      @name              = name
-      @appendix          = appendix
-      @test_clans        = [test_clan]
-      @test_cases_blocks = []
-    end
-
-    def add_setup(name, values, block)
-      logger.debug "   Adding setup block #{name}"
-      @appendix.add_setup Thoreau::Models::Setup.new(name, values, block)
-    end
-
-  end
-end