spectre-core 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a15b70a0865cac8f59408847056d512ca190458c3dd208bc094d341bea27bcf
-  data.tar.gz: 4fe55b4c7ee8112739a04618f876a955d4ac24885a7b560c550ee55809f619e1
+  metadata.gz: 4b3c5faed7a6a34d2c9fe9e2c3b637ce8cc818e8ea597649e7b1c386dd444fde
+  data.tar.gz: 330492cacaad784dea242b35bd539a75660268022485afde75e47cdc99d374a7
 SHA512:
-  metadata.gz: 31539fcff4b1d247c9cb6d7453acdd9faad80da9e189a8c47f074c6b9563efc0e87fb2def7cf9c54db9762f06512357ad9cf47fc978ddb6e40a6b0400cca3a44
-  data.tar.gz: 10fe914139d2f6afc5cc0d06ea571057f9665bf848e0cc3a232ce8dad2b1e8a5938eb758436418b32d16525caf3731208840aebf583ad0aa04fbcb9eb91d49ef
+  metadata.gz: 02b2682ae4911e462be2c9e48622c0dca079916719a9b2ce519bae1d7945290a989572e16c8c21768201f811177ef5580d3077f2a0f50ce0225639a93c1c1b9a
+  data.tar.gz: 140ebcba6bbbd1056510bd8c231fe16b0e63a6d0a4209abb69701fdfc9d99b2a2655742e334880e31e3fbda55cf0a434d2dee1290a95a7513a5a64699bb5a288

data/exe/spectre

@@ -48,6 +48,7 @@ DEFAULT_CONFIG = {
   },
   'debug' => false,
   'out_path' => './reports',
+  'secure_keys' => ['password', 'secret', 'token', 'secure', 'authorization'],
   'spec_patterns' => ['./specs/**/*.spec.rb'],
   'mixin_patterns' => ['../common/mixins/**/*.mixin.rb', './mixins/**/*.mixin.rb'],
   'env_patterns' => ['./environments/**/*.env.yml'],
@@ -68,10 +69,6 @@ DEFAULT_CONFIG = {
     'spectre/http/basic_auth',
     'spectre/http/keystone',
     'spectre/resources',
-    'spectre/ssh',
-    'spectre/ftp',
-    'spectre/mysql',
-    # 'spectre/postgres',
   ],
   'include' => [
 
@@ -102,7 +99,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
 
@@ -126,12 +123,16 @@ Specific options:}
     cmd_options['colored'] = false
   end
 
+  opts.on('--ignore-failure', 'Always exit with code 0') do
+    cmd_options['ignore_failure'] = true
+  end
+
   opts.on('-o PATH', '--out PATH', 'Output directory path') do |path|
-    cmd_options['out_path'] = path
+    cmd_options['out_path'] = File.absolute_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', '--reporters 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 +148,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
 
@@ -205,10 +206,11 @@ envs = {}
 read_env_files = {}
 cfg['env_patterns'].each do |pattern|
   Dir.glob(pattern).each do|f|
-    spec_env = YAML.load_file(f)
-    name = spec_env.delete('name') || 'default'
+    spec_env = YAML.load_file(f) || {}
 
-    if envs.has_key? name
+    name = spec_env['name'] || 'default'
+
+    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 +226,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
@@ -295,7 +297,7 @@ if action == 'run'
   })
 
   log_dir = File.dirname cfg['log_file']
-  Dir.mkdir log_dir if !Dir.exists? log_dir
+  FileUtils.makedirs log_dir if !Dir.exists? log_dir
 
   # Load Modules
   cfg['modules']
@@ -303,12 +305,19 @@ if action == 'run'
     .select { |mod| !cfg['exclude'].include? mod }
     .each do |mod|
       begin
-        if !File.exists? mod
-          require_relative File.join('../lib', mod)
-        else
+        spectre_lib_mod = File.join('../lib', mod)
+
+        if File.exists? mod
           require_relative mod
+
+        elsif File.exists? spectre_lib_mod
+          require_relative spectre_lib_mod
+
+        else
+          require mod
         end
-      rescue => e
+
+      rescue LoadError => e
         puts "Unable to load module #{mod}. Check if the module exists or remove it from your spectre config:\n#{e.message}"
         exit 1
       end
@@ -337,7 +346,11 @@ if action == 'run'
     reporter.report(run_infos)
   end
 
-  exit 0
+  errors = run_infos.select { |x| x.error != nil or x.failure != nil }
+
+  exit 0 if cfg['ignore_failure'] or errors.count == 0
+
+  exit 1
 end
 
 
