camping 3.2.4 → 3.2.6

data/test/integration/Rakefile

@@ -15,30 +15,3 @@ namespace 'test' do
   end
 end
 
-# def delete_file(filename="")
-#   return if !File.exist? filename
-#   begin
-#     f = File.open(filename, 'r')
-#   ensure
-#     f.close unless f.nil? or f.closed?
-#     File.delete(filename) if File.exist? filename
-#   end
-# end
-
-## Integration Test
-# desc "Perform an integration test"
-# task :integration do
-  # `bundle install` # remove gems
-  # `bundle clean --force` # remove gems
-  # puts Dir.pwd
-  # # `gem install` # add bundler.
-  # `bundle install` # rewrites Gemfile.lock
-  # `bundle add camping --path=../../`
-  # # `bundle add camping puma`
-  # # `bundle add minitest -g=test`
-  # # `bundle add minitest-reporters -g=test`
-  # # `bundle add rack-test -g=test`
-  # # `bundle add minitest-hooks -g=test`
-  # # t.libs << "/"
-  # # t.test_files = FileList['test/test_*.rb']
-# end

data/test/integration/kindling/starty.rb

@@ -0,0 +1,7 @@
+module Starty
+
+  def message = "Hello Friends"
+
+  def name = "Starty"
+
+end

data/test/reload_reloader.rb

@@ -16,11 +16,9 @@ module TestCaseLoader
     move_to_reloader
     loader.reload!
     assert Object.const_defined?(:Reloader), "Reloader didn't load app"
-    # puts "before_all called"
   end
 
   def after_all
-    # puts "after_all called"
     assert Object.const_defined?(:Reloader), "Test removed app"
     loader.remove_constants
     assert !Object.const_defined?(:Reloader), "Loader didn't remove app"
@@ -40,7 +38,6 @@ class TestLoader < TestCase
     super
     $counter = 0
     loader.reload!
-    # puts "setup called"
   end
 
   def test_counter
@@ -71,11 +68,11 @@ class TestLoader < TestCase
   end
 end
 
-# class TestConfigRu < TestLoader
-#   BASE = File.expand_path('../apps/reloader', __FILE__)
-#   def file; BASE + '/config.ru' end
+class TestConfigRu < TestLoader
+  BASE = File.expand_path('../apps/reloader', __FILE__)
+  def file; BASE + '/config.ru' end
 
-#   def test_name
-#     assert_equal Reloader, loader.apps[:reloader]
-#   end
-# end
+  def test_name
+    assert_equal Reloader, loader.apps[:reloader]
+  end
+end

data/test/server/helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+$:.unshift(File.expand_path('../lib', __dir__))
+# $:.unshift(File.dirname(__FILE__) + '../../lib')
+
+require_relative '../../lib/camping'
+require_relative '../../lib/camping/server'
+
+require 'minitest/global_expectations/autorun'
+require 'stringio'
+
+require 'minitest/reporters'
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]

data/test/server/spec_server.rb

@@ -0,0 +1,103 @@
+require_relative 'helper'
+
+require 'tempfile'
+require 'socket'
+require 'webrick'
+require 'open-uri'
+require 'net/http'
+require 'net/https'
+
+begin
+  require 'stackprof'
+  require 'tmpdir'
+rescue LoadError
+else
+  test_profile = true
+end
+
+describe Camping::Server do
+  argv = Camping::Server::ARGV = []
+  define_method(:argv) { argv }
+
+  before {
+    argv.clear
+    @original_dir = Dir.pwd
+    Dir.chdir "test/integration"
+  }
+
+  after {
+    Dir.chdir @original_dir
+  }
+
+  # Probably need to revise this for the camping port
+  def app
+    lambda { |env| [200, { 'content-type' => 'text/plain' }, ['success']] }
+  end
+
+  # learn what this is doing.
+  def with_stderr
+    old, $stderr = $stderr, StringIO.new
+    yield $stderr
+  ensure
+    $stderr = old
+  end
+
+  # first copied test to make sure this works right.
+  it "overrides :config if :app is passed in" do
+    server = Rackup::Server.new(app: "FOO")
+    server.app.must_equal "FOO"
+  end
+
+  # Fails a lot
+  # it "runs a server" do
+  #   pidfile = Tempfile.open('pidfile') { |f| break f }
+  #   FileUtils.rm pidfile.path
+  #   server = Camping::Server.new(
+  #     app: "FOO",
+  #     environment: 'none',
+  #     pid: pidfile.path,
+  #     Port: TCPServer.open('localhost', '0'){|s| s.addr[1] },
+  #     Host: 'localhost',
+  #     Logger: WEBrick::Log.new(nil, WEBrick::BasicLog::WARN),
+  #     AccessLog: [],
+  #     daemonize: false,
+  #     server: 'webrick'
+  #   )
+  #   t = Thread.new { server.start { |s| Thread.current[:server] = s } }
+  #   t.join(0.01) until t[:server] && t[:server].status != :Stop
+  #   body = if URI.respond_to?(:open)
+  #           URI.open("http://localhost:#{server.options[:Port]}/") { |f| f.read }
+  #         else
+  #           open("http://localhost:#{server.options[:Port]}/") { |f| f.read }
+  #         end
+  #   body.must_include 'Let's go Camping'
+  #   Process.kill(:INT, $$)
+  #   t.join
+  #   open(pidfile.path) { |f| f.read.must_equal $$.to_s }
+  # end
+
+  it "Loads the kindling initializers" do
+    pidfile = Tempfile.open('pidfile') { |f| break f }
+    FileUtils.rm pidfile.path
+    server = Camping::Server.new
+
+    starty_file = false
+    starty_name = "Starty"
+
+    t = Thread.new {
+      server.start { |s|
+        Thread.current[:server] = s
+        starty_file = Object.constants.include? :Starty
+        starty_name = Starty.name
+      }
+    }
+    t.join(0.01) until t[:server] && t[:server].status != :Stop
+
+    starty_file.must_equal true
+    starty_name.must_equal "Starty"
+
+    Process.kill(:INT, $$)
+    t.join
+  end
+
+end

data/test/test_helper.rb

@@ -18,7 +18,6 @@ require 'minitest/reporters'
 require 'minitest/hooks'
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
 
-
 module CommandLineCommands
 
   def move_to_tmp
@@ -47,30 +46,11 @@ module CommandLineCommands
 
   # deletes the temporary directories found in the /apps directory for reloader testing.
   def leave_reloader
-    Dir.chdir @original_dir
+    leave_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
   def move_to_loader
     @original_dir = Dir.pwd
@@ -81,11 +61,15 @@ module CommandLineCommands
     Dir.mkdir("lib") unless Dir.exist?("lib")
   end
 
-  # deletes the temporary directories found in the /apps directory for reloader testing.
-  def leave_loader
-	  Dir.chdir @original_dir
+  # generic move_to(dir) method
+  def move_to(dir)
+    @original_dir = Dir.pwd
+    Dir.chdir dir
   end
 
+  # generic leave_dir method
+  def leave_dir = Dir.chdir @original_dir
+
   def write(file, content)
     raise "cannot write nil" unless file
     file = tmp_file(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.6
 platform: ruby
 authors:
 - why the lucky stiff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -186,6 +186,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-sprint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: why@ruby-lang.org
 executables:
@@ -237,20 +293,20 @@ files:
 - lib/camping/ar.rb
 - 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
 - lib/camping/loader.rb
 - lib/camping/loads.rb
 - lib/camping/mab.rb
+- lib/camping/sequel.rb
 - lib/camping/server.rb
 - lib/camping/session.rb
 - lib/camping/template.rb
 - lib/camping/tools.rb
 - lib/camping/version.rb
-- lib/campingtrip.md
+- lib/gear/filters.rb
+- lib/gear/firewatch.rb
+- lib/gear/inspection.rb
+- lib/gear/kuddly.rb
+- lib/gear/nancy.rb
 - test/app_camping_gear.rb
 - test/app_camping_tools.rb
 - test/app_config.rb
@@ -291,8 +347,11 @@ files:
 - test/integration/Rakefile
 - test/integration/camp.rb
 - test/integration/config.kdl
+- test/integration/kindling/starty.rb
 - test/integration/test/test_helper.rb
 - test/reload_reloader.rb
+- test/server/helper.rb
+- test/server/spec_server.rb
 - test/test_helper.rb
 homepage: http://rubycamping.org/
 licenses: