smartcloud 0.1.0.beta5 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62498c1f68025b362a0887fe07ff16f8f43eeae99955e9ff60b2098c10d7b0da
-  data.tar.gz: a85f8a5ac34a078ab695a6ca91db41c5aa06692b2ab45b951cd7e81f31a741a3
+  metadata.gz: 9958c8ebc6f3cdf8111a9034bf70d052c5e1fcec70a23306deb953a3e81a9675
+  data.tar.gz: 335d928f1b65200db471517a4c8c38d32868ec24a2e188e87f6d7ef2b61338e6
 SHA512:
-  metadata.gz: 2bc01a890b6cefe16b7aab7f6fce7901a73de54a22ff2eceb05999be9cfd31218a9e4e02670470f09992e513c6036ccb365b9563dfe22761e76fa7c1d03a5fc3
-  data.tar.gz: 502d8097742296cbc37ad72114904123d7d8f4bbcbf8d66fc8d5bc010e016aea0905bd6abb1d41c99f5e037f01c58cbd98c0db25088df8984e6e9c1873d4a7fc
+  metadata.gz: 6951d53b56b47962fbab916f5943d20974974ba3d70e25c16e505a4ff6bda03ad30f8ef69f99ac24ebb686ea87bc4de7b39f20799ebd07dbbd4a7b522664742a
+  data.tar.gz: 796c0b9e7f77ef91161a4d29a46edf637782aee55014f183ef67a24fdbcfda8ee79eb832f74bac53cf8c9443e7aa08991117d0527efeeb3767a773ccf1155174

data/bin/smartcloud

@@ -2,73 +2,34 @@
 
 require 'smartcloud'
 
-if ARGV[0] == 'init'
-	Smartcloud::Boot.init
-elsif !Smartcloud::Boot.initialized?
-	puts "Smartcloud has not been initialized. Please run command 'smartcloud init'."
-	exit
-end
-
-# if ARGV[0] == 'new'
-# 	machine = Smartcloud::Machine.new
-# 	raise "Please specify machine name" unless ARGV[1]
-# 	machine.create(ARGV[1])
-# elsif ARGV[0] == 'install'
-# 	machine = Smartcloud::Machine.new
-# 	machine.install_docker
-# 	machine.install_engine
-# elsif ARGV[0] == 'uninstall'
-# 	machine = Smartcloud::Machine.new
-# 	machine.uninstall_engine
-# 	machine.uninstall_docker
-# elsif ARGV[0] == 'run'
-# 	machine = Smartcloud::Machine.new
-# 	ARGV.shift
-# 	raise "Please specify command to run" unless ARGV[0]
-# 	machine.run(ARGV)
+command = ARGV.shift
 
-if ARGV[0] == 'docker'
-	if ARGV[1] == 'install'
-		Smartcloud::Docker.install
-	elsif ARGV[1] == 'uninstall'
-		Smartcloud::Docker.uninstall
-	end
-elsif ARGV[0] == 'grids'
-	if ARGV[1] == 'runner'
-		if ARGV[2] == 'up'
-			Smartcloud::Grids::Runner.up
-		elsif ARGV[2] == 'down'
-			Smartcloud::Grids::Runner.down
-		end
-	elsif ARGV[1] == 'mysql'
-		if ARGV[2] == 'up'
-			Smartcloud::Grids::Mysql.up(ARGV[3])
-		elsif ARGV[2] == 'down'
-			Smartcloud::Grids::Mysql.down
-		end
-	elsif ARGV[1] == 'nginx'
-		if ARGV[2] == 'up'
-			Smartcloud::Grids::Nginx.up(ARGV[3])
-		elsif ARGV[2] == 'down'
-			Smartcloud::Grids::Nginx.down
-		end
-	elsif ARGV[1] == 'solr'
-		if ARGV[2] == 'up'
-			Smartcloud::Grids::Solr.up(ARGV[3])
-		elsif ARGV[2] == 'down'
-			Smartcloud::Grids::Solr.down
-		elsif ARGV[2] == 'create_core'
-			Smartcloud::Grids::Solr.create_core(ARGV[3])
-		elsif ARGV[2] == 'destroy_core'
-			Smartcloud::Grids::Solr.destroy_core(ARGV[3])
-		end
+unless command == 'new'
+	unless Smartcloud::Machine.smartcloud_dir?
+		raise "This is not a smartcloud directory. Are you in the correct directory?"
 	end
