smartmachine 0.8.0 → 0.9.0

data/lib/smart_machine/templates/dotsmartmachine/config/mysql.yml

@@ -0,0 +1,13 @@
+mysqlone:
+  port: 3306
+  root_password: <%= SmartMachine.credentials.dig(:mysqlone, :root_password) %>
+  username: <%= SmartMachine.credentials.dig(:mysqlone, :username) %>
+  password: <%= SmartMachine.credentials.dig(:mysqlone, :password) %>
+  database_name: <%= SmartMachine.credentials.dig(:mysqlone, :database_name) %>
+
+# mysqltwo:
+#   port: 3307
+#   root_password: <%= SmartMachine.credentials.dig(:mysqltwo, :root_password) %>
+#   username: <%= SmartMachine.credentials.dig(:mysqltwo, :username) %>
+#   password: <%= SmartMachine.credentials.dig(:mysqltwo, :password) %>
+#   database_name: <%= SmartMachine.credentials.dig(:mysqltwo, :database_name) %>

data/lib/smart_machine/templates/dotsmartmachine/config/prereceiver.yml

@@ -0,0 +1,7 @@
+prereceiverone:
+  git_domain: "git.yourdomain.com"
+  letsencrypt_test: false
+
+# prereceivertwo:
+#   git_domain: "gittwo.yourdomain.com"
+#   letsencrypt_test: false

data/lib/smart_machine/templates/dotsmartmachine/config/redis.yml

@@ -0,0 +1,13 @@
+redisone:
+  port: 6379
+  password: <%= SmartMachine.credentials.dig(:redisone, :password) %>
+  appendonly: "yes"
+  maxmemory: 250MB
+  maxmemory_policy: allkeys-lfu
+
+# redistwo:
+#   port: 6380
+#   password: <%= SmartMachine.credentials.dig(:redistwo, :password) %>
+#   appendonly: "yes"
+#   maxmemory: 250MB
+#   maxmemory_policy: allkeys-lfu

data/lib/smart_machine/templates/dotsmartmachine/config/users.yml

@@ -1,4 +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:
-  yourname@yourdomain.com: yourpassword
+  yourname@yourdomain.com: yourpassword

data/lib/smart_machine/templates/dotsmartmachine/gitignore-template

