theorem 0.0.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3451c37e94f11e1fed722a6ab987454f8ccaa7d52edcc906ef0635cb92d177b
-  data.tar.gz: 544bcaef77540b26c750741bffd35ef363c331e155f1ca49c99696959ff21eae
+  metadata.gz: 433696da9dd29c04e52b86d753dbbc73aba33fdb3e2a14a1c7e03dc4f7f1c2c9
+  data.tar.gz: 42f41fc806176cecbcce43441ace89126e751bed7ab23b103b91477451b243c5
 SHA512:
-  metadata.gz: 9963c7729eeaedbf7b9ec575931d2918630d04244eecd0c6d9b5178636edc20ec1867f4bf2a33e30527481cb76ee3e56dd140124ffd279e808d977bee25edd6b
-  data.tar.gz: c2224d035456e70630851b8f1d8acf1e4519b7310c1805ce1ec45c98689138b5ae0cea04cb582e4ec8aad67db376d42a68235394516589813c4264321aed7aa0
+  metadata.gz: 336ef51f1a4b3bfe1b34da109e8ab193a10aff873a3e4151c4d3a754be479bec455aae731886f8a35c769effc1f89b439ef66055b6a62b096b5fa53ec966c3a4
+  data.tar.gz: e5454f1c81f833480f2b5eccbe9f516f9a4826c7ae743f47c1e4112123b0c558220b2dde81eb918929622aca286ba67b8679f3a3cc1a71dee14313a80e8f1b9c

data/bin/theorize

@@ -6,13 +6,16 @@ require_relative '../src/theorem'
 opts = Slop.parse do |o|
   o.array '--require', 'files to require', delimiter: ','
   o.string '-m', '--module', 'module (default: Theorem::Hypothesis)', default: 'Theorem::Hypothesis'
-  o.string '-h', '--harness', 'harness (default: Theorem::Hypothesis)', default: 'Theorem::Harness'
+  o.string '-h', '--harness', 'harness (default: Theorem::Harness)', default: 'Theorem::Harness'
   o.array '-p', '--publisher', 'publishers (default: Theorem::StdoutReporter)', delimiter: ',', default: ['Theorem::StdoutReporter']
   o.string '-d', '--directory', 'directory to load tests (default: ".")', default: '.'
+  o.array '-i', '--include', 'tags to specify what tests should be included (default: wont filter)', default: []
+  o.array '-e', '--exclude', 'tags the specify what tests should be excluded (default: wont filter)', default: []
+  o.string '--meta', 'string of metadata to pass to the harness', default: ''
   o.on '--help' do
     puts o
     exit
   end
 end
 
-Theorem.run! opts[:directory], opts
+Theorem.run! opts.to_h

data/src/experiment.rb

@@ -9,9 +9,9 @@ module Theorem
         @tests << { name: name, block: block }
       end
 
-      def tests(**opts)
+      def tests(_experiment_namespace: to_s, **opts)
         @tests.map do |hash|
-          Control::Test.new(hash[:name], to_s, **opts, &hash[:block])
+          Control::Test.new(hash[:name], _experiment_namespace, **opts, &hash[:block])
         end
       end
     end

data/src/harness.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
 require_relative './theorem/harness'
-require 'parallel'
 
 # harness
 module Theorem
   # default test harness
   module Harness
     include Control::Harness
-  end
 
-  # parallel harness
-  module ParallelHarness
-    include Control::Harness
+    load_tests do |options|
+      directory = options[:directory] || '.'
 
-    on_run do |tests|
-      Parallel.map(tests, in_threads: 6, &:run!).flatten
+      ExtendedDir.require_all("./#{directory}")
+
+      filtered_registry(options)
     end
   end
 

data/src/stdout_reporter.rb

@@ -63,7 +63,7 @@ module Theorem
 
     def report_failures(tests)
       tests.each do |failure|
