spectre-core 1.11.0 → 1.12.0

data/lib/spectre/diagnostic.rb

@@ -1,29 +1,39 @@
-module Spectre
-  module Diagnostic
-    module Stopwatch
-      @@duration = 0.0
-
-      class << self
-        def start_watch
-          @@start_time = Time.now
-        end
-
-        def stop_watch
-          @@end_time = Time.now
-        end
-
-        def measure
-          start_watch
-          yield
-          stop_watch
-        end
-
-        def duration
-          @@end_time - @@start_time
-        end
-      end
-
-      Spectre.delegate :start_watch, :stop_watch, :duration, :measure, to: Stopwatch
-    end
-  end
-end
+require_relative '../spectre'
+
+module Spectre
+  module Diagnostic
+    module Stopwatch
+      @@duration = 0.0
+
+      class << self
+        def start_watch
+          @@start_time = Time.now
+        end
+
+        def stop_watch
+          @@end_time = Time.now
+        end
+
+        def measure
+          start_watch
+          yield
+          stop_watch
+        end
+
+        def duration
+          @@end_time - @@start_time
+        end
+
+        def started_at
+          @@start_time
+        end
+
+        def finished_at
+          @@end_time
+        end
+      end
+
+      Spectre.delegate :start_watch, :stop_watch, :duration, :measure, to: self
+    end
+  end
+end

data/lib/spectre/environment.rb

@@ -1,26 +1,30 @@
-require 'ostruct'
-
-def to_recursive_ostruct(hash)
-  OpenStruct.new(hash.each_with_object({}) do |(key, val), memo|
-    memo[key] = val.is_a?(Hash) ? to_recursive_ostruct(val) : val
-  end)
-end
-
-module Spectre
-  module Environment
-    class << self
-      @@environment = OpenStruct.new
-
-      def env
-        @@environment
-      end
-    end
-
-    Spectre.register do |config|
-      @@environment = to_recursive_ostruct(config)
-      @@environment.freeze
-    end
-
-    Spectre.delegate :env, to: Environment
-  end
-end
+require_relative '../spectre'
+
+require 'ostruct'
+
+def to_recursive_ostruct(hash)
+  OpenStruct.new(
+    hash.each_with_object({}) do |(key, val), memo|
+      memo[key] = val.is_a?(Hash) ? to_recursive_ostruct(val) : val
+    end
+  )
+end
+
+module Spectre
+  module Environment
+    class << self
+      @@environment = OpenStruct.new
+
+      def env
+        @@environment
+      end
+    end
+
+    Spectre.register do |config|
+      @@environment = to_recursive_ostruct(config)
+      @@environment.freeze
+    end
+
+    Spectre.delegate :env, to: self
+  end
+end

data/lib/spectre/helpers.rb

