smartcloud 0.0.83 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a25efc095e4c286729b4c656ad819bc3c340fce40b390a860286f409505ace8
-  data.tar.gz: 6c326486c6686a34a61ac288a76c2b652f3359dd3f161def22ef0d82984d89d2
+  metadata.gz: 24b3f805e1fd1c1f9997ef327ccefafb104c8ce44a969d681151a2e1344e4d51
+  data.tar.gz: 734a0dfb85808d01e676dad61aaa717408620269d34f7c0463ad05022f305028
 SHA512:
-  metadata.gz: 07e6397b996b8f13755f6f5736e4ed29ea875efd8641d7f98a2213e7846585f51ce057a46366dc549f7cd6519dda8e575bcdc40e9d26f7a239a0dc1ae1a21e26
-  data.tar.gz: 8bcc770501a7d35abad3642e510870119e4a6b99cbb5c147eb721c8da159bb86667b5e029aeb5b8f99dee7a86aeb89933892afb775e3399e4e5616a3a9ae8fe1
+  metadata.gz: cae4c977dd08da48f05963db0453f3ffe2ea20ddfc33698594f2a562653ce767d433a56d12cbc4cea5ba51cfae6b062f95cdecf4de9f48205879c7c0a516cc26
+  data.tar.gz: 7e9d1ef94df2969dd02f753ad2a603d2d3412032cb6491d6a390a53a06c434dddf37aade9af3b3181291cd29c73753398669c61508337d2a8630cf44a5bab78b

data/lib/smartcloud.rb

@@ -1,4 +1,5 @@
 require "ostruct"
+require "logger"
 
 # The main Smartcloud driver
 module Smartcloud

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

@@ -12,7 +12,7 @@ class Buildpacker
 		FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
 
 		puts "-----> Performing bundle install ... "
-		if system("bundle install --deployment --clean --without development test")
+		if system("bundle install --deployment --clean")
 			puts "-----> Installing Javascript Dependencies & Pre-compiling Assets ... "
 			if system("bundle exec rails assets:precompile", out: File::NULL)
 				puts "done"
@@ -21,7 +21,7 @@ class Buildpacker
 				if system("god -c Godfile -D")
 					puts "-----> Launched Application ... Success."
 				end
-				exit 0
+				# exit 0
 			end
 		end		
 	end

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,12 @@ module Smartcloud
 			end
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
-				# logger = Logger.new(STDOUT)
-				$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
-				print "-----> Verifying User ... "
+				logger.info "-----> Verifying User ... "
 				unless File.exist? "#{container_path}/env"
 					puts "Environment could not be loaded ... Failed."
 					exit 1
@@ -240,28 +239,28 @@ module Smartcloud
 
 				# Match Username
 				unless ENV['USERNAME'] == username
-					puts "User is not authorized ... Failed."
+					puts "Unauthorized."
 					exit 1
 				end
-				puts "done"
+				logger.info "done"
 
 				# Only run this script for the master branch. You can remove this
 				# if block if you wish to run it for others as well.
 				if refname == "refs/heads/master"
-					print "-----> Initializing Application ... "
+					logger.info "-----> 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 +278,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,27 +289,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
@@ -334,12 +335,12 @@ module Smartcloud
 				end
 			end
 
-			def self.start_app_rails(appname, container_path, container_path_with_now_date)
-				puts "-----> Ruby on Rails application detected"
+			def self.start_app_rails(appname, container_path, container_path_with_version)
+				puts "-----> Ruby on Rails application detected."
 
 				# Setup rails env
 				env_path = "#{container_path}/env"
-				system("grep -q '^## Rails' #{env_path} || echo '\n## Rails' >> #{env_path}")
+				system("grep -q '^## Rails' #{env_path} || echo '## Rails' >> #{env_path}")
 				system("grep -q '^RAILS_ENV=' #{env_path} || echo 'RAILS_ENV=production' >> #{env_path}")
 				system("grep -q '^RACK_ENV=' #{env_path} || echo 'RACK_ENV=production' >> #{env_path}")
 				system("grep -q '^RAILS_LOG_TO_STDOUT=' #{env_path} || echo 'RAILS_LOG_TO_STDOUT=enabled' >> #{env_path}")
@@ -348,17 +349,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 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_now_date}/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."
-					system("cat > #{container_path_with_now_date}/Godfile <<- EOF
+					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
-					EOF")
+					HEREDOC
+					system("echo '#{page}' > #{container_path_with_version}/Godfile")
 				end
 
 				# Creating & Starting container
@@ -366,7 +372,7 @@ module Smartcloud
 					--name='#{appname}' \
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
-					--volume='#{container_path_with_now_date}:/code' \
+					--volume='#{container_path_with_version}:/code' \
 					--volume='#{container_path}/gems:/code/vendor/bundle' \
 					--workdir='/code' \
 					--restart='always' \

metadata

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