@@ -464,6 +477,16 @@ reports/
 **/environments/*.env.secret.yml
 ]
 
+DEFAULT_GEMFILE = %[source 'https://rubygems.org'
+
+gem 'spectre-core', '>= #{Spectre::VERSION}'
+# gem 'spectre-mysql', '>= 1.0.0'
+# gem 'spectre-ssh', '>= 1.0.0'
+# gem 'spectre-ftp', '>= 1.0.0'
+# gem 'spectre-curl', '>= 1.0.0'
+# gem 'spectre-git', '>= 0.1.0'
+]
+
 if action == 'init'
   DEFAULT_FILES = [
     ['./environments/default.env.yml', DEFAULT_ENV_CFG],
@@ -471,6 +494,7 @@ if action == 'init'
     ['./specs/sample.spec.rb', SAMPLE_SPEC],
     ['./spectre.yml', DEFAULT_SPECTRE_CFG],
     ['./.gitignore', DEFAULT_GITIGNORE],
+    ['./Gemfile', DEFAULT_GEMFILE],
   ]
 
   %w(environments logs specs).each do |dir_name|

data/lib/spectre.rb

@@ -1,7 +1,7 @@
 module Spectre
   module Version
     MAJOR = 1
-    MINOR = 8
+    MINOR = 9
     TINY  = 0
   end
 

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/helpers.rb

@@ -17,12 +17,22 @@ class ::String
     file_content = File.read(self)
 
     if with
-      with.each do |key, value|
-        file_content = file_content.gsub '#{' + key.to_s + '}', value.to_s
-      end
+      file_content.with(with)
+    else
+      file_content
+    end
+  end
+
+  def with mapping
+    return self unless mapping and mapping.is_a? Hash
+
+    new_string = self
+
+    mapping.each do |key, value|
+      new_string = new_string.gsub '#{' + key.to_s + '}', value.to_s
     end
 
-    file_content
+    new_string
   end
 
   def exists?
@@ -35,9 +45,9 @@ class ::String
     File.delete self
   end
 
-  def trim count=50
+  def trim count = 50
     if (self.length + 3) > count
-      return self[0..count] + '...'
+      return self[0..count-4] + '...'
     end
 
     self
@@ -60,5 +70,5 @@ end
 
 
 def uuid length = 5
-  SecureRandom.uuid().gsub('-', '')[0..length]
+  SecureRandom.uuid().gsub('-', '')[0..length-1]
 end

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)
@@ -174,7 +175,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
@@ -209,20 +210,35 @@ 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)
           else
             str = JSON.dump(json)
           end
-        rescue
-          # do nothing
+        # rescue => e
+        #   # do nothing
+        #   @@logger.error(e)
         end
 
         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
 
@@ -254,7 +270,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']
@@ -275,28 +291,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 +320,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,8 +342,10 @@ 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.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/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, '**/*')

metadata

@@ -1,85 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-07-01 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
+        version: 1.2.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
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  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
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 1.2.0
 description: A DSL and command line tool to describe and run automated tests
 email:
 - me@christianneubauer.de
@@ -93,10 +37,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 +47,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 +73,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.has_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

data/lib/spectre/ftp.rb

@@ -1,195 +0,0 @@
-require 'net/ftp'
-require 'net/sftp'
-require 'logger'
-require 'json'
-
-
-module Spectre
-  module FTP
-    @@cfg = {}
-
-    class FTPConnection < DslClass
-      def initialize host, username, password, opts, logger
-        @__logger = logger
-        @__session = nil
-
-        @__host = host
-        @__username = username
-        @__password = password
-        @__opts = opts
-      end
-
-      def connect!
-        return unless @__session == nil or @__session.closed?
-        @__logger.info "Connecting to '#{@__host}' with user '#{@__username}'"
-        @__session = Net::FTP.new(@__host, @__opts)
-        @__session.login @__username, @__password
-      end
-
-      def close
-        return unless @__session and not @__session.closed?
-        @__session.close
-      end
-
-      def can_connect?
-        begin
-          connect!
-          return true
-        rescue
-          return false
-        end
-      end
-
-      def download remotefile, to: File.basename(remotefile)
-        connect!
-        @__logger.info "Downloading '#{@__username}@#{@__host}:#{File.join @__session.pwd, remotefile}' to '#{File.expand_path to}'"
-        @__session.getbinaryfile(remotefile, to)
-      end
-
-      def upload localfile, to: File.basename(localfile)
-        connect!
-        @__logger.info "Uploading '#{File.expand_path localfile}' to '#{@__username}@#{@__host}:#{File.join @__session.pwd, to}'"
-        @__session.putbinaryfile(localfile, to)
-      end
-
-      def list
-        connect!
-        file_list = @__session.list
-        @__logger.info "Listing file in #{@__session.pwd}\n#{file_list}"
-        file_list
-      end
-    end
-
-
-    class SFTPConnection < DslClass
-      def initialize host, username, opts, logger
-        opts[:non_interactive] = true
-
-        @__logger = logger
-        @__session = nil
-        @__host = host
-        @__username = username
-        @__opts = opts
-      end
-
-      def connect!
-        return unless @__session == nil or @__session.closed?
-        @__logger.info "Connecting to '#{@__host}' with user '#{@__username}'"
-        @__session = Net::SFTP.start(@__host, @__username, @__opts)
-        @__session.connect!
-      end
-
-      def close
-        return unless @__session and not @__session.closed?
-        # @__session.close!
-      end
-
-      def can_connect?
-        begin
-          connect!
-          return true
-        rescue
-          return false
-        end
-      end
-
-      def download remotefile, to: File.basename(remotefile)
-        @__logger.info "Downloading '#{@__username}@#{@__host}:#{remotefile}' to '#{File.expand_path to}'"
-        connect!
-        @__session.download!(remotefile, to)
-      end
-
-      def upload localfile, to: File.basename(localfile)
-        @__logger.info "Uploading '#{File.expand_path localfile}' to '#{@__username}@#{@__host}:#{to}'"
-        connect!
-        @__session.upload!(localfile, to)
-      end
-
-      def stat path
-        connect!
-        file_info = @__session.stat! path
-        @__logger.info "Stat '#{path}'\n#{JSON.pretty_generate file_info.attributes}"
-        file_info.attributes
-      end
-
-      def exists path
-        begin
-          file_info = @__session.stat! path
-
-        rescue Net::SFTP::StatusException => e
-          return false if e.description == 'no such file'
-          raise e
-        end
-
-        return true
-      end
-    end
-
-
-    class << self
-      def ftp name, config={}, &block
-        raise "FTP connection '#{name}' not configured" unless @@cfg.has_key?(name) or config.count > 0
-        cfg = @@cfg[name] || {}
-
-        host = config[:host] || cfg['host'] || name
-        username = config[:username] || cfg['username']
-        password = config[:password] || cfg['password']
-
-        opts = {}
-        opts[:ssl] = config[:ssl]
-        opts[:port] = config[:port] || cfg['port'] || 21
-
-        @@logger.info "Connecting to #{host} with user #{username}"
-
-        ftp_conn = FTPConnection.new(host, username, password, opts, @@logger)
-
-        begin
-          ftp_conn.instance_eval &block
-        ensure
-          ftp_conn.close
-        end
-      end
-
-      def sftp name, config={}, &block
-        raise "FTP connection '#{name}' not configured" unless @@cfg.has_key?(name) or config.count > 0
-
-        cfg = @@cfg[name] || {}
-
-        host = config[:host] || cfg['host'] || name
-        username = config[:username] || cfg['username']
-        password = config[:password] || cfg['password']
-
-        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[:auth_methods] = []
-        opts[:auth_methods].push 'publickey' if opts[:keys]
-        opts[:auth_methods].push 'password' if opts[:password]
-
-        sftp_con = SFTPConnection.new(host, username, opts, @@logger)
-
-        begin
-          sftp_con.instance_eval &block
-        ensure
-          sftp_con.close
-        end
-      end
-    end
-
-    Spectre.register do |config|
-      @@logger = ::Logger.new config['log_file'], progname: 'spectre/ftp'
-
-      if config.has_key? 'ftp'
-
-        config['ftp'].each do |name, cfg|
-          @@cfg[name] = cfg
-        end
-      end
-    end
-
-    Spectre.delegate :ftp, :sftp, to: self
-  end
-end

data/lib/spectre/mysql.rb

@@ -1,97 +0,0 @@
-require 'mysql2'
-
-module Spectre
-  module MySQL
-
-    class MySqlQuery < DslClass
-      def initialize query
-        @__query = query
-      end
-
-      def host hostname
-        @__query['host'] = hostname
-      end
-
-      def username user
-        @__query['username'] = user
-      end
-
-      def password pass
-        @__query['password'] = pass
-      end
-
-      def database name
-        @__query['database'] = name
-      end
-
-      def query statement
-        @__query['query'] = [] if not @__query.has_key? 'query'
-        @__query['query'].append(statement)
-      end
-    end
-
-    class << self
-      @@mysql_cfg = {}
-      @@result = nil
-      @@last_conn = nil
-
-      def mysql name = nil, &block
-        query = {}
-
-        if name != nil and @@mysql_cfg.has_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
-          query['host'] = name
-        elsif @@last_conn == nil
-          raise 'No name given and there was no previous MySQL connection to use'
-        end
-
-        MySqlQuery.new(query).instance_eval(&block) if block_given?
-
-        if name != nil
-          @@last_conn = {
-            host: query['host'],
-            username: query['username'],
-            password: query['password'],
-            database: query['database']
-          }
-        end
-
-        @@logger.info "Connecting to database #{query['username']}@#{query['host']}:#{query['database']}"
-
-        client = ::Mysql2::Client.new(**@@last_conn)
-
-        res = []
-
-        query['query'].each do |statement|
-          @@logger.info 'Executing statement "' + statement + '"'
-          res = client.query(statement, cast_booleans: true)
-        end if query['query']
-
-        @@result = res.map { |row| OpenStruct.new row } if res
-
-        client.close
-      end
-
-      def result
-        raise 'No MySQL query has been executed yet' unless @@result
-        @@result
-      end
-    end
-
-    Spectre.register do |config|
-      @@logger = ::Logger.new config['log_file'], progname: 'spectre/mysql'
-
-      if config.has_key? 'mysql'
-        @@mysql_cfg = {}
-
-        config['mysql'].each do |name, cfg|
-          @@mysql_cfg[name] = cfg
-        end
-      end
-    end
-
-    Spectre.delegate :mysql, :result, to: self
-  end
-end

data/lib/spectre/ssh.rb

@@ -1,149 +0,0 @@
-require 'net/ssh'
-require 'logger'
-
-
-module Spectre
-  module SSH
-    @@cfg = {}
-
-    class SSHConnection < DslClass
-      def initialize host, username, opts, logger
-        opts[:non_interactive] = true
-
-        @__logger = logger
-        @__host = host
-        @__username = username
-        @__opts = opts
-        @__session = nil
-        @__exit_code = nil
-        @__output = ''
-      end
-
-      def file_exists path
-        exec "ls #{path}"
-        exit_code == 0
-      end
-
-      def owner_of path
-        exec "stat -c %U #{path}"
-        output.chomp
-      end
-
-      def connect!
-        return unless @__session == nil or @__session.closed?
-        @__session = Net::SSH.start(@__host, @__username, @__opts)
-      end
-
-      def close
-        return unless @__session and not @__session.closed?
-        @__session.close
-      end
-
-      def can_connect?
-        @__output = nil
-
-        begin
-          connect!
-          @__session.open_channel.close
-          @__output = "successfully connected to #{@__host} with user #{@__username}"
-          @__exit_code = 0
-          return true
-        rescue Exception => e
-          @__logger.error e.message
-          @__output = "unable to connect to #{@__host} with user #{@__username}"
-          @__exit_code = 1
-        end
-
-        return false
-      end
-
-      def exec command
-        connect!
-
-        log_str = "#{@__session.options[:user]}@#{@__session.host} -p #{@__session.options[:port]} #{command}"
-
-        @channel = @__session.open_channel do |channel|
-          channel.exec(command) do |ch, success|
-            abort "could not execute #{command} on #{@__session.host}" unless success
-
-            @__output = ''
-
-            channel.on_data do |ch, data|
-              @__output += data
-            end
-
-            channel.on_extended_data do |ch,type,data|
-              @__output += data
-            end
-
-            channel.on_request('exit-status') do |ch, data|
-              @__exit_code = data.read_long
-            end
-
-            # channel.on_request('exit-signal') do |ch, data|
-            #   exit_code = data.read_long
-            # end
-          end
-
-        end
-
-        @channel.wait
-        @__session.loop
-
-        log_str += "\n" + @__output
-        @__logger.info log_str
-      end
-
-      def output
-        @__output
-      end
-
-      def exit_code
-        @__exit_code
-      end
-    end
-
-
-    class << self
-      def ssh name, config = {}, &block
-        raise "SSH connection '#{name}' not configured" unless @@cfg.has_key?(name) or config.count > 0
-
-        cfg = @@cfg[name] || {}
-
-        host = cfg['host'] || name
-        username = config[:username] || cfg['username']
-        password = config[:password] || cfg['password']
-
-        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[:auth_methods] = []
-        opts[:auth_methods].push 'publickey' if opts[:keys]
-        opts[:auth_methods].push 'password' if opts[:password]
-
-        ssh_con = SSHConnection.new(host, username, opts, @@logger)
-
-        begin
-          ssh_con.instance_eval &block
-        ensure
-          ssh_con.close
-        end
-      end
-    end
-
-    Spectre.register do |config|
-      @@logger = ::Logger.new config['log_file'], progname: 'spectre/ssh'
-
-      if config.has_key? 'ssh'
-        config['ssh'].each do |name, cfg|
-          @@cfg[name] = cfg
-        end
-      end
-    end
-
-    Spectre.delegate :ssh, to: self
-  end
-end