-# elsif ARGV[0] == 'user'
-# 	if ARGV[1] == 'create'
-# 		Smartcloud::User.create(ARGV[2], ARGV[3], ARGV[4])
-# 	elsif ARGV[1] == 'destroy'
-# 		Smartcloud::User.destroy(ARGV[2], ARGV[3])
-# 	end
+end
+
+if command == 'new'
+	raise "This is already a smartcloud directory. Are you in the correct directory?" if Smartcloud::Machine.smartcloud_dir?
+	raise "Please specify a machine name" if ARGV.empty?
+	machine = Smartcloud::Machine.new
+	machine.create ARGV
+elsif command == 'start'
+	machine = Smartcloud::Machine.new
+	machine.start
+elsif command == 'stop'
+	machine = Smartcloud::Machine.new
+	machine.stop
+elsif command == 'grid'
+	machine = Smartcloud::Machine.new
+	machine.grid ARGV
+elsif command == 'ssh'
+	machine = Smartcloud::Machine.new
+	machine.ssh
+elsif command == 'sync'
+	machine = Smartcloud::Machine.new
+	machine.sync
 else
 	puts "Specify a command to execute."
 end

data/lib/smartcloud.rb

@@ -1,10 +1,23 @@
 require "ostruct"
+require "yaml"
 
 # The main Smartcloud driver
 module Smartcloud
 	def self.config
 		@@config ||= OpenStruct.new
 	end
+
+	def self.credentials
+		@@credentials ||= OpenStruct.new(Smartcloud.transform_keys_to_symbols(YAML.load_file("#{Dir.pwd}/config/credentials.yml")))
+	end
+
+	private
+
+	def self.transform_keys_to_symbols(value)
+		return value if not value.is_a?(Hash)
+		hash = value.inject({}){|memo,(k,v)| memo[k.to_sym] = self.transform_keys_to_symbols(v); memo}
+		return hash
+	end
 end
 
 Smartcloud.config.root_path = File.expand_path('../..', __FILE__)

data/lib/smartcloud/boot.rb

@@ -1,87 +1,12 @@
-require 'securerandom'
-require "tempfile"
-
 # The main Smartcloud Boot driver
 module Smartcloud
 	class Boot < Smartcloud::Base
 		def initialize
 		end
-
-		def self.init
-			# Copy Template for dotsmartcloud
-			unless self.initialized?
-				puts "Initializing Smartcloud ...\n\n"
-
-				begin
-					print "Enter top-level apps domain to be used for subdomains of your apps. [Recommended: yourdomain.com]: "
-					config_apps_domain = STDIN.gets.chomp
-					raise if config_apps_domain.empty?
-				rescue
-					retry
-				end
-
-				begin
-					print "Enter sysadmin email id. [Recommended: admin@#{config_apps_domain}]: "
-					config_sysadmin_email = STDIN.gets.chomp
-					raise if config_sysadmin_email.empty?
-				rescue
-					retry
-				end
-
-				begin
-					print "Enter username for your git grid user. [Recommended: git@#{config_apps_domain}]: "
-					username = STDIN.gets.chomp
-					raise if username.empty?
-				rescue
-					retry
-				end
-
-				print "Enter password for your git grid user. (leave blank to generate automatically) [Recommended: Minimum 8 characters with numbers and symbols]: "
-				password = STDIN.gets.chomp
-				if password.empty?
-					password = SecureRandom.base64(8)
-				end
-
-				# Copy dotsmartcloud template to user home directory
-				FileUtils.cp_r("#{Smartcloud.config.root_path}/lib/smartcloud/templates/dotsmartcloud", "#{Smartcloud.config.user_home_path}/.smartcloud")
-
-				# modifying environment.rb file
-				tempFile = Tempfile.new("#{Smartcloud.config.user_home_path}/.smartcloud/config/environmentTemp.rb")
-				File.open("#{Smartcloud.config.user_home_path}/.smartcloud/config/environment.rb", "r").each_line do |line|
-					if line =~ /Smartcloud.config.apps_domain/
-						tempFile.puts "Smartcloud.config.apps_domain = \"#{config_apps_domain}\""
-					elsif line =~ /Smartcloud.config.git_domain/
-						tempFile.puts "Smartcloud.config.git_domain = \"git.#{config_apps_domain}\""
-					elsif line =~ /Smartcloud.config.sysadmin_email/
-						tempFile.puts "Smartcloud.config.sysadmin_email = \"#{config_sysadmin_email}\""
-					else
-						tempFile.puts line
-					end
-				end
-				tempFile.close
-				FileUtils.mv(tempFile.path, "#{Smartcloud.config.user_home_path}/.smartcloud/config/environment.rb")			
-
-				# Reload the updated environment.rb file as it is required by methods below
-				require "#{Smartcloud.config.user_home_path}/.smartcloud/config/environment.rb"
-				
-				# creating user for git grid at config.git_domain
-				Smartcloud::User.create(Smartcloud.config.git_domain, username, password)
-
-				puts "\nIMPORTANT NOTE: Please ensure that the required top-level apps domain '#{Smartcloud.config.apps_domain}' and git domain '#{Smartcloud.config.git_domain}' is pointing to this server using DNS Records before proceeding."
-				puts "IMPORTANT NOTE: Your git grid password is #{password} for username #{username}"
-
-				puts "\nInitializing Smartcloud ... done"
-			else
-				puts "Already Initialized. Please go to #{Smartcloud.config.user_home_path}/.smartcloud/config to make configuration changes."
-			end
-		end
-
-		def self.initialized?
-			Dir.exist? "#{Smartcloud.config.user_home_path}/.smartcloud"
-		end
 	end
 end
 
