utopia 2.22.0 → 2.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d6cd31c0780c6d2071157034b6d125da0b4e6c3649affafb9338208b0467b7
-  data.tar.gz: 9092ab79ee6fb441051e1114fefbe41761aa5339d2eee574d588729e7ea5c479
+  metadata.gz: bad66abbb1a3bfd34ad266594c8f79b713f6289e1e2e572280459bdf3fe3ac9b
+  data.tar.gz: 04b1e9a3831cbbfe5551838725fd58ae71e5b218eeaa6ff708450e3a82c5007a
 SHA512:
-  metadata.gz: cd49ec085295dded939c0da489dfc6bb64a97207032bd3cf177b39cf84f131f00b935c96173c2c6196c50032a07f4786b2312144b776cbadd4c05840b96f9f70
-  data.tar.gz: 5fc0e4c878dfa11693481cbaf560d9024f69c66c48db29cc5722a56757d216449c4026e59f534578a784f6484a94ee0bd894831e93bcddeb26830dcadf17be2b
+  metadata.gz: acee0556abc970a44077e739b344cd25f962b559d7238ae11535154e500bb3a529220970a031f437a5d37debc44edd1a279131680ae6cab012d1a404680d4628
+  data.tar.gz: d6056af6f2a3b59b5539444d3e7be38f82528dee5ec33e71d1dd8076eeb750f7e7fb388b8d574462b86d216f87653bd0b4663ee5dbf5a0d2e882f14ae5d459b8

data/bake/utopia/environment.rb

@@ -15,8 +15,8 @@ end
 # Setup default environemnts "testing" and "development".
 # @parameter root [String] The root directory of the project.
 def setup(root: context.root)
-	defaults(name: "testing", root: root)
-	defaults(name: "development", root: root)
+	defaults("testing", root: root)
+	defaults("development", root: root)
 end
 
 # Setup the defaults for a specific environment.
@@ -24,6 +24,7 @@ end
 # @parameter root [String] The root directory of the project.
 def defaults(name, root: context.root)
 	update_environment(root, name) do |store|
+		Console.logger.info(self) {"Setting up defaults for environment #{name}..."}
 		# Set some useful defaults for the environment.
 		store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
 	end
@@ -33,22 +34,23 @@ end
 # @parameter name [String] The name of the environment to update.
 # @parameter variables [Hash(String, String)] A list of environment KEY=VALUE pairs to set.
 def update(name, root: context.root, **variables)
-	update_environment(root, name) do |store|
-		variables&.each do |variable|
-			key, value = variable.split('=', 2)
+	update_environment(root, name) do |store, _, path|
+		variables&.each do |key, value|
+			# Ensure the key is a string...
+			key = key.to_s
 			
-			if value
-				puts "ENV[#{key.inspect}] will default to #{value.inspect} unless otherwise specified."
+			if value && !value.empty?
+				Console.logger.info(self) {"ENV[#{key.inspect}] will default to #{value.inspect} unless otherwise specified."}
 				store[key] = value
 			else
-				puts "ENV[#{key.inspect}] will be unset unless otherwise specified."
+				Console.logger.info(self) {"ENV[#{key.inspect}] will be unset unless otherwise specified."}
 				store.delete(key)
 			end
 		end
 		
 		yield store if block_given?
 		
-		Console.logger.debug(self) do |buffer|
+		Console.logger.info(self) do |buffer|
 			buffer.puts "Environment #{name} (#{path}):"
 			store.roots.each do |key|
 				value = store[key]

data/bake/utopia/site.rb

@@ -9,6 +9,8 @@ def initialize(...)
 	
 	require 'fileutils'
 	require 'find'
+	
+	require_relative '../../lib/utopia/version'
 end
 
 # The path to the setup directory in the gem:
@@ -18,7 +20,7 @@ SETUP_ROOT = File.expand_path("../../setup", __dir__)
 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", "bake", "test"]
+DIRECTORIES = ["config", "lib", "pages", "public", "bake", "fixtures", "test"]
 
 # Directories that should be removed during upgrade process:
 OLD_PATHS = ["access_log", "cache", "tmp", "Rakefile", "tasks", ".bowerrc"]
@@ -62,6 +64,8 @@ def create(root: context.root)
 	
 	system("bundle", "install", chdir: root) or warn "could not install bundled gems"
 	
+	context.lookup('utopia:environment:setup').call(root: root)
+	
 	if !File.exist?('.git')
 		Console.logger.info(self) {"Setting up git repository..."}
 		
@@ -70,8 +74,6 @@ def create(root: context.root)
 		system("git", "commit", "-q", "-m", "Initial Utopia v#{Utopia::VERSION} site.", chdir: root) or warn "could not commit files"
 	end
 	
-	context.lookup('utopia:environment:defaults').call(root)
-	
 	name = `git config user.name || whoami`.chomp
 	
 	puts
