smartcloud 0.0.198 → 0.0.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8b9476cdd5ed8a6993d84f26b2ce1e6ebe966fd35f193622dff8532fd39ef2
-  data.tar.gz: 4922222e91746feb348eb887346567fc45cd3290dc3c875dbc882eb3bad11de1
+  metadata.gz: f39e9f8572245850d400240d2562d24233f0510f53576d5aa5618583b7f0a8a6
+  data.tar.gz: b994f906a8d88af94c62381f9a327159c253f4b639ec17d3c63f0d1ff2692dc6
 SHA512:
-  metadata.gz: 605b518da4a5d290f628198ddaa92aa060be0ec9cceadef487fa1dd1046e3929532aec9569a27db3afe13ecfd5722e7381427bc22eae29806d78ab9d8d0ee107
-  data.tar.gz: 720b3575168ecec626b12faedaf9cebd1c30b3d94f7a9dbbdbc7115afcd41e51b7ad30e84b82c028f463d280340460b0309145bd74835f150c7c952e79661cac
+  metadata.gz: 43656caf7f2c93f42bd216881260f2c4e7afc701c13742d0f55eb018c60ab28f1b6cf5833e09d6a6037a2503910f6a707d72a3b91ed9811259d9ae2f9c1c6a49
+  data.tar.gz: d5636d2f9f6ebef5666bf68a1ac179b2806a91f69bc268dcef9df2758d1d0eeae5f4dbdb27b8bf15aaede4f149a6a837b3cb834a4e72cc7e8f235ff6eaf75ca1

data/bin/smartcloud

@@ -9,6 +9,24 @@ elsif !Smartcloud::Boot.initialized?
 	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)
+
 if ARGV[0] == 'docker'
 	if ARGV[1] == 'install'
 		Smartcloud::Docker.install
@@ -51,4 +69,6 @@ elsif ARGV[0] == 'grids'
 # 	elsif ARGV[1] == 'destroy'
 # 		Smartcloud::User.destroy(ARGV[2], ARGV[3])
 # 	end
-end
+else
+	puts "Specify a command to execute."
+end

data/lib/smartcloud/boot.rb

@@ -83,12 +83,14 @@ module Smartcloud
 end
 
 require 'smartcloud/machine'
-require 'smartcloud/docker'
 
-require 'smartcloud/grids/nginx'
-require 'smartcloud/grids/runner'
-require 'smartcloud/grids/buildpacker'
-require 'smartcloud/grids/solr'
-require 'smartcloud/grids/mysql'
+require 'smartcloud/engine'
+require 'smartcloud/docker'
 
 require 'smartcloud/user'
+
+require 'smartcloud/grids/mysql'
+require 'smartcloud/grids/solr'
+require 'smartcloud/grids/buildpacker'
+require 'smartcloud/grids/runner'
+require 'smartcloud/grids/nginx'

data/lib/smartcloud/engine.rb

@@ -0,0 +1,38 @@
+# The main Smartcloud Engine driver
+module Smartcloud
+	class Engine < Smartcloud::Base
+		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
+
+			#docker build -t smartcloud \
+			#  --build-arg USER_UID=`id -u` \
+			#  --build-arg USER_GID=`id -g` \
+			#  --build-arg USER_NAME=`id -un` \
+			#  .
+
+			# 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)
+		end
+	end
+end

data/lib/smartcloud/engine/Dockerfile

@@ -1,30 +1,27 @@
 FROM ruby:2.6.4-alpine3.10
 MAINTAINER Timeboard <hello@timeboard.me>
 