@@ -1,134 +1,133 @@
-require 'securerandom'
-require 'json'
-require 'date'
-require 'ostruct'
-require 'jsonpath'
-
-class ::String
-  def as_json
-    JSON.parse(self, object_class: OpenStruct)
-  end
-
-  def as_date
-    DateTime.parse(self)
-  end
-
-  def as_timestamp
-    DateTime.parse(self).to_time.to_i
-  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
-
-    new_string
-  end
-
-  def trim size = 50
-    if (self.length + 3) > size
-      return self[0..size-4] + '...'
-    end
-
-    self
-  end
-
-  def pick path
-    raise ArgumentError.new("`path' must not be nil or empty") if path.nil? or path.empty?
-
-    begin
-      JsonPath.on(self, path)
-
-    rescue MultiJson::ParseError
-      # do nothing and return nil
-    end
-  end
-
-  # File helpers
-
-  def content with: nil
-    fail "'#{self}' is not a file path, or the file does not exist." if !File.exists? self
-    file_content = File.read(self)
-
-    if with
-      file_content.with(with)
-    else
-      file_content
-    end
-  end
-
-  def file_size
-    fail "'#{self}' is not a file path, or the file does not exist." if !File.exists? self
-    File.size(self)
-  end
-
-  def exists?
-    File.exists? self
-  end
-
-  def remove!
-    fail "'#{self}' is not a file path, or the file does not exist." if !File.exists? self
-    File.delete self
-  end
-end
-
-
-class ::OpenStruct
-  def to_json *args, **kwargs
-    self.to_h.inject({}) { |memo, (k,v)| memo[k] = v.is_a?(OpenStruct) ? v.to_h : v; memo }.to_json(*args, **kwargs)
-  end
-
-  def pick path
-    raise ArgumentError.new("`path' must not be nil or empty") if path.nil? or path.empty?
-
-    JsonPath.on(self, path)
-  end
-
-  def default_to! defaults
-    defaults.each_key do |key|
-      if not self[key] != nil
-        self[key] = defaults[key]
-      end
-    end
-  end
-
-  alias :defaults_to! :default_to!
-end
-
-
-class ::Hash
-  def symbolize_keys
-    self.inject({}) { |memo, (k,v)| memo[k.to_sym] = v; memo }
-  end
-
-  def default_to! defaults
-    defaults.each_key do |key|
-      if not self[key] != nil
-        self[key] = defaults[key]
-      end
-    end
-  end
-
-  alias :defaults_to! :default_to!
-end
-
-
-class ::Array
-  def last
-    self[-1]
-  end
-end
-
-
-def uuid length = 5
-  SecureRandom.uuid().gsub('-', '')[0..length-1]
-end
-
-
-def now
-  Time.now
-end
+require_relative '../spectre'
+
+require 'securerandom'
+require 'json'
+require 'date'
+require 'ostruct'
+require 'jsonpath'
+
+class ::String
+  def as_json
+    JSON.parse(self, object_class: OpenStruct)
+  end
+
+  def as_date
+    DateTime.parse(self)
+  end
+
+  def as_timestamp
+    DateTime.parse(self).to_time.to_i
+  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
+
+    new_string
+  end
+
+  def trim size = 50
+    if (self.length + 3) > size
+      return self[0..size-4] + '...'
+    end
+
+    self
+  end
+
+  def pick path
+    raise ArgumentError.new("`path' must not be nil or empty") if path.nil? or path.empty?
+
+    begin
+      JsonPath.on(self, path)
+    rescue MultiJson::ParseError
+      # do nothing and return nil
+    end
+  end
+
+  # File helpers
+
+  def content with: nil
+    fail "'#{self}' is not a file path, or the file does not exist." unless File.exists? self
+
+    file_content = File.read(self)
+
+    if with
+      file_content.with(with)
+    else
+      file_content
+    end
+  end
+
+  def file_size
+    fail "'#{self}' is not a file path, or the file does not exist." unless File.exists? self
+
+    File.size(self)
+  end
+
+  def exists?
+    File.exists? self
+  end
+
+  def remove!
+    fail "'#{self}' is not a file path, or the file does not exist." unless File.exists? self
+
+    File.delete self
+  end
+end
+
+class ::OpenStruct
+  def to_json *args, **kwargs
+    self.to_h.inject({}) { |memo, (k,v)| memo[k] = v.is_a?(OpenStruct) ? v.to_h : v; memo }.to_json(*args, **kwargs)
+  end
+
+  def pick path
+    raise ArgumentError.new("`path' must not be nil or empty") if path.nil? or path.empty?
+
+    JsonPath.on(self, path)
+  end
+
+  def default_to! defaults
+    defaults.each_key do |key|
+      unless self[key] != nil
+        self[key] = defaults[key]
+      end
+    end
+  end
+
+  alias :defaults_to! :default_to!
+end
+
+class ::Hash
+  def symbolize_keys
+    self.inject({}) { |memo, (k,v)| memo[k.to_sym] = v; memo }
+  end
+
+  def default_to! defaults
+    defaults.each_key do |key|
+      unless self[key] != nil
+        self[key] = defaults[key]
+      end
+    end
+  end
+
+  alias :defaults_to! :default_to!
+end
+
+class ::Array
+  def last_element
+    self[-1]
+  end
+end
+
+def uuid length = 5
+  SecureRandom.uuid().gsub('-', '')[0..length-1]
+end
+
+def now
+  Time.now
+end

data/lib/spectre/http/basic_auth.rb

@@ -1,7 +1,9 @@
+require_relative '../http'
+
 module Spectre::Http
   class SpectreHttpRequest
     def basic_auth username, password
-      @__req['basic_auth'] = {} if not @__req.key? 'basic_auth'
+      @__req['basic_auth'] = {} unless @__req.key? 'basic_auth'
 
       @__req['basic_auth']['username'] = username
       @__req['basic_auth']['password'] = password
@@ -11,8 +13,9 @@ module Spectre::Http
   end
 
   module BasicAuth
-    def self.on_req http, net_req, req
+    def self.on_req _http, net_req, req
       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,98 +1,101 @@
-class HttpRequest
-  def keystone url, username, password, project, domain, cert
-    @__req['keystone'] = {} if not @__req.key? 'keystone'
-
-    @__req['keystone']['url'] = url
-    @__req['keystone']['username'] = username
-    @__req['keystone']['password'] = password
-    @__req['keystone']['project'] = project
-    @__req['keystone']['domain'] = domain
-    @__req['keystone']['cert'] = cert
-
-    @__req.config['auth'] = 'keystone'
+require_relative '../http'
+
+module Spectre::Http
+  class SpectreHttpRequest
+    def keystone url, username, password, project, domain, cert=nil
+      @__req['keystone'] = {} unless @__req.key? 'keystone'
+
+      @__req['keystone']['url'] = url
+      @__req['keystone']['username'] = username
+      @__req['keystone']['password'] = password
+      @__req['keystone']['project'] = project
+      @__req['keystone']['domain'] = domain
+      @__req['keystone']['cert'] = cert
+
+      @__req['auth'] = 'keystone'
+    end
   end
-end
 
+  module Keystone
+    @@cache = {}
 
-module Spectre::Http::Keystone
-  @@cache = {}
+    def self.on_req _http, net_req, req
+      return unless req.key? 'keystone' and req['auth'] == 'keystone'
 
-  def self.on_req http, net_req, req
-    return unless req.key? 'keystone' and req['auth'] == 'keystone'
+      keystone_cfg = req['keystone']
 
-    keystone_cfg = req['keystone']
+      if @@cache.key? keystone_cfg
+        token = @@cache[keystone_cfg]
+      else
+        token, _ = authenticate(
+          keystone_cfg['url'],
+          keystone_cfg['username'],
+          keystone_cfg['password'],
+          keystone_cfg['project'],
+          keystone_cfg['domain'],
+          keystone_cfg['cert'],
+        )
 
-    if @@cache.key? keystone_cfg
-      token = @@cache[keystone_cfg]
-    else
-      token, _ = authenticate(
-        keystone_cfg['url'],
-        keystone_cfg['username'],
-        keystone_cfg['password'],
-        keystone_cfg['project'],
-        keystone_cfg['domain'],
-        keystone_cfg['cert'],
-      )
+        @@cache[keystone_cfg] = token
+      end
 
-      @@cache[keystone_cfg] = token
+      net_req['X-Auth-Token'] = token
     end
 
-    net_req['X-Auth-Token'] = token
-  end
-
-  private
-
-  def self.authenticate keystone_url, username, password, project, domain, cert
-    auth_data = {
-      auth: {
-        identity: {
-          methods: ['password'],
-          password: {
-            user: {
-              name: username,
-              password: password,
-              domain: {
-                name: domain,
+    private
+
+    def self.authenticate keystone_url, username, password, project, domain, cert
+      auth_data = {
+        auth: {
+          identity: {
+            methods: ['password'],
+            password: {
+              user: {
+                name: username,
+                password: password,
+                domain: {
+                  name: domain,
+                },
               },
             },
           },
-        },
-        scope: {
-          project: {
-            name: project,
-            domain: {
-              name: domain,
+          scope: {
+            project: {
+              name: project,
+              domain: {
+                name: domain,
+              },
             },
           },
         },
-      },
-    }
+      }
 
-    keystone_url = keystone_url + '/' if !keystone_url.end_with? '/'
+      keystone_url = keystone_url + '/' unless keystone_url.end_with? '/'
 
-    base_uri = URI(keystone_url)
-    uri = URI.join(base_uri, 'auth/tokens?nocatalog=true')
+      base_uri = URI(keystone_url)
+      uri = URI.join(base_uri, 'auth/tokens?nocatalog=true')
 
-    http = Net::HTTP.new(base_uri.host, base_uri.port)
+      http = Net::HTTP.new(base_uri.host, base_uri.port)
 
-    if cert
-      http.use_ssl = true
-      http.ca_file = cert
-    end
+      if cert
+        http.use_ssl = true
+        http.ca_file = cert
+      end
 
-    req = Net::HTTP::Post.new(uri)
-    req.body = JSON.pretty_generate(auth_data)
-    req.content_type = 'application/json'
+      req = Net::HTTP::Post.new(uri)
+      req.body = JSON.pretty_generate(auth_data)
+      req.content_type = 'application/json'
 
-    res = http.request(req)
+      res = http.request(req)
 
-    raise "error while authenticating: #{res.code} #{res.message}\n#{res.body}" if res.code != '201'
+      raise "error while authenticating: #{res.code} #{res.message}\n#{res.body}" if res.code != '201'
 
-    [
-      res['X-Subject-Token'],
-      JSON.parse(res.body),
-    ]
-  end
+      [
+        res['X-Subject-Token'],
+        JSON.parse(res.body),
+      ]
+    end
 
-  Spectre::Http.register(self)
+    Spectre::Http.register(self)
+  end
 end