allure-ruby-commons 2.13.6.2 → 2.13.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dde5d93b183282927b03e256e2d9cbe933fd234aa9230545b7d91f074111a20
-  data.tar.gz: 8c05594912decb62f1fc9cc52ebdc85ff9a506c6bd1cbb8cb0a71f7d54102dca
+  metadata.gz: be70de370f6d6732ca70063312ccb4ffd0cf27ede2c50f53f7427ba718ce11d9
+  data.tar.gz: 67b723e4ef1b8092f279a27a9c250a093124b8f78c93dbc34a8655afc29420bd
 SHA512:
-  metadata.gz: f8feed62b8a1f8c1182566623ac01e35356f6ce43dc86479b76175ae0cee0480517df3f5bc349a624a8ae4769acc1e72e10ccde649fc204debe508dd8b104783
-  data.tar.gz: f58060aa2b39d17b5a28b7ae222c049d96d734a64ea238d27a2fa536fd4010015fe11c3abbd43cb6ce28ec1b7548dffa245dc7c75f1fdf622c1e0cb04a24551c
+  metadata.gz: c10538c94a3334367b08d536db7f2449ef184201d7c5d95e02914c018ad4691b80dac94e898ee03d10e53f98741532afec30192b4e558be1ad19aeaf27324eb2
+  data.tar.gz: dad294ed8428f5e84a514203f8515cbe7241ebab5535ceb5163c2cf83df589ba5874ad5bd8aa3f820e5e18b42e92436567c96b8d5f5f3ab2554447ef1f4915b7

data/lib/allure-ruby-commons.rb

@@ -3,6 +3,7 @@
 
 require "require_all"
 require "uuid"
+
 require_rel "allure_ruby_commons/**/*rb"
 
 # Namespace for classes that handle allure report generation and different framework adaptors
@@ -161,15 +162,17 @@ module Allure
       lifecycle.stop_test_step
     end
 
-    # Run passed block as step with given name
+    # Run passed block as step with given name and return result of yield
     # @param [String] name
     # @yield [] step block
-    # @return [void]
+    # @return [Object]
     def run_step(name)
       lifecycle.start_test_step(StepResult.new(name: name, stage: Stage::RUNNING))
-      yield
+      result = yield
       lifecycle.update_test_step { |step| step.status = Status::PASSED }
-    rescue => e
+
+      result
+    rescue StandardError => e
       lifecycle.update_test_step do |step|
         step.status = ResultUtils.status(e)
         step.status_details = ResultUtils.status_details(e)

data/lib/allure_ruby_commons/allure_lifecycle.rb

@@ -5,13 +5,13 @@ require "forwardable"
 
 module Allure
   # Main class for creating and writing allure results
-  class AllureLifecycle
+  class AllureLifecycle # rubocop:disable Metrics/ClassLength
     extend Forwardable
 
     def initialize
       @test_context = []
       @step_context = []
-      @logger = Logger.new(STDOUT, level: Config.instance.logging_level)
+      @logger = Logger.new($stdout, level: Config.instance.logging_level)
       @file_writer = FileWriter.new
     end
 
@@ -133,7 +133,7 @@ module Allure
     def stop_test_step
       return logger.error { "Could not stop test step, no step is running" } unless current_test_step
 
-      logger.debug { "Stoping test step: #{current_test_step.stop}" }
+      logger.debug { "Stopping test step: #{current_test_step.name}" }
       current_test_step.stop = ResultUtils.timestamp
       current_test_step.stage = Stage::FINISHED
       clear_last_test_step
@@ -204,13 +204,13 @@ module Allure
     # @param [Boolean] test_case add attachment to current test case
     # @return [void]
     def add_attachment(name:, source:, type:, test_case: false)
-      attachment = ResultUtils.prepare_attachment(name, type) || begin
-        return logger.error { "Can't add attachment, unrecognized mime type: #{type}" }
-      end
-      executable_item = (test_case && @current_test_case) || current_executable
-      executable_item&.attachments&.push(attachment) || begin
-        return logger.error { "Can't add attachment, no test, step or fixture is running" }
-      end
+      attachment = ResultUtils.prepare_attachment(name, type)
+      return logger.error { "Can't add attachment, unrecognized mime type: #{type}" } unless attachment
+
+      executable_item = test_case ? @current_test_case : current_executable
+      return logger.error { "Can't add attachment, no test, step or fixture is running" } unless executable_item
+
+      executable_item.attachments.push(attachment)
       logger.debug { "Adding attachment '#{name}' to '#{executable_item.name}'" }
       write_attachment(source, attachment)
     end

data/lib/allure_ruby_commons/config.rb

@@ -10,12 +10,41 @@ module Allure
 
     # @return [Array<String>] valid log levels
     LOGLEVELS = %w[DEBUG INFO WARN ERROR FATAL UNKNOWN].freeze
+    # @return [String] test plan path env var name
+    TESTPLAN_PATH = "ALLURE_TESTPLAN_PATH"
+
+    attr_accessor :results_directory, :logging_level, :link_tms_pattern, :link_issue_pattern, :clean_results_directory
 
     def initialize
       @results_directory = "reports/allure-results"
       @logging_level = LOGLEVELS.index(ENV.fetch("ALLURE_LOG_LEVEL", "INFO")) || Logger::INFO
     end
 
-    attr_accessor :results_directory, :logging_level, :link_tms_pattern, :link_issue_pattern, :clean_results_directory
+    # Allure id's of executable tests
+    #
+    # @return [Array]
+    def test_ids
+      @test_ids ||= tests&.map { |test| test[:id] }
+    end
+
+    # Test names of executable tests
+    #
+    # @return [Array]
+    def test_names
+      @test_names ||= tests&.map { |test| test[:selector] }
+    end
+
+    private
+
+    # Tests to execute from allure testplan.json
+    #
+    # @return [Array<Hash>]
+    def tests
+      @tests ||= begin
+        Oj.load_file(ENV[TESTPLAN_PATH], symbol_keys: true)&.fetch(:tests) if ENV[TESTPLAN_PATH]
+      end
+    rescue Oj::ParseError
+      nil
+    end
   end
 end

data/lib/allure_ruby_commons/file_writer.rb

@@ -18,17 +18,14 @@ module Allure
     # @param [Allure::TestResult] test_result
     # @return [void]
     def write_test_result(test_result)
-      write("#{test_result.uuid}#{TEST_RESULT_SUFFIX}", JSON.generate(test_result, max_nesting: false))
+      write("#{test_result.uuid}#{TEST_RESULT_SUFFIX}", Oj.dump(test_result))
     end
 
     # Write test result container
     # @param [Allure::TestResultContainer] test_container_result
     # @return [void]
     def write_test_result_container(test_container_result)
-      write(
-        "#{test_container_result.uuid}#{TEST_RESULT_CONTAINER_SUFFIX}",
-        JSON.generate(test_container_result, max_nesting: false),
-      )
+      write("#{test_container_result.uuid}#{TEST_RESULT_CONTAINER_SUFFIX}", Oj.dump(test_container_result))
     end
 
     # Write allure attachment file
@@ -55,7 +52,7 @@ module Allure
       if categories.is_a?(File)
         copy(categories.path, CATEGORIES_FILE)
       else
-        write(CATEGORIES_FILE, categories.to_json)
+        write(CATEGORIES_FILE, Oj.dump(categories))
       end
     end
 

data/lib/allure_ruby_commons/model/{jsonable.rb → 01_jsonable.rb}

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require "json"
+require "oj"
 
 module Allure
   # General jsonable object implementation
   class JSONable
-    # Return object has represantation
-    # @param [Array<Object>] _options
+    Oj.default_options = { mode: :custom, use_to_hash: true, ascii_only: true }
+
+    # Return object hash represantation
     # @return [Hash]
-    def as_json(*_options)
+    def to_hash
       instance_variables.each_with_object({}) do |var, map|
         key = camelcase(var.to_s.delete_prefix("@"))
         value = instance_variable_get(var)
@@ -16,13 +17,6 @@ module Allure
       end
     end
 
-    # Convert object to json string
-    # @param [Array<Object>] options
-    # @return [String]
-    def to_json(*options)
-      as_json.to_json(*options)
-    end
-
     # Object comparator
     # @param [JSONable] other
     # @return [Booelan]

data/lib/allure_ruby_commons/model/attachment.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Allure model attachment object
   class Attachment < JSONable

data/lib/allure_ruby_commons/model/category.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Defects category
   class Category < JSONable

data/lib/allure_ruby_commons/model/executable_item.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Allure model executable item
   class ExecutableItem < JSONable

data/lib/allure_ruby_commons/model/label.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Allure model label object
   class Label < JSONable

data/lib/allure_ruby_commons/model/link.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Allure model link object
   class Link < JSONable

data/lib/allure_ruby_commons/model/parameter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Allure model parameter object
   class Parameter < JSONable

data/lib/allure_ruby_commons/model/test_result_container.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "jsonable"
-
 module Allure
   # Allure model step result container
   class TestResultContainer < JSONable

metadata

@@ -1,36 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: allure-ruby-commons
 version: !ruby/object:Gem::Version
-  version: 2.13.6.2
+  version: 2.13.8.1
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.10'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -40,44 +46,50 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.10'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Utilities allowing to implement allure result generation by other test
   frameworks
 email: andrejs.cunskis@gmail.com
@@ -90,12 +102,12 @@ files:
 - lib/allure_ruby_commons/allure_lifecycle.rb
 - lib/allure_ruby_commons/config.rb
 - lib/allure_ruby_commons/file_writer.rb
+- lib/allure_ruby_commons/model/01_jsonable.rb
 - lib/allure_ruby_commons/model/attachment.rb
 - lib/allure_ruby_commons/model/category.rb
 - lib/allure_ruby_commons/model/content_type.rb
 - lib/allure_ruby_commons/model/executable_item.rb
 - lib/allure_ruby_commons/model/fixture_result.rb
-- lib/allure_ruby_commons/model/jsonable.rb
 - lib/allure_ruby_commons/model/label.rb
 - lib/allure_ruby_commons/model/link.rb
 - lib/allure_ruby_commons/model/parameter.rb
@@ -130,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Common library for allure results generation