+RUN apk add --update docker && \
+    rm -rf /var/cache/apk/*
+
 # Setting up group and user
 # - envs
 ARG USER_NAME
 ARG USER_UID
-ARG USER_GID
 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 $USER_GID $USER_NAME && adduser $USER_NAME $USER_NAME && \
 	addgroup --gid $DOCKER_GID "docker" && adduser $USER_NAME docker
+
 USER "$USER_NAME"
 WORKDIR "/home/$USER_NAME/.smartcloud"
 
 # Generating entrypoint file
 RUN echo -e '#!/bin/sh\n\
 gem install --no-document smartcloud\n\
-exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
-
-RUN apk add --update docker && \
-    rm -rf /var/cache/apk/*
+exec smartcloud "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
 
 # Set entrypoint
 ENTRYPOINT "/home/$(whoami)/entrypoint"
-
-CMD ["smartcloud"]

data/lib/smartcloud/grids/buildpacker.rb

@@ -24,7 +24,7 @@ module Smartcloud
 				exit 0
 			end
 
-			# Perform bundle install			
+			# Perform bundle install
 			def bundle_install?
 				logger.info "Performing bundle install ..."
 
@@ -43,7 +43,7 @@ module Smartcloud
 					return false
 				end
 			end
-			
+
 			# Perform pre-compiling of assets
 			def precompile_assets?
 				logger.info "Installing Javascript dependencies & pre-compiling assets ..."
@@ -63,7 +63,7 @@ module Smartcloud
 					return false
 				end
 			end
-			
+
 			# Perform starting of web server
 			def start_web_server?
 				logger.debug "Starting Web Server ..."
@@ -76,7 +76,7 @@ module Smartcloud
 				# end
 				# return false
 			end
-			
+
 			def set_logger_formatter_arrow
 				logger.formatter = proc do |severity, datetime, progname, message|
 					severity_text = { "DEBUG" => "\u{1f527} #{severity}:", "INFO" => " \u{276f}", "WARN" => "\u{2757} #{severity}:",
@@ -85,7 +85,7 @@ module Smartcloud
 					"\t\t\t\t#{severity_text[severity]} #{message}\n"
 				end
 			end
-			
+
 			def set_logger_formatter_tabs
 				logger.formatter = proc do |severity, datetime, progname, message|
 					"\t\t\t\t       #{message}"

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

@@ -1,26 +1,10 @@
 FROM ruby:2.6.4-alpine3.10
 MAINTAINER Timeboard <hello@timeboard.me>
 
-# Setting up group and user
-# - envs
-ARG DOCKER_GID
-ARG USER_UID
-ARG USER_NAME
-# - 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 && \
-	addgroup --gid "$DOCKER_GID" "docker" && \
-	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
-	adduser "$USER_NAME" "docker"
-USER "$USER_NAME"
-# We need the following:
-# - fcgiwrap, because that is how nginx does CGI
-# ----- IMPORTANT NOTE: This is custom build fcgiwrap package to account for NO_BUFFERING option.
-# ----- Original fcgiwrap: https://github.com/gnosek/fcgiwrap
-# ----- Custom fcgiwrap: https://github.com/notr1ch/fcgiwrap
-# - git and git-daemon, because that gets us the git-http-backend CGI script
-# - ruby, to run smartcloud gem
-# - spawn-fcgi, to launch fcgiwrap and to create the unix socket
+# FCGI Essentials
+# --- IMPORTANT NOTE: This is custom built fcgiwrap package for alpine linux to account for NO_BUFFERING option.
+# --- Original fcgiwrap: https://github.com/gnosek/fcgiwrap
+# --- Custom fcgiwrap: https://github.com/notr1ch/fcgiwrap
 COPY fcgiwrap /root/apk-packages/fcgiwrap
 RUN apk add fcgiwrap --repository /root/apk-packages/fcgiwrap/packages/main --allow-untrusted && \
 	rm -rf /root/apk-packages
@@ -32,15 +16,18 @@ RUN apk add --update coreutils && \
     apk add --update spawn-fcgi && \
     rm -rf /var/cache/apk/*
 
+# 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
+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"
 USER "$USER_NAME"
 WORKDIR "/home/$USER_NAME/.smartcloud/grids/grid-runner/apps"
 
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-gem install --no-document --local smartcloud\n\
-exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
-
-# Set entrypoint
-ENTRYPOINT "/home/$(whoami)/entrypoint"
+# Gems
+RUN gem install smartcloud
 
 CMD ["spawn-fcgi", "-n", "-p", "9000", "/usr/bin/fcgiwrap", "-f"]

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

@@ -1,14 +1,7 @@
 FROM ruby:2.6.4-alpine3.10
-MAINTAINER Timeboard <hello@timeboard.me>
+LABEL maintainer="Timeboard <hello@timeboard.me>"
 
-# Setting up user
-# - envs
-ARG USER_UID
-ARG USER_NAME
-# - Create user.
-RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
-
-# Install Ruby on Rails Essentials
+# Ruby on Rails Essentials
 RUN apk add --update build-base && \
 	apk add --update tzdata && \
 	apk add --update nodejs && \
@@ -20,20 +13,16 @@ RUN apk add --update build-base && \
 	apk add --update mupdf-tools && \
     rm -rf /var/cache/apk/*
 
+# User
+ARG USER_UID
+ARG USER_NAME
+RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
 USER "$USER_NAME"
 WORKDIR "/app"
 
-# Install gems
-RUN gem install bundler && \
+# Gems
+RUN gem install smartcloud && \
+	gem install bundler && \
 	gem install god
 
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-gem install --no-document --local smartcloud\n\
-exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
-
-# Set entrypoint
-ENTRYPOINT "/home/$(whoami)/entrypoint"
-
-# Command to execute at container start
 CMD ["buildpacker", "start"]

data/lib/smartcloud/grids/runner.rb

@@ -27,7 +27,6 @@ module Smartcloud
 							--env GIT_PROJECT_ROOT=#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories \
 							--env GIT_HTTP_EXPORT_ALL="" \
 							--expose='9000' \
-							--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' \
@@ -111,9 +110,9 @@ module Smartcloud
 				unless system("docker image inspect smartcloud/runner", [:out, :err] => File::NULL)
 					print "-----> Creating image smartcloud/runner ... "
 					if system("docker image build -t smartcloud/runner \
-						--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
-						--build-arg USER_UID=`id -u` \
 						--build-arg USER_NAME=`id -un` \
+						--build-arg USER_UID=`id -u` \
+						--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
 						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner")
 						puts "done"
 					end
@@ -328,7 +327,6 @@ module Smartcloud
 					--name='#{appname}_new' \
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
-					--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='#{container_path_with_version}:/app' \
 					--volume='#{container_path}/app/vendor/bundle:/app/vendor/bundle' \
@@ -346,7 +344,7 @@ module Smartcloud
 							self.clean_up(container_path)
 							logger.info "Launched Application ... Success."
 							exit 0
-						end						
+						end
 					else
 						self.stop_app("#{appname}_new")
 					end

data/lib/smartcloud/machine.rb

@@ -1,3 +1,5 @@
+require "net/ssh"
+
 # The main Smartcloud Machine driver
 module Smartcloud
 	class Machine < Smartcloud::Base
@@ -59,5 +61,26 @@ module Smartcloud
 			# sudo fail2ban-client reload
 			# 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
 	end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.198
+  version: 0.0.203
 platform: ruby
 authors:
 - Timeboard
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-09-04 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 description: Smartcloud is a full-stack deployment framework for rails optimized for
   programmer happiness and peaceful administration. It encourages natural simplicity
   by favoring convention over configuration.
@@ -30,6 +44,7 @@ files:
 - lib/smartcloud/base.rb
 - lib/smartcloud/boot.rb
 - lib/smartcloud/docker.rb
+- lib/smartcloud/engine.rb
 - lib/smartcloud/engine/Dockerfile
 - lib/smartcloud/grids/buildpacker.rb
 - lib/smartcloud/grids/grid-buildpacker/.keep
@@ -224,6 +239,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/user.rb
 homepage: https://github.com/timeboardme/smartcloud
 licenses: