RubyGems - utopia - Versions diffs - 2.2.0 → 2.3.0 - Mend

utopia 2.2.0 → 2.3.0

Files changed (290) hide show

data/lib/utopia/version.rb CHANGED Viewed

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 module Utopia
-	VERSION = "2.2.0"
+	VERSION = "2.3.0"
 end

data/setup/site/README.md CHANGED Viewed

@@ -6,12 +6,11 @@ Welcome to Utopia, a Ruby framework for web site and application development. Fo
 To start the development server, simply execute
-	> rake server
-	Puma starting in single mode...
-	* Version 2.15.3 (ruby 2.2.1-p85), codename: Autumn Arbor Airbrush
-	* Min threads: 0, max threads: 16
-	* Environment: development
-	* Listening on tcp://0.0.0.0:9292
-	Use Ctrl-C to stop
+	> rake
+	Generating transient session key for development...
+	20:57:36 - INFO - Starting Falcon HTTP server on localhost:9292
+	20:57:36 - INFO - Guard::RSpec is running
+	20:57:36 - INFO - Guard is now watching at '...'
+	[1] guard(main)>
 Then browse http://localhost:9292 (or as specified) to see your new site.

data/setup/site/Rakefile CHANGED Viewed

@@ -1,4 +1,7 @@
+require 'pathname'
+SITE_ROOT = Pathname.new(__dir__).realpath
 # Load all rake tasks:
 import(*Dir.glob('tasks/**/*.rake'))

data/setup/site/pages/_page.xnode CHANGED Viewed

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<?r response.content_type = "text/html; charset=utf-8" ?>
 		<?r response.cache! ?>
 		<?r if title = self[:title] ?>
@@ -11,6 +10,7 @@
 		<?r end ?>
 		<base href="#{first.node.uri_path}"/>
+		<meta name="viewport" content="width=device-width, initial-scale=1"/>
 		<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />

data/setup/site/public/_static/site.css CHANGED Viewed

@@ -40,7 +40,7 @@ body > header {
 	background-color: white;
-	background-image: url(/_static/utopia-background.svg);
+	background-image: url(utopia-background.svg);
 	box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
 }

data/setup/site/tasks/bower.rake CHANGED Viewed

@@ -3,15 +3,12 @@ namespace :bower do
 	desc 'Load the .bowerrc file and setup the environment for other tasks.'
 	task :bowerrc do
 		require 'json'
-		require 'pathname'
-		root = Pathname.new(__dir__).dirname
-		bowerrc_path = root + ".bowerrc"
+		bowerrc_path = SITE_ROOT + ".bowerrc"
 		bowerrc = JSON.load(File.read(bowerrc_path))
-		@bower_package_root = root + bowerrc['directory']
-		@bower_install_root = root + bowerrc['public']
+		@bower_package_root = SITE_ROOT + bowerrc['directory']
+		@bower_install_root = SITE_ROOT + bowerrc['public']
 		@bower_install_method = (bowerrc['install'] || :copy).to_sym
 	end

data/setup/site/tasks/deploy.rake CHANGED Viewed

@@ -8,6 +8,6 @@ desc 'Restart the application server'
 task :restart do
 	# This task is run after the deployment task above.
 	if passenger_config = `which passenger-config`.chomp!
-		sh(passenger_config, 'restart-app', '--ignore-passenger-not-running', File.dirname(__dir__))
+		sh(passenger_config, 'restart-app', '--ignore-passenger-not-running', SITE_ROOT.to_s)
 	end
 end

data/setup/site/tasks/development.rake CHANGED Viewed

@@ -27,7 +27,7 @@ task :console => :environment do
 	include Rack::Test::Methods
 	def app
-		@app ||= Rack::Builder.parse_file(File.expand_path("../config.ru", __dir__)).first
+		@app ||= Rack::Builder.parse_file(SITE_ROOT + 'config.ru').first
 	end
 	Pry.start

data/setup/site/tasks/environment.rake CHANGED Viewed

@@ -1,7 +1,7 @@
 desc 'Set up the environment for running your web application'
-task :environment do
-	require_relative '../config/environment'
+task :environment do |task|
+	require SITE_ROOT + 'config/environment'
 	# We ensure this is part of the shell environment so if other commands are invoked they will work correctly.
 	ENV['RACK_ENV'] = RACK_ENV.to_s if defined?(RACK_ENV)

data/setup/site/tasks/static.rake ADDED Viewed

