utopia 2.13.1 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8b5b3a827d5761b59943834584c7662632de566d79966cc452d53a9a62c420f
-  data.tar.gz: d9448719a5819dcf6afc7b2c82c0add6972d5d934a1312c01419a03a650f6d03
+  metadata.gz: b55bff1afd9814b453d84f5539d06fb4e969c804bedae04eb40259ff934b2097
+  data.tar.gz: 4483a3359f05949c3952ff22e4d6bd3f34907e861b2da9e8b75ed77a84d8b6a6
 SHA512:
-  metadata.gz: 607d2cf34d0d851e653f8fc3a3c913255c398edf657af96d8a611bb8ea7b2b9a7a8aa0a22c4d1a5a7683da0d6990c07264e237ee3e9458a9bca04961c3925465
-  data.tar.gz: 37cf0301c908e4790b6711cbd3cde0f2e0362a866232633c51c86868d3c4c2781ebef12a743fdf805c7c711ec0ff11bc04bae561e3c7cdbbff7f9e3696708b02
+  metadata.gz: f4512d2aae4b421a2a10cf5ccb50badfa4dee7792ab59dabb79eaab0792e9bed35f5f61a0a1bbe04e38acbed98bdf714583de7f75cbded5ac2fcea6112c28b89
+  data.tar.gz: b5ae7a176dedc1af47f5e2a8a57b3d8168de33f11824b607e972d5c6eba81d409583626cff3bc4daedd4ba8c3166a18015c554a418b3e65999d1bfd3fc56b4b1

data/.travis.yml

@@ -11,7 +11,6 @@ before_install:
 
 matrix:
   include:
-    - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
       env: BENCHMARK=true

data/bake/utopia/test.rb

@@ -6,5 +6,5 @@ def coverage
 end
 
 def test
-	system("rspec", exception: true)
+	system("rspec") or abort
 end

data/lib/utopia/command/environment.rb

@@ -22,6 +22,7 @@
 
 require 'securerandom'
 require 'yaml/store'
+require 'console'
 
 module Utopia
 	module Command
@@ -31,27 +32,41 @@ module Utopia
 			
 			options do
 				option '-e/--environment-name <name>', "The environment file to modify.", default: 'environment'
+				option '-d/--defaults', "Initialize any recommended defaults."
 			end
 			
 			many :variables, "A list of environment KEY=VALUE pairs to set."
 			
+			def self.defaults(destination_root)
+				# Set some useful defaults for the environment.
+				self["--environment-name", "testing", "--defaults"].call(destination_root)
+				self["--environment-name", "development", "--defaults"].call(destination_root)
+			end
+			
+			def environment_name
+				@options[:environment_name]
+			end
+			
 			# Setup `config/environment.yaml` according to specified options.
-			def update_environment(root, name = @options[:environment_name])
+			def update_environment(root, name = self.environment_name)
 				environment_path = File.join(root, "config", "#{name}.yaml")
 				FileUtils.mkpath File.dirname(environment_path)
 				
 				store = YAML::Store.new(environment_path)
 				
 				store.transaction do
-					yield store
+					yield store, name, environment_path
 				end
 			end
 			
-			def invoke(parent)
-				destination_root = parent.root
-				
-				update_environment(destination_root) do |store|
-					variables.each do |variable|
+			def call(root = parent.root)
+				update_environment(root) do |store, name, path|
+					if @options[:defaults]
+						# Set some useful defaults for the environment.
+						store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
+					end
+					
+					variables&.each do |variable|
 						key, value = variable.split('=', 2)
 						
 						if value
@@ -63,10 +78,13 @@ module Utopia
 						end
 					end
 					
-					store.roots.each do |key|
-						value = store[key]
-						
-						puts "#{Rainbow(key).blue}: #{Rainbow(value.inspect).green}"
+					Console.logger.debug(self) do |buffer|
+						buffer.puts "Environment #{name} (#{path}):"
+						store.roots.each do |key|
+							value = store[key]
+							
+							buffer.puts "#{key}=#{value.inspect}"
+						end
 					end
 				end
 			end

data/lib/utopia/command/site.rb

@@ -99,11 +99,7 @@ module Utopia
 						end
 					end
 					
