lavin 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a7216c049391b24ccad2eb6c6d6424114761a11b1b4aa15824c5c58ca2bf19
-  data.tar.gz: 3ec27a41fdc255d3eafb3a168c39ad8b744b28ab5e436d38d8eaf9f94aa22f23
+  metadata.gz: 52a0a48c405e0aff4b816ff7bf91b27e8407929a838db819f8777d222b4f7674
+  data.tar.gz: 4acb3c0a928acd45ecbd8137089433e69cdc8235919a0db6fefefb40418bfd82
 SHA512:
-  metadata.gz: c6689ccce7532d8438013a8e3af32052f5b8df828169a026270f03d16a9078f11677b36f2a6c8989ec27cd8bfa3248d4bb1a9bbd2ddc35cccd4d8f1df143e182
-  data.tar.gz: 4b2b728d3d5c775471c3ffdcf52c7b2a475d6c7e76d6aae4288b1e1154747e6f81bc802bf3f04f951aa1dec02de690671f110e01db8baed5c5442717f93f2b85
+  metadata.gz: e2fe666e13f22d13dc4f085e8ab7e78c2242a973bd9b0d58054e0b4ada2cc17d1ca924e4103a3c55408bd88c4d1cd3efa8b3449cee7fd8a5d36794392218779c
+  data.tar.gz: b1f7f478a288492082a4f02462d345ce42703316638b3d6aee7848a92a539b22b750105e5e70fdf2ffe662ac26ed68a4f6a32c63154b18ba4faf96dee917b16b

data/lib/lavin/client.rb

@@ -5,6 +5,13 @@ require 'async/http/internet'
 module Lavin
   class Client
     class Error < Lavin::Error; end
+
+    class ServerError < Error
+      def initialize(status)
+        super("Server responded with status: #{status}")
+      end
+    end
+
     class NoCurrentAsyncTaskError < Error
       def initialize(msg = nil)
         super(msg || "Trying to create a client outside of an Async task")

data/lib/lavin/error.rb

@@ -2,4 +2,8 @@
 
 module Lavin
   class Error < StandardError; end
+
+  class RecoverableError < Error; end
+
+  class IrrecoverableError < Error; end
 end

data/lib/lavin/failure.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'lavin/error'
+
+module Lavin
+  module Failure
+    def failure(msg)
+      raise RecoverableError, msg
+    end
+
+    def failure!(msg)
+      raise IrrecoverableError, msg
+    end
+  end
+end

data/lib/lavin/hook.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
-#
 
 module Lavin
   class Hook
-    attr_reader :user, :block
+    attr_reader :user, :block, :type
 
-    def initialize(user:, &block)
+    def initialize(user:, type: :before, &block)
       @user = user
       @block = block
+      @type = type
     end
 
     def run(context: nil)
@@ -19,9 +19,11 @@ module Lavin
       report_statistics = context.client.report_statistics
       context.client.report_statistics = false
       context.instance_exec(&block)
+    rescue RecoverableError
     rescue => error
-      puts "Caught an error - #{error.class}: #{error.message}"
-      puts error.backtrace
+      puts "Caught #{error.class} in #{type} hook: #{error.message}"
+      puts error.backtrace unless error.is_a? IrrecoverableError
+      throw :failure
     ensure
       context.client.report_statistics = report_statistics
     end

data/lib/lavin/http_client.rb

@@ -17,27 +17,35 @@ module Lavin
     end
 
     def get(url, headers: {})
-      client.request(:get, url:, headers:)
+      request(:get, url:, headers:)
     end
 
     def head(url, headers: {})
-      client.request(:head, url:, headers:)
+      request(:head, url:, headers:)
     end
 
     def post(url, headers: {}, body: nil)
-      client.request(:post, url:, headers:, body:)
+      request(:post, url:, headers:, body:)
     end
 
     def put(url, headers: {}, body: nil)
-      client.request(:put, url:, headers:, body:)
+      request(:put, url:, headers:, body:)
     end
 
     def patch(url, headers: {}, body: nil)
-      client.request(:patch, url:, headers:, body:)
+      request(:patch, url:, headers:, body:)
     end
 
     def delete(url, headers: {})
-      client.request(:delete, url:, headers:)
+      request(:delete, url:, headers:)
+    end
+
+    private
+
+    def request(method, url:, headers:, body: nil)
+      client.request(method, url:, headers:, body:).tap do |response|
+        raise Lavin::Client::ServerError, response[:status] if response[:status] > 499
+      end
     end
   end
 end

