inferno_core 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e278b200d33582c51a4dcfcee3c7ef321162ecbc0c1c12225601b8b03627747
-  data.tar.gz: 80a3cac6f4de4e9c191733bedc22e31182acc2ef135f1473a52ff971fd2ab0b2
+  metadata.gz: b9bc9822a032ed4fa7c3b1639b24bc14c6ed977e271e60e424f6a1d60fbff657
+  data.tar.gz: 5d0a9a794ce081c3128e68d7cb6a1802a05aafddbcbb03ab7ee7667696ac81f5
 SHA512:
-  metadata.gz: 5834a48e2c99300e08a1acacc040fa7a96fc85b74c6b5de4d64a3f0265e9c79dad017d7becc927c6bfd3be9ab690008c48223c29e129e8d28bc70edfe3e75e59
-  data.tar.gz: 7cfaa5b8d64596e7d245026cf35f93b2093c0517bcdcae7b14ed4778e369c3244ea1cf8ce8179153001ed82275293edea25379a9a0a5cf90aecd027ddb728b1f
+  metadata.gz: 8645e64fc2c5890378d9693734ce5268b219541c82307b13d14703f7a8e8ff70ddac9c00ddf254ba9db6121bb54015445222e497b0d519b9bc2de1d93ac1c06c
+  data.tar.gz: 67a64df05660cca2377009e45c13fb6baddae3cd39e3527d7fe85e6b64fc201b2cb871b894bf86c55ca6facc6f3790993e6548dec14ad245b563d8bbc5ac690f

data/lib/inferno/apps/cli/main.rb

@@ -1,5 +1,6 @@
 require_relative 'console'
 require_relative 'migration'
+require_relative 'services'
 require_relative 'suite'
 require_relative 'suites'
 
@@ -16,11 +17,23 @@ module Inferno
         Migration.new.run
       end
 
+      desc 'start', 'Start Inferno'
+      def start
+        if `gem list -i foreman`.chomp == 'false'
+          puts "You must install foreman with 'gem install foreman' prior to running inferno."
+        end
+
+        system 'foreman start --env=/dev/null'
+      end
+
       desc 'suites', 'List available test suites'
       def suites
         Suites.new.run
       end
 
+      desc 'services stop/start', 'Start or stop background services'
+      subcommand 'services', Services
+
       desc 'suite SUBCOMMAND ...ARGS', 'Perform suite-based operations'
       subcommand 'suite', Suite
     end

data/lib/inferno/apps/cli/services.rb

@@ -0,0 +1,56 @@
+module Inferno
+  module CLI
+    class Services < Thor
+      no_commands do
+        def base_command
+          'docker-compose -f docker-compose.background.yml'
+        end
+      end
+
+      desc 'start', 'Start background services'
+      option :foreground,
+             default: false,
+             type: :boolean,
+             desc: 'Run services in foreground'
+      def start
+        command = "#{base_command} up"
+        command += ' -d' unless options[:foreground]
+
+        system command
+      end
+
+      desc 'stop', 'Stop background services'
+      def stop
+        system "#{base_command} down"
+      end
+
+      desc 'build', 'Build background service images'
+      def build
+        system "#{base_command} build"
+      end
+
+      desc 'pull', 'Pull background service images'
+      def pull
+        system "#{base_command} pull"
+      end
+
+      desc 'logs', 'Display the logs for the background services'
+      option :follow,
+             default: false,
+             aliases: [:f],
+             type: :boolean,
+             desc: 'Follow log output'
+      option :tail,
+             banner: 'string',
+             default: 'all',
+             desc: 'Number of lines to show from the end of the logs for each container'
+      def logs
+        command = "#{base_command} logs"
+        command += ' -f' if options[:follow]
+        command += " --tail #{options[:tail]}" if options[:tail]
+
+        system command
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/index.html.erb

@@ -38,14 +38,18 @@
         height: 100%;
         display: flex;
         flex-direction: column;
+        overflow: hidden;
       }
       .banner {
         flex-shrink: 1;
+        overflow: 'auto';
+        white-space: nowrap;
       }
       .app {
         flex-grow: 1;
         display: flex;
         flex-direction: column;
+        overflow: auto;
       }
     </style>
     <title>Inferno</title>

data/lib/inferno/apps/web/serializers/request.rb

@@ -3,7 +3,8 @@ module Inferno
     module Serializers
       class Request < Serializer
         view :summary do
-          field :id
+          identifier :id
+          field :index
           field :created_at, name: :timestamp
           field :verb
           field :url

data/lib/inferno/apps/web/serializers/result.rb

@@ -1,4 +1,5 @@
 require 'json'
+require_relative 'request'
 
 module Inferno
   module Web
@@ -27,7 +28,9 @@ module Inferno
         end
 
         association :messages, blueprint: Message, if: :field_present?
-        association :requests, blueprint: Request, view: :summary, if: :field_present?
+        field :requests do |result, _options|
+          Request.render_as_hash(result.requests.sort_by(&:index), view: :summary)
+        end
       end
     end
   end

data/lib/inferno/config/boot.rb

@@ -4,4 +4,9 @@ ENV['APP_ENV'] ||= 'development'
 
 root_path = Dir.pwd
 
-Dotenv.load(File.join(root_path, '.env'), File.join(root_path, ".env.#{ENV.fetch('APP_ENV', nil)}"))
+Dotenv.load(
+  File.join(root_path, ".env.#{ENV.fetch('APP_ENV', nil)}.local"),
+  File.join(root_path, '.env.local'),
+  File.join(root_path, ".env.#{ENV.fetch('APP_ENV', nil)}"),
+  File.join(root_path, '.env')
+)

data/lib/inferno/dsl/runnable.rb

@@ -382,7 +382,11 @@ module Inferno
       def test_count(selected_suite_options = [])
         @test_counts ||= {}
 
-        @test_counts[selected_suite_options] ||=
+        options_json = selected_suite_options.to_json
+
+        return @test_counts[options_json] if @test_counts[options_json]
+
+        @test_counts[options_json] =
           children(selected_suite_options)
             &.reduce(0) { |sum, child| sum + child.test_count(selected_suite_options) } || 0
       end