smartcloud 0.0.170 → 0.0.175

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fd60fd7e8faf1b8fc21ed2d0258329b2963c4748a0b312c0272104045f422c
-  data.tar.gz: 64a033c1adb9c5640bbc356d623b7e43d72d7d3508422f13479cddffeea5c24a
+  metadata.gz: 99e69fe0612ec14d6e92533ccd41a7a5b8d5b28a3647b5e8d406c36d62fcd35d
+  data.tar.gz: 8df92bc6e039ea2a09cf4f651a8694ef317c7cf2d5d143a2abda14fd619c277e
 SHA512:
-  metadata.gz: a9136551d60c79830bfd1d9d68175a4c8181accc516d64432108af898a8cddfe30f0d8c354e8575c31bff4fbfd1701afce161ba7585dec1d9368ef434419ebdd
-  data.tar.gz: 3132e08e01400f5bd7da3ffd9231aa15db0f26dc36df8b06eb880ae983a5d284a589a29da43e94dc2eabf561aed258357e219c63a788ac326b88fad9a171ece0
+  metadata.gz: 6cb0174ba73d9cbc9bc142c5dd72e67889a90a64b15325a51bf21381f9748d25d70ce8fb4e22898b4e3888f1c7facb41d3b7a520c517f69dc1000de384a9c817
+  data.tar.gz: 944daa53a58715fc88f28fc11fc39a910068222bbb3ea2fe5c9092bf5c4dfbe6a9f4a156239fc3167f694e48638720ab03eca1553af4630c4087d852fe51c39f

data/lib/smartcloud/grids/buildpacker.rb

@@ -7,47 +7,97 @@ module Smartcloud
 			end
 
 			def pack
-				logger.formatter = proc do |severity, datetime, progname, message|
-					"\t\t\t------> #{severity}: #{message}\n"
-				end
+				set_logger_formatter_arrow
 
 				pack_rails if File.exist? "bin/rails"
-				logger.info "Could not continue ... Launch Failed."
 
+				logger.error "Could not continue ... Launch Failed."
 				logger.formatter = nil
+				exit 1
 			end
 
 			def pack_rails
-				# Remove server.pid if it exists
-				FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
+				return unless bundle_install?
+				return unless precompile_assets?
+				return unless start_web_server?
 
-				# Perform bundle install
+				exit 0
+			end
+
+			# Perform bundle install			
+			def bundle_install?
+				logger.info ""
 				logger.info "Performing bundle install ..."
-				logger.formatter = proc do |severity, datetime, progname, message|
-					"\t\t\t\t#{message}"
-				end
+
+				set_logger_formatter_tabs
 				exit_status = nil
-				Open3.popen2("bundle", "install", "--deployment", "--clean") do |stdin, stdout_andstderr, wait_thr|
-					stdout_andstderr.each do |line|
-						logger.info "#{line}"
-					end
-					exit_status = wait_thr.value
+				Open3.popen2e("bundle", "install", "--deployment", "--clean") do |stdin, stdout_and_stderr, wait_thr|
+					stdout_and_stderr.each { |line| logger.info "#{line}" }
+					exit_status = wait_thr.value.success?
 				end
+				set_logger_formatter_arrow
 
-				if exit_status.success?
+				if exit_status
+					return true
+				else
 					logger.error "Could not complete bundle install."
+					return false
+				end
+			end
+			
+			# Perform pre-compiling of assets
+			def precompile_assets?
+				logger.info ""
+				logger.info "Installing Javascript dependencies & pre-compiling assets ..."
+
+				set_logger_formatter_tabs
+				exit_status = nil
+				Open3.popen2e("bundle", "exec", "rails", "assets:precompile") do |stdin, stdout_and_stderr, wait_thr|
+					stdout_and_stderr.each { |line| logger.info "#{line}" }
+					exit_status = wait_thr.value.success?
 				end
+				set_logger_formatter_arrow
 
-				# if system("bundle install --deployment --clean")
-				# 	logger.info "Installing Javascript Dependencies & Pre-compiling Assets ..."
-				# 	if system("bundle exec rails assets:precompile", out: File::NULL)
-				# 		logger.debug "Starting Server ..."
-				# 		if system("god -c Godfile -D")
-				# 			logger.info "Launched Application ... Success."
-				# 		end
-				# 		# exit 0
-				# 	end
+				if exit_status
+					return true
+				else
+					logger.error "Could not install Javascript dependencies or pre-compile assets."
+					return false
+				end
+			end
+			
+			# Perform starting of web server
+			def start_web_server?
+				logger.debug ""
+				logger.debug "Starting Web Server ..."
+
+				# Remove server.pid if it exists
+				FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
+
+				# if system("god -c Godfile -D")
+					logger.info ""
+					logger.info "Launched Application ... Success."
+					# return true
 				# end
