padrino-core 0.16.0.pre4 → 0.16.0

data/lib/padrino-core/application/show_exceptions.rb

@@ -7,14 +7,12 @@ module Padrino
     private
 
     def frame_class(frame)
-      if frame.filename =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/
-        "framework"
-      elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
-            frame.filename =~ /\/bin\/(\w+)$/ ||
-            frame.filename =~ /Ruby\/Gems/
-        "system"
+      if frame.filename =~ %r{lib/sinatra.*\.rb|lib/padrino.*\.rb}
+        'framework'
+      elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) || frame.filename =~ %r{/bin/(\w+)$|Ruby/Gems}
+        'system'
       else
-        "app"
+        'app'
       end
     end
   end

data/lib/padrino-core/application.rb

@@ -54,7 +54,7 @@ module Padrino
         logger.devel "Reloading application #{settings}"
         reset!
         reset_router!
-        Padrino.require_dependencies(settings.app_file, :force => true)
+        Padrino.require_dependencies(settings.app_file, force: true)
         require_dependencies
         default_routes
         default_errors
@@ -112,7 +112,7 @@ module Padrino
       #
       # @see Padrino::Server#start
       #
-      def run!(options={})
+      def run!(options = {})
         return unless Padrino.load!
         Padrino.mount(settings.to_s).to('/')
         Padrino.run!(options)
@@ -139,7 +139,7 @@ module Padrino
           'controllers.rb',
           'helpers/**/*.rb',
           'helpers.rb'
-        ].flat_map{ |file| Dir.glob(File.join(settings.root, file)) }
+        ].flat_map { |file| Dir.glob(File.join(settings.root, file)) }
       end
 
       ##
@@ -171,7 +171,7 @@ module Padrino
       # Requires all files within the application load paths.
       #
       def require_dependencies
-        Padrino.require_dependencies(dependencies, :force => true)
+        Padrino.require_dependencies(dependencies, force: true)
       end
     end
   end

data/lib/padrino-core/caller.rb

@@ -1,5 +1,4 @@
 module Padrino
-
   unless defined?(PADRINO_IGNORE_CALLERS)
     # List of callers in a Padrino application that should be ignored as part of a stack trace.
     PADRINO_IGNORE_CALLERS = [
@@ -15,8 +14,8 @@ module Padrino
       %r{shoulda/context\.rb$},
       %r{mocha/integration},
       %r{test/unit},
-      %r{rake_test_loader\.rb},
-      %r{custom_require\.rb$},
+      /rake_test_loader\.rb/,
+      /custom_require\.rb$/,
       %r{/thor}
     ]
 
@@ -44,9 +43,9 @@ module Padrino
   #   The files of the calling methods.
   #
   def self.caller_files
-    caller(1).
-      map    { |line| line.split(/:(?=\d|in )/)[0,2] }.
-      reject { |file,_line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
-      map    { |file,_line| file }
+    caller(1).each_with_object([]) do |line, result|
+      file, = line.split(/:(?=\d|in )/)[0, 2]
+      result << file unless PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern }
+    end
   end
 end

data/lib/padrino-core/cli/adapter.rb

@@ -17,11 +17,11 @@ module Padrino
             puts "=> Sending INT to process with pid #{pid}"
             begin
               Process.kill(2, pid)
-            rescue Errno::ESRCH, RangeError => error
-              puts error.message
+            rescue Errno::ESRCH, RangeError => e
+              puts e.message
               exit
-            rescue Errno::EPERM => error
-              puts error.message
+            rescue Errno::EPERM => e
+              puts e.message
               abort
             end
           else

data/lib/padrino-core/cli/base.rb

@@ -3,16 +3,16 @@ require 'padrino-core/cli/launcher'
 module Padrino
   module Cli
     class Base < Launcher