-					# Set some useful defaults for the environment.
-					environment = Environment[]
-					environment.update_environment(destination_root, :testing) do |store|
-						store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
-					end
+					Environment.defaults(destination_root)
 					
 					name = `git config user.name || whoami`.chomp
 					
@@ -177,6 +173,8 @@ module Utopia
 						File.open(destination_path, "w") { |file| file.write(buffer) }
 					end
 					
+					Environment.defaults(destination_root)
+					
 					begin
 						Dir.chdir(destination_root) do
 							# Stage any files that have been changed or removed:

data/lib/utopia/setup.rb

@@ -113,11 +113,11 @@ module Utopia
 				Utopia.logger.debug(self) {"Loading environment at path: #{path.inspect}"}
 				
 				# Load the YAML environment file:
-				environment = YAML.load_file(path)
-				
-				# We update ENV but only when it's not already set to something:
-				ENV.update(environment) do |name, old_value, new_value|
-					old_value || new_value
+				if environment = YAML.load_file(path)
+					# We update ENV but only when it's not already set to something:
+					ENV.update(environment) do |name, old_value, new_value|
+						old_value || new_value
+					end
 				end
 				
 				return true

data/lib/utopia/version.rb

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

data/setup/site/.gitignore

@@ -1,6 +1,7 @@
 # Development specific:
 .rspec_status
 .tags*
+.bundle
 
 # Temporary data should not be added to the repository:
 tmp/

data/spec/utopia/command_spec.rb

@@ -28,16 +28,13 @@ require 'open3'
 require 'bundler'
 
 RSpec.describe "utopia command" do
+	let(:utopia_path) {File.expand_path("../..", __dir__)}
+	let(:pkg_path) {File.expand_path("pkg", utopia_path)}
 	let(:utopia) {File.expand_path("../../bin/utopia", __dir__)}
-	let(:gemspec) {Gem::Specification.load File.expand_path("../../utopia.gemspec", __dir__)}
-	let(:package_path) {File.expand_path("../../pkg/#{gemspec.file_name}", __dir__)}
 	
 	before(:all) do
 		# We need to build a package to test deployment:
 		system("rake", "build") or abort("Could not build package for setup spec!")
-		
-		ENV['DEPLOY_USER'] = 'http'
-		ENV['DEPLOY_GROUP'] = 'http'
 	end
 	
 	around(:each) do |example|
@@ -45,9 +42,6 @@ RSpec.describe "utopia command" do
 			# If we don't delete this, when running on travis, it will try submit the coverage report.
 			ENV.delete('COVERAGE')
 			
-			# This allows the utopia command to load the correct library:
-			ENV['RUBYLIB'] = File.expand_path("../../lib", __dir__)
-			
 			example.run
 		end
 	end
@@ -75,24 +69,21 @@ RSpec.describe "utopia command" do
 	end
 	
 	def install_packages(dir)
-		# We do a bit of a hack here to ensure the package is available:
-		FileUtils.mkpath File.join(dir, "vendor/cache")
-		FileUtils.cp package_path, File.join(dir, "vendor/cache")
+		system("bundle", "config", "--local", "local.utopia", utopia_path, chdir: dir)
+		system("bundle", "config", "--local", "cache_path", pkg_path, chdir: dir)
 	end
 	
 	it "should generate sample site" do
 		Dir.mktmpdir('test-site') do |dir|
 			install_packages(dir)
 			
-			result = sh_status(utopia, "--in", dir, "site", "create")
-			expect(result).to be == 0
+			system(utopia, "--in", dir, "site", "create")
 			
 			expect(Dir.entries(dir)).to include(".yarnrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "bake.rb", "config.ru", "lib", "pages", "public", "spec")
 			
-			Dir.chdir(dir) do
-				result = sh_status("bundle", "exec", "bake", "utopia:test")
-				expect(result).to be == 0
-			end
+			expect(
+				system("bundle", "exec", "bake", "utopia:test", chdir: dir)
+			).to be true
 		end
 	end
 	

data/utopia.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ['lib']
 	
-	spec.required_ruby_version = '~> 2.2'
+	spec.required_ruby_version = '~> 2.5'
 	
 	spec.add_dependency 'trenni', '~> 3.0'
 	spec.add_dependency 'mime-types', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.13.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -813,14 +813,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.