@@ -0,0 +1,43 @@
+namespace :static do
+	task :static_environment do
+		RACK_ENV ||= :static
+		DATABASE_ENV ||= :production
+		SERVER_PORT ||= 9291
+	end
+	desc "Generate a static copy of the site."
+	task :generate => [:static_environment, :environment] do
+		require 'falcon/server'
+		require 'async/io'
+		require 'async/container'
+		config_path = SITE_ROOT + 'config.ru'
+		container_class = Async::Container::Threaded
+		app, options = Rack::Builder.parse_file(config_path.to_s)
+		container = container_class.new(concurrency: 2) do
+			server = Falcon::Server.new(app, [
+				Async::IO::Endpoint.parse("tcp://localhost:#{SERVER_PORT}", reuse_port: true)
+			])
+			server.run
+		end
+		output_path = ENV.fetch('OUTPUT_PATH') {SITE_ROOT + 'static'}
+		# Delete any existing stuff:
+		FileUtils.rm_rf(output_path)
+		# Copy all public assets:
+		Dir.glob(SITE_ROOT + 'public/*').each do |path|
+			FileUtils.cp_r(path, output_path)
+		end
+		# Generate HTML pages:
+		system("wget", "--mirror", "--recursive", "--continue", "--convert-links", "--adjust-extension", "--no-host-directories", "--directory-prefix", output_path.to_s, "http://localhost:#{SERVER_PORT}")
+		container.stop
+	end
+end

data/spec/utopia/command_spec.rb ADDED Viewed