-      desc "rake", "Execute rake tasks."
-      method_option :environment, :type => :string,  :aliases => "-e"
-      method_option :list,        :type => :string,  :aliases => "-T", :desc => "Display the tasks (matching optional PATTERN) with descriptions, then exit."
-      method_option :trace,       :type => :boolean, :aliases => "-t", :desc => "Turn on invoke/execute tracing, enable full backtrace."
+      desc 'rake', 'Execute rake tasks.'
+      method_option :environment, type: :string,  aliases: '-e'
+      method_option :list,        type: :string,  aliases: '-T', desc: 'Display the tasks (matching optional PATTERN) with descriptions, then exit.'
+      method_option :trace,       type: :boolean, aliases: '-t', desc: 'Turn on invoke/execute tracing, enable full backtrace.'
       def rake(*args)
         prepare :rake
-        args << "-T" if options[:list]
-        args << options[:list]  unless options[:list].nil? || options[:list].to_s == "list"
-        args << "--trace" if options[:trace]
-        args << "--verbose" if options[:verbose]
+        args << '-T' if options[:list]
+        args << options[:list] unless options[:list].nil? || options[:list].to_s == 'list'
+        args << '--trace' if options[:trace]
+        args << '--verbose' if options[:verbose]
         ARGV.clear
         ARGV.concat(args)
         puts "=> Executing Rake #{ARGV.join(' ')} ..."
@@ -23,8 +23,8 @@ module Padrino
         Rake.application.top_level
       end
 
-      desc "console", "Boots up the Padrino application irb console (alternatively use 'c')."
-      map "c" => :console
+      desc 'console', "Boots up the Padrino application irb console (alternatively use 'c')."
+      map 'c' => :console
       def console(*args)
         prepare :console
         require File.expand_path('../version', __dir__)
@@ -37,44 +37,43 @@ module Padrino
         else
           require 'irb'
           begin
-            require "irb/completion"
+            require 'irb/completion'
           rescue LoadError
+            # do nothing
           end
           IRB.start
         end
       end
 
-      desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."
-      map ["gen", "g"] => :generate
+      desc 'generate', "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."
+      map %w[gen g] => :generate
       def generate(*args)
-        
-          # We try to load the vendored padrino-gen if exist
-          padrino_gen_path = File.expand_path('../../../../padrino-gen/lib', __dir__)
-          $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
-          require 'padrino-core/command'
-          require 'padrino-gen/command'
-          ARGV.shift
-          ARGV << 'help' if ARGV.empty?
-          Padrino.bin_gen(*ARGV)
-        rescue StandardError
-          puts "<= You need padrino-gen! Run: gem install padrino-gen"
-        
+        # We try to load the vendored padrino-gen if exist
+        padrino_gen_path = File.expand_path('../../../../padrino-gen/lib', __dir__)
+        $LOAD_PATH.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$LOAD_PATH.include?(padrino_gen_path)
+        require 'padrino-core/command'
+        require 'padrino-gen/command'
+        ARGV.shift
+        ARGV << 'help' if ARGV.empty?
+        Padrino.bin_gen(*ARGV)
+      rescue StandardError
+        puts '<= You need padrino-gen! Run: gem install padrino-gen'
       end
 
-      desc "version", "Show current Padrino version."
-      map ["-v", "--version"] => :version
+      desc 'version', 'Show current Padrino version.'
+      map ['-v', '--version'] => :version
       def version
         require 'padrino-core/version'
         puts "Padrino v. #{Padrino.version}"
       end
 
-      desc "runner", "Run a piece of code in the Padrino application environment (alternatively use 'run' or 'r')."
-      map ["run", "r"] => :runner
+      desc 'runner', "Run a piece of code in the Padrino application environment (alternatively use 'run' or 'r')."
+      map %w[run r] => :runner
       def runner(*args)
         prepare :runner
 
         code_or_file = args.shift
-        abort "Please specify code or file" if code_or_file.nil?
+        abort 'Please specify code or file' if code_or_file.nil?
 
         require File.expand_path('config/boot.rb')
 
@@ -87,7 +86,7 @@ module Padrino
 
       protected
 
-      def self.banner(task=nil, *args)
+      def self.banner(task = nil, *args)
         "padrino #{task.name}"
       end
 
@@ -103,7 +102,7 @@ module Padrino
 
         result
       end
-      alias :silence :capture
+      alias silence capture
     end
   end
 end

data/lib/padrino-core/cli/binstub.rb

