simmer 2.0.0 → 2.1.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0142cad4a1bfe9a53ed19c0b6c1738c94cd51dffd468edf0b2d64213bd4b465
-  data.tar.gz: f02d545ead4a4333dd70880e08c77290f72f25e0b8a6b13b4ed1a3b88f5b2394
+  metadata.gz: f8469413b339324e3aaf45eea56f7245bed4624bd9979e238d1c8538eb1137df
+  data.tar.gz: cb99f6ececbf91facf3383487455c2beda0739d71c3869755f38ac2f9cbc5fd4
 SHA512:
-  metadata.gz: 27c03c2af5cfb9049d8e6f11792ae025df4063e6424329519199118a915a96194cfc78910b87d1d9e5cb6bd5a520404f66d1702124e54b9427eed70b7b144e55
-  data.tar.gz: 82101f95eaa70f35818b255c0794e3884fb3d1b8bf768b6f5b222f72422b4f2184b4959afeffa44f195467de46ae86379288abfe05a100d0365602c8e2abb514
+  metadata.gz: b77ab5434f1f1ba2ec7ad7871f988cc5b637fe7488599f445aa5c41a685053542656aeaab68188c700aa576b7dd2539bf53c9842574dee6592b5762949767988
+  data.tar.gz: bb69b280fa06cb96c3e7582596191fff239250cae05fb76d36c6156ee4f65b7995a5eb4f7632f70e4d115626f60b48c9222ed82dc21de2569c92564ad9cb24bd

data/.rubocop.yml

@@ -13,7 +13,7 @@ Metrics/BlockLength:
     - define
 
 Metrics/MethodLength:
-  Max: 25
+  Max: 30
 
 AllCops:
   TargetRubyVersion: 2.5
@@ -23,3 +23,9 @@ Metrics/AbcSize:
 
 Metrics/ClassLength:
   Max: 125
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.1.0 (May 12th, 2020)
+
+Additions:
+
+* Do not make missing fixtures short-circuit the rest of the test suite.
+* Do not make PDI timeouts short-circuit the rest of the test suite.
+* Report PDI's exit code and execution time to the console.
+
 # 2.0.0 (May 11th, 2020)
 
 Breaking Changes:

data/lib/simmer/database/fixture_set.rb

@@ -13,6 +13,8 @@ module Simmer
   module Database
     # Hydrate a collection of Fixture instances from configuration.
     class FixtureSet
+      class FixtureMissingError < StandardError; end
+
       def initialize(config = {})
         @fixtures_by_name = config_to_fixures_by_name(config)
 
@@ -22,7 +24,7 @@ module Simmer
       def get!(name)
         key = name.to_s
 
-        raise ArgumentError, "fixture not found: #{name}" unless fixtures_by_name.key?(key)
+        raise FixtureMissingError, "fixture missing: #{name}" unless fixtures_by_name.key?(key)
 
         fixtures_by_name[key]
       end

data/lib/simmer/judge/result.rb

@@ -13,7 +13,7 @@ module Simmer
     class Result
       attr_reader :bad_assertions
 
-      def initialize(bad_assertions)
+      def initialize(bad_assertions = [])
         @bad_assertions = bad_assertions
 
         freeze

data/lib/simmer/runner/result.rb

@@ -13,23 +13,36 @@ module Simmer
     class Result
       extend Forwardable
 
-      attr_reader :id, :judge_result, :specification, :spoon_client_result
-
-      def_delegators :spoon_client_result, :time_in_seconds
+      attr_reader :errors, :id, :judge_result, :specification, :spoon_client_result
 
       def_delegators :specification, :name
 
-      def initialize(id, judge_result, specification, spoon_client_result)
+      def initialize(
+        id:,
+        specification:,
+        judge_result: nil,
+        spoon_client_result: nil,
+        errors: []
+      )
         @id                  = id.to_s
         @judge_result        = judge_result
         @specification       = specification
         @spoon_client_result = spoon_client_result
+        @errors              = Array(errors)
 
         freeze
       end
 
+      def time_in_seconds
+        spoon_client_result&.time_in_seconds || 0
+      end
+
       def pass?
-        judge_result&.pass? && spoon_client_result&.pass?
+        [
+          judge_result&.pass?,
+          spoon_client_result&.pass?,
+          errors.empty?,
+        ].all?
       end
 
       def fail?
@@ -44,9 +57,18 @@ module Simmer
           'time_in_seconds' => time_in_seconds,
           'pass' => pass?,
           'spoon_client_result' => spoon_client_result.to_h,
-          'judge_result' => judge_result.to_h
+          'judge_result' => judge_result.to_h,
+          'errors' => errors,
         }
       end
+
+      def execution_output
+        execution_result&.out
+      end
+
+      def execution_result
+        spoon_client_result&.execution_result
+      end
     end
   end
 end

data/lib/simmer/runner.rb

@@ -30,18 +30,26 @@ module Simmer
       print("Name: #{specification.name}")
       print("Path: #{specification.path}")
 
-      clean_db
-      seed_db(specification)
-      clean_file_system
-      seed_file_system(specification)
+      clean_and_seed(specification)
 
       spoon_client_result = execute_spoon(specification, config)
       judge_result        = assert(specification, spoon_client_result)
 
-      Result.new(id, judge_result, specification, spoon_client_result).tap do |result|
-        msg = pass_message(result)
-        print_waiting('Done', 'Final verdict')
-        print(msg)
+      Result.new(
+        id: id,
+        judge_result: judge_result,
+        specification: specification,
+        spoon_client_result: spoon_client_result
+      ).tap do |result|
+        print_result(result)
+      end
+    rescue Database::FixtureSet::FixtureMissingError, Timeout::Error => e
+      Result.new(
+        id: id,
+        specification: specification,
+        errors: e.message
+      ).tap do |result|
+        print_result(result)
       end
     end
 
@@ -49,6 +57,19 @@ module Simmer
 
     attr_reader :database, :file_system, :fixture_set, :judge, :out
 
+    def print_result(result)
+      msg = pass_message(result)
+      print_waiting('Done', 'Final verdict')
+      print(msg)
+    end
+
+    def clean_and_seed(specification)
+      clean_db
+      seed_db(specification)
+      clean_file_system
+      seed_file_system(specification)
+    end
+
     def clean_db
       print_waiting('Stage', 'Cleaning database')
       count = database.clean!
@@ -66,6 +87,9 @@ module Simmer
       print("#{count} record(s) inserted")
 
       count
+    rescue Database::FixtureSet::FixtureMissingError => e
+      print('Missing Fixture(s)')
+      raise e
     end
 
     def clean_file_system
@@ -86,11 +110,22 @@ module Simmer
 
     def execute_spoon(specification, config)
       print_waiting('Act', 'Executing Spoon')
+
       spoon_client_result = spoon_client.run(specification, config)
-      msg = pass_message(spoon_client_result)
+      time_in_seconds     = spoon_client_result.time_in_seconds
+      code                = spoon_client_result.execution_result.status.code
+
+      msg = [
+        pass_message(spoon_client_result),
+        "(Exited with code #{code} after #{time_in_seconds} seconds)"
+      ].join(' ')
+
       print(msg)
 
       spoon_client_result
+    rescue Timeout::Error => e
+      print('Timed out')
+      raise e
     end
 
     def assert(specification, spoon_client_result)

data/lib/simmer/suite/reporter.rb

@@ -58,7 +58,7 @@ module Simmer
         runner_results.each do |runner_result|
           name         = runner_result.name
           runner_id    = runner_result.id
-          out_contents = runner_result.spoon_client_result.execution_result.out
+          out_contents = runner_result.execution_output
 
           write_block(pdi_out_file, name, runner_id, out_contents)
         end

data/lib/simmer/suite/result.rb

@@ -22,6 +22,7 @@ module Simmer
       def pass?
         !fail?
       end
+      alias passing? pass?
 
       def fail?
         runner_results.any?(&:fail?)

data/lib/simmer/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Simmer
-  VERSION = '2.0.0'
+  VERSION = '2.1.0-alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simmer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.pre.alpha
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_hashable
@@ -275,9 +275,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: