Modernize gem. (#37)

* Migrate tests to sus.

Author: ioquatix

.github/workflows/coverage.yaml

@@ -30,10 +30,22 @@ jobs:
         ruby-version: ${{matrix.ruby}}
         bundler-cache: true
 
+    - name: Installing packages (ubuntu)
+      if: matrix.os == 'ubuntu'
+      run: sudo apt-get install wget
+    
+    - name: Installing packages (macos)
+      if: matrix.os == 'macos'
+      run: brew install wget
+    
     - name: Run tests
-      timeout-minutes: 5
-      run: bundle exec bake test
-
+      timeout-minutes: 10
+      run: |
+        git config --global user.email "samuel@oriontransfer.net"
+        git config --global user.name "Samuel Williams"
+        git config --global init.defaultBranch main
+        bundle exec bake test
+    
     - uses: actions/upload-artifact@v2
       with:
         name: coverage-${{matrix.os}}-${{matrix.ruby}}

.github/workflows/documentation.yaml

@@ -32,7 +32,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
         bundler-cache: true
 
     - name: Installing packages

.github/workflows/test-external.yaml

@@ -0,0 +1,37 @@
+name: Test External
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+env:
+  CONSOLE_OUTPUT: XTerm
+
+jobs:
+  test:
+    name: ${{matrix.ruby}} on ${{matrix.os}}
+    runs-on: ${{matrix.os}}-latest
+    
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+    
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+    
+    - name: Run tests
+      timeout-minutes: 10
+      run: bundle exec bake test:external

.github/workflows/test.yaml

@@ -60,4 +60,4 @@ jobs:
         git config --global user.email "samuel@oriontransfer.net"
         git config --global user.name "Samuel Williams"
         git config --global init.defaultBranch main
-        bundle exec rspec
+        bundle exec bake test

.gitignore

@@ -3,6 +3,3 @@
 /gems.locked
 /.covered.db
 /external
-
-.rspec
-.rspec_status

.mailmap

@@ -1 +1,2 @@
 Samuel Williams <root@Nekomimi.local>
+Pierre Montelle <k1tsu@github.com>

.rspec

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2023, by Samuel Williams.
 
 def coverage
 	ENV['COVERAGE'] = 'PartialSummary'
 end
 
 def test
-	system("rspec") or abort
+	system("sus") or abort
 end

bake/utopia/test.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require 'covered/sus'
+include Covered::Sus

config/sus.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2022, by Samuel Williams.
+# Copyright, 2016-2023, by Samuel Williams.
 
 require 'rack/test'
+require 'rack/builder'
 
-RSpec.shared_context "rack app" do |relative_rackup_path|
+ARackApplication = Sus::Shared("a rack app") do |rackup_path|
 	include Rack::Test::Methods
 
-	let(:rackup_path) {File.expand_path(relative_rackup_path, __dir__)}
 	let(:rackup_directory) {File.dirname(rackup_path)}
-	
 	let(:app) {Rack::Builder.parse_file(rackup_path)}
 end

spec/utopia/rack_helper.rb renamed to fixtures/a_rack_application.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2012-2022, by Samuel Williams.
+# Copyright, 2012-2023, by Samuel Williams.
 
 source 'https://rubygems.org'
 
@@ -22,6 +22,8 @@
 group :test do
 	gem 'bake-gem'
 	gem 'bake-test'
+	gem 'bake-test-external'
+	
 	gem 'benchmark-ips'
 
 	gem 'guard-falcon'
@@ -30,3 +32,4 @@
 end
 
 gem "thread-local", "~> 1.0"
+# gem "sus", path: "../../ioquatix/sus"

gems.rb

@@ -71,7 +71,7 @@ jobs:
           - ubuntu
 
         ruby:
-          - 2.7
+          - "3.2"
 
     runs-on: ${{matrix.os}}-latest
 
@@ -93,7 +93,7 @@ jobs:
         bundle config path vendor/bundle
         bundle install --jobs 4 --retry 3
     - name: Run tests
-      run: ${{matrix.env}} bundle exec rspec
+      run: ${{matrix.env}} bundle exec sus
 
   deploy:
     needs: test

guides/getting-started/README.md renamed to guides/getting-started/readme.md

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2022, by Samuel Williams.
+# Copyright, 2017-2023, by Samuel Williams.
 # Copyright, 2020, by Michael Adams.
 
 require 'fileutils'
@@ -17,7 +17,7 @@ module Command
 		# Local site setup commands.
 		class Site < Samovar::Command
 			# Configuration files which should be installed/updated:
-			CONFIGURATION_FILES = ['.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'gems.rb', 'Guardfile', 'bake.rb', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
+			CONFIGURATION_FILES = ['.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'gems.rb', 'Guardfile', 'bake.rb', 'test/website.rb', 'fixtures/website.rb']
 
 			# Directories that should exist:
 			DIRECTORIES = ["config", "lib", "pages", "public", "tasks", "spec"]

guides/integrating-with-javascript/README.md renamed to guides/integrating-with-javascript/readme.md

@@ -1,9 +1,9 @@
 # MIT License
 
-Copyright, 2009-2022, by Samuel Williams.  
+Copyright, 2009-2023, by Samuel Williams.  
 Copyright, 2015-2019, by Huba Nagy.  
 Copyright, 2020, by Olle Jonsson.  
-Copyright, 2020, by k1tsu.  
+Copyright, 2020, by Pierre Montelle.  
 Copyright, 2020, by Michael Adams.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

guides/middleware/README.md renamed to guides/middleware/readme.md

@@ -2,7 +2,7 @@
 
 Utopia is a website generation framework which provides a robust set of tools to build highly complex dynamic websites. It uses the filesystem heavily for content and provides functions for interacting with files and directories as structure representing the website.
 
-[![Development Status](https://github.com/socketry/utopia/workflows/Test/badge.svg)](https://github.com/socketry/utopia/actions?workflow=Test)
+[![Development Status](https://github.com/ioquatix/utopia/workflows/Test/badge.svg)](https://github.com/ioquatix/utopia/actions?workflow=Test)
 
 ## Features
 

guides/server-setup/README.md renamed to guides/server-setup/readme.md

@@ -1,5 +1,4 @@
 # Development specific:
-/.rspec_status
 /.bundle
 
 # Temporary data should not be added to the repository:

guides/updating-utopia/README.md renamed to guides/updating-utopia/readme.md

@@ -10,20 +10,20 @@ group :development do
 end
 
 group :test do
-	guard :rspec, cmd: 'rspec' do
-		# Notifications can get a bit tedious:
-		# notification :off
+	# guard :rspec, cmd: 'rspec' do
+	# 	# Notifications can get a bit tedious:
+	# 	# notification :off
 
-		# Re-run specs if they are changed:
-		watch(%r{^spec/.+_spec\.rb$})
-		watch('spec/spec_helper.rb') {'spec'}
+	# 	# Re-run specs if they are changed:
+	# 	watch(%r{^spec/.+_spec\.rb$})
+	# 	watch('spec/spec_helper.rb') {'spec'}
 
-		# Run relevent specs if files in `lib/` or `pages/` are changed:
-		watch(%r{^lib/(.+)\.rb$}) {|match| "spec/lib/#{match[1]}_spec.rb" }
-		watch(%r{^pages/(.+)\.(rb|xnode)$}) {|match| "spec/pages/#{match[1]}_spec.rb"}
-		watch(%r{^pages/(.+)controller\.rb$}) {|match| Dir.glob("spec/pages/#{match[1]}*_spec.rb")}
+	# 	# Run relevent specs if files in `lib/` or `pages/` are changed:
+	# 	watch(%r{^lib/(.+)\.rb$}) {|match| "spec/lib/#{match[1]}_spec.rb" }
+	# 	watch(%r{^pages/(.+)\.(rb|xnode)$}) {|match| "spec/pages/#{match[1]}_spec.rb"}
+	# 	watch(%r{^pages/(.+)controller\.rb$}) {|match| Dir.glob("spec/pages/#{match[1]}*_spec.rb")}
 
-		# If any files in pages changes, ensure the website still works:
-		watch(%r{^pages/.*}) {'spec/website_spec.rb'}
-	end
+	# 	# If any files in pages changes, ensure the website still works:
+	# 	watch(%r{^pages/.*}) {'spec/website_spec.rb'}
+	# end
 end

guides/what-is-xnode/README.md renamed to guides/what-is-xnode/readme.md

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require 'variant'
+Variant.force!(:testing)
+
+require 'covered/sus'
+include Covered::Sus

lib/utopia/command/site.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2016-2023, by Samuel Williams.
+
+require 'rack/test'
+require 'sus/fixtures/async/http'
+require 'protocol/rack'
+
+AWebsite = Sus::Shared("a website") do
+	include Rack::Test::Methods
+	
+	let(:rackup_path) {File.expand_path('../config.ru', __dir__)}
+	let(:rackup_directory) {File.dirname(rackup_path)}
+	
+	let(:app) {Rack::Builder.parse_file(rackup_path)}
+end
+
+AValidPage = Sus::Shared("a valid page") do |path|
+	it "can access #{path}" do
+		get path
+		
+		while last_response.redirect?
+			follow_redirect!
+		end
+		
+		expect(last_response.status).to be == 200
+	end
+end
+
+AServer = Sus::Shared("a server") do
+	include Sus::Fixtures::Async::HTTP::ServerContext
+	
+	let(:rackup_path) {File.expand_path('../config.ru', __dir__)}
+	let(:rackup_directory) {File.dirname(rackup_path)}
+	
+	let(:rack_app) {Rack::Builder.parse_file(rackup_path)}
+	let(:app) {Protocol::Rack::Adapter.new(rack_app)}
+end

license.md

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2012-2022, by Samuel Williams.
+# Copyright, 2012-2023, by Samuel Williams.
 
 source 'https://rubygems.org'
 
@@ -13,20 +13,19 @@
 	gem 'variant'
 end
 
-gem 'rake'
 gem 'bake'
 gem 'bundler'
 gem 'rack-test'
 gem 'net-smtp'
 
 group :development do
 	gem 'guard-falcon', require: false
-	gem 'guard-rspec', require: false
 
-	gem 'rspec'
+	gem 'sus'
+	gem 'sus-fixtures-async-http'
+	
 	gem 'covered'
 
-	gem 'async-rspec'
 	gem 'benchmark-http'
 end