@@ -6,6 +6,7 @@ module Padrino
     begin
       return if Bundler.definition.missing_specs.empty?
     rescue NameError, NoMethodError, Bundler::GemfileNotFound
+      # Move forward
     end
 
     project_root = Dir.pwd
@@ -14,14 +15,14 @@ module Padrino
       project_root = project_root.rpartition('/').first
     end
 
-    if %w[Gemfile .components].all? { |file| File.file?(File.join(project_root, file)) }
-      binstub = File.join(project_root, 'bin', executable)
-      if File.file?(binstub)
-        exec Gem.ruby, binstub, *ARGV
-      else
-        puts 'Please run `bundle install --binstubs` from your project root to generate bundle-specific executables'
-        exit!
-      end
+    return unless %w[Gemfile .components].all? { |file| File.file?(File.join(project_root, file)) }
+
+    binstub = File.join(project_root, 'bin', executable)
+    if File.file?(binstub)
+      exec Gem.ruby, binstub, *ARGV
+    else
+      puts 'Please run `bundle install --binstubs` from your project root to generate bundle-specific executables'
+      exit!
     end
   end
 end

data/lib/padrino-core/cli/console.rb

@@ -7,7 +7,7 @@ end
 def applications
   puts "==== List of Mounted Applications ====\n\n"
   Padrino.mounted_apps.each do |app|
-    puts " * %-10s mapped to      %s" % [app.name, app.uri_root]
+    puts format(' * %-10s mapped to      %s', app.name, app.uri_root)
   end
   puts
   Padrino.mounted_apps.map { |app| "#{app.name} => #{app.uri_root}" }

data/lib/padrino-core/cli/launcher.rb

@@ -5,20 +5,23 @@ module Padrino
     class Launcher < Thor
       include Thor::Actions
 
-      class_option :chdir, :type => :string, :aliases => "-c", :desc => "Change to dir before starting."
-      class_option :environment, :type => :string,  :aliases => "-e", :desc => "Padrino Environment."
-      class_option :help, :type => :boolean, :desc => "Show help usage"
-
-      desc "start", "Starts the Padrino application (alternatively use 's')."
-      map "s" => :start
-      method_option :server,    :type => :string,  :aliases => "-a", :desc => "Rack Handler (default: autodetect)"
-      method_option :host,      :type => :string,  :aliases => "-h", :desc => "Bind to HOST address (default: 127.0.0.1)"
-      method_option :port,      :type => :numeric, :aliases => "-p", :desc => "Use PORT (default: 3000)"
-      method_option :daemonize, :type => :boolean, :aliases => "-d", :desc => "Run daemonized in the background."
-      method_option :pid,       :type => :string,  :aliases => "-i", :desc => "File to store pid."
-      method_option :debug,     :type => :boolean,                   :desc => "Set debugging flags."
-      method_option :options,   :type => :array,  :aliases => "-O", :desc => "--options NAME=VALUE NAME2=VALUE2'. pass VALUE to the server as option NAME. If no VALUE, sets it to true. Run '#{$0} --server_options"
-      method_option :server_options,   :type => :boolean, :desc => "Tells the current server handler's options that can be used with --options"
+      class_option :chdir, type: :string, aliases: '-c', desc: 'Change to dir before starting.'
+      class_option :environment, type: :string, aliases: '-e', desc: 'Padrino Environment.'
+      class_option :help, type: :boolean, desc: 'Show help usage'
+
+      desc 'start', "Starts the Padrino application (alternatively use 's')."
+      map 's' => :start
+      method_option :server,         type: :string,  aliases: '-a', desc: 'Rack Handler (default: autodetect)'
+      method_option :host,           type: :string,  aliases: '-h', desc: 'Bind to HOST address (default: 127.0.0.1)'
+      method_option :port,           type: :numeric, aliases: '-p', desc: 'Use PORT (default: 3000)'
+      method_option :daemonize,      type: :boolean, aliases: '-d', desc: 'Run daemonized in the background.'
+      method_option :pid,            type: :string,  aliases: '-i', desc: 'File to store pid.'
+      method_option :debug,          type: :boolean,                desc: 'Set debugging flags.'
+      method_option :options,        type: :array,   aliases: '-O', desc: <<~DESC.chomp
+        --options NAME=VALUE NAME2=VALUE2'. pass VALUE to the server as option NAME. If no VALUE, sets it to true. Run '#{$PROGRAM_NAME} --server_options
+      DESC
+      method_option :server_options, type: :boolean,                desc: "Tells the current server handler's options that can be used with --options"
+
       def start(*args)
         prepare :start
         require File.expand_path('adapter', __dir__)
@@ -27,13 +30,13 @@ module Padrino
         if options[:server_options]
           puts server_options(options)
         else
-          Padrino::Cli::Adapter.start(args.last ? options.merge(:config => args.last).freeze : options)
+          Padrino::Cli::Adapter.start(args.last ? options.merge(config: args.last).freeze : options)
         end
       end
 
-      desc "stop", "Stops the Padrino application (alternatively use 'st')."
-      map "st" => :stop
-      method_option :pid, :type => :string,  :aliases => "-p", :desc => "File to store pid", :default => 'tmp/pids/server.pid'
+      desc 'stop', "Stops the Padrino application (alternatively use 'st')."
+      map 'st' => :stop
+      method_option :pid, type: :string, aliases: '-p', desc: 'File to store pid', default: 'tmp/pids/server.pid'
       def stop
         prepare :stop
         require File.expand_path('adapter', __dir__)
@@ -44,25 +47,23 @@ module Padrino
 
       # https://github.com/rack/rack/blob/master/lib/rack/server.rb\#L100
       def server_options(options)
-        
-          info = []
-          server = Rack::Handler.get(options[:server]) || Rack::Handler.default(options)
-          if server && server.respond_to?(:valid_options)
-            info << ""
-            info << "Server-specific options for #{server.name}:"
-
-            has_options = false
-            server.valid_options.each do |name, description|
-              next if name.to_s.match(/^(Host|Port)[^a-zA-Z]/) # ignore handler's host and port options, we do our own.
-              info << "  -O %-21s %s" % [name, description]
-              has_options = true
-            end
-            return "" unless has_options
+        info = []
+        server = Rack::Handler.get(options[:server]) || Rack::Handler.default(options)
+        if server.respond_to?(:valid_options)
+          info << ''
+          info << "Server-specific options for #{server.name}:"
+
+          has_options = false
+          server.valid_options.each do |name, description|
+            next if name.to_s.match(/^(Host|Port)[^a-zA-Z]/) # ignore handler's host and port options, we do our own.
+            info << format('  -O %-21s %s', name, description)
+            has_options = true
           end
-          info.join("\n")
-        rescue NameError
-          "Warning: Could not find handler specified (#{options[:server] || 'default'}) to determine handler-specific options"
-        
+          return '' unless has_options
+        end
+        info.join("\n")
+      rescue NameError
+        "Warning: Could not find handler specified (#{options[:server] || 'default'}) to determine handler-specific options"
       end
 
       protected
@@ -72,16 +73,18 @@ module Padrino
           help(task.to_s)
           exit
         end
+
         if options.environment
-          ENV["RACK_ENV"] = options.environment.to_s
+          ENV['RACK_ENV'] = options.environment.to_s
         else
-          ENV["RACK_ENV"] ||= 'development'
+          ENV['RACK_ENV'] ||= 'development'
         end
+
         chdir(options.chdir)
-        unless File.exist?('config/boot.rb')
-          puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"
-          abort
-        end
+        return if File.exist?('config/boot.rb')
+
+        puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"
+        abort
       end
 
       def chdir(dir)

data/lib/padrino-core/cli/rake.rb

@@ -6,15 +6,17 @@ require 'securerandom' unless defined?(SecureRandom)
 begin
   require 'padrino-gen'
 rescue LoadError
+  # do nothing if padrino-gen is not available
 end
 
 module PadrinoTasks
