simmer 1.0.0.pre.alpha.1 → 1.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4989371b7d24d0acab51620e5f6fde689544988ecce968d848f00c4eb00ea2ce
-  data.tar.gz: 5011b80e753c36aaaf52fcf4468147440403f4a09eae13571ec3e000ed1f5ffe
+  metadata.gz: 1166684a6f6ae1ba9ca0e87aab0405fd6a83fa4c8bf5206950827b2d857577ff
+  data.tar.gz: 50214a9c1aa9dfb26bc5663f43a7cb2c36b62fbf31a7a1b52e66067ba84b5bdc
 SHA512:
-  metadata.gz: e8c1193e86c8fdc027093ace238c73446f3ea3560957a278d6610019afe5f05bb80b0700c593a225e8a27482b125d6255936c58cea436dcde9617cc4a02c4c42
-  data.tar.gz: 902c63c1f437938d215b84965d91c1f60a3b0a15ac7368f72fd6a728735b4e5758c5723ceff52138d96b3e8da181864765a6ebfb54dc1f04fee4a410fb141232
+  metadata.gz: 2675ec1ade5ebd6465c43040fa561125492a9abb6d58561ad69be852f8b6daa3056d90193fca079c187607f65dbf78983304e1e755ccb9fda0a3ca6a36279edd
+  data.tar.gz: cf2100c542aaf4157417c2e08bbeb7b362bc0505f3ceb2cbc0e47f3e184e9d36826b20347eadb3f6437ac2474672c1faccdefff8b6691e0dc6437a1ae53b5f41

data/.gitignore

@@ -4,3 +4,4 @@
 /coverage
 Gemfile.lock
 /pkg
+/bin/di

data/lib/simmer.rb

@@ -36,14 +36,14 @@ require_relative 'simmer/suite'
 module Simmer
   DEFAULT_CONFIG_PATH = File.join('config', 'simmer.yaml')
   DEFAULT_RESULTS_DIR = 'results'
-  DEFAULT_SPEC_DIR    = 'simmer'
+  DEFAULT_SIMMER_DIR  = 'simmer'
   class << self
     def run(path)
       Suite.new(
         out: $stdout,
         config_path: DEFAULT_CONFIG_PATH,
         results_dir: DEFAULT_RESULTS_DIR,
-        spec_dir: DEFAULT_SPEC_DIR
+        simmer_dir: DEFAULT_SIMMER_DIR
       ).run(path)
     end
   end

data/lib/simmer/configuration.rb

@@ -34,13 +34,13 @@ module Simmer
       config_path:,
       resolver: Objectable.resolver,
       results_dir:,
-      spec_dir:,
+      simmer_dir:,
       yaml_reader: Util::YamlReader.new
     )
       @config      = yaml_reader.read(config_path)
       @resolver    = resolver
       @results_dir = results_dir
-      @spec_dir    = spec_dir
+      @simmer_dir  = simmer_dir
       @yaml_reader = yaml_reader
 
       freeze
@@ -59,15 +59,15 @@ module Simmer
     end
 
     def tests_dir
-      File.join(spec_dir, TESTS)
+      File.join(simmer_dir, TESTS)
     end
 
     def fixtures_dir
-      File.join(spec_dir, FIXTURES)
+      File.join(simmer_dir, FIXTURES)
     end
 
     def files_dir
-      File.join(spec_dir, FILES)
+      File.join(simmer_dir, FILES)
     end
 
     def fixture_set
@@ -80,7 +80,7 @@ module Simmer
 
     attr_reader :resolver,
                 :results_dir,
-                :spec_dir,
+                :simmer_dir,
                 :yaml_reader
 
     def get(key)

data/lib/simmer/externals/aws_file_system.rb

@@ -59,6 +59,8 @@ module Simmer
       attr_reader :bucket, :encryption, :files_dir
 
       def write_single(dest, src)
+        src = File.expand_path(src)
+
         File.open(src, 'rb') do |file|
           bucket.object(dest).put(
             body: file,

data/lib/simmer/externals/spoon_client.rb

@@ -43,7 +43,7 @@ module Simmer
         begin
           time_in_seconds = Benchmark.measure do
             execution_result = execute!(specification, config)
-          end.real.round(2)
+          end.real
         rescue Pdi::Spoon::PanError, Pdi::Spoon::KitchenError => e
           return Result.new(
             message: "PDI execution returned an error: #{e.class.name} (#{e.execution.code})",

data/lib/simmer/externals/spoon_client/result.rb

@@ -17,7 +17,7 @@ module Simmer
         def initialize(message: '', execution_result:, time_in_seconds:)
           @message          = message
           @execution_result = execution_result
-          @time_in_seconds  = time_in_seconds
+          @time_in_seconds  = (time_in_seconds || 0).round(2)
 
           freeze
         end

data/lib/simmer/runner/result.rb

@@ -29,7 +29,7 @@ module Simmer
       end
 
       def pass?
-        spoon_client_result&.pass? && spoon_client_result&.pass?
+        judge_result&.pass? && spoon_client_result&.pass?
       end
 
       def fail?

data/lib/simmer/session/reporter.rb

@@ -23,17 +23,13 @@ module Simmer
         freeze
       end
 
-      def write!(path)
-        FileUtils.mkdir_p(path)
+      def write!(dir)
+        dir = setup_directory(dir)
 
-        data_path = File.join(path, DATA_FILE)
-        pdi_out   = File.join(path, PDI_OUT_FILE)
-        pdi_err   = File.join(path, PDI_ERR_FILE)
+        IO.write(data_path(dir), session_result.to_h.to_yaml)
 
-        IO.write(data_path, session_result.to_h.to_yaml)
-
-        pdi_out_file = File.open(pdi_out, 'w')
-        pdi_err_file = File.open(pdi_err, 'w')
+        pdi_out_file = File.open(pdi_out_path(dir), 'w')
+        pdi_err_file = File.open(pdi_err_path(dir), 'w')
 
         write_part(session_result.runner_results, pdi_out_file, pdi_err_file)
 
@@ -55,6 +51,24 @@ module Simmer
 
       attr_reader :session_result
 
+      def data_path(dir)
+        File.join(dir, DATA_FILE)
+      end
+
+      def pdi_out_path(dir)
+        File.join(dir, PDI_OUT_FILE)
+      end
+
+      def pdi_err_path(dir)
+        File.join(dir, PDI_ERR_FILE)
+      end
+
+      def setup_directory(dir)
+        File.expand_path(dir).tap do |expanded_dir|
+          FileUtils.mkdir_p(expanded_dir)
+        end
+      end
+
       def write_part(runner_results, pdi_out_file, pdi_err_file)
         runner_results.each do |runner_result|
           name         = runner_result.name

data/lib/simmer/suite.rb

@@ -19,11 +19,11 @@ module Simmer
   class Suite
     attr_reader :configuration, :session
 
-    def initialize(out:, config_path:, results_dir:, spec_dir:)
+    def initialize(config_path:, out:, results_dir:, simmer_dir:)
       @configuration = Configuration.new(
         config_path: config_path,
         results_dir: results_dir,
-        spec_dir: spec_dir
+        simmer_dir: simmer_dir
       )
 
       runner = Runner.new(

data/lib/simmer/util/yaml_reader.rb

@@ -29,6 +29,7 @@ module Simmer
       end
 
       def read(path)
+        path     = File.expand_path(path)
         contents = File.read(path)
 
         YAML.safe_load(contents) || {}

data/lib/simmer/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Simmer
-  VERSION = '1.0.0-alpha.1'
+  VERSION = '1.0.0-alpha.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simmer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.1
+  version: 1.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Matthew Ruggio