data/lib/lavin/runner.rb

@@ -62,9 +62,9 @@ module Lavin
       end
 
       def stop
-        Statistics.stop
         thread&.kill
         self.thread = nil
+        Statistics.stop
       end
 
       def running?

data/lib/lavin/statistics.rb

@@ -53,6 +53,7 @@ module Lavin
         key = [user, step_name]
         data[:steps][key][:success] += 1 unless failure
         data[:steps][key][:failure] += 1 if failure
+        data[:failures][failure.to_s] += 1 if failure
       end
 
       def stats
@@ -62,9 +63,11 @@ module Lavin
         requests = data[:requests].map do |(method, url), requests|
           durations = []
           statuses = []
+          failed_requests = 0
           requests.each do |request|
             durations << request[:duration]
             statuses << request[:status]
+            failed_requests += 1 if request[:failure]
           end
           min_duration = durations.min
           max_duration = durations.max
@@ -75,9 +78,10 @@ module Lavin
             url: url,
             requests: requests.size,
             statuses: statuses.tally,
-            avg_duration: avg_duration,
-            min_duration: min_duration,
-            max_duration: max_duration
+            failed_requests:,
+            avg_duration:,
+            min_duration:,
+            max_duration:
           }
         end
 
@@ -87,7 +91,8 @@ module Lavin
           rate: duration ? format("%.2f", total_requests / duration) : 0,
           step_summary: data[:step_summary],
           steps: data[:steps],
-          requests: requests
+          requests: requests,
+          failures: data[:failures]
         ).tap do |stats|
           # FIXME remove!
           puts "Calculated stats in #{Time.now - time}s"
@@ -101,7 +106,7 @@ module Lavin
 
         show_steps(values) do |(user, step), hash|
           format(
-            "%-24<user_step>s %8<success>d %8<failure>d",
+            "%-48<user_step>s %8<success>d %8<failure>d",
             user_step: "#{user}.#{step}",
             **hash
           )
@@ -113,6 +118,10 @@ module Lavin
             **request_values
           )
         end
+
+        show_failures(values) do |message, count|
+          format("%-64<message>s %6<count>d", message:, count:)
+        end
       end
 
       private
@@ -141,7 +150,8 @@ module Lavin
             failure: 0
           },
           steps: Hash.new { |h, k| h[k] = {success: 0, failure: 0} },
-          requests: Hash.new { |h, k| h[k] = [] }
+          requests: Hash.new { |h, k| h[k] = [] },
+          failures: Hash.new { |h, k| h[k] = 0 }
         }
       end
 
@@ -155,26 +165,25 @@ module Lavin
 
           Total number of steps: #{values.total_steps}
           Step success rate: #{format("%.2f %%", 100 * values.successful_steps.to_f / values.total_steps)}
-
         RESULT
       end
 
       def show_steps(values)
         puts format(
-          "%-24<user_step>s %8<success>s %8<failure>s",
+          "\n%-48<user_step>s %8<success>s %8<failure>s",
           user_step: "Steps",
           success: "Success",
           failure: "Failure"
         )
-        divider = "-" * 42
+        divider = "-" * 66
         puts divider
         values.each_step { |step_values| puts yield step_values }
-        puts "#{divider}\n\n"
+        puts divider
       end
 
       def show_table(values)
         puts format(
-          "%-6<method>s %-100<url>s %-6<requests>s %12<avg_duration>s %12<min_duration>s %12<max_duration>s",
+          "\n%-6<method>s %-100<url>s %-6<requests>s %12<avg_duration>s %12<min_duration>s %12<max_duration>s",
           method: "Method",
           url: "URL",
           requests: "Requests",
@@ -188,6 +197,14 @@ module Lavin
         values.each_request { |request_values| puts yield request_values }
         puts divider
       end
+
+      def show_failures(values)
+        puts format("\n%-64<message>s %6<count>s", message: "Failures", count: "Count")
+        divider = "-" * 71
+        puts divider
+        values.each_failure { |failures| puts yield failures }
+        puts divider
+      end
     end
   end
 end

data/lib/lavin/stats.rb

@@ -2,15 +2,16 @@
 
 module Lavin
   class Stats
-    attr_reader :duration, :total_requests, :rate, :requests, :step_summary, :steps
+    attr_reader :duration, :total_requests, :rate, :requests, :step_summary, :steps, :failures
 
-    def initialize(duration:, total_requests:, rate:, requests: [], step_summary: {}, steps: [])
+    def initialize(duration:, total_requests:, rate:, requests: [], step_summary: {}, steps: [], failures: [])
       @duration = duration
       @total_requests = total_requests
       @rate = rate
       @requests = requests
       @step_summary = step_summary
       @steps = steps
+      @failures = failures
     end
 
     def empty?
@@ -24,7 +25,8 @@ module Lavin
         rate:,
         requests:,
         step_summary:,
-        steps:
+        steps:,
+        failures:
       }
     end
 
