smartcloud 0.0.184 → 0.0.189

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b036a69c41986c8bc466401694c5602292426a2aacf28bcdccb12ff60356d02
-  data.tar.gz: 4be43d0d642cb6243372a2e9400ed58f9e5cf702dbfb1718388f031dbbd68227
+  metadata.gz: 8b33bd879a4af69d254a92c7e3805b93acf2e8a7b81865ec54a7c2858de36e60
+  data.tar.gz: 74c5aa93230e4687e667586d2f962a9590f7b3b5d2148354eab6fdd0bb4e5c84
 SHA512:
-  metadata.gz: 2e8e26705bc738ce8e47e31915a76b8794be5195d8ddc1694b61ece548f39afa24c271aaf62f0a966e4bdad951207cc02e7ac211a7b87924915d67178838dbe0
-  data.tar.gz: 98163e53f2528d250c880c7b418af7b9d44e58ce3b0237a0039f1325433388e4c638c3f7af3c6f17f600bd553fdf06f47af85ca4d57405dbdbe09725ebe74f9b
+  metadata.gz: 3afe318524b8f7257fa4a2fcf0bf8e987c41ab2d389204554205038bfc0e2fb93f38ea97011da02c44b1026af1db8a94cd7778e7e357bcafbd92fbe5cfdc2026
+  data.tar.gz: 8f3f9f882c999740ce6d7fe2962d12b1bc8895633545b8f6695a2c0716739ad0cce4e7fc9f73c84772f0522f5076fcbc71a44f5498d98f06c8404cf34f9050fa

data/lib/smartcloud/grids/buildpacker.rb

@@ -72,10 +72,9 @@ module Smartcloud
 				FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
 
 				# 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

data/lib/smartcloud/grids/runner.rb

@@ -304,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"
@@ -330,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' \
@@ -340,11 +344,12 @@ 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)
+							logger.info "Launched Application ... Success."
+							exit 0
+						end						
 					else
-						# Runs only if #{appname}_new starting has failed.
 						self.stop_app("#{appname}_new")
 					end
 				end
@@ -367,7 +372,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
@@ -377,13 +382,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)

data/lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/pre-receive

@@ -9,6 +9,9 @@ while read oldrev newrev refname; do
 	else
 	    REPOSITORY_BASENAME=$(basename $(readlink -nf "$PWD"/..))
 	fi
-	script -qfc "runner prereceive $REPOSITORY_BASENAME $REMOTE_USER $oldrev $newrev $refname" /home/$(whoami)/.smartcloud/grids/grid-runner/apps/containers/$REPOSITORY_BASENAME/typescript
+	script --quiet --return --flush --command "runner prereceive $REPOSITORY_BASENAME $REMOTE_USER $oldrev $newrev $refname" /home/$(whoami)/.smartcloud/grids/grid-runner/apps/containers/$REPOSITORY_BASENAME/typescript
+	if [ "$?" -eq 0 ]; then
+		exit 0
+	fi
 	exit 1
 done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.184
+  version: 0.0.189
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies: []
 description: Smartcloud is a full-stack deployment framework for rails optimized for
   programmer happiness and peaceful administration. It encourages natural simplicity