spectre-core 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a15b70a0865cac8f59408847056d512ca190458c3dd208bc094d341bea27bcf
-  data.tar.gz: 4fe55b4c7ee8112739a04618f876a955d4ac24885a7b560c550ee55809f619e1
+  metadata.gz: bc992f089d223d10e25ed3ab390e2fa2b3ea826b24c3943bf60ea04992d14163
+  data.tar.gz: c95f4a37b887bef1d79fe22f221ddd35957e259d03d3e1c2513b973d3c54f564
 SHA512:
-  metadata.gz: 31539fcff4b1d247c9cb6d7453acdd9faad80da9e189a8c47f074c6b9563efc0e87fb2def7cf9c54db9762f06512357ad9cf47fc978ddb6e40a6b0400cca3a44
-  data.tar.gz: 10fe914139d2f6afc5cc0d06ea571057f9665bf848e0cc3a232ce8dad2b1e8a5938eb758436418b32d16525caf3731208840aebf583ad0aa04fbcb9eb91d49ef
+  metadata.gz: b7e9166af9137aab37688aa5a1a975296765d903c53e4547a7e1e74de8347cd4ce6e0860a0fd23dd494cc90fd8baafced1fff3381ecd99316159189f80a44629
+  data.tar.gz: d762e949fdffe4b5faac4a35192eb2ca130a8799f714667eb10b2e09550ccbff13047581f72e5753e3262b4771f4a4bc65aa46e58615ad6d0e894c9c63f9e0d2

data/exe/spectre

@@ -102,7 +102,7 @@ Specific options:}
     cmd_options['specs'] = specs
   end
 
-  opts.on('-t TAG,TAG', '--tags TAG,TAG', Array, 'Run only specs with give tags') do |tags|
+  opts.on('-t TAG,TAG', '--tags TAG,TAG', Array, 'Run only specs with given tags') do |tags|
     cmd_options['tags'] = tags
   end
 
@@ -130,8 +130,8 @@ Specific options:}
     cmd_options['out_path'] = path
   end
 
-  opts.on('-r NAME', '--reporter NAME', "The name of the reporter to use") do |reporter|
-    cmd_options['reporter'] = reporter
+  opts.on('-r NAME', '--reporter NAME', Array, "A list of reporters to use") do |reporters|
+    cmd_options['reporters'] = reporters
   end
 
   opts.on('-d', '--debug', "Run in debug mode") do
@@ -147,7 +147,7 @@ Specific options:}
 
     curr_opt = cmd_options
     (key.split '.').each do |k|
-      curr_opt[k] = {} if not curr_opt.has_key? k
+      curr_opt[k] = {} if not curr_opt.key? k
     end
     curr_opt = val
 
@@ -208,7 +208,7 @@ cfg['env_patterns'].each do |pattern|
     spec_env = YAML.load_file(f)
     name = spec_env.delete('name') || 'default'
 
-    if envs.has_key? name
+    if envs.key? name
       existing_env_file = read_env_files[name]
       puts "Duplicate environment definition detected with name #{name} in '#{f}'. Previously defined in '#{existing_env_file}'"
       exit 1
@@ -224,7 +224,7 @@ cfg['env_partial_patterns'].each do |pattern|
   Dir.glob(pattern).each do|f|
     partial_env = YAML.load_file(f)
     name = partial_env.delete('name') || 'default'
-    next if not envs.has_key? name
+    next if not envs.key? name
 
     envs[name].deep_merge! partial_env
   end

data/lib/spectre.rb

@@ -2,7 +2,7 @@ module Spectre
   module Version
     MAJOR = 1
     MINOR = 8
-    TINY  = 0
+    TINY  = 1
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'

data/lib/spectre/curl.rb

@@ -159,7 +159,7 @@ module Spectre::Curl
         'use_ssl' => secure,
       }
 
-      if @@http_cfg.has_key? name
+      if @@http_cfg.key? name
         req.merge! @@http_cfg[name]
         raise "No `base_url' set for HTTP client '#{name}'. Check your HTTP config in your environment." if !req['base_url']
       else
@@ -355,7 +355,7 @@ module Spectre::Curl
 
     @@curl_path = config['curl_path'] || 'curl'
 
-    if config.has_key? 'http'
+    if config.key? 'http'
       @@http_cfg = {}
 
       config['http'].each do |name, cfg|

data/lib/spectre/database/postgres.rb

@@ -31,7 +31,7 @@ module Spectre
 
       class << self
         def postgres name, &block
-          raise "postgres '#{name}' not configured" unless @@db_cfg.has_key? name
+          raise "postgres '#{name}' not configured" unless @@db_cfg.key? name
 
           statement = SQLStatement.new
           statement.instance_eval &block