@@ -90,36 +92,37 @@ end
 
 # Upgrade an existing site to use the latest configuration files from the template.
 def upgrade(root: context.root)
-	branch_name = "utopia-upgrade-#{Utopia::VERSION}"
-	
-	$stderr.puts "Upgrading #{destination_root}..."
-	
-	system('git', 'checkout', '-b', branch_name, chdir: root) or fail "could not change branch"
-	
-	DIRECTORIES.each do |directory|
-		FileUtils.mkdir_p(File.join(root, directory))
-	end
+	message = "Upgrade to utopia v#{Utopia::VERSION}."
 	
-	OLD_PATHS.each do |path|
-		path = File.join(root, path)
-		Console.logger.info(self) {"Removing #{path}..."}
-		FileUtils.rm_rf(path)
-	end
+	Console.logger.info(self) {"Upgrading #{root}..."}
 	
-	CONFIGURATION_FILES.each do |configuration_file|
-		source_path = File.join(SITE_ROOT, configuration_file)
-		destination_path = File.join(root, configuration_file)
+	commit_changes(root, message) do
+		DIRECTORIES.each do |directory|
+			FileUtils.mkdir_p(File.join(root, directory))
+		end
 		
-		Console.logger.info(self) {"Updating #{destination_path}..."}
+		OLD_PATHS.each do |path|
+			path = File.join(root, path)
+			
+			if File.exist?(path)
+				Console.logger.info(self) {"Removing #{path}..."}
+				FileUtils.rm_rf(path)
+			end
+		end
 		
-		FileUtils.copy_entry(source_path, destination_path)
-		buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
-		File.open(destination_path, "w") { |file| file.write(buffer) }
-	end
-	
-	context.lookup('environment:defaults').call(root)
+		CONFIGURATION_FILES.each do |configuration_file|
+			source_path = File.join(SITE_ROOT, configuration_file)
+			destination_path = File.join(root, configuration_file)
+			
+			Console.logger.info(self) {"Updating #{destination_path}..."}
+			
+			FileUtils.copy_entry(source_path, destination_path)
+			buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
+			File.open(destination_path, "w") { |file| file.write(buffer) }
+		end
+		
+		context.lookup('utopia:environment:setup').call(root: root)
 	
-	begin
 		# Stage any files that have been changed or removed:
 		system("git", "add", "-u", chdir: root) or fail "could not add files"
 		
@@ -128,26 +131,27 @@ def upgrade(root: context.root)
 		
 		move_static!(root)
 		update_gemfile!(root)
-		
-		# Commit all changes:
-		system("git", "commit", "-m", "Upgrade to utopia #{Utopia::VERSION}.", chdir: root) or fail "could not commit changes"
-		
-		# Checkout main..
-		system("git", "checkout", "main", chdir: root) or fail "could not checkout main"
-		
-		# and merge:
-		system("git", "merge", "--squash", "--no-commit", branch_name, chdir: root) or fail "could not merge changes"
-	rescue => error
-		Console.logger.error(self, error) {"Upgrade failed."}
-		
-		system("git", "checkout", "master", chdir: root)
-	ensure
-		system("git", "branch", "-D", branch_name, chdir: root)
 	end
 end
 
 private
 
+def commit_changes(root, message)
+	# Ensure the current branch is clean:
+	system("git", "diff-index", "--quiet", "HEAD", chdir: root) or fail "current branch is not clean"
+	
+	begin
+		yield
+	rescue
+		# Clear out the changes:
+		system("git", "reset", "--hard", "HEAD", chdir: root) or fail "could not reset changes"
+		raise
+	end
+	
+	# Commit all changes:
+	system("git", "commit", "-m", message, chdir: root) or fail "could not commit changes"
+end
+
 # Move legacy `pages/_static` to `public/_static`.
 def move_static!(root)
 	old_static_path = File.expand_path('pages/_static', root)

data/lib/utopia/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2009-2022, by Samuel Williams.
 
 module Utopia
-	VERSION = "2.22.0"
+	VERSION = "2.22.2"
 end

data/setup/site/Guardfile

@@ -8,22 +8,3 @@ group :development do
 		notification :off
 	end
 end
-
-group :test do
-	# 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'}
-		
-	# 	# 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
-end

data/setup/site/config.ru

@@ -14,7 +14,7 @@ else
 	use Rack::ShowExceptions unless UTOPIA.testing?
 end
 
-# serve static files from public/
+# Serve static files from "public" directory:
 use Utopia::Static, root: 'public'
 
 use Utopia::Redirection::Rewrite, {
@@ -40,10 +40,10 @@ use Utopia::Session,
 
 use Utopia::Controller
 
-# serve static files from pages/
+# Serve static files from "pages" directory:
 use Utopia::Static
 
-# Serve dynamic content
+# Serve dynamic content:
 use Utopia::Content
 
 run lambda { |env| [404, {}, []] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.22.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -411,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.