-  def self.init(init=false)
-    Padrino::Tasks.files.flatten.uniq.each { |rakefile| begin
-                                                          Rake.application.add_import(rakefile)
-                                                        rescue StandardError
-                                                          puts "<= Failed load #{ext}"
-                                                        end }
+  def self.init(init = false)
+    Padrino::Tasks.files.flatten.uniq.each do |rakefile|
+      Rake.application.add_import(rakefile)
+    rescue StandardError
+      puts "<= Failed load #{ext}"
+    end
+
     load(File.expand_path('rake_tasks.rb', __dir__))
     Rake.application.load_imports
   end
@@ -29,18 +31,18 @@ module PadrinoTasks
 
   def self.load?(task, constant_present)
     if constant_present && !PadrinoTasks.tasks.include?(task)
-      warn <<-WARNING
-Loading #{task} tasks automatically.
-This functionality will be disabled in future versions. Please put
+      warn <<~WARNING
+        Loading #{task} tasks automatically.
+        This functionality will be disabled in future versions. Please put
 
-  PadrinoTasks.use(#{task.inspect})
-  PadrinoTasks.init
+          PadrinoTasks.use(#{task.inspect})
+          PadrinoTasks.init
 
-and remove
+        and remove
 
-  require File.expand_path('../config/boot.rb', __FILE__)
+          require File.expand_path('../config/boot.rb', __FILE__)
 
-in you Rakefile instead.
+        in you Rakefile instead.
       WARNING
     end
 

data/lib/padrino-core/cli/rake_tasks.rb

@@ -11,36 +11,36 @@ end
 task :skeleton do
   PADRINO_ROOT ||= Rake.application.original_dir
   require 'padrino-core'
-  Padrino.send(:dependency_paths).reject!{ |path| path.include?('/models/') }
+  Padrino.send(:dependency_paths).reject! { |path| path.include?('/models/') }
   require File.expand_path('config/boot.rb', Rake.application.original_dir)
 end
 
-desc "Generate a secret key"
+desc 'Generate a secret key'
 task :secret do
   shell.say SecureRandom.hex(32)
 end
 
 def list_app_routes(app, args)
   app_routes = app.named_routes
-  app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query && !args.query.empty?
+  app_routes.select! { |r| r.identifier.to_s =~ /#{args.query}/ } if args.query && !args.query.empty?
   app_routes.map! { |r| [r.verb, r.name, r.path] }
   return if app_routes.empty?
   shell.say "\nApplication: #{app.app_class}", :yellow
-  app_routes.unshift(["REQUEST", "URL", "PATH"])
-  max_col_1 = app_routes.max { |a, b| a[0].size <=> b[0].size }[0].size
-  max_col_2 = app_routes.max { |a, b| a[1].size <=> b[1].size }[1].size
+  app_routes.unshift(%w[REQUEST URL PATH])
+  max_col1 = app_routes.max { |a, b| a[0].size <=> b[0].size }[0].size
+  max_col2 = app_routes.max { |a, b| a[1].size <=> b[1].size }[1].size
   app_routes.each_with_index do |row, i|
-    message = [row[1].ljust(max_col_2+2), row[0].center(max_col_1+2), row[2]]
-    shell.say("    " + message.join(" "), i==0 ? :bold : nil)
+    message = [row[1].ljust(max_col2 + 2), row[0].center(max_col1 + 2), row[2]]
+    shell.say("    #{message.join(' ')}", i.zero? ? :bold : nil)
   end
 end
 
 def env_migration_version
-  version = ENV["MIGRATION_VERSION"]
-  if version.nil? && ENV["VERSION"]
+  version = ENV['MIGRATION_VERSION']
+  if version.nil? && ENV['VERSION']
     deprecated = true
-    warn "Environment variable VERSION is deprecated, use MIGRATION_VERSION"
-    version = ENV["VERSION"]
+    warn 'Environment variable VERSION is deprecated, use MIGRATION_VERSION'
+    version = ENV['VERSION']
   end
   version ? Integer(version) : nil
 rescue ArgumentError
@@ -48,14 +48,14 @@ rescue ArgumentError
   nil
 end
 
-desc "Displays a listing of the named routes within a project, optionally only those matched by [query]"
+desc 'Displays a listing of the named routes within a project, optionally only those matched by [query]'
 task :routes, [:query] => :environment do |_t, args|
   Padrino.mounted_apps.each do |app|
     list_app_routes(app, args)
   end
 end
 
-desc "Displays a listing of the named routes a given app [app]"
+desc 'Displays a listing of the named routes a given app [app]'
 namespace :routes do
   task :app, [:app] => :environment do |_t, args|
     app = Padrino.mounted_apps.find { |app| app.app_class == args.app }
@@ -63,10 +63,8 @@ namespace :routes do
   end
 end
 
-Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
-  
-    load(File.expand_path(file))
-  rescue LoadError => e
-    warn "#{file}: #{e.message}"
-  
+Dir['{lib/tasks/**,tasks/**,test,spec}/*.rake'].each do |file|
+  load(File.expand_path(file))
+rescue LoadError => e
+  warn "#{file}: #{e.message}"
 end

data/lib/padrino-core/command.rb

@@ -15,7 +15,7 @@ module Padrino
   #
   def self.bin(*args)
     @_padrino_bin ||= [self.ruby_command, File.expand_path('../../bin/padrino', __dir__)]
-    args.empty? ? @_padrino_bin : system(args.unshift(@_padrino_bin).join(" "))
+    args.empty? ? @_padrino_bin : system(args.unshift(@_padrino_bin).join(' '))
   end
 
   ##

data/lib/padrino-core/ext/sinatra.rb

@@ -7,9 +7,10 @@ class Sinatra::Request
   attr_accessor :route_obj
 
   def controller
-    route_obj && route_obj.controller
+    route_obj&.controller
   end
+
   def action
-    route_obj && route_obj.action
+    route_obj&.action
   end
 end

data/lib/padrino-core/filter.rb

@@ -27,7 +27,7 @@ module Padrino
     private
 
     def scoped_controller_name
-      @scoped_controller_name ||= Array(@scoped_controller).join("_")
+      @scoped_controller_name ||= Array(@scoped_controller).join('_')
     end
 
     def match_with_arguments?(request)
@@ -37,7 +37,7 @@ module Padrino
         if argument.instance_of?(Symbol)
           next unless route
           name = route.name
-          argument == name || name == [scoped_controller_name, argument].join(" ").to_sym
+          argument == name || name == [scoped_controller_name, argument].join(' ').to_sym
         else
           argument === path
         end
@@ -46,7 +46,7 @@ module Padrino
 
     def match_with_options?(request)
       user_agent = request.user_agent
-      @options.any?{|name, value| value === (name == :agent ? user_agent : request.send(name)) }
+      @options.any? { |name, value| value === (name == :agent ? user_agent : request.send(name)) }
     end
   end
 end

data/lib/padrino-core/loader.rb

@@ -142,24 +142,22 @@ module Padrino
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
     #
     def require_dependencies(*paths)
-      options = { :cyclic => true }.update(paths.last.is_a?(Hash) ? paths.pop : {})
+      options = { cyclic: true }.update(paths.last.is_a?(Hash) ? paths.pop : {})
 
-      files = paths.flatten.flat_map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.uniq
+      files = paths.flatten.flat_map { |path| Dir.glob(path).sort_by { |filename| filename.count('/') } }.uniq
 
       until files.empty?
         error = fatal = loaded = nil
 
         files.dup.each do |file|
-          
-            Reloader.safe_load(file, options)
-            files.delete(file)
-            loaded = true
-          rescue NameError, LoadError => error
-            raise if Reloader.exclude.any?{ |path| file.start_with?(path) } || options[:cyclic] == false
-            logger.devel "Cyclic dependency reload for #{error.class}: #{error.message}"
-          rescue Exception => fatal
-            break
-          
+          Reloader.safe_load(file, options)
+          files.delete(file)
+          loaded = true
+        rescue NameError, LoadError => error
+          raise if Reloader.exclude.any? { |path| file.start_with?(path) } || options[:cyclic] == false
+          logger.devel "Cyclic dependency reload for #{error.class}: #{error.message}"
+        rescue Exception => fatal
+          break
         end
 
         next unless fatal || !loaded