@@ -0,0 +1,170 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+require 'fileutils'
+require 'tmpdir'
+require 'yaml'
+require 'open3'
+RSpec.describe "utopia command" do
+	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|
+		Bundler.with_clean_env 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
+	def sh_status(*args)
+		system(*args) ? 0 : false
+	end
+	def sh_stdout(*args)
+		output, status = Open3.capture2(*args)
+		return output
+	end
+	def git_config(name, value=nil)
+		unless value.nil?
+			return sh_status('git', 'config', name, value)
+		else
+			return sh_stdout('git', 'config', name).chomp
+		end
+	end
+	def group_rw(path)
+		gaccess = File.stat(path).mode.to_s(8)[-2]
+		return gaccess == '6' || gaccess == '7'
+	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")
+	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
+			expect(Dir.entries(dir)).to include(".bowerrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "spec")
+			Dir.chdir(dir) do
+				result = sh_status("rake", "test")
+				expect(result).to be == 0
+			end
+		end
+	end
+	it "should generate a sample server" do
+		Dir.mktmpdir('test-server') do |dir|
+			install_packages(dir)
+			result = sh_status(utopia, "--in", dir, "server", "create")
+			expect(result).to be == 0
+			expect(Dir.entries(dir)).to include(".git")
+			# make sure git is set up properly
+			Dir.chdir(dir) do
+				expect(git_config 'core.sharedRepository').to be == '1'
+				expect(git_config 'receive.denyCurrentBranch').to be == 'ignore'
+				expect(git_config 'core.worktree').to be == dir
+			end
+			environment = YAML.load_file(File.join(dir, 'config/environment.yaml'))
+			expect(environment).to include('RACK_ENV', 'UTOPIA_SESSION_SECRET')
+		end
+	end
+	it "should not trash the sample server during update" do
+		Dir.mktmpdir('test-server') do |dir|
+			install_packages(dir)
+			result = sh_status(utopia, "--in", dir, "server", "create")
+			expect(result).to be == 0
+			Dir.chdir(dir) do
+				# make the repository look a bit like like it's an old one
+				git_config 'core.sharedRepository', 'false'
+				sh_status 'chmod', '-Rf', 'g-x', '.git'
+				sh_status 'rm', '-f', '.git/hooks/post-receive'
+			end
+			result = sh_status(utopia, "--in", dir, "server", "update")
+			expect(result).to be == 0
+			# check a couple of files to make sure they have group read and write access
+			# after the update
+			Dir.glob(File.join(dir, '.git/**/*')).each do |path|
+				expect(group_rw path).to be == true
+			end
+		end
+	end
+	it "can generate sample site, server and push to the server" do
+		Dir.mktmpdir('test') do |dir|
+			site_path = File.join(dir, 'site')
+			install_packages(site_path)
+			server_path = File.join(dir, 'server')
+			result = sh_status(utopia, "--in", site_path, "site", "create")
+			expect(result).to be == 0
+			result = sh_status(utopia, "--in", server_path, "server", "create")
+			expect(result).to be == 0
+			Dir.chdir(site_path) do
+				result = sh_status("git", "push", "--set-upstream", server_path, "master")
+				expect(result).to be == 0
+			end
+			files = %W[.bowerrc .git Gemfile Gemfile.lock README.md Rakefile config.ru lib pages public]
+			expect(Dir.entries(server_path)).to include(*files)
+			expect(File.executable? File.join(server_path, 'config.ru')).to be == true
+			puts File.stat(File.join(dir, 'server', '.git')).mode
+		end
+	end
+end

data/spec/utopia/setup_spec.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,153 +18,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require 'fileutils'
-require 'tmpdir'
-require 'yaml'
+require 'utopia/setup'
-require 'open3'
-RSpec.describe "utopia executable" do
-	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__)}
+RSpec.describe Utopia::Setup do
+	let(:config_root) {File.expand_path('setup_spec/config', __dir__)}
+	subject{Utopia::Setup.new(config_root)}
-	before(:all) do
-		# We need to build a package to test deployment:
-		system("rake", "build") or abort("Could not build package for setup spec!")
+	it "should load specified environment" do
+		stub_const("Utopia::Setup::ENV", {'UTOPIA_ENV' => 'production'})
-		ENV['DEPLOY_USER'] = 'http'
-		ENV['DEPLOY_GROUP'] = 'http'
-	end
-	around(:each) do |example|
-		Bundler.with_clean_env 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
-	def sh_status(*args)
-		system(*args) ? 0 : false
-	end
-	def sh_stdout(*args)
-		output, status = Open3.capture2(*args)
-		return output
-	end
-	def git_config(name, value=nil)
-		unless value.nil?
-			return sh_status('git', 'config', name, value)
-		else
-			return sh_stdout('git', 'config', name).chomp
-		end
-	end
-	def group_rw(path)
-		gaccess = File.stat(path).mode.to_s(8)[-2]
-		return gaccess == '6' || gaccess == '7'
-	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")
-	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
-			expect(Dir.entries(dir)).to include(".bowerrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "spec")
-			Dir.chdir(dir) do
-				result = sh_status("rake", "test")
-				expect(result).to be == 0
-			end
-		end
-	end
-	it "should generate a sample server" do
-		Dir.mktmpdir('test-server') do |dir|
-			install_packages(dir)
-			result = sh_status(utopia, "--in", dir, "server", "create")
-			expect(result).to be == 0
-			expect(Dir.entries(dir)).to include(".git")
-			# make sure git is set up properly
-			Dir.chdir(dir) do
-				expect(git_config 'core.sharedRepository').to be == '1'
-				expect(git_config 'receive.denyCurrentBranch').to be == 'ignore'
-				expect(git_config 'core.worktree').to be == dir
-			end
-			environment = YAML.load_file(File.join(dir, 'config/environment.yaml'))
-			expect(environment).to include('RACK_ENV', 'UTOPIA_SESSION_SECRET')
-		end
+		expect(subject).to receive(:load_environment).with('production')
+		subject.apply_environment
 	end
-	it "should not trash the sample server during update" do
-		Dir.mktmpdir('test-server') do |dir|
-			install_packages(dir)
-			result = sh_status(utopia, "--in", dir, "server", "create")
-			expect(result).to be == 0
-			Dir.chdir(dir) do
-				# make the repository look a bit like like it's an old one
-				git_config 'core.sharedRepository', 'false'
-				sh_status 'chmod', '-Rf', 'g-x', '.git'
-				sh_status 'rm', '-f', '.git/hooks/post-receive'
-			end
-			result = sh_status(utopia, "--in", dir, "server", "update")
-			expect(result).to be == 0
-			# check a couple of files to make sure they have group read and write access
-			# after the update
-			Dir.glob(File.join(dir, '.git/**/*')).each do |path|
-				expect(group_rw path).to be == true
-			end
-		end
+	it "should load default environment" do
+		stub_const("Utopia::Setup::ENV", {})
+		expect(subject).to receive(:load_environment).with('environment')
+		subject.apply_environment
 	end
-	it "can generate sample site, server and push to the server" do
-		Dir.mktmpdir('test') do |dir|
-			site_path = File.join(dir, 'site')
-			install_packages(site_path)
-			server_path = File.join(dir, 'server')
-			result = sh_status(utopia, "--in", site_path, "site", "create")
-			expect(result).to be == 0
-			result = sh_status(utopia, "--in", server_path, "server", "create")
-			expect(result).to be == 0
-			Dir.chdir(site_path) do
-				result = sh_status("git", "push", "--set-upstream", server_path, "master")
-				expect(result).to be == 0
-			end
-			files = %W[.bowerrc .git Gemfile Gemfile.lock README.md Rakefile config.ru lib pages public]
-			expect(Dir.entries(server_path)).to include(*files)
-			expect(File.executable? File.join(server_path, 'config.ru')).to be == true
-			puts File.stat(File.join(dir, 'server', '.git')).mode
-		end
+	it "should add load path" do
+		subject.add_load_path('lib')
+		expect($LOAD_PATH).to include(File.expand_path('lib', subject.site_root))
 	end
 end