data/lib/spectre/ftp.rb

@@ -128,7 +128,7 @@ module Spectre
 
     class << self
       def ftp name, config={}, &block
-        raise "FTP connection '#{name}' not configured" unless @@cfg.has_key?(name) or config.count > 0
+        raise "FTP connection '#{name}' not configured" unless @@cfg.key?(name) or config.count > 0
         cfg = @@cfg[name] || {}
 
         host = config[:host] || cfg['host'] || name
@@ -151,7 +151,7 @@ module Spectre
       end
 
       def sftp name, config={}, &block
-        raise "FTP connection '#{name}' not configured" unless @@cfg.has_key?(name) or config.count > 0
+        raise "FTP connection '#{name}' not configured" unless @@cfg.key?(name) or config.count > 0
 
         cfg = @@cfg[name] || {}
 
@@ -162,8 +162,8 @@ module Spectre
         opts = {}
         opts[:password] = password
         opts[:port] = config[:port] || cfg['port'] || 22
-        opts[:keys] = [cfg['key']] if cfg.has_key? 'key'
-        opts[:passphrase] = cfg['passphrase'] if cfg.has_key? 'passphrase'
+        opts[:keys] = [cfg['key']] if cfg.key? 'key'
+        opts[:passphrase] = cfg['passphrase'] if cfg.key? 'passphrase'
 
         opts[:auth_methods] = []
         opts[:auth_methods].push 'publickey' if opts[:keys]
@@ -182,7 +182,7 @@ module Spectre
     Spectre.register do |config|
       @@logger = ::Logger.new config['log_file'], progname: 'spectre/ftp'
 
-      if config.has_key? 'ftp'
+      if config.key? 'ftp'
 
         config['ftp'].each do |name, cfg|
           @@cfg[name] = cfg

data/lib/spectre/http.rb

@@ -174,7 +174,7 @@ module Spectre
       def http name, secure: nil, &block
         req = {}
 
-        if @@http_cfg.has_key? name
+        if @@http_cfg.key? name
           req.merge! @@http_cfg[name]
           raise "No `base_url' set for HTTP client '#{name}'. Check your HTTP config in your environment." if !req['base_url']
         else
@@ -254,7 +254,7 @@ module Spectre
         if uri.scheme == 'https'
           net_http.use_ssl = true
 
-          if req.has_key? 'cert'
+          if req.key? 'cert'
             raise "Certificate '#{req['cert']}' does not exist" unless File.exists? req['cert']
             net_http.verify_mode = OpenSSL::SSL::VERIFY_PEER
             net_http.ca_file = req['cert']
@@ -329,7 +329,7 @@ module Spectre
     Spectre.register do |config|
       @@logger = ::Logger.new config['log_file'], progname: 'spectre/http'
 
-      if config.has_key? 'http'
+      if config.key? 'http'
         @@http_cfg = {}
 
         config['http'].each do |name, cfg|

data/lib/spectre/http/basic_auth.rb

@@ -1,7 +1,7 @@
 module Spectre::Http
   class SpectreHttpRequest
     def basic_auth username, password
-      @__req['basic_auth'] = {} if not @__req.has_key? 'basic_auth'
+      @__req['basic_auth'] = {} if not @__req.key? 'basic_auth'
 
       @__req['basic_auth']['username'] = username
       @__req['basic_auth']['password'] = password
@@ -12,7 +12,7 @@ module Spectre::Http
 
   module BasicAuth
     def self.on_req http, net_req, req
-      return unless req.has_key? 'basic_auth' and req['auth'] == 'basic_auth'
+      return unless req.key? 'basic_auth' and req['auth'] == 'basic_auth'
       basic_auth_cfg = req['basic_auth']
       net_req.basic_auth(basic_auth_cfg['username'], basic_auth_cfg['password'])
     end

data/lib/spectre/http/keystone.rb

@@ -1,6 +1,6 @@
 class HttpRequest
   def keystone url, username, password, project, domain, cert
-    @__req['keystone'] = {} if not @__req.has_key? 'keystone'
+    @__req['keystone'] = {} if not @__req.key? 'keystone'
 
     @__req['keystone']['url'] = url
     @__req['keystone']['username'] = username
@@ -18,11 +18,11 @@ module Spectre::Http::Keystone
   @@cache = {}
 
   def self.on_req http, net_req, req
-    return unless req.has_key? 'keystone' and req['auth'] == 'keystone'
+    return unless req.key? 'keystone' and req['auth'] == 'keystone'
 
     keystone_cfg = req['keystone']
 