+				return false
+			end
+			
+			def set_logger_formatter_arrow
+				logger.formatter = proc do |severity, datetime, progname, message|
+					severity_text = (severity == 'INFO') ? "     " : "#{severity}:"
+					info_symbol = "#{('\u2713').force_encoding('utf-8')}"
+					# error_symbol = "#{('\u274c').force_encoding('utf-8')}"
+					# warn_symbol = "#{('\u26a0').force_encoding('utf-8')}"
+					symbol_text = (severity == 'INFO') ? info_symbol : "#{severity}:"
+
+					"\t\t\t------> #{severity_text} #{message}\n"
+				end
+			end
+			
+			def set_logger_formatter_tabs
+				logger.formatter = proc do |severity, datetime, progname, message|
+					"\t\t\t\t\t      #{message}"
+				end
 			end
 		end
 	end

data/lib/smartcloud/grids/runner.rb

@@ -220,7 +220,13 @@ module Smartcloud
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
 				logger.formatter = proc do |severity, datetime, progname, message|
-				  "\t\t\t------> #{severity}: #{message}\n"
+					severity_text = (severity == 'INFO') ? "     " : "#{severity}:"
+					info_symbol = "#{('\u2713').force_encoding('utf-8')}"
+					# error_symbol = "#{('\u274c').force_encoding('utf-8')}"
+					# warn_symbol = "#{('\u26a0').force_encoding('utf-8')}"
+					symbol_text = (severity == 'INFO') ? info_symbol : "#{severity}:"
+
+					"\t\t\t------> #{severity_text} #{message}\n"
 				end
 
 				# Load vars and environment
@@ -228,7 +234,6 @@ module Smartcloud
 				return unless self.load_container_env_vars(container_path)
 
 				# Verify the user and ensure the user is correct and has access to this repository
-				logger.info "Verifying User ..."
 				unless ENV['USERNAME'] == username
 					logger.error "Unauthorized."
 					return
@@ -289,6 +294,7 @@ module Smartcloud
 			end
 
 			def self.start_app_rails(appname, container_path, container_path_with_version)
+				logger.info ""
 				logger.info "Ruby on Rails application detected."
 
 				# Setup rails env
@@ -300,7 +306,7 @@ module Smartcloud
 				system("grep -q '^RAILS_SERVE_STATIC_FILES=' #{env_path} || echo 'RAILS_SERVE_STATIC_FILES=enabled' >> #{env_path}")
 				system("grep -q '^LANG=' #{env_path} || echo 'LANG=en_US.UTF-8' >> #{env_path}")
 				system("grep -q '^RAILS_MASTER_KEY=' #{env_path} || echo 'RAILS_MASTER_KEY=yourmasterkey' >> #{env_path}")
-				logger.warn "WARNING: Please set your RAILS_MASTER_KEY env var for this rails app." if system("grep -q '^RAILS_MASTER_KEY=yourmasterkey' #{env_path}")
+				logger.warn "Please set your RAILS_MASTER_KEY env var for this rails app." if system("grep -q '^RAILS_MASTER_KEY=yourmasterkey' #{env_path}")
 
 				# Setup gems folder. If this is not created then docker will create it while running the container,
 				# but the folder will have root user assigned instead of the current user.
@@ -308,7 +314,7 @@ module Smartcloud
 
 				# Setup Godfile
 				unless File.exist? "#{container_path_with_version}/Godfile"
-					logger.warn "WARNING: Godfile not detected. Adding a default Godfile. It is recommended to add your own Godfile."
+					logger.warn "Godfile not detected. Adding a default Godfile. It is recommended to add your own Godfile."
 					page = <<~"HEREDOC"
 						God.watch do |w|
 							w.name = "web"
@@ -327,9 +333,9 @@ module Smartcloud
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
 					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
-					--volume='#{container_path_with_version}:/code' \
-					--volume='#{container_path}/gems:/code/vendor/bundle' \
-					--workdir='/code' \
+					--volume='#{container_path_with_version}:/app' \
+					--volume='#{container_path}/gems:/app/vendor/bundle' \
+					--workdir='/app' \
 					--restart='always' \
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)

data/lib/smartcloud/logger.rb

@@ -1,5 +1,7 @@
 require "logger"
 
+$stdout.sync = true
+
 module Smartcloud
 	module Logger
 	  def logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.170
+  version: 0.0.175
 platform: ruby
 authors:
 - Timeboard