-        puts "Failure in #{failure.full_name}\nError: #{failure.error.to_s.red}\nBacktrace:\n------\n#{failure.error.backtrace.map(&:red).join("\n")}"
+        puts "Failure in #{failure.full_name}\nError: #{failure.error.message.to_s.red}\nBacktrace:\n------\n#{failure.error.backtrace.map(&:red).join("\n")}"
       end
     end
   end

data/src/theorem/completed_test.rb

@@ -6,9 +6,14 @@ module Theorem
     class CompletedTest
       attr_reader :test, :error
 
-      def initialize(test, error = nil)
+      def initialize(test, error = nil, notary:)
         @test = test
         @error = error
+        @notary = notary
+      end
+
+      def notary
+        @notary
       end
 
       def full_name

data/src/theorem/harness.rb

@@ -9,8 +9,8 @@ module Theorem
       def self.included(mod)
         mod.extend(ClassMethods)
         mod.define_singleton_method :included do |inner|
-          inner.define_singleton_method :run! do |directory, options = {}|
-            tests = inner.instance_exec directory, options, &mod.test_loader
+          inner.define_singleton_method :run! do |options: {}|
+            tests = inner.instance_exec options, &mod.test_loader
             results = inner.instance_exec tests, options, &mod.run_loader
             inner.completed_suite_subscribers.each do |subscriber|
               subscriber.call(results)
@@ -22,7 +22,9 @@ module Theorem
 
       # harness helpers
       module ClassMethods
-        DEFAULT_LOADER = ->(directory, tags) do
+        DEFAULT_LOADER = ->(options) do
+          directory = options[:directory] || '.'
+
           ExtendedDir.require_all("./#{directory}")
 
           registry

data/src/theorem/hypothesis.rb

@@ -15,6 +15,16 @@ module Theorem
             mod
           end
 
+          klass.attr_reader :notary
+
+          klass.define_method :initialize do
+            @notary = Notation.new
+          end
+
+          klass.define_method :notate do |&block|
+            block.call(@notary)
+          end
+
           klass.extend ClassMethods
           klass.instance_eval do
             @before_all ||= Beaker.new

data/src/theorem/notation.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Theorem
+  module Control
+    class Notation
+      def initialize(state = {})
+        @state = state
+      end
+
+      def write(key, value)
+        @state[key] = value
+      end
+
+      def read(key)
+        @state[key]
+      end
+
+      def dump
+        @state
+      end
+
+      def merge(notary)
+        Notation.new(@state.merge(notary.dump))
+      end
+
+      def edit(key, &block)
+        data = read(key)
+        block.call(data)
+        write(key, data)
+      end
+    end
+  end
+end

data/src/theorem/registry.rb

@@ -8,6 +8,22 @@ module Theorem
         @registry ||= []
       end
 
+      def filtered_registry(options)
+        registry.each do |test_class|
+          if options[:include]&.any?
+            test_class.tests.select! do |test|
+              test.metadata[:tags]&.intersection(options[:include])&.any?
+            end
+          end
+
+          next unless options[:exclude]&.any?
+
+          test_class.tests.reject! do |test|
+            test.metadata[:tags]&.intersection(options[:include])&.any?
+          end
+        end
+      end
+
       def add_to_registry(klass)
         registry << klass
       end

data/src/theorem/test.rb

@@ -1,23 +1,30 @@
 # frozen_string_literal: true
 require_relative './beaker'
+require_relative 'notation'
 
 module Theorem
   module Control
     # test new
     class Test
-      def initialize(name, namespace, **opts, &block)
+      def initialize(name, namespace, arguments: {}, **metadata, &block)
         @name = name
         @namespace = namespace
         @block = block
-        @arguments = opts
+        @arguments = arguments
+        @metadata = metadata
+        @notary = Notation.new
       end
 
-      attr_reader :block, :name, :arguments, :namespace
+      attr_reader :block, :name, :arguments, :namespace, :metadata, :notary
 
       def full_name
         "#{namespace} #{name}"
       end
 
+      def notate(&block)
+        block.call(notary)
+      end
+
       def run!(ctx)
         ctx.instance_exec self, **arguments, &block
       end
@@ -67,8 +74,8 @@ module Theorem
         obj = Class.new
         obj.include(control)
         obj.instance_eval &block if block
-        obj.instance_exec klass, opts do |experiment_klass, params|
-          @tests.concat experiment_klass.tests(**params)
+        obj.instance_exec self, klass, opts do |consumer, experiment_klass, params|
+          @tests.concat experiment_klass.tests(_experiment_namespace: consumer.to_s, arguments: params)
         end
       end
 
@@ -92,34 +99,50 @@ module Theorem
         @after_all
       end
 
-      def test(name, &block)
-        @tests << Test.new(name, to_s, &block)
+      def test(name, **hargs, &block)
+        @tests << Test.new(name, to_s, **hargs, &block)
       end
 
       def run!
         test_case = new
 
+        # run before all beakers to create state in test case
         before_failures = run_before_all_beakers(test_case)
+
         if before_failures.any?
           return before_failures
         end
 
+        # duplicate the before_all arrangement for the after all hook
+        duplicate_test_case = test_case.clone
+
         results = []
         @tests.each do |test|
           error ||= run_before_each_beakers(test_case)
-          error ||= run_test(test, test_case)
-          error ||= run_after_each_beakers(test_case)
+          before_test_case = test_case.clone
+
+          error ||= run_test(test, before_test_case)
 
-          completed_test = CompletedTest.new(test, error)
+          error ||= run_after_each_beakers(before_test_case)
+
+          notary = test_case.notary.merge(test.notary)
+
+          completed_test = CompletedTest.new(test, error, notary: notary.dump)
           publish_test_completion(completed_test)
           results << completed_test
         end
 
-        after_failures = run_after_all_beakers(test_case)
+        after_failures = run_after_all_beakers(duplicate_test_case)
+
         if after_failures.any?
           return after_failures
         end
 
+        results.each do |completed_test|
+          # merge any after_all notations
+          completed_test.notary.merge!(duplicate_test_case.notary.dump)
+        end
+
         results
       end
 
@@ -152,7 +175,7 @@ module Theorem
         Theorem.handle_exception(error)
 
         @tests.map do |test|
-          CompletedTest.new(test, error)
+          CompletedTest.new(test, error, notary: test_case.notary)
         end
       end
 
@@ -191,7 +214,7 @@ module Theorem
         Theorem.handle_exception(error)
 
         @tests.map do |test|
-          CompletedTest.new(test, error)
+          CompletedTest.new(test, error, notary: test_case.notary)
         end
       end
 

data/src/theorem.rb

@@ -2,6 +2,8 @@ require_relative 'theorem/hypothesis'
 require_relative 'harness'
 require_relative 'experiment'
 require_relative 'stdout_reporter'
+
+require_relative 'theorem/harness'
 require 'json'
 
 module Theorem
@@ -20,7 +22,7 @@ module Theorem
     end
   end
 
-  def self.run!(directory, options)
+  def self.run!(options)
     options[:require].each do |file|
       require file
     end
@@ -40,7 +42,7 @@ module Theorem
       end
     end
 
-    mod.run!(directory, options)
+    mod.run!(options: options)
   end
 
   module JsonReporter
@@ -50,7 +52,7 @@ module Theorem
       results = results.map do |result|
         { name: result.full_name, failed: result.failed? }
       end
-      puts results
+      puts results.to_json
       puts "\n\n"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theorem
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Gregory
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: simple and extensible test library toolkit
 email: sean.christopher.gregory@gmail.com
 executables:
@@ -110,6 +96,7 @@ files:
 - src/theorem/completed_test.rb
 - src/theorem/harness.rb
 - src/theorem/hypothesis.rb
+- src/theorem/notation.rb
 - src/theorem/registry.rb
 - src/theorem/reporter.rb
 - src/theorem/test.rb
@@ -133,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: simple and extensible test library toolkit