+require 'smartcloud/ssh'
 require 'smartcloud/machine'
 
 require 'smartcloud/engine'

data/lib/smartcloud/docker.rb

@@ -13,22 +13,30 @@ module Smartcloud
 		# Arguments:
 		#   none
 		def self.install
+			ssh = Smartcloud::SSH.new
+
 			puts "-----> Installing Docker"
-			system("sudo apt-get update")
-			system("sudo apt-get install apt-transport-https ca-certificates curl software-properties-common")
-			system("curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -")
-			system("sudo apt-key fingerprint 0EBFCD88")
-			system("sudo add-apt-repository \"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\"")
-			system("sudo apt-get update")
-			system("sudo apt-get install docker-ce")
-			system("sudo usermod -aG docker $USER")
-			system("docker run --rm hello-world")
+			commands = [
+				"sudo apt-get update",
+				"sudo apt-get install apt-transport-https ca-certificates curl software-properties-common",
+				"curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -",
+				"sudo apt-key fingerprint 0EBFCD88",
+				"sudo add-apt-repository \"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\"",
+				"sudo apt-get update",
+				"sudo apt-get install docker-ce",
+				"sudo usermod -aG docker $USER",
+				"docker run --rm hello-world"
+			]
+			ssh.run commands
 
 			puts "-----> Installing Docker Compose"
-			system("sudo curl -L --fail https://github.com/docker/compose/releases/download/1.24.0/run.sh -o /usr/local/bin/docker-compose")
-			system("sudo chmod +x /usr/local/bin/docker-compose")
-			system("docker-compose --version")
-			system("sudo curl -L https://raw.githubusercontent.com/docker/compose/1.24.0/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose")
+			commands = [
+				"sudo curl -L --fail https://github.com/docker/compose/releases/download/1.24.0/run.sh -o /usr/local/bin/docker-compose",
+				"sudo chmod +x /usr/local/bin/docker-compose",
+				"docker-compose --version",
+				"sudo curl -L https://raw.githubusercontent.com/docker/compose/1.24.0/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose"
+			]
+			ssh.run commands
 
 			self.add_ufw_rules
 
@@ -44,12 +52,17 @@ module Smartcloud
 		# Arguments:
 		#   none
 		def self.uninstall
+			ssh = Smartcloud::SSH.new
+
 			puts "-----> Uninstalling Docker Compose"
-			system("sudo rm /usr/local/bin/docker-compose")
+			ssh.run "sudo rm /usr/local/bin/docker-compose"
 
 			puts "-----> Uninstalling Docker"
-			system("sudo apt-get purge docker-ce")
-			system("sudo rm -rf /var/lib/docker")
+			commands = [
+				"sudo apt-get purge docker-ce",
+				"sudo rm -rf /var/lib/docker"
+			]
+			ssh.run commands
 
 			self.remove_ufw_rules
 
@@ -57,15 +70,6 @@ module Smartcloud
 			puts "-----> You must delete any edited configuration files manually."
 		end
 
-		def self.running?
-			if system("docker info", [:out, :err] => File::NULL)
-				true
-			else
-				puts "Error: Docker daemon is not running. Have you installed docker? Please ensure docker daemon is running and try again."
-				false
-			end
-		end
-
 		def self.add_ufw_rules
 			puts '-----> Add the following rules to the end of the file /etc/ufw/after.rules and reload ufw using - sudo ufw reload'
 			puts '# BEGIN UFW AND DOCKER
@@ -116,5 +120,16 @@ module Smartcloud
 			# system("sed '/^# BEGIN UFW AND DOCKER/,/^# END UFW AND DOCKER/d' '/etc/ufw/after.rules'")
 			# system("sudo ufw reload")
 		end
