smartcloud 0.0.147 → 0.0.152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab4d783600234f10dae6ca73b7b8a3cf217f917788f49b848c6b3f77f76d6c93
-  data.tar.gz: c5e3358e29d21a0ba107065a8a1371dd9d58f8ff03ea9c41b5e4840bfe4e8820
+  metadata.gz: 3146224d7a28c5f2be95c7c1df25a6aee6f389063869f6c779203835522b1371
+  data.tar.gz: 68e4fd2197a102fbe154f941342d5073a0fdfc071bae2cc60e6580b4a78610f0
 SHA512:
-  metadata.gz: 461c82b342a2cd25038626c2e4757d4d9f0ca3ec5ac4624f3614d2fa8c379dd99ccdcb8d83d22c1aef6f75de820f095143d647becf79800425923d4651b049a0
-  data.tar.gz: 6f76f795e36f91f2f4e629815c73ccb2862365570dcc9b8eeb52c366a50c197b95a5da2d7be5cabf3d12d2466d07f6d2a2424f282a40105af503fb59dcd124a0
+  metadata.gz: aaa85bfdcf08755d72b2bc56185c8fb37b1874a174d96f697c52fc75aff92adb13073a6cbccf2d80711065e9a4e2661bc1d11adb7f5988569e9a64542eee5498
+  data.tar.gz: 91212d5681a150e13e144f73bd96c6c4ae4bf6844140a3c83d17a74c891495bc0b7a3821bffca40c7c9cb0de99b508ca37f0dedc7abb79b459189e27bc428cab

data/lib/smartcloud/grids/runner.rb

@@ -220,16 +220,16 @@ module Smartcloud
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
 				logger.formatter = proc do |severity, datetime, progname, message|
-				  "\t\t\t#{severity}: #{message}\n"
+				  "\t\t\t-----> #{severity}: #{message}\n"
 				end
 
 				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 ... "
+				logger.info "Verifying User ..."
 				unless File.exist? "#{container_path}/env"
-					puts "Environment could not be loaded ... Failed."
-					exit 1
+					logger.fatal "Environment could not be loaded ... Failed."
+					return
 				end
 
 				# Load ENV vars
@@ -242,15 +242,14 @@ module Smartcloud
 
 				# Match Username
 				unless ENV['USERNAME'] == username
-					puts "Unauthorized."
-					exit 1
+					logger.error "Unauthorized."
+					return
 				end
-				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"
-					logger.info "-----> Initializing Application ... "
+					logger.info "Loading Application ..."
 
 					# Note: There should be no space between + and " in version.
 					# Note: date will be UTC date until timezone has been changed.
@@ -260,30 +259,15 @@ module Smartcloud
 					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}/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
-									print "-----> Deleting older application releases ... "
-									destroy_count.times do
-										FileUtils.rm_r(File.join(Dir.pwd, app_versions.shift))
-									end
-									puts "done"
-								end
-							end
-
 							# Start App
 							self.start_app(appname)
 						else
-							puts "Could not extract new app version ... Failed."
-							exit 1
+							logger.fatal "Could not extract new app version ... Failed."
+							return
 						end
 					else
-						puts "This version name already exists ... Failed."
-						exit 1
+						logger.fatal "This version name already exists ... Failed."
+						return
 					end
 				end
 
@@ -306,7 +290,7 @@ module Smartcloud
 						buildpacker_path = "#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb"
 						FileUtils.cp(buildpacker_path, container_path_with_version)
 
-						puts "-----> Launching Application ... "
+						logger.info "Launching Application ..."
 
 						if File.exist? "#{container_path_with_version}/bin/rails"
 							# Stopping & Removing container
@@ -321,19 +305,16 @@ module Smartcloud
 				# These two lines are important to stop and remove container and then cancel pre-receive push if finally the app could not be started.
 				# If the app was finally started, then these two lines should never be executed.
 				self.stop_app(appname)
-				exit 1
 			end
 
 			def self.stop_app(appname)
 				if Smartcloud::Docker.running?
 					if system("docker inspect -f '{{.State.Running}}' #{appname}", [:out, :err] => File::NULL)
-						print "-----> Stopping container #{appname} ... "
+						logger.debug "Stopping container #{appname} ..."
 						if system("docker stop '#{appname}'", out: File::NULL)
-							puts "done"
-
-							print "-----> Removing container #{appname} ... "
+							logger.debug "Removing container #{appname} ..."
 							if system("docker rm '#{appname}'", out: File::NULL)
-								puts "done"
+								logger.info "Stopped & Removed #{appname} ..."
 							end
 						end
 					end
@@ -341,7 +322,7 @@ module Smartcloud
 			end
 
 			def self.start_app_rails(appname, container_path, container_path_with_version)
-				puts "-----> Ruby on Rails application detected."
+				logger.info "Ruby on Rails application detected"
 
 				# Setup rails env
 				env_path = "#{container_path}/env"
@@ -352,7 +333,7 @@ module Smartcloud
 				system("grep -q '^RAILS_SERVE_STATIC_FILES=' #{env_path} || echo 'RAILS_SERVE_STATIC_FILES=enabled' >> #{env_path}")
 				system("grep -q '^LANG=' #{env_path} || echo 'LANG=en_US.UTF-8' >> #{env_path}")
 				system("grep -q '^RAILS_MASTER_KEY=' #{env_path} || echo 'RAILS_MASTER_KEY=yourmasterkey' >> #{env_path}")
-				logger.warn "-----> WARNING: Please set your RAILS_MASTER_KEY env var for this rails app." if system("grep -q '^RAILS_MASTER_KEY=yourmasterkey' #{env_path}")
+				logger.warn "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.
@@ -360,7 +341,7 @@ module Smartcloud
 
 				# 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."
+					logger.warn "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'
@@ -388,6 +369,22 @@ module Smartcloud
 					system("docker network connect mysql-network #{appname}")
 
 					system("docker start --attach #{appname}")
+					self.clean_up(container_path)
+				end
+			end
+
+			def self.clean_up(container_path)
+				logger.info "Cleaning up ..."
+
+				# Clean up very old versions
+				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
+						destroy_count.times do
+							FileUtils.rm_r(File.join(Dir.pwd, app_versions.shift))
+						end
+					end
 				end
 			end
 		end

data/lib/smartcloud/logger.rb

@@ -9,13 +9,21 @@ module Smartcloud
 	  # Use a hash class-ivar to cache a unique Logger per class:
 	  @loggers = {}
 
+	  def self.included(base)
+		class << base
+			def logger
+			  @logger ||= Smartcloud::Logger.logger_for(self.name)
+			end
+		end
+	  end
+
 	  class << self
 	    def logger_for(classname)
 	      @loggers[classname] ||= configure_logger_for(classname)
 	    end
 
 	    def configure_logger_for(classname)
-	      logger = Logger.new($stdout)
+	      logger = ::Logger.new($stdout)
 	      logger.progname = classname
 	      logger
 	    end

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

@@ -10,4 +10,5 @@ while read oldrev newrev refname; do
 	    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
+	exit 1
 done

metadata

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