spectre-core 1.8.3 → 1.11.0

data/lib/spectre/http.rb

@@ -62,8 +62,7 @@ module Spectre
       end
 
       def body body_content
-        raise 'Body value must be a string' if not body_content.is_a? String
-        @__req['body'] = body_content
+        @__req['body'] = body_content.to_s
       end
 
       def ensure_success!
@@ -102,6 +101,7 @@ module Spectre
       end
 
       def [] key
+        return nil if not @headers.has_key?(key.downcase)
         @headers[key.downcase].first
       end
 
@@ -166,6 +166,7 @@ module Spectre
       @@response = nil
       @@request = nil
       @@modules = []
+      @@secure_keys = []
 
       def https name, &block
         http(name, secure: true, &block)
@@ -209,7 +210,8 @@ module Spectre
         return str unless str or str.empty?
 
         begin
-          json = JSON.parse str
+          json = JSON.parse(str)
+          json.obfuscate!(@@secure_keys) if not @@debug
 
           if pretty
             str = JSON.pretty_generate(json)
@@ -223,6 +225,19 @@ module Spectre
         str
       end
 
+      def is_secure? key
+        @@secure_keys.any? { |x| key.to_s.downcase.include? x.downcase  }
+      end
+
+      def header_to_s headers
+        s = ''
+        headers.each_header.each do |header, value|
+          value = '*****' if is_secure?(header) and not @@debug
+          s += "#{header.to_s.ljust(30, '.')}: #{value.to_s}\n"
+        end
+        s
+      end
+
       def invoke req
         @@request = nil
 
@@ -275,28 +290,28 @@ module Spectre
 
         req_id = SecureRandom.uuid()[0..5]
 
+        # Run HTTP modules
+
+        @@modules.each do |mod|
+          mod.on_req(net_http, net_req, req) if mod.respond_to? :on_req
+        end
+
         # Log request
 
-        req_log = "[>] #{req_id} #{req['method']} #{uri}"
-        req['headers'].each do |header|
-          req_log += "\n#{header[0].to_s.ljust(30, '.')}: #{header[1].to_s}"
-        end if req['headers']
-        req_log += "\n" + try_format_json(req['body'], pretty: true) if req['body'] != nil and not req['body'].empty?
+        req_log = "[>] #{req_id} #{req['method']} #{uri}\n"
+        req_log += header_to_s(net_req)
+        req_log += try_format_json(req['body'], pretty: true) if req['body'] != nil and not req['body'].empty?
 
         @@logger.info req_log
 
         # Request
 
         start_time = Time.now
-
-        @@modules.each do |mod|
-          mod.on_req(net_http, net_req, req) if mod.respond_to? :on_req
-        end
-
         net_res = net_http.request(net_req)
-
         end_time = Time.now
 
+        # Run HTTP modules
+
         @@modules.each do |mod|
           mod.on_res(net_http, net_res, req) if mod.respond_to? :on_res
         end
@@ -304,9 +319,7 @@ module Spectre
         # Log response
 
         res_log = "[<] #{req_id} #{net_res.code} #{net_res.message} (#{end_time - start_time}s)\n"
-        net_res.each_header do |header, value|
-          res_log += "#{header.to_s.ljust(30, '.')}: #{value}\n"
-        end
+        res_log += header_to_s(net_res)
         res_log += try_format_json(net_res.body, pretty: true) if net_res.body != nil and !net_res.body.empty?
 
         @@logger.info(res_log)
@@ -328,6 +341,8 @@ module Spectre
 
     Spectre.register do |config|
       @@logger = ::Logger.new config['log_file'], progname: 'spectre/http'
+      @@secure_keys = config['secure_keys'] || []
+      @@debug = config['debug']
 
       if config.key? 'http'
         @@http_cfg = {}

data/lib/spectre/mixin.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'spectre/logger'
 
 module Spectre
   module Mixin
@@ -11,12 +12,16 @@ module Spectre
 
       def run desc, with: []
         raise "no mixin with desc '#{desc}' defined" unless @@mixins.key? desc
-        Logger.log_debug "running mixin '#{desc}'"
+        Spectre::Logger.log_debug "running mixin '#{desc}'"
 
-        if with.is_a? Array
-          @@mixins[desc].call *with
+        params = with || {}
+
+        if params.is_a? Array
+          @@mixins[desc].call *params
+        elsif params.is_a? Hash
+          @@mixins[desc].call OpenStruct.new(params)
         else
-          @@mixins[desc].call with
+          @@mixins[desc].call params
         end
       end
 
@@ -24,18 +29,6 @@ module Spectre
       alias_method :step, :run
     end
 
-    Spectre.register do |config|
-      if not config.key? 'mixin_patterns'
-        return
-      end
-
-      config['mixin_patterns'].each do |pattern|
-        Dir.glob(pattern).each do|f|
-          require_relative File.join(Dir.pwd, f)
-        end
-      end
-    end
-
     Spectre.delegate :mixin, :run, :also, :step, to: Mixin
   end
 end

data/lib/spectre/reporter/console.rb

@@ -97,6 +97,7 @@ module Spectre::Reporter
       str += "       line.....: #{line}\n"
       str += "       type.....: #{error.class}\n"
       str += "       message..: #{error.message}\n"
+      str += "       backtrace: \n         #{error.backtrace.join("\n         ")}\n" if @config['debug']
       str
     end
   end

data/lib/spectre/reporter/junit.rb

@@ -57,6 +57,7 @@ module Spectre::Reporter
 
           if run_info.log.count > 0 or run_info.properties.count > 0 or run_info.data
             xml_str += '<system-out>'
+            xml_str += '<![CDATA['
 
             if  run_info.properties.count > 0
               run_info.properties.each do |key, val|
@@ -75,6 +76,7 @@ module Spectre::Reporter
               xml_str += messages.join("\n")
             end
 
+            xml_str += ']]>'
             xml_str += '</system-out>'
           end
 

data/lib/spectre.rb

@@ -1,8 +1,8 @@
 module Spectre
   module Version
     MAJOR = 1
-    MINOR = 8
-    TINY  = 3
+    MINOR = 11
+    TINY  = 0
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'
@@ -31,20 +31,20 @@ module Spectre
   # https://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
   class DslClass
     def _evaluate &block
-      @__bound_self__ = eval 'self', block.binding
+      @__bound_self__ = eval('self', block.binding)
       instance_eval(&block)
     end
 
     def _execute args, &block
-      @__bound_self__ = eval 'self', block.binding
+      @__bound_self__ = eval('self', block.binding)
       instance_exec(args, &block)
     end
 
     def method_missing method, *args, **kwargs, &block
       if @__bound_self__.respond_to? method
-        @__bound_self__.send method, *args, **kwargs, &block
+        @__bound_self__.send(method, *args, **kwargs, &block)
       else
-        Delegator.redirect method, *args, **kwargs, &block
+        Delegator.redirect(method, *args, **kwargs, &block)
       end
     end
   end
@@ -151,7 +151,7 @@ module Spectre
 
       begin
         specs.each do |spec|
-          if spec.data.length > 0
+          if spec.data.any?
             spec.data.each do |data|
               Logger.log_spec(spec, data) do
                 runs << run_spec(spec, data)
@@ -208,7 +208,7 @@ module Spectre
     end
 
     def run_spec spec, data=nil
-      run_info = RunInfo.new spec, data
+      run_info = RunInfo.new(spec, data)
 
       @@current = run_info
 
@@ -216,16 +216,16 @@ module Spectre
 
       begin
         if spec.context.__before_blocks.count > 0
-          before_ctx = SpecContext.new spec.subject, 'before'
+          before_ctx = SpecContext.new(spec.subject, 'before')
 
           Logger.log_context before_ctx do
             spec.context.__before_blocks.each do |block|
-              block.call data
+              block.call(data)
             end
           end
         end
 
-        spec.block.call data
+        spec.block.call(data)
 
       rescue ExpectationFailure => e
         run_info.failure = e
@@ -240,7 +240,7 @@ module Spectre
 
       ensure
         if spec.context.__after_blocks.count > 0
-          after_ctx = SpecContext.new spec.subject, 'after'
+          after_ctx = SpecContext.new(spec.subject, 'after')
 
           Logger.log_context after_ctx do
             begin
@@ -306,7 +306,11 @@ module Spectre
           .first
       end
 
-      @__subject.add_spec(desc, tags, with, block, self, spec_file)
+      raise "`with' has to be an Array" unless with.is_a? Array
+
+      data = with.map { |x| x.is_a?(Hash) ? OpenStruct.new(x) : x }
+
+      @__subject.add_spec(desc, tags, data, block, self, spec_file)
     end
 
     def before &block

metadata

@@ -1,85 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.11.0
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ectoplasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: openssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: jsonpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 1.1.0
 description: A DSL and command line tool to describe and run automated tests
 email:
 - me@christianneubauer.de
@@ -93,10 +51,8 @@ files:
 - lib/spectre/assertion.rb
 - lib/spectre/bag.rb
 - lib/spectre/curl.rb
-- lib/spectre/database/postgres.rb
 - lib/spectre/diagnostic.rb
 - lib/spectre/environment.rb
-- lib/spectre/ftp.rb
 - lib/spectre/helpers.rb
 - lib/spectre/http.rb
 - lib/spectre/http/basic_auth.rb
@@ -105,20 +61,18 @@ files:
 - lib/spectre/logger/console.rb
 - lib/spectre/logger/file.rb
 - lib/spectre/mixin.rb
-- lib/spectre/mysql.rb
 - lib/spectre/reporter/console.rb
 - lib/spectre/reporter/junit.rb
 - lib/spectre/resources.rb
-- lib/spectre/ssh.rb
-homepage: https://bitbucket.org/cneubaur/spectre-core
+homepage: https://github.com/cneubauer/spectre-core
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-  homepage_uri: https://bitbucket.org/cneubaur/spectre-core
-  source_code_uri: https://bitbucket.org/cneubaur/spectre-core
-  changelog_uri: https://bitbucket.org/cneubaur/spectre-core/src/master/CHANGELOG.md
-post_install_message:
+  homepage_uri: https://github.com/cneubauer/spectre-core
+  source_code_uri: https://github.com/cneubauer/spectre-core
+  changelog_uri: https://github.com/cneubauer/spectre-core/blob/master/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Describe and run automated tests
 test_files: []

data/lib/spectre/database/postgres.rb

@@ -1,78 +0,0 @@
-require 'pg'
-
-
-class PG::Result
-  alias :count :ntuples
-end
-
-
-module Spectre
-  module Database
-    module Postgres
-      @@modules = []
-
-      class SQLStatement
-        attr_accessor :query, :params
-
-        def initialize
-          @query = nil
-          @params = []
-        end
-
-        def statement query
-          @query = query
-        end
-
-        def param val
-          @params << val
-        end
-      end
-
-
-      class << self
-        def postgres name, &block
-          raise "postgres '#{name}' not configured" unless @@db_cfg.key? name
-
-          statement = SQLStatement.new
-          statement.instance_eval &block
-
-          cfg = @@db_cfg[name]
-
-          begin
-            con = PG.connect({
-              host: cfg['host'],
-              port: cfg['port'],
-              dbname: cfg['database'],
-              user: cfg['username'],
-              password: cfg['username'],
-            })
-
-            if statement.params
-              @@result = con.exec_params(statement.query, statement.params)
-            else
-              @@result = con.exec(statement.query)
-            end
-
-          ensure
-            con.close if con
-          end
-        end
-
-
-        def result
-          @@result
-        end
-      end
-
-      Spectre.register do |config|
-        @@db_cfg = {}
-
-        config['postgres'].each do |name, cfg|
-          @@db_cfg[name] = cfg
-        end
-      end
-
-      Spectre.delegate :postgres, :result, to: self
-    end
-  end
-end