smartcloud 0.0.183 → 0.0.188

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3c539dab1e6f0c5b63e0a0c4de873ddce852dd069bb7bd7426cad1502c75d30
-  data.tar.gz: 3e114db0743b4114e0689235fdc0d59ef3aeb5d2c7e397c7a813ddb4a99bb332
+  metadata.gz: 9c53fe02c5045ba4ecea4ff92cc9b3576d9cd23d820ac8c10fdac3e9b76e3c3b
+  data.tar.gz: ff8cbe7ca9d08a4e4150705d159291431746ddb748f93496fbf749b778055272
 SHA512:
-  metadata.gz: ae921b5751e7b60a036440f5a172e90fb5a825d273442954fd3b5eab8dc8af470ff9a202d228e2399ec35fc937ffd963e03df6b7c4922ff25fb5591c1b6cc69b
-  data.tar.gz: 767f764ddb3f8b407e40acf4935af6a29b7c2a851753a781fae93a0a9e812d68ef6ec134053d23476a1b4dceb3451232e2d4e853bb8f4a5cf92d8451116aa429
+  metadata.gz: cd7ba77ecb3c4e62fec3d47314e1db6871c4df8f62a0d6c81d411caf21f9b74a243d1d555f6ff1a8cf17988de183273f6a02943189d8cf31a99b2c2f2ed68694
+  data.tar.gz: ed282e7ffd3a7f00d0e3721936b087126baeb324c9011f47cbb4476e9d84bfff1c11f4e508fc40fb9e02df7c5a7b06d50eb3f493548148a136818cf5beac9579

data/lib/smartcloud/grids/buildpacker.rb

@@ -73,20 +73,17 @@ module Smartcloud
 
 				# if system("god -c Godfile -D")
 					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}: "
-					severity_symbols = { "DEBUG" => "\u{1f527}", "INFO" => "\u{276f}",
-						"WARN" => "\u{2757}", "ERROR" => "\u{2b55}", "FATAL" => "\u{274c}", 
-						"UNKNOWN" => "\u{2753}"
+					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}:"
 					}
-					symbol_text = (message == "") ? "" : severity_symbols[severity]
-					"\t\t\t\t#{symbol_text} #{severity_text}#{message}\n"
+					"\t\t\t\t#{severity_text[severity]} #{message}\n"
 				end
 			end
 			

data/lib/smartcloud/grids/runner.rb

@@ -220,13 +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}: "
-					severity_symbols = { "DEBUG" => "\u{1f527}", "INFO" => "\u{276f}",
-						"WARN" => "\u{2757}", "ERROR" => "\u{2b55}", "FATAL" => "\u{274c}", 
-						"UNKNOWN" => "\u{2753}"
+					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}:"
 					}
-					symbol_text = (message == "") ? "" : severity_symbols[severity]
-					"\t\t\t\t#{symbol_text} #{severity_text}#{message}\n"
+					"\t\t\t\t#{severity_text[severity]} #{message}\n"
 				end
 
 				# Load vars and environment
@@ -253,7 +250,7 @@ module Smartcloud
 						FileUtils.mkdir_p(container_path_with_version)
 						if system("git archive #{newrev} | tar -x -C #{container_path_with_version}")
 							# Start App
-							self.start_app(appname)
+							return self.start_app(appname)
 						else
 							logger.fatal "Could not extract new app version ... Failed."
 							return
@@ -283,7 +280,7 @@ module Smartcloud
 						logger.info "Launching Application ..."
 						if File.exist? "#{container_path_with_version}/bin/rails"
 							# Starting Rails App
-							self.start_app_rails(appname, container_path, container_path_with_version)
+							return self.start_app_rails(appname, container_path, container_path_with_version)
 						end
 					end
 				end
@@ -307,9 +304,11 @@ 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")
+				FileUtils.mkdir_p("#{container_path}/app/node_modules")
 
 				# Setup Godfile
 				unless File.exist? "#{container_path_with_version}/Godfile"
@@ -333,7 +332,9 @@ 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' \
+					--volume='#{container_path}/app/node_modules:/app/node_modules' \
 					--workdir='/app' \
 					--restart='always' \
 					--network='nginx-network' \
@@ -343,11 +344,11 @@ module Smartcloud
 					system("docker network connect mysql-network #{appname}_new")
 
 					if system("docker start --attach #{appname}_new")
-						# Runs only if #{appname}_new has been started successfully and is reachable.
-						self.hot_reloaded_app(appname)
-						self.clean_up(container_path)
+						if self.hot_reloaded_app?(appname)
+							self.clean_up(container_path)
+							exit 0
+						end						
 					else
-						# Runs only if #{appname}_new starting has failed.
 						self.stop_app("#{appname}_new")
 					end
 				end
@@ -370,7 +371,7 @@ module Smartcloud
 			end
 
 			# Hot reloading app containers and removing old app container
-			def self.hot_reloaded_app(appname)
+			def self.hot_reloaded_app?(appname)
 				logger.debug "Hot reloading '#{appname}' containers ..."
 
 				container_id = `docker ps -a -q --filter='name=^#{appname}$'`.chomp
@@ -380,13 +381,16 @@ module Smartcloud
 						if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
 							logger.debug "Container renamed from #{appname}_new #{appname}"
 							self.stop_app("#{appname}_old")
+							return true
 						end
 					end
 				else
 					if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
 						logger.debug "Container renamed from #{appname}_new #{appname}"
+						return true
 					end
 				end
+				return false
 			end
 
 			def self.load_container_env_vars(container_path)

metadata

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