utopia 2.16.2 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1833aabc2d72234952e6ee164138d234cafc5d0d2015b64edcb28cead480c95
-  data.tar.gz: d6e9675b9921ae290547c25b11c8b5974860256393c65147705d0dd1472ba851
+  metadata.gz: 5549c06603672129f49f5d8c7f00b9cc706786460ba6597c3459be007d508c5c
+  data.tar.gz: 7ee6b130a7a671944ec64c7a98cc8b01e7f579e64e978e3733462c2f60ead135
 SHA512:
-  metadata.gz: cd8ee2bdd633f9bcd10be1bd18db664299e9cc8c16169ad7d84d934ba8abb301037d0a0f459608087204cd43ac51eb155e88c4af2e988d03b2c29859df5fc2a3
-  data.tar.gz: 4a16550958bc3ddf8fc37760f8436cc450d3e84ee2178ba6f194ce557869e0e20bfee0f3412eb6f2364c7f5ccc831da2b8f440fce11a81e8fc7f436914d64dde
+  metadata.gz: ae1d066e702f89c544236458d8753bcc01ab07aade2eb9b7e89755d88d9ddce520e3f1453ee9c8535f5f2788ae1cd5f5d34d412b4fdd8ee0ef00008d476debfc
+  data.tar.gz: bba30364281ce80ff9c25597c7181a903579fe6fe28cf128e53ab730c768a216a3632e999a3c1f7a4ee249debe43c3e4afcfe59e1b4fee2a3f1df6c9f04f3f0e

data/lib/utopia/command/server.rb

@@ -68,7 +68,8 @@ module Utopia
 						system("git", "config", "receive.denyCurrentBranch", "ignore") or fail "could not set configuration"
 						system("git", "config", "core.worktree", destination_root) or fail "could not set configuration"
 						
-						system("bundle", "config", "set", "--local", "deployment", "true")
+						# Doing this invokes a lot of behaviour that isn't always ideal...
+						# system("bundle", "config", "set", "--local", "deployment", "true")
 						system("bundle", "config", "set", "--local", "without", "development")
 						
 						# In theory, to convert from non-shared to shared:

data/lib/utopia/command/site.rb

@@ -33,7 +33,7 @@ module Utopia
 		# 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', 'Gemfile', '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', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
 			
 			# Directories that should exist:
 			DIRECTORIES = ["config", "lib", "pages", "public", "tasks", "spec"]
@@ -142,6 +142,15 @@ module Utopia
 					end
 				end
 				
+				# Move `Gemfile` to `gems.rb`.
+				def update_gemfile!
+					# If `Gemfile` doens't exist, we are done:
+					return unless File.exist?('Gemfile')
+					
+					system("git", "mv", "Gemfile", "gems.rb")
+					system("git", "mv", "Gemfile.lock", "gems.locked")
+				end
+				
 				def call
 					destination_root = parent.root
 					branch_name = "utopia-upgrade-#{Utopia::VERSION}"
@@ -184,6 +193,7 @@ module Utopia
 							system("git", "add", *Site::CONFIGURATION_FILES) or fail "could not add files"
 							
 							move_static!
+							update_gemfile!
 							
 							# Commit all changes:
 							system("git", "commit", "-m", "Upgrade to utopia #{Utopia::VERSION}.") or fail "could not commit changes"

data/lib/utopia/path.rb

@@ -25,7 +25,7 @@ module Utopia
 	class Path
 		include Comparable
 		
-		SEPARATOR = '/'.freeze
+		SEPARATOR = '/'
 		
 		def initialize(components = [])
 			@components = components
@@ -34,6 +34,8 @@ module Utopia
 		attr_accessor :components
 		
 		def freeze
+			return self if frozen?
+			
 			@components.freeze
 			
 			super
@@ -235,14 +237,22 @@ module Utopia
 			return self.class.new(result)
 		end
 		
-		def pop
-			@components.pop
+		def first
+			if absolute?
+				@components[1]
+			else
+				@components[0]
+			end
 		end
 		
 		def last
 			@components.last
 		end
 		
+		def pop
+			@components.pop
+		end
+		
 		# @return [String] the last path component without any file extension.
 		def basename
 			basename, _ = @components.last.split('.', 2)
@@ -350,22 +360,6 @@ module Utopia
 			@components.delete_at(component_offset(index))
 		end
 		
-		def first
-			if absolute?
-				@components[1]
-			else
-				@components[0]
-			end
-		end
-		
-		def last
-			if directory?
-				@components[-2]
-			else
-				@components[-1]
-			end
-		end
-		
 		private
 		
 		# We adjust the index slightly so that indices reference path components rather than the directory markers at the start and end of the path components array.

data/lib/utopia/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.16.2"
+	VERSION = "2.17.0"
 end

data/setup/server/git/hooks/post-receive

@@ -62,7 +62,7 @@ Dir.chdir(GIT_WORK_TREE) do
 	sudo %W{git checkout -f}
 	sudo %W{git submodule update -i}
 	
-	if File.exist? 'Gemfile'
+	if File.exist? 'gems.rb'
 		sudo %W{bundle install}
 	end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.16.2
+  version: 2.17.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -290,8 +290,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: 
+description:
+email:
 executables:
 - utopia
 extensions: []
@@ -350,7 +350,6 @@ files:
 - setup/server/git/hooks/post-receive
 - setup/site/.gitignore
 - setup/site/.rspec
-- setup/site/Gemfile
 - setup/site/Guardfile
 - setup/site/README.md
 - setup/site/bake.rb
@@ -358,6 +357,7 @@ files:
 - setup/site/config/README.md
 - setup/site/config/environment.rb
 - setup/site/falcon.rb
+- setup/site/gems.rb
 - setup/site/lib/readme.txt
 - setup/site/pages/_heading.xnode
 - setup/site/pages/_page.xnode
@@ -378,7 +378,7 @@ licenses:
 - MIT
 metadata:
   funding_uri: https://github.com/sponsors/ioquatix/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -394,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files: []