specwrk 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d76f2f9716e7c7e613bc0b341f89e42caf9375dfe0d48083afb908146d1374b
-  data.tar.gz: 36136d67829a41b39f4e9de4fff45ea1a614111f9556a523eefde1b35cceba51
+  metadata.gz: 52798ca674b5b11b238ba315c34ada0357a0d4c52df995a04f3dbbdeaeb523eb
+  data.tar.gz: cf488e8d531ca483d3f8a7e6ce80600c55693028f05cba5321da190e3fdec114
 SHA512:
-  metadata.gz: b7fd2a78d6019864949e6847f09474ad357b04614dd1a2cc3f563ec95f915e7958bfdf211c9d60213d61bea517e59e200ad3e7898963fe0cdd49df114941a786
-  data.tar.gz: 6b1836bb1a50ba0d853689ec5b7f169c83883a39c134caf93b4a70637a81c3b4f6e4f8112285dca4b30065d0c6a816807e13e65ff748dc7b16d5c5d03064e52c
+  metadata.gz: 4d4fad41383ca3388bde45eebff774b9f052d2b830de7dca35774cc9f567236be56cdeb036207241617c8774684c07f9ec37d7e4d57eb75811117c29cbe78dae
+  data.tar.gz: 4f308d4b2c362981b2f88f4bdca0f6b271f96a354954dd911b3f1208fecd3c95f16e2fe84a44f0d2ba0e96dcfc38922228dd242f68ec7d49c0ea817d839fbf1c

data/lib/specwrk/cli.rb

@@ -16,7 +16,7 @@ module Specwrk
       extend Hookable
 
       on_included do |base|
-        base.unique_option :uri, type: :string, default: ENV.fetch("SPECWRK_SRV_URI", "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"), desc: "HTTP URI of the server to pull jobs from. Overrides SPECWRK_SRV_PORT. Default 5138."
+        base.unique_option :uri, type: :string, default: ENV.fetch("SPECWRK_SRV_URI", "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"), desc: "HTTP URI of the server to pull jobs from. Overrides SPECWRK_SRV_URI. Default http://localhost:5138."
         base.unique_option :key, type: :string, default: ENV.fetch("SPECWRK_SRV_KEY", ""), aliases: ["-k"], desc: "Authentication key clients must use for access. Overrides SPECWRK_SRV_KEY. Default ''."
         base.unique_option :run, type: :string, default: ENV.fetch("SPECWRK_RUN", "main"), aliases: ["-r"], desc: "The run identifier for this job execution. Overrides SPECWRK_RUN. Default main."
         base.unique_option :timeout, type: :integer, default: ENV.fetch("SPECWRK_TIMEOUT", "5"), aliases: ["-t"], desc: "The amount of time to wait for the server to respond. Overrides SPECWRK_TIMEOUT. Default 5."

data/lib/specwrk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Specwrk
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/specwrk/web/app.rb

@@ -50,22 +50,24 @@ module Specwrk
           Rack::Builder.new do
             use Rack::Runtime
             use Specwrk::Web::Logger, $stdout
-            use Specwrk::Web::Auth          # global auth check
-            run Specwrk::Web::App.new       # your router
+            use Specwrk::Web::Auth, %w[/health] # global auth check
+            run Specwrk::Web::App.new           # your router
           end
         end
       end
 
       def call(env)
-        request = Rack::Request.new(env)
+        env[:request] ||= Rack::Request.new(env)
 
-        route(method: request.request_method, path: request.path_info)
-          .new(request)
+        route(method: env[:request].request_method, path: env[:request].path_info)
+          .new(env[:request])
           .response
       end
 
       def route(method:, path:)
         case [method, path]
+        when ["GET", "/health"]
+          Endpoints::Health
         when ["GET", "/heartbeat"]
           Endpoints::Heartbeat
         when ["POST", "/pop"]

data/lib/specwrk/web/auth.rb

@@ -5,12 +5,16 @@ require "rack/auth/abstract/request"
 module Specwrk
   class Web
     class Auth
-      def initialize(app)
+      def initialize(app, excluded_paths = [])
         @app = app
+        @excluded_paths = excluded_paths
       end
 
       def call(env)
+        env[:request] ||= Rack::Request.new(env)
+
         return @app.call(env) if [nil, ""].include? ENV["SPECWRK_SRV_KEY"]
+        return @app.call(env) if @excluded_paths.include? env[:request].path_info
 
         auth = Rack::Auth::AbstractRequest.new(env)
 

data/lib/specwrk/web/endpoints.rb

@@ -50,6 +50,12 @@ module Specwrk
       # Base default response is 404
       NotFound = Class.new(Base)
 
+      class Health < Base
+        def response
+          ok
+        end
+      end
+
       class Heartbeat < Base
         def response
           ok

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specwrk
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Daniel Westendorf