-    if @@cache.has_key? keystone_cfg
+    if @@cache.key? keystone_cfg
       token = @@cache[keystone_cfg]
     else
       token, _ = authenticate(

data/lib/spectre/logger/console.rb

@@ -4,7 +4,7 @@ module Spectre
   module Logger
     class Console
       def initialize config
-        raise 'No log format section in config for console logger' unless config.has_key? 'log_format' and config['log_format'].has_key? 'console'
+        raise 'No log format section in config for console logger' unless config.key? 'log_format' and config['log_format'].key? 'console'
 
         @config = config['log_format']['console']
         @indent = @config['indent'] || 2

data/lib/spectre/logger/file.rb

@@ -2,7 +2,7 @@ module Spectre
   module Logger
     class File
       def initialize config
-        raise 'No log format section in config for console logger' unless config.has_key? 'log_format' and config['log_format'].has_key? 'file'
+        raise 'No log format section in config for console logger' unless config.key? 'log_format' and config['log_format'].key? 'file'
 
         @config = config['log_format']['file']
         @fmt_start_group = @config['start_group']

data/lib/spectre/mixin.rb

@@ -10,7 +10,7 @@ module Spectre
       end
 
       def run desc, with: []
-        raise "no mixin with desc '#{desc}' defined" unless @@mixins.has_key? desc
+        raise "no mixin with desc '#{desc}' defined" unless @@mixins.key? desc
         Logger.log_debug "running mixin '#{desc}'"
 
         if with.is_a? Array
@@ -25,7 +25,7 @@ module Spectre
     end
 
     Spectre.register do |config|
-      if not config.has_key? 'mixin_patterns'
+      if not config.key? 'mixin_patterns'
         return
       end
 

data/lib/spectre/mysql.rb

@@ -25,7 +25,7 @@ module Spectre
       end
 
       def query statement
-        @__query['query'] = [] if not @__query.has_key? 'query'
+        @__query['query'] = [] if not @__query.key? 'query'
         @__query['query'].append(statement)
       end
     end
@@ -38,7 +38,7 @@ module Spectre
       def mysql name = nil, &block
         query = {}
 
-        if name != nil and @@mysql_cfg.has_key? name
+        if name != nil and @@mysql_cfg.key? name
           query.merge! @@mysql_cfg[name]
           raise "No `host' set for MySQL client '#{name}'. Check your MySQL config in your environment." if !query['host']
         elsif name != nil
@@ -83,7 +83,7 @@ module Spectre
     Spectre.register do |config|
       @@logger = ::Logger.new config['log_file'], progname: 'spectre/mysql'
 
-      if config.has_key? 'mysql'
+      if config.key? 'mysql'
         @@mysql_cfg = {}
 
         config['mysql'].each do |name, cfg|

data/lib/spectre/resources.rb

@@ -12,7 +12,7 @@ module Spectre
       end
 
       def [] name
-        raise "Resource with name '#{name}' does not exist" if not @items.has_key? name
+        raise "Resource with name '#{name}' does not exist" if not @items.key? name
         @items[name]
       end
     end
@@ -26,7 +26,7 @@ module Spectre
     end
 
     Spectre.register do |config|
-      return if !config.has_key? 'resource_paths'
+      return if !config.key? 'resource_paths'
 
       config['resource_paths'].each do |resource_path|
         resource_files = Dir.glob File.join(resource_path, '**/*')

data/lib/spectre/ssh.rb

@@ -106,7 +106,7 @@ module Spectre
 
     class << self
       def ssh name, config = {}, &block
-        raise "SSH connection '#{name}' not configured" unless @@cfg.has_key?(name) or config.count > 0
+        raise "SSH connection '#{name}' not configured" unless @@cfg.key?(name) or config.count > 0
 
         cfg = @@cfg[name] || {}
 
@@ -117,8 +117,8 @@ module Spectre
         opts = {}
         opts[:password] = password
         opts[:port] = config[:port] || cfg['port'] || 22
-        opts[:keys] = [cfg['key']] if cfg.has_key? 'key'
-        opts[:passphrase] = cfg['passphrase'] if cfg.has_key? 'passphrase'
+        opts[:keys] = [cfg['key']] if cfg.key? 'key'
+        opts[:passphrase] = cfg['passphrase'] if cfg.key? 'passphrase'
 
         opts[:auth_methods] = []
         opts[:auth_methods].push 'publickey' if opts[:keys]
@@ -137,7 +137,7 @@ module Spectre
     Spectre.register do |config|
       @@logger = ::Logger.new config['log_file'], progname: 'spectre/ssh'
 
-      if config.has_key? 'ssh'
+      if config.key? 'ssh'
         config['ssh'].each do |name, cfg|
           @@cfg[name] = cfg
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Christian Neubauer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ectoplasm