+
+		# Below methods are non ssh methods and should be executed on the server only.
+
+		def self.running?
+			if system("docker info", [:out, :err] => File::NULL)
+				true
+			else
+				puts "Error: Docker daemon is not running. Have you installed docker? Please ensure docker daemon is running and try again."
+				false
+			end
+		end
 	end
 end

data/lib/smartcloud/engine.rb

@@ -4,35 +4,32 @@ module Smartcloud
 		def initialize
 		end
 
-		def create_images
-			# unless system("docker image inspect smartcloud", [:out, :err] => File::NULL)
-			# 	print "-----> Creating image smartcloud ... "
-			# 	if system("docker image build -t 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/engine")
-			# 		puts "done"
-			# 	end
-			# end
+		def self.install
+			ssh = Smartcloud::SSH.new
+			machine = Smartcloud::Machine.new
 
-			#docker build -t smartcloud \
-			#  --build-arg USER_UID=`id -u` \
-			#  --build-arg USER_GID=`id -g` \
-			#  --build-arg USER_NAME=`id -un` \
-			#  .
+			system("mkdir -p ./tmp/engine")
+			system("cp #{Smartcloud.config.root_path}/lib/smartcloud/engine/Dockerfile ./tmp/engine/Dockerfile")
 
-			# docker run -it --rm -v "/home/$(whoami)/.smartcloud:/home/$(whoami)/.smartcloud" smartcloud
-			#
-			# system("docker create \
-			# 	--name='smartcloud' \
-			# 	--volume='#{Smartcloud.config.user_home_path}/.gem:#{Smartcloud.config.user_home_path}/.gem' \
-			# 	--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
-			# 	--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner:#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner' \
-			# 	--volume='/var/run/docker.sock:/var/run/docker.sock' \
-			# 	--restart='always' \
-			# 	--network='nginx-network' \
-			# 	smartcloud/runner", out: File::NULL)
+			machine.sync first_sync: true
+
+			puts "-----> Creating image smartcloud ... "
+			ssh.run "docker image build -t smartcloud \
+					--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
+					--build-arg USER_UID=`id -u` \
+					--build-arg USER_NAME=`id -un` \
+					~/.smartcloud/tmp/engine"
+
+			puts "-----> Adding smartcloud to PATH ... "
+			ssh.run "chmod +x ~/.smartcloud/bin/smartcloud.sh && sudo ln -sf ~/.smartcloud/bin/smartcloud.sh /usr/local/bin/smartcloud"
+			system("rm ./tmp/engine/Dockerfile")
+
+			machine.sync
+		end
+
+		def self.uninstall
+			ssh.run "sudo rm /usr/local/bin/smartcloud"
+			ssh.run "docker rmi smartcloud"
 		end
 	end
-end
+end

data/lib/smartcloud/engine/Dockerfile

@@ -1,27 +1,23 @@
 FROM ruby:2.6.4-alpine3.10
-MAINTAINER Timeboard <hello@timeboard.me>
+LABEL maintainer="Timeboard <hello@timeboard.me>"
 
