smartcloud 0.0.81 → 0.0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646078f60f1b097477a66ed4c5c4fdbbf63f8d1537267bc16a574cbfaaa93592
-  data.tar.gz: 47d48167d8f10499b4141fc18bbe39092c143046cee9566f6729721b99e7bea5
+  metadata.gz: 211f9df575810d1e2ecce55c218707e7fe3f5c531359596b7d9d5b58606e3e2f
+  data.tar.gz: '04827c4fba43e75c68ecdb8118ee35256678bf89e25e79bfff49867503ad49b9'
 SHA512:
-  metadata.gz: 5eab2db60ccff6fd96267e109c183e1aafd9978649c802dbc3e79e48bc7f2a360e3f304afbb3b2b4e54acdd61ee52fa22fd7b6df2a8621341b03852b1255c1e3
-  data.tar.gz: 600a96782744b59d605be2df81c88c9885dadd135f5a4ec92b9038c85fa48b1fce3e61fb151590d970e0b6d59eacbcfa4de178bca39dbf052997c0fbe1528093
+  metadata.gz: a110a5e6cabd95b506dc8ebb7b2b27738e20a7b3e7a5974054fc1719fd4c5a8113236ba35b1710db5db0d8e7abbe6776ecc19744350a8f77a2c58e418b1dceee
+  data.tar.gz: aeb9eb96109fb2dfa84ca4b074c0872dc69b98b2bc0df0b189cc4fbe6b6374d128bace3d265ffd23e93f99c7c5faa1b22e147030191565af4e22c736c11ab55b

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

@@ -18,10 +18,10 @@ 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
+				# exit 0
 			end
 		end		
 	end

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

@@ -186,7 +186,7 @@ module Smartcloud
 					end
 					unless File.exist? "#{container_path}/env"
 						print "-----> Creating App Environment ... "
-						system("cat > #{container_path}/env <<- EOF
+						page = <<~HEREDOC
 							## System
 							USERNAME=#{username}
 							KEEP_RELEASES=3
@@ -196,8 +196,8 @@ module Smartcloud
 							LETSENCRYPT_HOST=#{appname}.#{Smartcloud.config.apps_domain}
 							LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email}
 							LETSENCRYPT_TEST=false
-						EOF")
-						puts "done"
+						HEREDOC
+						puts "done" if system("echo '#{page}' > #{container_path}/env")
 					end
 				end
 			end
@@ -218,13 +218,10 @@ module Smartcloud
 			end
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
-				STDOUT.sync = true
-				logger = Logger.new(STDOUT)				
-
 				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
@@ -240,7 +237,7 @@ module Smartcloud
 
 				# Match Username
 				unless ENV['USERNAME'] == username
-					puts "User is not authorized ... Failed."
+					puts "Unauthorized."
 					exit 1
 				end
 				puts "done"
@@ -250,18 +247,18 @@ module Smartcloud
 				if refname == "refs/heads/master"
 					print "-----> Initializing Application ... "
 
-					# Note: There should be no space between + and " in now_date.
+					# Note: There should be no space between + and " in version.
 					# Note: date will be UTC date until timezone has been changed.
-					now_date = `date +"%Y%m%d%H%M%S"`.chomp!
-					container_path_with_now_date = "#{container_path}/#{now_date}"
+					version = `date +"%Y%m%d%H%M%S"`.chomp!
+					container_path_with_version = "#{container_path}/releases/#{version}"
 
-					unless Dir.exist? container_path_with_now_date
-						FileUtils.mkdir_p(container_path_with_now_date)
-						if system("git archive #{newrev} | tar -x -C #{container_path_with_now_date}")
+					unless Dir.exist? container_path_with_version
+						FileUtils.mkdir_p(container_path_with_version)
+						if system("git archive #{newrev} | tar -x -C #{container_path_with_version}")
 							puts "done"
 
 							# Clean up very old versions
-							Dir.chdir(container_path) do
+							Dir.chdir("#{container_path}/releases") do
 								app_versions = Dir.glob('*').select { |f| File.directory? f }.sort
 								destroy_count = app_versions.count - ENV['KEEP_RELEASES'].to_i
 								if destroy_count > 0
@@ -279,6 +276,9 @@ module Smartcloud
 							puts "Could not extract new app version ... Failed."
 							exit 1
 						end
+					else
+						puts "This version name already exists ... Failed."
+						exit 1
 					end
 				end
 			end
@@ -287,26 +287,26 @@ module Smartcloud
 				if Smartcloud::Docker.running?
 					container_path = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/containers/#{appname}"
 
-					Dir.chdir(container_path) do
+					Dir.chdir("#{container_path}/releases") do
 						if app_version == 0
 							app_versions = Dir.glob('*').select { |f| File.directory? f }.sort
 							app_version = app_versions.last
 						end
 
-						container_path_with_now_date = "#{container_path}/#{app_version}"
+						container_path_with_version = "#{container_path}/releases/#{app_version}"
 
 						# 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_version)
 
 						puts "-----> Launching Application ... "
 
-						if File.exist? "#{container_path_with_now_date}/bin/rails"
+						if File.exist? "#{container_path_with_version}/bin/rails"
 							# Stopping & Removing container
 							self.stop_app(appname)
 
 							# Starting Rails App
-							self.start_app_rails(appname, container_path, container_path_with_now_date)
+							self.start_app_rails(appname, container_path, container_path_with_version)
 						end
 					end
 				end
@@ -333,7 +333,7 @@ module Smartcloud
 				end
 			end
 
-			def self.start_app_rails(appname, container_path, container_path_with_now_date)
+			def self.start_app_rails(appname, container_path, container_path_with_version)
 				puts "-----> Ruby on Rails application detected"
 
 				# Setup rails env
@@ -347,12 +347,22 @@ 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
-					EOF")
+				# Setup gems folder. 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")
+
+				# Setup Godfile
+				unless File.exist? "#{container_path_with_version}/Godfile"
+					puts "-----> WARNING: Godfile not detected. Adding a default Godfile. It is recommended to add your own Godfile."
+					page = <<~HEREDOC
+						God.watch do |w|
+							w.name = 'web'
+							w.start = 'bundle exec puma -C config/puma.rb'
+							w.behavior(:clean_pid_file)
+							w.keepalive
+						end
+					HEREDOC
+					system("echo '#{page}' > #{container_path_with_version}/Godfile")
 				end
 
 				# Creating & Starting container
@@ -360,8 +370,8 @@ module Smartcloud
 					--name='#{appname}' \
 					--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' \
+					--volume='#{container_path_with_version}:/code' \
+					--volume='#{container_path}/gems:/code/vendor/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.86
 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
@@ -48,7 +48,6 @@ files:
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-nginx/users.yml
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/apps/containers/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/apps/repositories/.keep
-- lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/buildpacks/rails/gems/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/pre-receive
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/README.txt