smartcloud 0.0.180 → 0.0.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99f52b901768f9b2f528e164dd7b73193639062faca90bf85afe5c39530ea59
-  data.tar.gz: ba422d333a7bdbd6b4462afd54316dc5e76b7bdab5ecd1c22924dca5204e509e
+  metadata.gz: c484a6fcf7dcb984273371aa62fdd8276a1ac34f8198e7bd14b54e6ca3c6f7a2
+  data.tar.gz: f003009d8c5849c28540a4c7e807540015afdda3996d59464cf075be16c67f1a
 SHA512:
-  metadata.gz: 44700ca49b1c8bfae9b8c58db309cb48229905ea62c8d4305d0fad3c8c5d306ba244caa44ca5df2f0059240452aa0faadcaf6ff604572607c520e35a120d66ed
-  data.tar.gz: dbec0cdc6106064832ba60dfdf3528e48aa6e6d3293b5ca1b079c94cbfeb76a761c1378b8bcfa235de33aaa3313ad71ffcfb6d618a60c06c262a8c83c245ebf8
+  metadata.gz: f84e907973d6c90a7a8b72ff84c7b21d92ff9a1e57d8b63947ad26490473c6f506caad65fa83dad6a9f750f7e8c6da154dcd93da2d28748c081ec6e8b01f5483
+  data.tar.gz: e35384f303b0d2b381371c412672686ff1ba8c199fad3097063694b90e6ce3ff3b41351a09da38a0d10acf38c5b7a2a62785701ab87acc6d62fc4c280ac02151

data/lib/smartcloud/grids/buildpacker.rb

@@ -26,7 +26,6 @@ module Smartcloud
 
 			# Perform bundle install			
 			def bundle_install?
-				logger.info ""
 				logger.info "Performing bundle install ..."
 
 				set_logger_formatter_tabs
@@ -47,7 +46,6 @@ module Smartcloud
 			
 			# Perform pre-compiling of assets
 			def precompile_assets?
-				logger.info ""
 				logger.info "Installing Javascript dependencies & pre-compiling assets ..."
 
 				set_logger_formatter_tabs
@@ -68,31 +66,24 @@ module Smartcloud
 			
 			# 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
+					return true
 				# end
-				return false
+				# return false
 			end
 			
 			def set_logger_formatter_arrow
 				logger.formatter = proc do |severity, datetime, progname, message|
-					severity_text = (severity == 'INFO') ? "" : "#{severity}: "
-
-					SYMBOL_DEBUG = "\u{1f527}"
-					SYMBOL_INFO = "\u{1f604}"
-					SYMBOL_WARN = "\u{2753}"
-					SYMBOL_ERROR, SYMBOL_FATAL = "\u{274c}"
-					symbol_text = (message == "") ? "" : Object.const_get("SYMBOL_#{severity}")
-
-					"\t\t\t\t#{symbol_text} #{severity_text}#{message}\n"
+					severity_text = { "DEBUG" => "\u{1f527} #{severity}:", "INFO" => " \u{276f}", "WARN" => "\u{2757} #{severity}:",
+						"ERROR" => "\u{274c} #{severity}:", "FATAL" => "\u{2b55} #{severity}:", "UNKNOWN" => "\u{2753} #{severity}:"
+					}
+					"\t\t\t\t#{severity_text[severity]} #{message}\n"
 				end
 			end
 			

data/lib/smartcloud/grids/runner.rb

@@ -220,15 +220,10 @@ module Smartcloud
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
 				logger.formatter = proc do |severity, datetime, progname, message|
-					severity_text = (severity == 'INFO') ? "" : "#{severity}: "
-
-					SYMBOL_DEBUG = "\u{1f527}"
-					SYMBOL_INFO = "\u{1f604}"
-					SYMBOL_WARN = "\u{2753}"
-					SYMBOL_ERROR, SYMBOL_FATAL = "\u{274c}"
-					symbol_text = (message == "") ? "" : Object.const_get("SYMBOL_#{severity}")
-
-					"\t\t\t\t#{symbol_text} #{severity_text}#{message}\n"
+					severity_text = { "DEBUG" => "\u{1f527} #{severity}:", "INFO" => " \u{276f}", "WARN" => "\u{2757} #{severity}:",
+						"ERROR" => "\u{274c} #{severity}:", "FATAL" => "\u{2b55} #{severity}:", "UNKNOWN" => "\u{2753} #{severity}:"
+					}
+					"\t\t\t\t#{severity_text[severity]} #{message}\n"
 				end
 
 				# Load vars and environment
@@ -296,7 +291,6 @@ 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
@@ -310,9 +304,10 @@ module Smartcloud
 				system("grep -q '^RAILS_MASTER_KEY=' #{env_path} || echo '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,
+				# Setup app folders. 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.
-				FileUtils.mkdir_p("#{container_path}/gems")
+				FileUtils.mkdir_p("#{container_path}/app/vendor/bundle")
+				FileUtils.mkdir_p("#{container_path}/app/public")
 
 				# Setup Godfile
 				unless File.exist? "#{container_path_with_version}/Godfile"
@@ -336,7 +331,8 @@ module Smartcloud
 					--expose='5000' \
 					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
 					--volume='#{container_path_with_version}:/app' \
-					--volume='#{container_path}/gems:/app/vendor/bundle' \
+					--volume='#{container_path}/app/vendor/bundle:/app/vendor/bundle' \
+					--volume='#{container_path}/app/public:/app/public' \
 					--workdir='/app' \
 					--restart='always' \
 					--network='nginx-network' \

metadata

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