smartcloud 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646078f60f1b097477a66ed4c5c4fdbbf63f8d1537267bc16a574cbfaaa93592
-  data.tar.gz: 47d48167d8f10499b4141fc18bbe39092c143046cee9566f6729721b99e7bea5
+  metadata.gz: 26f088b84350fb24d4ad054c310174cb94bfcd2c7462aeab7550e585212aef2c
+  data.tar.gz: 442893d4d98576b73905970bb43951f34f462e9c870dbeb9c1f4537a71ca5244
 SHA512:
-  metadata.gz: 5eab2db60ccff6fd96267e109c183e1aafd9978649c802dbc3e79e48bc7f2a360e3f304afbb3b2b4e54acdd61ee52fa22fd7b6df2a8621341b03852b1255c1e3
-  data.tar.gz: 600a96782744b59d605be2df81c88c9885dadd135f5a4ec92b9038c85fa48b1fce3e61fb151590d970e0b6d59eacbcfa4de178bca39dbf052997c0fbe1528093
+  metadata.gz: 0326f41f3d2e535c44f00a3d977b8d2232a778fd5474296a005b492fca66cd06d1448826cf58d0fdeba8b1e50bde53c0e51645890133b5dee86fb867702980c6
+  data.tar.gz: a3deeb8a40b3d11e72184a51956310af8c5d20510888a7e8853b250afaed412b673a6536c7c359cba7275e814bdcf00fe93b46f8a0828501d6951b19e9947f7d

data/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb

@@ -18,7 +18,7 @@ class Buildpacker
 				puts "done"
 
 				puts "-----> Running Web Server ... "
-				if system("foreman start -f Procfile")
+				if system("god -c Godfile -D")
 					puts "-----> Launched Application ... Success."
 				end
 				exit 0

data/lib/smartcloud/grids/grid-runner/buildpacks/rails/Dockerfile

@@ -22,9 +22,9 @@ RUN apk add --update build-base && \
 
 USER "$USER_NAME"
 
-# Install bundler and foreman gems
+# Install bundler and god gems
 RUN gem install bundler && \
-	gem install foreman
+	gem install god
 
 # Command to execute at container start
 CMD ["ruby", "buildpacker.rb"]

data/lib/smartcloud/grids/runner.rb

@@ -218,13 +218,13 @@ module Smartcloud
 			end
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
-				STDOUT.sync = true
-				logger = Logger.new(STDOUT)				
+				# logger = Logger.new(STDOUT)
+				$stdout.sync = true
 
 				container_path = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/containers/#{appname}"
 
 				## Verify the user and ensure the user is correct and has access to this repository
-				logger.info "-----> Verifying User ... "
+				print "-----> Verifying User ... "
 				unless File.exist? "#{container_path}/env"
 					puts "Environment could not be loaded ... Failed."
 					exit 1
@@ -297,11 +297,12 @@ module Smartcloud
 
 						# Setup Buildpacker
 						buildpacker_path = "#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb"
-						FileUtils.cp(buildpacker_path, container_path_with_now_date)
+						FileUtils.cp buildpacker_path, container_path_with_now_date
 
 						puts "-----> Launching Application ... "
 
 						if File.exist? "#{container_path_with_now_date}/bin/rails"
+
 							# Stopping & Removing container
 							self.stop_app(appname)
 
@@ -347,11 +348,20 @@ module Smartcloud
 				system("grep -q '^RAILS_MASTER_KEY=' #{env_path} || echo 'RAILS_MASTER_KEY=yourmasterkey' >> #{env_path}")
 				puts "-----> WARNING: Please set your RAILS_MASTER_KEY env var for this rails app." if system("grep -q '^RAILS_MASTER_KEY=yourmasterkey' #{env_path}")
 
-				# Setup Procfile
-				unless File.exist? "#{container_path_with_now_date}/Procfile"
-					puts "-----> WARNING: Procfile not detected. Adding a default Procfile. It is recommended to add your own Procfile."
-					system("cat > #{container_path_with_now_date}/Procfile <<- EOF
-						web: bundle exec puma -C config/puma.rb
+				# Setup gems folder to reuse gems
+				FileUtils.mkdir_p("#{container_path}/gems")
+				FileUtils.symlink "#{container_path}/gems", "#{container_path_with_now_date}/vendor/bundle", force: true
+
+				# Setup Godfile
+				unless File.exist? "#{container_path_with_now_date}/Godfile"
+					puts "-----> WARNING: Godfile not detected. Adding a default Godfile. It is recommended to add your own Godfile."
+					system("cat > #{container_path_with_now_date}/Godfile <<- EOF
+						God.watch do |w|
+							w.name = 'web'
+							w.start = 'bundle exec puma -C config/puma.rb'
+							w.behavior(:clean_pid_file)
+							w.keepalive
+						end
 					EOF")
 				end
 
@@ -361,7 +371,6 @@ module Smartcloud
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
 					--volume='#{container_path_with_now_date}:/code' \
-					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/buildpacks/rails/gems:/usr/local/bundle' \
 					--workdir='/code' \
 					--restart='always' \
 					--network='nginx-network' \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-01 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