camping 3.1.3 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf72576fffe27b262b298dbd9355a0e801ea962c532a63010e60e72564092c77
-  data.tar.gz: caa65f8d4585a2b99a6ddbf3699065512b7ffee4f84a6f7a03c31d2871542bd6
+  metadata.gz: e8f510e735548917a248d02aec9a7a36f21c3c527919799c23dc32c2c717396d
+  data.tar.gz: 2535878776ceb1093fd24b621db216ae5917addd76a9bc0f7f8fff33abc6f4e6
 SHA512:
-  metadata.gz: 9094ac07b30d28d2a2e8f955793959142c00db8f1880e60adb2ff02152f0f401b336a7ccb2e5228e396a5fc2f0ead7f78597dadaeca304d3e489f0c74746f28e
-  data.tar.gz: 1f789d875289e0632734ffb04b4765c454f050fd0efd96f8603a52cde615e452bd5dcc27f6a338a2efe86fa0fef03183f819567785a45208bdf1700aabd2722d
+  metadata.gz: 99b49c530feed07ee899e83d1e442b708cb44e383d8e23437896cbeea0ed945b0500edd794bd887b2d59a9be957b13556d61600d6c2d38a0389625dd1b2c6222
+  data.tar.gz: 1eb83d984b72e38e5a475555dd80503fbf9dcd2ca43ca6770e1b744f4f41b360698432f08c35162bc4ff422f249813a705f93e0b00a471181ba7e73b9fb74905

data/Rakefile

@@ -29,8 +29,18 @@ CLEAN.include ['**/.*.sw?', '*.gem', '.config', 'test/test.log', '.*.pt']
 
 task :default => :check
 
-## RDoc
+# New Docs
+
+## context for the docs sections: we're going to move to using Rdoc and yard.
+## With some extras. The Docs folder will probably go away.
+
+## New docs directly serve a website like a boss.
+desc "Serves the docs locally"
+task :serve do
+  sh "ruby -run -e httpd docs -p 8000"
+end
 
+## RDoc
 begin
   gem 'rdoc', '~>3.9.0'
 rescue LoadError
@@ -82,6 +92,15 @@ Rake::TestTask.new(:configreloader) do |t|
   t.test_files = FileList['test/config_*.rb']
 end
 
+Rake::TestTask.new(:integration) do |t|
+  `gem build`
+  gem = Dir.glob("camping*.gem").first
+  exit if gem == nil
+  `cd test/integration`
+  t.libs << "/"
+  t.test_files = FileList['test/test_*.rb']
+end
+
 ## Diff
 desc "Compare camping and camping-unabridged"
 task :diff do

data/book/04_more_about_views.md

@@ -18,7 +18,7 @@ with the render sentence. The views do not use class.
 module Nust::Views
 
    def post_number
-      p "you asked the post number @postn"
+      p "you asked the post number @post"
    end
 
 end

data/book/07_philosophy.md

@@ -12,7 +12,7 @@ The End.
 
 # Actual philosophy
 
-Why The Lucky Stiff is no longer around, so those of us who contributed early on to Camping have since become its caretakers. We continue to push the framework foward, to be more compact, to be faster, easier, more fun. These are our guiding principals:
+Why The Lucky Stiff is no longer around, so those of us who contributed early on to Camping have since become its caretakers. We continue to push the framework forward, to be more compact, to be faster, easier, more fun. These are our guiding principals:
 
 - Camping is for everyone. It sure is great to turn an idea in to a single ruby file which creates a website. It's also great to organise an app in to several files sometimes. You can plug bits together all in a row, and grow your evil monkey in to an entire army of evil circus animals!
 - Camping isn't for making money. You can make money using camping. Nobody will stop you. But we don't have any buzzwords to offer, we won't make your unit tests easier, nor help you do market research. Our main contributors certainly aren't using camping in large scale deployments, and while camping is blazingly fast, we have no idea how well it would work if you ran it on lots of servers!

data/lib/camping/commands.rb

@@ -316,10 +316,8 @@ TXT
       # write a config.kdl
       def make_configkdl
         write 'config.kdl', <<-KDL
-# config.kdl
-hostname {
-  default "localhost"
-}
+// config.kdl
+hostname "localhost"
 KDL
       end
 

data/lib/camping/gear/firewatch.rb

@@ -0,0 +1,79 @@
+require 'rack'
+require 'rack/utils'
+require 'rack/common_logger'
+require 'dry/logger'
+
+
+# Firewatch is Camping's logger.
+# It wraps Rack::CommonLogger, and gives a mechanism to Redirect logs.
+module Camping
+  class Firewatch < Rack::CommonLogger
+
+    class << self
+      def logger
+        @logger ||= default_logger
+      end
+      def logger=(new_logger)
+        @logger = new_logger
+      end
+      def default_logger
+        Dry.Logger(:Camping, template: default_template).add_backend(stream: "logs/development.log")
+      end
+      def default_template
+        "[<green>%<severity>s</green> - %<time>s] %<message>s"
+      end
+    end
+
+    # +logger+ can be any object that supports the +write+ or +<<+ methods,
+    # which includes the standard library Logger.  These methods are called
+    # with a single string argument, the log message.
+    # If +logger+ is nil, Firewatch(CommonLogger) will fall back <tt>env['rack.errors']</tt>.
+    def initialize(app, logger = nil)
+      @app = app
+      if logger == nil
+        @logger = Camping::Firewatch.default_logger
+      else
+        @logger = logger
+      end
+      # @logger = Camping::Firewatch.logger = logger.nil? ? Camping::Firewatch.default_logger : logger
+    end
+
+  end
+end
+
+module Gear
+
+  # Fire watch Gear gives us helper methods to access the logger, log stuff,
+  # and do other shenanigans
+  module Firewatch
+
+    class << self
+
+      def included(mod)
+        mod::Helpers.include(HelperMethods)
+      end
+
+      # required for compliance reasons
+      def setup(app, *a, &block)
+      end
+
+    end
+
+    module HelperMethods
+
+      def logger
+        Camping::Firewatch.logger
+      end
+
+      # #log A helper method to log stuff.
+      # @message: String, Default: nil, An optional value used to directly log
+      # rather than requesting the logger
+      def log(message = nil)
+        return logger unless !message.nil?
+        logger.info message
+      end
+    end
+
+  end
+
+end

data/lib/camping/gear/nancy.rb

@@ -21,14 +21,13 @@ module Gear
 				s = ""
 				rs = ""
 				routes.each do |r|
+					rs += "'#{r}'" + ","
 					if r == '/'
 						r = 'Index'
 					end
-					rs += "'#{r}'" + ","
 					r.split("/").each(&:capitalize!).each{|t|
 						s << t.gsub(/[^a-z0-9A-Z ]/, '')
 					}
-					# s << r
 				end
 				rs.chop!
 
@@ -73,12 +72,11 @@ module Gear
 				cname = "#{meth.capitalize}#{symbol.to_s}"
 
 				begin
-					m.module_eval(%Q[
-					module Controllers
-						class #{cname} < R #{rs}
-						end
-					end
-					], file_name, line_number.to_i)
+
+					# Find out which eval script to use.
+					eval_script = m.name.include?("Controllers") ? controller_script(name: cname,routes: rs) : module_script(name: cname,routes: rs)
+
+					m.module_eval(eval_script, file_name, line_number.to_i)
 				rescue => error
 					if error.message.include? "superclass mismatch for class"
 						raise "You've probably tried to define the same route twice using the sinatra method. ['#{rs}']"
@@ -93,7 +91,8 @@ module Gear
 				# If we have a rack response instead of string, then we need to extract
 				# the response then reassign the values. the r method  is a great helper
 				# for that.
-				constantine = m::X.const_get("#{cname}")
+				constantine = m.name.include?("Controllers") ? m.const_get("#{cname}") : m::X.const_get("#{cname}")
+
 				if block.arity == -1
 					constantine.send(:define_method, meth) { |*args|
 						block[*args]
@@ -115,8 +114,27 @@ module Gear
 				return nil
 			end
 
+			# returns a formatted string for making a controller class in the App module
+			def module_script(name:, routes:)
+				%Q[
+				module Controllers
+					class #{name} < R #{routes}
+					end
+				end
+				]
+			end
+
+			# returns a formatted string for making a controller class in the Controllers module
+			def controller_script(name:, routes:)
+				%Q[
+					class #{name} < R #{routes}
+					end
+				]
+			end
+
 			def included(mod)
 				mod.extend(ClassMethods)
+				mod::Controllers.extend(ClassMethods)
 			end
 
 			# required for compliance reasons

data/lib/camping/loader.rb

@@ -85,7 +85,13 @@ module Camping
       all_requires = $LOADED_FEATURES.dup
       all_apps = Camping::Apps.dup
 
+      # Zeitwerk will Autoload stuff, which is great. But we don't want Zeitwerk
+      # autoloading when we evaluate the camp.rb file because it will try to
+      # autoload any controllers and helpers that we've defined in there from
+      # the descendant /apps and /lib directory, which then make it break.
+      @zeit.unload
       load_file
+      @zeit.setup
       reload_directory("#{@root}/apps")
       reload_directory("#{@root}/lib")
       Camping.make_camp
@@ -138,7 +144,7 @@ module Camping
     # so everything in /apps, and /lib in relation from this script.
     def remove_constants
     	@requires.each do |(path, full)|
-     		$LOADED_FEATURES.delete(path)
+     		$LOADED_FEATURES.delete(path) unless path.match? "concurrent-ruby"
      	end
 
       @apps.each do |name, app|
@@ -200,6 +206,7 @@ module Camping
     end
 
     # Splits the descendent files and folders found in a given directory for eager loading and recursion.
+    # If the given directory doesn't exist or is empty, then nothing is returned.
     def folders_and_files_in(directory)
       directory = directory + "/*" # unless directory
       [Dir.glob(directory).select {|f| !File.directory? f },
@@ -207,6 +214,7 @@ module Camping
     end
 
     # Reloads a directory recursively. loading more shallow files before deeper files.
+    # If the given directory doesn't exist or is empty, then nothing happens.
     def reload_directory(directory)
       files, folders = folders_and_files_in(directory)
       files.each {|file|

data/lib/camping/loads.rb

@@ -13,3 +13,4 @@ require 'camping/gear/filters'
 require 'camping/gear/nancy'
 require 'camping/gear/inspection'
 require 'camping/gear/kuddly'
+require 'camping/gear/firewatch'

data/lib/camping/server.rb

@@ -3,6 +3,7 @@ require 'erb'
 require 'rack'
 require 'rackup'
 require 'camping/version'
+require 'camping/gear/firewatch'
 require 'camping/loader'
 require 'camping/commands'
 
@@ -93,6 +94,10 @@ module Camping
       end
     end
 
+    def loader
+      @reloader || nil
+    end
+
     def opt_parser
       Options.new
     end
@@ -103,18 +108,27 @@ module Camping
       })
     end
 
+    # redefine logging middleware
+    class << self
+      def logging_middleware
+        lambda { |server|
+          /CGI/.match?(server.server.name) || server.options[:quiet] ?  nil : [Camping::Firewatch, $stderr]
+        }
+      end
+    end
+
     def middleware
       h = super
       h["development"] << [XSendfile]
+      h["deployment"] << [XSendfile]
       h
     end
 
-    def start
-
-      commands = []
-      ARGV.each do |cmd|
-        commands << cmd
-      end
+    # Starts the Camping Server. Camping server inherits from Rack::Server so
+    # referencing their documentation would be a good idea.
+    # @file: String, file location for a camp.rb file.
+    def start(file = nil)
+      commands = ARGV
 
       # Parse commands
       case commands[0]
@@ -147,7 +161,7 @@ module Camping
       else
         name = server.name[/\w+$/]
         puts "** Starting #{name} on #{options[:Host]}:#{options[:Port]}"
-        super
+        super()
       end
     end
 

data/lib/camping/version.rb

@@ -1,5 +1,5 @@
 module Camping
-  VERSION = "3.1.3"
+  VERSION = "3.2"
   def self.version
     VERSION
   end

data/lib/camping-unabridged.rb

@@ -17,7 +17,7 @@ Z ||= "text/html"
 
 class Object #:nodoc:
   def meta_def(m,&b) #:nodoc:
-    (class<<self;self end).send(:define_method,m,&b)
+    (class<<self;self end).define_method(m,&b)
   end
 end
 
@@ -81,7 +81,7 @@ module Camping
     #   => :macadamian
     #
     def method_missing(m,*a)
-        m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.to_s]:super
+      m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.to_s]:super
     end
     undef id, type if ?? == 63
   end
@@ -672,7 +672,7 @@ module Camping
         # TODO: Refactor this to make it less convoluted around making urls.
         constants.filter {|c| c.to_s != 'Camper'}.map { |c|
           k = const_get(c)
-          k.send :include,C,X,Base,Helpers,Models
+          k.include(C,X,Base,Helpers,Models)
           @r=[k]+@r if @r-[k]==@r
           mu = false # Should we make urls?
           ka = k.ancestors
@@ -703,9 +703,8 @@ module Camping
     # helps Camping::Server map routes to multiple apps.
     # Usage:
     #
-    #   Nuts.routes
+    #   Nuts.routes # returns routes for Nuts
     #   Camping.routes
-    #   Nuts.routes
     #
     def routes
       (Apps.map(&:routes)<<X.v).flatten
@@ -714,6 +713,7 @@ module Camping
     # An internal method used to return the current app's url_prefix.
     # the prefix is processed to make sure that it's not all wonky. excessive
     # trailing and leading slashes are removed. A trailing slash is added.
+    # @return [String] A reference to the URL response
     def prx
       @_prx ||= CampTools.normalize_slashes(O[:url_prefix])
     end
@@ -723,6 +723,8 @@ module Camping
     # Array with [status, headers, body] is expected at the output.
     #
     # See: https://github.com/rack/rack/blob/main/SPEC.rdoc
+    # @param [Array] A rack response
+    # @return [Array] A rack response
     def call(e)
       k,m,*a=X.D e["PATH_INFO"],e['REQUEST_METHOD'].downcase,e
       k.new(e,m,prx).service(*a).to_a
@@ -766,11 +768,11 @@ module Camping
     #   end
     #
     # This piece of code feels a bit confusing, but let's walk through it.
-    # Rack apps all implement a Call method. This is how Rub web servers
-    # pass call the app, or code that you're set up. In our case, our camping
+    # Rack apps all implement a Call method. This is how Ruby web servers
+    # call the app, or code that you've set up. In our case, our camping
     # apps.
     #
-    # The Use method is setting up a new middleware, it first shifts the first
+    # The Use method is setting up a new middleware, it shifts the first
     # argument supplied to Use, which should be the Middleware name, then
     # initializes it. That's your new middleware. Rack based middleware accept
     # a single argument to their initialize methods, which is an app. Optionally
@@ -791,6 +793,7 @@ module Camping
     def use(*a, &b)
       m = a.shift.new(method(:call), *a, &b)
       meta_def(:call) { |e| m.call(e) }
+      m
     end
 
     # Add gear to your app:
@@ -825,6 +828,22 @@ module Camping
     #     end
     #   end
     #
+    # Camping gear can also provide Helper methods to our controllers:
+    #
+    #   module MyGear
+    #     module HelperMethods
+    #       # Define Helper Methods here
+    #     end
+    #
+    #     # This is plumbing in our Gear to add our Helper methods.
+    #     class << self
+    #       def included(mod)
+    #         mod::Helpers.include(HelperMethods)
+    #       end
+    #     end
+    #   end
+    #
+    # Helper methods are available in our controllers.
     def pack(*a, &b)
       G << g = a.shift
       include g
@@ -865,7 +884,7 @@ module Camping
     # which enables you to create a Camping-based application within
     # another module.
     #
-    # Here's an example of namespacing your web interface and
+    # Here's an example of name spacing your web interface and
     # code for a worker process together:
     #
     #   module YourApplication
@@ -913,11 +932,10 @@ module Camping
 
       # setup caller data
       sp = caller[0].split('`')[0].split(":")
-      fl, ln, pr = sp[0], sp[1].to_i, nil
-      # ln = 0
+      fl, ln, pr = sp[0]+' <Cam\ping App> ' , sp[1].to_i, nil
 
       # Create the app
-      Apps << a = eval(S.gsub(/Camping/,m.to_s), g, fl, ln)
+      Apps << a = eval(S.gsub(/Camping/,m.to_s), g, fl, 1)
 
       caller[0]=~/:/
       IO.read(a.set:__FILE__,$`)=~/^__END__/ &&
@@ -995,7 +1013,7 @@ module Camping
   #
   # Models cannot be referred from Views at this time.
   module Models
-    Helpers.send(:include, X, self)
+    Helpers.include(X, self)
   end
 
   autoload :Mab, 'camping/mab'

data/lib/camping.rb

@@ -1,6 +1,6 @@
 require "cam\ping/loads";E||="content-type";Z||="text/html"
 class Object;def meta_def m,&b;(class<<self;self
-end).send:define_method,m,&b end;end
+end).define_method(m,&b) end;end
 module Camping;C=self;S=IO.read(__FILE__)rescue nil
 P="<h1>Cam\ping Problem!</h1><h2>%s</h2>";U=Rack::Utils;Apps=[];SK="camping";G=[]
 class H<Hash;def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m
@@ -58,7 +58,7 @@ if c.to_s=="Index";while d[-1]=="/";d.chop! end;u.prepend("/"+d)end;u}
 N=H.new{|_,x|x.downcase}.merge! "N"=>'(\d+)',"X"=>'([^/]+)',"Index"=>''
 def M p;def M p;end
 constants.filter{|c|c.to_s!='Camper'}.map{|c|k=const_get(c);
-k.send:include,C,X,Base,Helpers,Models
+k.include(C,X,Base,Helpers,Models)
 @r=[k]+@r if @r-[k]==@r;mu=false;ka=k.ancestors
 if (k.respond_to?(:urls) && ka[1].respond_to?(:urls)) && (k.urls == ka[1].urls)
 mu = true unless ka[1].name == nil end
@@ -71,16 +71,16 @@ downcase,e;k.new(e,m,prx).service(*a).to_a;rescue;r500(:I,k,m,$!,:env=>e).to_a e
 def method_missing m,c,*a;h=Hash===a[-1]?a.pop : {};e=H[Rack::MockRequest.
 env_for('',h.delete(:env)||{})];k=X.const_get(c).new(e,m.to_s,prx);h.each{|i,v|
 k.send"#{i}=",v};k.service(*a)end
-def use*a,&b;m=a.shift.new(method(:call),*a,&b);meta_def(:call){|e|m.call(e)}end
+def use*a,&b;m=a.shift.new(method(:call),*a,&b);meta_def(:call){|e|m.call(e)};m;end
 def pack*a,&b;G<< g=a.shift;include g;g.setup(self,*a,&b)end
 def gear;G end;def options;O;end;def set k,v;O[k]=v end
 def goes m,g=TOPLEVEL_BINDING;sp=caller[0].split('`')[0].split(":");fl,ln,pr=
-sp[0],sp[1].to_i,nil;Apps<< a=eval(S.gsub(/Camping/,m.to_s),g,fl,ln);caller[0]=~/:/
+sp[0]+' <Cam\ping App> ',sp[1].to_i,nil;Apps<< a=eval(S.gsub(/Camping/,m.to_s),g,fl,1);caller[0]=~/:/
 IO.read(a.set:__FILE__,$`)=~/^__END__/&&(b=$'.split(/^@@\s*(.+?)\s*\r?\n/m)
 ).shift rescue nil;a.set :_t,H[*b||[]]
 a.set :_meta, H[file: fl, line_number: ln, parent: self,
 root: (name != "Cam\ping" ? '/' + CampTools.to_snake(name) : '/')];C.configure(a)end end
 module Views;include X,Helpers end;module Models
-Helpers.send:include,X,self end;autoload:Mab,'camping/mab'
+Helpers.include(X,self) end;autoload:Mab,'camping/mab'
 autoload:Template,'camping/template';pack Gear::Inspection;pack Gear::Filters
 pack Gear::Nancy;pack Gear::Kuddly;C end

data/test/app_logger.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+require 'camping'
+
+Camping.goes :Loggy
+
+Loggy.pack Gear::Firewatch
+
+module Loggy::Controllers
+
+  class Index
+    def get
+      # @env['rack.errors'] = StringIO.new
+      log.debug("Created Logger")
+      log.info("Program Started")
+      log.warn("Nothing to do!")
+      log "what up"
+    end
+  end
+end
+
+class Loggy::Test < TestCase
+
+  def logs
+    File.read Dir["./**/logs/development.log"].first
+  end
+
+  def after_all
+    `rm -rf logs` if File.exist?('logs/development.log')
+    `rm -rf logs` if File.exist?('logs/formatter.log')
+    `rm -rf logs` if File.exist?('logs/production.log')
+    super
+  end
+
+  def test_logging
+    get '/'
+    assert_log "Program Started"
+    assert_log "INFO"
+  end
+
+  def test_log_levels
+    get '/'
+    assert(/(INFO).*Program Started$/.match?(logs), "Log level of INFO not found.")
+    assert(/(WARN).*Nothing to do!$/.match?(logs), "Log level of WARN not found.")
+  end
+
+  def test_log_on_error
+    get '/'
+    assert_raises {
+      raise "[Error]: There was a big error and I don't like it."
+    }
+  end
+
+  def test_change_log_location
+    Camping::Firewatch.logger = Dry.Logger(:Camping, template: Camping::Firewatch::default_template).add_backend(stream: "logs/production.log")
+    puts Camping::Firewatch.logger
+    get '/'
+    lags = File.read Dir["./**/logs/production.log"].first
+    assert(/(INFO).*Program Started$/.match?(lags), "Log level of INFO not found.")
+
+    # the end of the test means we set it back.
+    Camping::Firewatch.logger = Dry.Logger(:Camping, template: Camping::Firewatch::default_template).add_backend(stream: "logs/development.log")
+  end
+
+  # def test_changing_loggging_formatter
+  #   logger = Dry.Logger(:Camping, formatter: :rack).add_backend(stream: "logs/formatter.log")
+  #   get '/'
+  #   assert(/(INFO).*Program Started$/.match?(logs), "Log level of INFO not found.")
+  # end
+
+end

data/test/apps/loader/apps/donuts/controllers.rb

@@ -0,0 +1,10 @@
+module Donuts
+  module Controllers
+    class Index
+      def get
+       "hello friends"
+      end
+    end
+
+  end
+end

data/test/gear/gear_nancy.rb

@@ -53,6 +53,13 @@ module Frank
 		"start over?"
 	end
 
+	# Test Controllers too
+	module Controllers
+		get "/even_more" do
+			"I need even more."
+		end
+	end
+
 end
 
 Camping.goes :Bill
@@ -85,7 +92,7 @@ class Frank::Test < TestCase
 
 	def test_number_of_controllers
 		controllers = the_controllers
-		assert (controllers.count == 12), "There are not the right number of controllers: #{controllers.count}."
+		assert (controllers.count == 13), "There are not the right number of controllers: #{controllers.count}."
 	end
 
 	def test_controller_names
@@ -103,7 +110,11 @@ class Frank::Test < TestCase
 		assert controllers.include?(:PatchThisBoat), "Not Found: :PatchThisBoat. Controllers: #{controllers}."
 		assert controllers.include?(:LinkToThePast), "Not Found: :LinkToThePast. Controllers: #{controllers}."
 		assert controllers.include?(:UnlinkGameOver), "Not Found: :UnlinkGameOver. Controllers: #{controllers}."
+	end
 
+	def test_index_controller_works
+		get '/'
+		assert_body "Hello Friends", "Body is not what we expect."
 	end
 
 	def test_get_works_for_controllers
@@ -121,6 +132,11 @@ class Frank::Test < TestCase
 		assert_body "It looks like you have lots of friends.", "Well this is a bummer. Frank is left out, and not called."
 	end
 
+	def test_that_using_nancy_in_a_controller_works
+		get '/even_more'
+		assert_body 'I need even more.'
+	end
+
 	# TODO: Test that we are returning proper headers, that are not symbols, When Nancying.
 	def test_that_header_keys_aint_symbols
 

data/test/test_helper.rb

@@ -47,9 +47,28 @@ module CommandLineCommands
 
   # deletes the temporary directories found in the /apps directory for reloader testing.
   def leave_reloader
-	  Dir.chdir @original_dir
-	  `rm -rf test/apps/reloader/apps` if File.exist?('test/apps/reloader/apps')
-	  `rm -rf test/apps/reloader/lib` if File.exist?('test/apps/reloader/lib')
+    Dir.chdir @original_dir
+    `rm -rf test/apps/reloader/apps` if File.exist?('test/apps/reloader/apps')
+    `rm -rf test/apps/reloader/lib` if File.exist?('test/apps/reloader/lib')
+  end
+
+  # move_to_app
+  # Moves to an app directory,
+  # @app_name: String,
+  def move_to_app(app_name = "")
+    @original_dir = Dir.pwd
+    Dir.chdir "test"
+    Dir.chdir "apps"
+    Dir.chdir directory
+    Dir.mkdir("apps") unless Dir.exist?("apps")
+    Dir.mkdir("lib") unless Dir.exist?("lib")
+  end
+
+  def leave_app(app_name = "", purge_directorys = [])
+    Dir.chdir @original_dir
+    purge_directorys.each do |dir|
+      `rm -rf test/apps/#{app_name}/#{dir}` if File.exist?('test/apps/#{app_name}/#{dir}')
+    end
   end
 
   # Moves to the loader directory
@@ -87,7 +106,7 @@ module CommandLineCommands
     write 'config.kdl', <<-TXT
 // config.kdl
 database {
-  default adapter="sqlite3"  host="localhost" max_connections=5 timeout=5000
+  default adapter="sqlite3" host="localhost" max_connections=5 timeout=5000
   development
   production adapter="postgres" database="kow"
 }
@@ -102,7 +121,7 @@ TXT
 
 end
 
-class TestCase < MiniTest::Test
+class TestCase < Minitest::Test
   include Rack::Test::Methods
   include CommandLineCommands
   include Minitest::Hooks
@@ -145,6 +164,11 @@ class TestCase < MiniTest::Test
     end
   end
 
+  def assert_log(str, message="")
+    logs = File.read Dir["./**/logs/development.log"].first
+    assert(logs.to_s.match?(str), message)
+  end
+
   def assert_status(code, message="")
     assert_equal(code, last_response.status, message)
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.2
 platform: ruby
 authors:
 - why the lucky stiff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: mab
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +121,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,47 +131,61 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: dry-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 description:
 email: why@ruby-lang.org
 executables:
@@ -196,6 +238,7 @@ files:
 - lib/camping/campguide.rb
 - lib/camping/commands.rb
 - lib/camping/gear/filters.rb
+- lib/camping/gear/firewatch.rb
 - lib/camping/gear/inspection.rb
 - lib/camping/gear/kuddly.rb
 - lib/camping/gear/nancy.rb
@@ -219,6 +262,7 @@ files:
 - test/app_inception.rb
 - test/app_inline_templates.rb
 - test/app_loader.rb
+- test/app_logger.rb
 - test/app_markup.rb
 - test/app_migrations.rb
 - test/app_partials.rb
@@ -230,6 +274,7 @@ files:
 - test/apps/forms.rb
 - test/apps/forward_to_other_controller.rb
 - test/apps/loader/apps/donuts.rb
+- test/apps/loader/apps/donuts/controllers.rb
 - test/apps/loader/apps/donuts/controllers/index.rb
 - test/apps/loader/camp.rb
 - test/apps/migrations.rb
@@ -243,7 +288,7 @@ files:
 - test/gear/gear_nancy.rb
 - test/reload_reloader.rb
 - test/test_helper.rb
-homepage: http://camping.rubyforge.org/
+homepage: http://rubycamping.org/
 licenses: []
 metadata: {}
 post_install_message:
@@ -269,8 +314,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
-summary: micro mighty websites for anyone
+summary: miniature rails for anyone
 test_files: []