smartcloud 0.0.170 → 0.0.171

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fd60fd7e8faf1b8fc21ed2d0258329b2963c4748a0b312c0272104045f422c
-  data.tar.gz: 64a033c1adb9c5640bbc356d623b7e43d72d7d3508422f13479cddffeea5c24a
+  metadata.gz: e156f54f86c83734ce2a079df33131fbe931c06ba14cc40f546f02c0ed591099
+  data.tar.gz: 3fcf9d76b499c06cb4759c99fb057aa594795c08e6b147ed8a80d5d7edbb4936
 SHA512:
-  metadata.gz: a9136551d60c79830bfd1d9d68175a4c8181accc516d64432108af898a8cddfe30f0d8c354e8575c31bff4fbfd1701afce161ba7585dec1d9368ef434419ebdd
-  data.tar.gz: 3132e08e01400f5bd7da3ffd9231aa15db0f26dc36df8b06eb880ae983a5d284a589a29da43e94dc2eabf561aed258357e219c63a788ac326b88fad9a171ece0
+  metadata.gz: 89513317605a7d9fd69a11d563a82f87159e7d253a33f15f3941e3b7f6efd694e0e055e6679ad764c984c0acaab34134e8b86fc34ef4c7235765ed4e22be9e86
+  data.tar.gz: 6638d96afd7517fbb0f453f7578aa650406ed08096dfb9dc001189b9e89ee01ce715165635b7c635210eb3f4e1320642d0091207957160bb569f019253a6882b

data/lib/smartcloud/grids/buildpacker.rb

@@ -7,48 +7,72 @@ 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.info "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?
+
+				exit 0
+			end
 
-				# Perform bundle install
+			# Perform bundle install			
+			def bundle_install?
 				logger.info "Performing bundle install ..."
-				logger.formatter = proc do |severity, datetime, progname, message|
-					"\t\t\t\t#{message}"
+				set_logger_formatter_tabs
+				Open3.popen2("bundle", "install", "--deployment", "--clean") do |stdin, stdout_and_stderr, wait_thr|
+					stdout_and_stderr.each { |line| logger.info "#{line}" }
+					return true if wait_thr.value.success?
 				end
-				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
+				set_logger_formatter_arrow
+				logger.error "Could not complete bundle install. Please check if your Gemfile.lock is upto date."
+				return false
+			end
+			
+			# Perform pre-compiling of assets
+			def precompile_assets?
+				logger.info "Installing Javascript dependencies & pre-compiling assets ..."
+				set_logger_formatter_tabs
+				Open3.popen2("bundle", "exec", "rails", "assets:precompile") do |stdin, stdout_and_stderr, wait_thr|
+					stdout_and_stderr.each { |line| logger.info "#{line}" }
+					return true if wait_thr.value.success?
 				end
+				set_logger_formatter_arrow
+				logger.error "Could not install Javascript dependencies or pre-compile assets."
+				return false
+			end
+			
+			# Perform starting of web server
+			def start_web_server?
+				logger.debug "Starting Web Server ..."
 
-				if exit_status.success?
-					logger.error "Could not complete bundle install."
-				end
+				# Remove server.pid if it exists
+				FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
 
-				# 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 system("god -c Godfile -D")
+					logger.info "Launched Application ... Success."
 				# end
 			end
+			
+			def set_logger_formatter_arrow
+				logger.formatter = proc do |severity, datetime, progname, message|
+					"\t\t\t------> #{severity}: #{message}\n"
+				end
+			end
+			
+			def set_logger_formatter_tabs
+				logger.formatter = proc do |severity, datetime, progname, message|
+					"\t\t\t\t#{message}"
+				end
+			end
 		end
 	end
 end

data/lib/smartcloud/grids/runner.rb

@@ -327,9 +327,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)

metadata

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