-RUN apk add --update docker && \
-    rm -rf /var/cache/apk/*
-
-# Setting up group and user
-# - envs
+# User
+# --- Fix to change gid of 999 to 99 so that addgroup is free to create a group with 999 as gid
 ARG USER_NAME
 ARG USER_UID
 ARG DOCKER_GID
-# - fix to change gid of 999 to 99 so that addgroup is free to create a group with 999 as gid
-# - Create group & user. Then add user to group
 RUN sed -i "s/999/99/" /etc/group && \
-	adduser --disabled-password --gecos "" --uid $USER_UID $USER_NAME && \
-	addgroup --gid $DOCKER_GID "docker" && adduser $USER_NAME docker
+	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
+	addgroup --gid "$DOCKER_GID" "docker" && adduser "$USER_NAME" "docker"
+
+# Docker
+RUN apk add --update docker && \
+    rm -rf /var/cache/apk/*
 
+# Privileges
 USER "$USER_NAME"
-WORKDIR "/home/$USER_NAME/.smartcloud"
 
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-gem install --no-document smartcloud\n\
-exec smartcloud "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
+# Gems
+RUN gem install --no-document smartcloud -v 0.1.0
 
-# Set entrypoint
-ENTRYPOINT "/home/$(whoami)/entrypoint"
+ENTRYPOINT ["smartcloud"]

data/lib/smartcloud/grids/buildpacker.rb

@@ -17,11 +17,20 @@ module Smartcloud
 			end
 
 			def pack_rails
-				return unless bundle_install?
-				return unless precompile_assets?
-				return unless start_web_server?
+				if File.exist? "tmp/smartcloud/packed"
+					begin
+						pid = File.read('tmp/smartcloud/packed').to_i
+						Process.kill('QUIT', pid)
+					rescue Errno::ESRCH # No such process
+					end
+					exec "bundle", "exec", "puma", "--config", "config/puma.rb"
+				else
+					return unless bundle_install?
+					return unless precompile_assets?
+					return unless test_web_server?
 
-				exit 0
+					exit 0
+				end
 			end
 
 			# Perform bundle install
@@ -64,17 +73,34 @@ module Smartcloud
 				end
 			end
 
-			# Perform starting of web server
-			def start_web_server?
-				logger.debug "Starting Web Server ..."
-
-				# Remove server.pid if it exists
-				FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
-
-				if system("bundle", "exec", "puma", "-C", "config/puma.rb")
-					return true
+			# Perform testing of web server
+			def test_web_server?
+				logger.info "Setting up Web Server ..."
+
+				# tmp folder
+				FileUtils.mkdir_p("tmp/smartcloud")
+				FileUtils.rm_f("tmp/smartcloud/packed")
+
+				# Spawn Process
+				pid = Process.spawn("bundle", "exec", "puma", "--config", "config/puma.rb", out: File::NULL)
+				Process.detach(pid)
+
+				# Sleep
+				sleep 5
+
+				# Check PID running
+				status = nil
+				begin
+					Process.kill(0, pid)
+					system("echo '#{pid}' > tmp/smartcloud/packed")
+					status = true
+				rescue Errno::ESRCH # No such process
+					logger.info "Web Server could not start"
+					status = false
 				end
-				return false
+
+				# Return status
+				return status
 			end
 
 			def set_logger_formatter_arrow

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

@@ -30,6 +30,6 @@ USER "$USER_NAME"
 WORKDIR "/home/$USER_NAME/.smartcloud/grids/grid-runner/apps"
 
 # Gems
-RUN gem install smartcloud --pre
+RUN gem install smartcloud
 
 CMD ["spawn-fcgi", "-n", "-p", "9000", "/usr/bin/fcgiwrap", "-f"]

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

@@ -23,7 +23,7 @@ USER "$USER_NAME"
 WORKDIR "/app"
 
 # Gems
-RUN gem install smartcloud --pre && \
+RUN gem install smartcloud && \
 	gem install bundler
 
 CMD ["buildpacker", "start"]

data/lib/smartcloud/grids/mysql.rb

@@ -5,7 +5,10 @@ module Smartcloud
 			def initialize
 			end
 
-			def self.up(exposed)
+			def self.up(*args)
+				args.flatten!
+				exposed = args.empty? ? '' : args.shift
+
 				if Smartcloud::Docker.running?
 					# Creating networks
 					unless system("docker network inspect mysql-network", [:out, :err] => File::NULL)

data/lib/smartcloud/grids/nginx.rb

@@ -5,7 +5,10 @@ module Smartcloud
 			def initialize
 			end
 	
-			def self.up(exposed)
+			def self.up(*args)
+				args.flatten!
+				exposed = args.empty? ? '' : args.shift
+
 				if Smartcloud::Docker.running?
 					# Creating volumes
 					print "-----> Creating volume nginx-confd ... "

data/lib/smartcloud/grids/runner.rb

@@ -293,6 +293,7 @@ module Smartcloud
 				# Setup rails env
 				env_path = "#{container_path}/env"
 				system("grep -q '^## Rails' #{env_path} || echo '## Rails' >> #{env_path}")
+				system("grep -q '^MALLOC_ARENA_MAX=' #{env_path} || echo '# MALLOC_ARENA_MAX=2' >> #{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}")
@@ -323,6 +324,7 @@ module Smartcloud
 					--volume='#{container_path}/app/public:/app/public' \
 					--volume='#{container_path}/app/node_modules:/app/node_modules' \
 					--restart='always' \
+					--init \
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
 
@@ -330,10 +332,15 @@ module Smartcloud
 					system("docker network connect mysql-network #{new_container}")
 
 					if system("docker start --attach #{new_container}")
-						self.stop_app(old_container)
-						self.clean_up(container_path)
-						logger.info "Launched Application ... Success."
-						exit 10
+						logger.debug "Starting Web Server ..."
+						if system("docker start #{new_container}", out: File::NULL)
+							sleep 5
+							logger.info "Web Server started successfully."
+							self.stop_app(old_container)
+							self.clean_up(container_path)
+							logger.info "Launched Application ... Success."
+							exit 10
+						end
 					else
 						self.stop_app("#{new_container}")
 					end

data/lib/smartcloud/grids/solr.rb

@@ -5,7 +5,10 @@ module Smartcloud
 			def initialize
 			end
 
-			def self.up(exposed)
+			def self.up(*args)
+				args.flatten!
+				exposed = args.empty? ? '' : args.shift
+
 				if Smartcloud::Docker.running?
 					# Creating networks
 					unless system("docker network inspect solr-network", [:out, :err] => File::NULL)
@@ -59,7 +62,10 @@ module Smartcloud
 				end
 			end
 
-			def self.create_core(corename)
+			def self.create_core(*args)
+				args.flatten!
+				corename = args.empty? ? '' : args.shift
+
 				if Smartcloud::Docker.running?
 					puts "-----> Creating core #{corename} ... "
 					if system("docker exec -it --user=solr solr solr create_core -c #{corename}")
@@ -77,7 +83,10 @@ module Smartcloud
 				end
 			end
 
-			def self.destroy_core(corename)
+			def self.destroy_core(*args)
+				args.flatten!
+				corename = args.empty? ? '' : args.shift
+
 				if Smartcloud::Docker.running?
 					puts "-----> Removing core #{corename} ... "
 					if system("docker exec -it --user=solr solr solr delete -c #{corename}")

data/lib/smartcloud/machine.rb

@@ -6,6 +6,69 @@ module Smartcloud
 		def initialize
 		end
 
+		def create(*args)
+			args.flatten!
+
+			name = args.shift
+			FileUtils.mkdir name
+			FileUtils.cp_r "#{Smartcloud.config.root_path}/lib/smartcloud/templates/dotsmartcloud/.", "#{name}"
+			puts "New machine #{name} has been created."
+		end
+
+		def start
+			Smartcloud::User.create_htpasswd_files
+			Smartcloud::Docker.install
+			Smartcloud::Engine.install
+		end
+
+		def stop
+			Smartcloud::Engine.uninstall
+			Smartcloud::Docker.uninstall
+		end
+
+		def grid(*args)
+			args.flatten!
+			name = "Smartcloud::Grids::#{args.shift.capitalize}"
+			action = args.shift.to_sym
+
+			args.empty? ? Object.const_get(name).public_send(action) : Object.const_get(name).public_send(action, args)
+
+			# if ARGV[1] == 'runner'
+			# 	if ARGV[2] == 'up'
+			# 		Smartcloud::Grids::Runner.up
+			# 	elsif ARGV[2] == 'down'
+			# 		Smartcloud::Grids::Runner.down
+			# 	end
+			# elsif ARGV[1] == 'mysql'
+			# 	if ARGV[2] == 'up'
+			# 		Smartcloud::Grids::Mysql.up(ARGV[3])
+			# 	elsif ARGV[2] == 'down'
+			# 		Smartcloud::Grids::Mysql.down
+			# 	end
+			# elsif ARGV[1] == 'nginx'
+			# 	if ARGV[2] == 'up'
+			# 		Smartcloud::Grids::Nginx.up(ARGV[3])
+			# 	elsif ARGV[2] == 'down'
+			# 		Smartcloud::Grids::Nginx.down
+			# 	end
+			# elsif ARGV[1] == 'solr'
+			# 	if ARGV[2] == 'up'
+			# 		Smartcloud::Grids::Solr.up(ARGV[3])
+			# 	elsif ARGV[2] == 'down'
+			# 		Smartcloud::Grids::Solr.down
+			# 	elsif ARGV[2] == 'create_core'
+			# 		Smartcloud::Grids::Solr.create_core(ARGV[3])
+			# 	elsif ARGV[2] == 'destroy_core'
+			# 		Smartcloud::Grids::Solr.destroy_core(ARGV[3])
+			# 	end
+			# end
+		end
+
+		def ssh
+			ssh = Smartcloud::SSH.new
+			ssh.login
+		end
+
 		def getting_started
 			# puts 'You may be prompted to make a menu selection when the Grub package is updated on Ubuntu. If prompted, select keep the local version currently installed.'
 
@@ -62,25 +125,65 @@ module Smartcloud
 			# sudo fail2ban-client status
 		end
 
-		# def create(name)
-		# 	FileUtils.mkdir_p name
-		# 	FileUtils.cp_r "#{Smartcloud.config.root_path}/lib/smartcloud/templates/machine/.", "#{name}"
-		# 	puts "Please fill details in your config folder before proceeding."
-		# end
-		#
-		# def run(*args)
-		# end
-		#
-		# def install_docker
-		# end
-		#
-		# def uninstall_docker
-		# end
-		#
-		# def install_engine
-		# end
-		#
-		# def uninstall_engine
-		# end
+		def self.smartcloud_dir?
+			File.file?("./bin/smartcloud.sh")
+		end
+
+		def sync(first_sync = false)
+			puts "-----> Syncing smartcloud ... "
+			return sync_push if first_sync
+
+			unless block_given?
+				sync_pull && sync_push
+			else
+				sync_pull
+				yield
+				sync_push
+			end
+		end
+
+		private
+
+		def sync_pull
+			system("rsync -azumv --delete --include=*/ --include={#{sync_pull_files_list}} --exclude=* -e ssh #{Smartcloud.credentials.machine[:username]}@#{Smartcloud.credentials.machine[:host]}:~/.smartcloud/ .")
+		end
+
+		def sync_push
+			system("rsync -azumv --delete --include=*/ --include={#{sync_push_files_list}} --exclude={#{excluded_sync_files_list}} --exclude={#{sync_pull_files_list}} -e ssh ./ #{Smartcloud.credentials.machine[:username]}@#{Smartcloud.credentials.machine[:host]}:~/.smartcloud")
+		end
+
+		def excluded_sync_files_list
+			files = [
+				'config/credentials.yml',
+				'config/users.yml'
+			]
+			files.join(',')
+		end
+
+		def sync_pull_files_list
+			files = [
+				'grids/grid-mysql/data/***',
+				'grids/grid-nginx/certificates/***',
+				'grids/grid-runner/apps/***',
+				'grids/grid-solr/data/***',
+			]
+			files.join(',')
+		end
+
+		def sync_push_files_list
+			files = [
+				'grids/grid-mysql/data/.keep',
+				'grids/grid-nginx/certificates/.keep',
+				'grids/grid-runner/apps/containers/.keep',
+				'grids/grid-runner/apps/repositories/.keep',
+				'grids/grid-solr/data/.keep',
+				'grids/grid-solr/data/README.txt',
+				'grids/grid-solr/data/solr.xml',
+				'grids/grid-solr/data/zoo.cfg',
+				'grids/grid-solr/data/configsets/***',
+				'grids/grid-solr/data/lib/***',
+			]
+			files.join(',')
+		end
 	end
 end

data/lib/smartcloud/ssh.rb

@@ -0,0 +1,43 @@
+require "net/ssh"
+
+# The main Smartcloud SSH driver
+module Smartcloud
+	class SSH < Smartcloud::Base
+		def initialize
+		end
+
+		def run(*commands)
+			commands.flatten!
+			Net::SSH.start(Smartcloud.credentials.machine[:host], Smartcloud.credentials.machine[:username], { port: Smartcloud.credentials.machine[:port], password: Smartcloud.credentials.machine[:password] }) do |ssh|
+				channel = ssh.open_channel do |channel, success|
+					channel.request_pty do |channel, success|
+						channel.exec commands.join(';') do |channel, success|
+							raise "Could not execute command" unless success
+
+							channel.on_data do |channel, data|
+								$stdout.print data
+
+								if data =~ /^\[sudo\] password for /
+									channel.send_data "#{Smartcloud.credentials.machine[:password]}\n"
+								end
+							end
+
+							channel.on_extended_data do |channel, type, data|
+								$stderr.print data
+							end
+
+							channel.on_close do |channel|
+								# puts "done!"
+							end
+						end
+					end
+				end
+				channel.wait
+			end
+		end
+
+		def login
+			exec "ssh #{Smartcloud.credentials.machine[:username]}@#{Smartcloud.credentials.machine[:host]}"
+		end
+	end
+end

data/lib/smartcloud/templates/dotsmartcloud/bin/smartcloud.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+docker run -it --rm \
+	-v "/home/$(whoami)/.smartcloud:/home/$(whoami)/.smartcloud" \
+	-v "/var/run/docker.sock:/var/run/docker.sock" \
+	-v "$PWD:$PWD" \
+	-w "$PWD" \
+	-u `id -u` \
+	smartcloud "$@"

data/lib/smartcloud/templates/dotsmartcloud/config/credentials.yml

@@ -0,0 +1,6 @@
+machine:
+  host: 122.122.122.122
+  port: 22
+  username: yourusername
+  password: yourpassword
+  root_password: yourrootpassword

data/lib/smartcloud/templates/dotsmartcloud/config/environment.rb

@@ -1,12 +1,14 @@
 # Be sure to restart your server when you modify this file.
 
-# naked domain to be used for runner apps
+# => NOTE: Ensure that the specified top-level domains are pointing to this server ip address using DNS records.
+
+# Top-level naked domain to be used for subdomains of apps.
 Smartcloud.config.apps_domain = "yourdomain.com"
 
 # domain to be used for git runner
 Smartcloud.config.git_domain = "git.yourdomain.com"
 
-# sysadmin email id to be used
+# Sysadmin email id.
 Smartcloud.config.sysadmin_email = "admin@yourdomain.com"
 
 # letsencrypt test boolean to be used

data/lib/smartcloud/templates/dotsmartcloud/config/users.yml

@@ -0,0 +1,4 @@
+# The username and password will be used by nginx to provide htpasswd based authentication for each of the domains specified.
+
+git.yourdomain.com:
+  hello@yourdomain.com: yourpassword

data/lib/smartcloud/user.rb

@@ -7,50 +7,9 @@ module Smartcloud
 		def initialize
 		end
 
-		def self.create(hostname, username, password)
-			if hostname.nil? || hostname.empty? || username.nil? || username.empty? || password.nil? || password.empty?
-				puts "One of hostname, username, password missing."
-			else
-				puts "-----> Creating User ... "
-
-				salt = Base64.encode64((("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a).shuffle[0..7].join)
-				new_user = { "#{hostname}" => { "#{username}" => "#{password.crypt(salt)}" } }
-				users = self.get_users_from_file
-				users.merge!(new_user) { |hostname, curr_user_vals, new_user_val| (curr_user_vals && new_user_val) ? curr_user_vals.merge(new_user_val) : new_user_val }
-				self.set_users_to_file(users)
-
-				puts "-----> Creating User ... done"
-			end
-		end
-
-		# def self.destroy(hostname, username)
-		# 	if hostname.nil? || hostname.empty? || username.nil? || username.empty?
-		# 		puts "One of hostname, username missing."
-		# 	else
-		# 		puts "-----> Removing User ... "
-		#
-		# 		users = self.get_users_from_file
-		# 		# users.merge!(new_user)
-		# 		self.set_users_to_file(users)
-		#
-		# 		puts "-----> Removing User ... done"
-		# 	end
-		# end
-		
-		private
-
-		def self.get_users_from_file
-			YAML.load_file("#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-nginx/users.yml") || Hash.new
-		end
-		
-		def self.set_users_to_file(users)
-			File.open("#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-nginx/users.yml", "w") { |file| file.write(users.to_yaml) }
-			self.create_htpasswd_files
-		end
-
 		def self.create_htpasswd_files
-			htpasswd_dirpath = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-nginx/htpasswd"
-			
+			htpasswd_dirpath = "#{Dir.pwd}/grids/grid-nginx/htpasswd"
+
 			# Remove existing htpasswd_dirpath
 			FileUtils.rm_r htpasswd_dirpath if Dir.exist?(htpasswd_dirpath)
 			
@@ -63,10 +22,17 @@ module Smartcloud
 
 				file_data = ""
 				users.each do |user, password|
-					file_data += "#{user}:#{password}\n"
+					salt = Base64.encode64((("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a).shuffle[0..7].join)
+					file_data += "#{user}:#{password.crypt(salt)}\n"
 				end
-				File.open("#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-nginx/htpasswd/#{hostname}", "w") { |file| file.write(file_data) }
+				File.open("#{Dir.pwd}/grids/grid-nginx/htpasswd/#{hostname}", "w") { |file| file.write(file_data) }
 			end
 		end
+
+		private
+
+		def self.get_users_from_file
+			YAML.load_file("#{Dir.pwd}/config/users.yml") || Hash.new
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta5
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -70,12 +70,15 @@ files:
 - lib/smartcloud/grids/solr.rb
 - lib/smartcloud/logger.rb
 - lib/smartcloud/machine.rb
+- lib/smartcloud/ssh.rb
+- lib/smartcloud/templates/dotsmartcloud/bin/smartcloud.sh
+- lib/smartcloud/templates/dotsmartcloud/config/credentials.yml
 - lib/smartcloud/templates/dotsmartcloud/config/environment.rb
+- lib/smartcloud/templates/dotsmartcloud/config/users.yml
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-buildpacker/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-mysql/data/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-nginx/certificates/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-nginx/htpasswd/.keep
-- 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/pre-receive
@@ -239,7 +242,7 @@ files:
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/lib/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/solr.xml
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/zoo.cfg
-- lib/smartcloud/templates/machine/config/machine.yml
+- lib/smartcloud/templates/dotsmartcloud/tmp/.keep
 - lib/smartcloud/user.rb
 homepage: https://github.com/timeboardme/smartcloud
 licenses:

data/lib/smartcloud/templates/dotsmartcloud/grids/grid-nginx/users.yml

@@ -1 +0,0 @@
----

data/lib/smartcloud/templates/machine/config/machine.yml

@@ -1,5 +0,0 @@
-machine:
-  name: example
-  host: 122.122.122.122
-  username: exampleuser
-  password: examplepassword