@@ -0,0 +1,47 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
+# Environment Variables
+.env
+
+# Docs
+/docs/*
+!/docs/source/
+
+# ---------- Mac ---------- #
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

data/lib/smart_machine/version.rb

@@ -1,10 +1,34 @@
 # frozen_string_literal: true
 
-require_relative "gem_version"
-
 module SmartMachine
-	# Returns the version of the currently loaded SmartMachine as a <tt>Gem::Version</tt>
-	def self.version
-		gem_version
-	end
+  # Returns the version of the currently loaded SmartMachine as a <tt>Gem::Version</tt>.
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  def self.version
+    self.gem_version.to_s
+  end
+
+  def self.ruby_version
+    RUBY_VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 0
+    MINOR = 9
+    TINY  = 0
+    PRE   = nil
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+
+  module RUBY_VERSION
+    MAJOR = 2
+    MINOR = 7
+    TINY  = 0
+    PRE   = nil
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
 end

data/lib/smart_machine.rb

@@ -1,24 +1,50 @@
 require "ostruct"
 require "yaml"
 
-# The main SmartMachine driver
-module SmartMachine
-	def self.config
-		@@config ||= OpenStruct.new
-	end
+require 'smart_machine/version'
+require 'smart_machine/base'
 
-	def self.credentials
-		@@credentials ||= OpenStruct.new(SmartMachine::Credentials.new.config)
-	end
-end
+require 'smart_machine/configuration'
+require 'smart_machine/credentials'
 
-require 'smart_machine/version'
+require 'smart_machine/scp'
+require 'smart_machine/ssh'
+require 'smart_machine/machine'
+
+require 'smart_machine/docker'
+require 'smart_machine/engine'
+require 'smart_machine/syncer'
+
+require 'smart_machine/apps/app'
+require 'smart_machine/apps/container'
+require 'smart_machine/apps/manager'
 
-SmartMachine.config.root_path = File.expand_path('../..', __FILE__)
-SmartMachine.config.user_home_path = File.expand_path('~')
-if File.exist?("#{SmartMachine.config.user_home_path}/.smartmachine/config/environment.rb")
-	require "#{SmartMachine.config.user_home_path}/.smartmachine/config/environment"
+require 'smart_machine/buildpackers/buildpacker'
+require 'smart_machine/buildpackers/rails'
+
+require 'smart_machine/grids/elasticsearch'
+require 'smart_machine/grids/minio'
+require 'smart_machine/grids/mysql'
+require 'smart_machine/grids/nginx'
+require 'smart_machine/grids/prereceiver'
+require 'smart_machine/grids/redis'
+# require 'smart_machine/grids/scheduler'
+# require 'smart_machine/grids/solr'
+
+module SmartMachine
+  class Error < StandardError; end
+
+  def self.credentials
+    @@credentials ||= OpenStruct.new(SmartMachine::Credentials.new.config)
+  end
+
+  def self.config
+    @@config ||= OpenStruct.new(SmartMachine::Configuration.new.config)
+  end
 end
 
-require 'smart_machine/base'
-require 'smart_machine/boot'
+SmartMachine.config.gem_dir = Gem::Specification.find_by_name("smartmachine").gem_dir
+# This will only work inside the smartmachine engine.
+if File.exist?("#{File.expand_path('~')}/machine/config/environment.rb")
+  require "#{File.expand_path('~')}/machine/config/environment"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartmachine
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
-- Timeboard
+- Gaurav Goel
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement
@@ -75,39 +115,48 @@ dependencies:
 description: SmartMachine is a full-stack deployment framework for rails optimized
   for admin programmer happiness and peaceful administration. It encourages natural
   simplicity by favoring convention over configuration.
-email: hello@timeboard.me
+email: gaurav@timeboard.me
 executables:
-- buildpacker
-- prereceiver
-- scheduler
 - smartmachine
-- smartrunner
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
-- CHANGELOG.rdoc
-- MIT-LICENSE
-- README.rdoc
-- bin/buildpacker
-- bin/prereceiver
-- bin/scheduler
-- bin/smartmachine
-- bin/smartrunner
+- LICENSE.txt
+- README.md
+- bin/console
+- bin/setup
+- exe/smartmachine
 - lib/smart_machine.rb
-- lib/smart_machine/apps.rb
 - lib/smart_machine/apps/app.rb
-- lib/smart_machine/apps/rails.rb
+- lib/smart_machine/apps/container.rb
+- lib/smart_machine/apps/manager.rb
 - lib/smart_machine/base.rb
-- lib/smart_machine/boot.rb
-- lib/smart_machine/buildpacker.rb
+- lib/smart_machine/buildpackers/buildpacker.rb
+- lib/smart_machine/buildpackers/rails.rb
+- lib/smart_machine/buildpackers/rails/Dockerfile
+- lib/smart_machine/commands.rb
+- lib/smart_machine/commands/app.rb
+- lib/smart_machine/commands/buildpacker.rb
+- lib/smart_machine/commands/credentials.rb
+- lib/smart_machine/commands/docker.rb
+- lib/smart_machine/commands/engine.rb
+- lib/smart_machine/commands/grid.rb
+- lib/smart_machine/commands/grid_commands/elasticsearch.rb
+- lib/smart_machine/commands/grid_commands/minio.rb
+- lib/smart_machine/commands/grid_commands/mysql.rb
+- lib/smart_machine/commands/grid_commands/nginx.rb
+- lib/smart_machine/commands/grid_commands/prereceiver.rb
+- lib/smart_machine/commands/grid_commands/redis.rb
+- lib/smart_machine/commands/grid_commands/scheduler.rb
+- lib/smart_machine/commands/grid_commands/sub_thor.rb
+- lib/smart_machine/commands/machine.rb
+- lib/smart_machine/commands/syncer.rb
+- lib/smart_machine/commands/utilities.rb
+- lib/smart_machine/configuration.rb
 - lib/smart_machine/credentials.rb
 - lib/smart_machine/docker.rb
 - lib/smart_machine/engine.rb
 - lib/smart_machine/engine/Dockerfile
-- lib/smart_machine/engine/buildpacks/rails/Dockerfile
-- lib/smart_machine/gem_version.rb
-- lib/smart_machine/grids.rb
 - lib/smart_machine/grids/elasticsearch.rb
 - lib/smart_machine/grids/elasticsearch/.keep
 - lib/smart_machine/grids/minio.rb
@@ -126,6 +175,7 @@ files:
 - lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk
 - lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/fcgiwrap-doc-1.1.1-r4.apk
 - lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/fcgiwrap-openrc-1.1.1-r4.apk
+- lib/smart_machine/grids/prereceiver/pre-receive
 - lib/smart_machine/grids/redis.rb
 - lib/smart_machine/grids/redis/.keep
 - lib/smart_machine/grids/scheduler.rb
@@ -296,52 +346,52 @@ files:
 - lib/smart_machine/grids/solr/sunspot/conf/solrconfig.xml
 - lib/smart_machine/logger.rb
 - lib/smart_machine/machine.rb
+- lib/smart_machine/scp.rb
 - lib/smart_machine/ssh.rb
-- lib/smart_machine/sync.rb
+- lib/smart_machine/syncer.rb
+- lib/smart_machine/templates/dotsmartmachine/Gemfile
 - lib/smart_machine/templates/dotsmartmachine/apps/containers/.keep
 - lib/smart_machine/templates/dotsmartmachine/apps/repositories/.keep
+- lib/smart_machine/templates/dotsmartmachine/config/elasticsearch.yml
 - lib/smart_machine/templates/dotsmartmachine/config/environment.rb
+- lib/smart_machine/templates/dotsmartmachine/config/minio.yml
+- lib/smart_machine/templates/dotsmartmachine/config/mysql.yml
 - lib/smart_machine/templates/dotsmartmachine/config/mysql/schedule.rb
+- lib/smart_machine/templates/dotsmartmachine/config/prereceiver.yml
+- lib/smart_machine/templates/dotsmartmachine/config/redis.yml
 - lib/smart_machine/templates/dotsmartmachine/config/users.yml
-- lib/smart_machine/templates/dotsmartmachine/grids/elasticsearch/data/.keep
-- lib/smart_machine/templates/dotsmartmachine/grids/elasticsearch/logs/.keep
-- lib/smart_machine/templates/dotsmartmachine/grids/minio/data/.keep
-- lib/smart_machine/templates/dotsmartmachine/grids/mysql/backups/.keep
-- lib/smart_machine/templates/dotsmartmachine/grids/mysql/data/.keep
+- lib/smart_machine/templates/dotsmartmachine/gitignore-template
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/certificates/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/fastcgi.conf
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/htpasswd/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/nginx.tmpl
-- lib/smart_machine/templates/dotsmartmachine/grids/prereceiver/pre-receive
-- lib/smart_machine/templates/dotsmartmachine/grids/redis/data/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/scheduler/crontabs/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/solr/solr/.keep
 - lib/smart_machine/templates/dotsmartmachine/tmp/.keep
-- lib/smart_machine/user.rb
+- lib/smart_machine/templates/dotsmartmachine/vendor/.keep
 - lib/smart_machine/version.rb
-homepage: https://github.com/timeboarders/smartbytes
+homepage: https://github.com/timeboardorg/smartmachine
 licenses:
-- MIT
+- AGPL-3.0-or-later
 metadata:
-  bug_tracker_uri: https://github.com/timeboarders/smartbytes/issues
-  changelog_uri: https://github.com/timeboarders/smartbytes/blob/v0.8.0/smartmachine/CHANGELOG.rdoc
-  source_code_uri: https://github.com/timeboarders/smartbytes/tree/v0.8.0/smartmachine
+  homepage_uri: https://github.com/timeboardorg/smartmachine
+  bug_tracker_uri: https://github.com/timeboardorg/smartmachine/issues
+  changelog_uri: https://github.com/timeboardorg/smartmachine/releases/tag/v0.9.0
+  source_code_uri: https://github.com/timeboardorg/smartmachine/tree/v0.9.0/smartmachine
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.11
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/MIT-LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Timeboard
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

data/README.rdoc

@@ -1,87 +0,0 @@
-= SmartMachine
-
-Git push should deploy.
-
-SmartMachine is a full-stack deployment framework for rails optimized for admin programmer happiness and peaceful administration. It encourages natural simplicity by favoring convention over configuration.
-
-Deploy your Rails apps to your own server with - git push production master
-
-
-== How it Works
-
-After you run the below commands, you get.
-1. Setup of basic best practices of setting up and securing a VPS server.
-2. Setup and installation of Docker.
-3. Setup and installation of docker based Mysql, Solr, Nginx, App Prereceiver.
-4. Deployment of your Rails apps to your own server with - git push production master
-
-
-== Setup a New Machine - Ubuntu 18.04 LTS
-
-1. Getting Started with Linode:
-
-    https://www.linode.com/docs/getting-started/
-
-2. How to Secure Your Server:
-
-    https://www.linode.com/docs/security/securing-your-server/
-
-
-== Install SmartMachine
-
-1. Install Ruby:
-
-    $ sudo apt-get install ruby-full
-
-2. Add gem executables to PATH (remember to check ruby version in the path):
-
-    $ echo 'export PATH="$PATH:$HOME/.gem/ruby/2.5.0/bin"' >> ~/.bashrc && source ~/.bashrc
-
-3. Install smartmachine for current user:
-
-    $ gem install smartmachine --user-install
-
-4. Initialize smartmachine:
-
-    $ smartmachine init
-
-
-== TODO - Setup Machine
-1. Getting Started and Securing your Server:
-
-    $ smartmachine machine install
-
-
-== Install Docker
-
-1. Run docker install command:
-
-    $ smartmachine docker install
-
-2. Add UFW rules for Docker as specified at the end of installation.
-
-
-== Starting Grids as per Choice
-
-1. Start mysql grid:
-
-    $ smartmachine grids mysql up
-
-2. Start solr grid:
-
-    $ smartmachine grids solr up
-
-3. Start nginx grid:
-
-    $ smartmachine grids nginx up
-
-4. Start prereceiver grid:
-
-    $ smartmachine grids prereceiver up
-
-
-== TODO - Creating New App
-
-1. Creating a new bare app on the server:
-
-    $ smartmachine apps create <USERNAME> <APPNAME>

data/bin/buildpacker

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'smart_machine'
-
-if ARGV[0] == 'pack'
-	buildpacker = SmartMachine::Buildpacker.new
-	buildpacker.pack
-end

data/bin/prereceiver

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'smart_machine'
-
-if ARGV[0] == 'prereceive'
-	raise "Please provide appname, username, oldrev, newrev and refname" unless ARGV[1] && ARGV[2] && ARGV[3] && ARGV[4] && ARGV[5]
-	SmartMachine::Grids::Prereceiver.prereceive(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
-end

data/bin/scheduler

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'smart_machine'
-
-command = ARGV.shift
-
-scheduler = SmartMachine::Grids::Scheduler.new
-
-case command
-when "start"
-	action = ARGV.shift
-	scheduler.mysql("start") if action == "--mysql"
-
-when "stop"
-	action = ARGV.shift
-	scheduler.mysql("stop") if action == "--mysql"
-
-end

data/bin/smartmachine

@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-require "smart_machine"
-
-command = ARGV.shift
-
-machine = SmartMachine::Machine.new
-
-case command
-when "new"
-	machine.create ARGV
-	return
-
-when "--init-local"
-	machine.init_local ARGV
-	return
-
-when "--version"
-	puts "SmartMachine #{SmartMachine.version}"
-	return
-
-when "--help"
-	puts "Help: Specify a valid smartmachine command to execute. Are you in the correct directory to run this command?"
-	return
-
-when "runner"
-	exec "smartrunner #{ARGV.join(' ')}"
-	return
-
-end
-
-if machine.in_local_machine_dir?
-	case command
-	when "credentials:edit"
-		credentials = SmartMachine::Credentials.new
-		credentials.edit
-
-	when "environment:edit"
-		system("#{ENV['EDITOR']} config/environment.rb")
-
-	when "users:edit"
-		system("#{ENV['EDITOR']} config/users.yml")
-
-	when "ssh"
-		machine.ssh
-
-	when "install"
-		machine.installer ARGV.unshift("install")
-
-	when "update"
-		machine.installer ARGV.unshift("update")
-
-	when "uninstall"
-		machine.installer ARGV.unshift("uninstall")
-
-	when "apps"
-		machine.apps ARGV
-
-	when "grids"
-		machine.grids ARGV
-		return
-
-	when "ps"
-		machine.ps ARGV
-		return
-
-	when "logs"
-		machine.logs ARGV
-		return
-
-	when "sync"
-		sync = SmartMachine::Sync.new
-		sync.run
-
-	else
-		exec "smartmachine --help"
-
-	end
-else
-	exec "smartmachine --help"
-end