@@ -47,5 +49,9 @@ module Lavin
     def each_request(&block)
       requests.each(&block)
     end
+
+    def each_failure(&block)
+      failures.each(&block)
+    end
   end
 end

data/lib/lavin/step.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-#
+
+require 'lavin/error'
 
 module Lavin
   class Step
@@ -22,9 +23,10 @@ module Lavin
     def call(context:)
       context.instance_exec(&block)
       Statistics.register_step(user: user.name, step_name: name)
+    rescue IrrecoverableError => error
+      Statistics.register_step(user: user.name, step_name: name, failure: error.message)
+      throw :failure
     rescue => error
-      puts "Caught an error - #{error.class}: #{error.message}"
-      puts error.backtrace
       Statistics.register_step(user: user.name, step_name: name, failure: error.message)
     end
   end

data/lib/lavin/user.rb

@@ -4,6 +4,7 @@ require "set"
 require "lavin/user_config"
 require "lavin/worker"
 require "lavin/http_client"
+require "lavin/failure"
 
 module Lavin
   class User
@@ -12,6 +13,7 @@ module Lavin
       subclass.include UserConfig
       subclass.include Worker
       subclass.include HttpClient
+      subclass.include Failure
       all_personas << subclass
     end
 

data/lib/lavin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lavin
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/lavin/web_server.rb

@@ -40,6 +40,11 @@ module Lavin
       redirect to('/statistics')
     end
 
+    post '/stop' do
+      Lavin::Runner.stop
+      redirect to('/statistics')
+    end
+
     get '/statistics' do
       stats = Statistics.stats
       running = Lavin::Runner.running?
@@ -50,6 +55,16 @@ module Lavin
       end
     end
 
+    get '/failures' do
+      stats = Statistics.stats
+      running = Lavin::Runner.running?
+      if stats.empty? && !running
+        redirect to('/')
+      else
+        erb :failures, locals: {stats:, running:}
+      end
+    end
+
     get '/edit' do
       persona = find_persona
       raise Sinatra::NotFound unless persona

data/lib/lavin/worker.rb

@@ -9,13 +9,13 @@ module Lavin
       def before(&block)
         return @before unless block
 
-        @before = Hook.new(user: self, &block)
+        @before = Hook.new(user: self, type: :before, &block)
       end
 
       def after(&block)
         return @after unless block
 
-        @after = Hook.new(user: self, &block)
+        @after = Hook.new(user: self, type: :after, &block)
       end
 
       def steps
@@ -40,11 +40,15 @@ module Lavin
     end
 
     def run
-      self.class.before.run(context: self).then { Runner.yield } if self.class.before
+      catch(:failure) do
+        self.class.before.run(context: self).then { Runner.yield } if self.class.before
 
-      run_step until finished?
+        run_step until finished?
+      end
 
-      self.class.after.run(context: self).then { Runner.yield } if self.class.after
+      catch(:failure) do
+        self.class.after.run(context: self).then { Runner.yield } if self.class.after
+      end
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lavin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -29,7 +29,7 @@ cert_chain:
   DVzXaUnsmwP+jQ1PkDa5q8ibBzMd2c6Hmm87UDqPxZtML0bF9SjrpbyLMjwtXaMA
   WDPp0ajpdUZ9GPHsrVNYXiOfQIqcmlmpYVsH1o7vuneUIcIDMrnMDChh
   -----END CERTIFICATE-----
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -113,6 +113,7 @@ files:
 - lib/lavin.rb
 - lib/lavin/client.rb
 - lib/lavin/error.rb
+- lib/lavin/failure.rb
 - lib/lavin/hook.rb
 - lib/lavin/http_client.rb
 - lib/lavin/runner.rb