smartcloud 0.0.142 → 0.0.147

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1680a39421448be0e5064d10b8056bcf2ad1553d811745e8eeaaa869bc69310
-  data.tar.gz: ec341c0b5a3859cc06ebfbf752375b520b13e5bbba878b12203d10a2e09ea691
+  metadata.gz: ab4d783600234f10dae6ca73b7b8a3cf217f917788f49b848c6b3f77f76d6c93
+  data.tar.gz: c5e3358e29d21a0ba107065a8a1371dd9d58f8ff03ea9c41b5e4840bfe4e8820
 SHA512:
-  metadata.gz: cac79cf4bb0e4cca3a97fce98e1925397f5e16cd04ba1ed7a06c982ca141b024301c5c83d6c42d2ec16dd5d0c356d0f59731d733c575ed8ab816ee73922c2472
-  data.tar.gz: 793a1f5358a1b068e0b6326dea8846e1fe5510771d48e50928c9f9dd037bba382a5530303a3e3edf33b12b2cb05c1c2301fa9d9b883f19ec1db9fd115c18bd8d
+  metadata.gz: 461c82b342a2cd25038626c2e4757d4d9f0ca3ec5ac4624f3614d2fa8c379dd99ccdcb8d83d22c1aef6f75de820f095143d647becf79800425923d4651b049a0
+  data.tar.gz: 6f76f795e36f91f2f4e629815c73ccb2862365570dcc9b8eeb52c366a50c197b95a5da2d7be5cabf3d12d2466d07f6d2a2424f282a40105af503fb59dcd124a0

data/lib/smartcloud.rb

@@ -1,5 +1,4 @@
 require "ostruct"
-require "logger"
 
 # The main Smartcloud driver
 module Smartcloud
@@ -14,4 +13,5 @@ if File.exist?("#{Smartcloud.config.user_home_path}/.smartcloud/config/environme
 	require "#{Smartcloud.config.user_home_path}/.smartcloud/config/environment"
 end
 
+require 'smartcloud/base'
 require 'smartcloud/boot'

data/lib/smartcloud/base.rb

@@ -0,0 +1,10 @@
+require 'smartcloud/logger'
+
+module Smartcloud
+	class Base
+		include Smartcloud::Logger
+
+		def initialize
+		end		
+	end
+end

data/lib/smartcloud/grids/runner.rb

@@ -1,7 +1,8 @@
 # The main Smartcloud Grids Git driver
 module Smartcloud
 	module Grids
-		class Runner
+		class Runner < Smartcloud::Base
+
 			def initialize
 			end
 
@@ -115,7 +116,7 @@ module Smartcloud
 						--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
 						--build-arg USER_UID=`id -u` \
 						--build-arg USER_NAME=`id -un` \
-						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner")
+						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner", out: File::NULL)
 						puts "done"
 					end
 				end
@@ -218,13 +219,8 @@ module Smartcloud
 			end
 
 			def self.prereceive_app(appname, username, oldrev, newrev, refname)
-				$stdout.sync = true
-				logger = Logger.new($stdout)
-
-				5.times do
-				  puts '.'
-				  $stdout.flush
-				  sleep(1)
+				logger.formatter = proc do |severity, datetime, progname, message|
+				  "\t\t\t#{severity}: #{message}\n"
 				end
 
 				container_path = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/containers/#{appname}"
@@ -290,6 +286,8 @@ module Smartcloud
 						exit 1
 					end
 				end
+
+				logger.formatter = nil
 			end
 
 			def self.start_app(appname, app_version = 0)
@@ -354,7 +352,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}")
-				puts "-----> 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.
@@ -389,7 +387,7 @@ module Smartcloud
 					system("docker network connect solr-network #{appname}")
 					system("docker network connect mysql-network #{appname}")
 
-					# system("docker start --attach #{appname}")
+					system("docker start --attach #{appname}")
 				end
 			end
 		end

data/lib/smartcloud/logger.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.142
+  version: 0.0.147
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-03 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
@@ -25,6 +25,7 @@ files:
 - bin/runner
 - bin/smartcloud
 - lib/smartcloud.rb
+- lib/smartcloud/base.rb
 - lib/smartcloud/boot.rb
 - lib/smartcloud/docker.rb
 - lib/smartcloud/grids/grid-mysql/docker-entrypoint-initdb.d/.keep
@@ -48,6 +49,7 @@ files:
 - lib/smartcloud/grids/nginx.rb
 - lib/smartcloud/grids/runner.rb
 - lib/smartcloud/grids/solr.rb
+- lib/smartcloud/logger.rb
 - lib/smartcloud/machine.rb
 - lib/smartcloud/templates/dotsmartcloud/config/environment.rb
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-mysql/data/.keep