smartmachine 1.1.0 → 1.2.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4220956064ccc882a0f4bce3a90921b42e7904a1b46c93b5a5786e9b384a01
-  data.tar.gz: fa860c7a78280a2b0db69ff3acbdd133ce426efffd52583ad1cdf887ab910bc7
+  metadata.gz: 3d02cc8e054d7716fda6e487f5964c2c0e47a604e664be9cbcc77436ac1b8cc3
+  data.tar.gz: e476480bd9b755c84f4996e86dbc99e1d24d96b1139a9fd7bb14c4ab7b24cc29
 SHA512:
-  metadata.gz: 2b40194c50f6137985819f3fe5b190ed2fe08104f9e9a6149358ba5e4653c1f3ade8e8ac406c583515d4c50b16603aec0fa745b623d6e1a1bdf175fbdf584a97
-  data.tar.gz: c7cb2b875385bf57215ac80f19ae326c9af54e6a2870eefd2016b74a37b0cad410595efbbd1698811cf8d9ed70bba9a0d235308eb8d00988803e42603eea1fff
+  metadata.gz: 06ad0c9df3fde28ce64a629d2caa597cd84838eed893a3ce7b835bc29715f8b4f2d0764b8e32bb6593f255010519d342f60593ae5caf4417802953ea4e47d287
+  data.tar.gz: 6eadb0a1ba55a868f738dd7cb5ccfedda02247406d9d0fadc8f8b18918a43a9859164fd9844921bd377f0e4a4e4b4ba6c9890ca68bbbd494c25459b93c53c063

data/lib/smart_machine/commands/grid.rb

@@ -4,6 +4,7 @@ require 'smart_machine/commands/grid_commands/minio'
 require 'smart_machine/commands/grid_commands/mysql'
 require 'smart_machine/commands/grid_commands/nextcloud'
 require 'smart_machine/commands/grid_commands/nginx'
+require 'smart_machine/commands/grid_commands/phpmyadmin'
 require 'smart_machine/commands/grid_commands/prereceiver'
 require 'smart_machine/commands/grid_commands/redis'
 require 'smart_machine/commands/grid_commands/terminal'
@@ -28,6 +29,9 @@ module SmartMachine
       desc "nginx", "Run nginx grid commands"
       subcommand "nginx", GridCommands::Nginx
 
+      desc "phpmyadmin", "Run phpmyadmin grid commands"
+      subcommand "phpmyadmin", GridCommands::Phpmyadmin
+
       desc "prereceiver", "Run prereceiver grid commands"
       subcommand "prereceiver", GridCommands::Prereceiver
 

data/lib/smart_machine/commands/grid_commands/phpmyadmin.rb

@@ -0,0 +1,65 @@
+module SmartMachine
+  module Commands
+    module GridCommands
+      class Phpmyadmin < SubThor
+        include Utilities
+
+        desc "up", "Take UP the phpmyadmin grid"
+        option :name, type: :string
+        def up
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine grid phpmyadmin uper#{name_option}"
+            end
+          end
+        end
+
+        desc "down", "Take DOWN the phpmyadmin grid"
+        option :name, type: :string
+        def down
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine grid phpmyadmin downer#{name_option}"
+            end
+          end
+        end
+
+        desc "uper", "Phpmyadmin grid uper", hide: true
+        option :name, type: :string
+        def uper
+          inside_engine_machine_dir do
+            if options[:name]
+              phpmyadmin = SmartMachine::Grids::Phpmyadmin.new(name: options[:name])
+              phpmyadmin.uper
+            else
+              SmartMachine.config.grids.phpmyadmin.each do |name, config|
+                phpmyadmin = SmartMachine::Grids::Phpmyadmin.new(name: name.to_s)
+                phpmyadmin.uper
+              end
+            end
+          end
+        end
+
+        desc "downer", "Phpmyadmin grid downer", hide: true
+        option :name, type: :string
+        def downer
+          inside_engine_machine_dir do
+            if options[:name]
+              phpmyadmin = SmartMachine::Grids::Phpmyadmin.new(name: options[:name])
+              phpmyadmin.downer
+            else
+              SmartMachine.config.grids.phpmyadmin.each do |name, config|
+                phpmyadmin = SmartMachine::Grids::Phpmyadmin.new(name: name.to_s)
+                phpmyadmin.downer
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smart_machine/commands/machine.rb

@@ -1,3 +1,6 @@
+require 'smart_machine/commands/machine_commands/sub_thor'
+require 'smart_machine/commands/machine_commands/network'
+
 module SmartMachine
   module Commands
     class Machine < Thor
@@ -27,6 +30,9 @@ module SmartMachine
           machine.run_on_machine(commands: "#{args.join(' ')}")
         end
       end
+
+      desc "network", "Run machine network commands"
+      subcommand "network", MachineCommands::Network
     end
   end
 end

data/lib/smart_machine/commands/machine_commands/network.rb

@@ -0,0 +1,65 @@
+module SmartMachine
+  module Commands
+    module MachineCommands
+      class Network < SubThor
+        include Utilities
+
+        desc "up", "Take UP the machine network"
+        option :name, type: :string
+        def up
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine machine network uper#{name_option}"
+            end
+          end
+        end
+
+        desc "down", "Take DOWN the machine network"
+        option :name, type: :string
+        def down
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine machine network downer#{name_option}"
+            end
+          end
+        end
+
+        desc "uper", "Machine network uper", hide: true
+        option :name, type: :string
+        def uper
+          inside_engine_machine_dir do
+            if options[:name]
+              network = SmartMachine::Machines::Network.new(name: options[:name])
+              network.uper
+            else
+              SmartMachine.config.network.each do |name, config|
+                network = SmartMachine::Machines::Network.new(name: name.to_s)
+                network.uper
+              end
+            end
+          end
+        end
+
+        desc "downer", "Machine network downer", hide: true
+        option :name, type: :string
+        def downer
+          inside_engine_machine_dir do
+            if options[:name]
+              network = SmartMachine::Machines::Network.new(name: options[:name])
+              network.downer
+            else
+              SmartMachine.config.network.each do |name, config|
+                network = SmartMachine::Machines::Network.new(name: name.to_s)
+                network.downer
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smart_machine/commands/machine_commands/sub_thor.rb

@@ -0,0 +1,15 @@
+module SmartMachine
+  module Commands
+    module MachineCommands
+      class SubThor < Thor
+        def self.banner(command, namespace = nil, subcommand = false)
+          "#{basename} machine #{subcommand_prefix} #{command.usage}"
+        end
+
+        def self.subcommand_prefix
+          self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
+        end
+      end
+    end
+  end
+end

data/lib/smart_machine/configuration.rb

@@ -8,13 +8,13 @@ module SmartMachine
     end
 
     def config
-      @config ||= OpenStruct.new(grids: grids)
+      @config ||= OpenStruct.new(grids: grids, network: network)
     end
 
     private
 
     def grids
-      @grids ||= OpenStruct.new(elasticsearch: elasticsearch, minio: minio, mysql: mysql, nextcloud: nextcloud, prereceiver: prereceiver, redis: redis, terminal: terminal)
+      @grids ||= OpenStruct.new(elasticsearch: elasticsearch, minio: minio, mysql: mysql, nextcloud: nextcloud, phpmyadmin: phpmyadmin, prereceiver: prereceiver, redis: redis, terminal: terminal)
     end
 
     def elasticsearch
@@ -61,6 +61,17 @@ module SmartMachine
       end
     end
 
+    def phpmyadmin
+      # Once the SmartMachine.config assignments in smart_machine.rb file has been removed, then this file exist condition can be removed to ensure that config/phpmyadmin.yml always exists
+      if File.exist? "config/phpmyadmin.yml"
+        deserialize(IO.binread("config/phpmyadmin.yml")).deep_symbolize_keys
+      elsif File.exist? "#{File.expand_path('~')}/machine/config/phpmyadmin.yml"
+        deserialize(IO.binread("#{File.expand_path('~')}/machine/config/phpmyadmin.yml")).deep_symbolize_keys
+      else
+        {}
+      end
+    end
+
     def prereceiver
       # Once the SmartMachine.config assignments in smart_machine.rb file has been removed, then this file exist condition can be removed to ensure that config/prereceiver.yml always exists
       if File.exist? "config/prereceiver.yml"
@@ -94,6 +105,17 @@ module SmartMachine
       end
     end
 
+    def network
+      # Once the SmartMachine.config assignments in smart_machine.rb file has been removed, then this file exist condition can be removed to ensure that config/network.yml always exists
+      if File.exist? "config/network.yml"
+        deserialize(IO.binread("config/network.yml")).deep_symbolize_keys
+      elsif File.exist? "#{File.expand_path('~')}/machine/config/network.yml"
+        deserialize(IO.binread("#{File.expand_path('~')}/machine/config/network.yml")).deep_symbolize_keys
+      else
+        {}
+      end
+    end
+
     def deserialize(config)
       YAML.load(ERB.new(config).result).presence || {}
     end

data/lib/smart_machine/grids/mysql.rb

@@ -6,6 +6,7 @@ module SmartMachine
         raise "mysql config for #{name} not found." unless config
 
         @port = config.dig(:port)
+        @networks = Array(config.dig(:networks))
         @root_password = config.dig(:root_password)
         @username = config.dig(:username)
         @password = config.dig(:password)
@@ -48,6 +49,9 @@ module SmartMachine
           puts "done"
           puts "-----> Starting container #{@name} ... "
           if system("docker start #{@name}", out: File::NULL)
+            @networks.each do |network|
+              raise "Error: Could not connect container: #{network} - #{@name}" unless system("docker network connect #{network} #{@name}", out: File::NULL)
+            end
             puts "done"
           else
             raise "Error: Could not start the created #{@name} container"
@@ -59,6 +63,10 @@ module SmartMachine
 
       # Stopping & Removing containers - in reverse order
       def downer
+        @networks.each do |network|
+          raise "Error: Could not disconnect container: #{network} - #{@name}" unless system("docker network disconnect #{network} #{@name}", out: File::NULL)
+        end
+
         puts "-----> Stopping container #{@name} ... "
         if system("docker stop '#{@name}'", out: File::NULL)
           puts "done"

data/lib/smart_machine/grids/phpmyadmin.rb

@@ -0,0 +1,104 @@
+module SmartMachine
+  class Grids
+    class Phpmyadmin < SmartMachine::Base
+      def initialize(name:)
+        config = SmartMachine.config.grids.phpmyadmin.dig(name.to_sym)
+        raise "phpmyadmin config for #{name} not found." unless config
+
+        @image = config.dig(:image)
+        @command = config.dig(:command)
+        @host = config.dig(:host)
+        @networks = Array(config.dig(:networks))
+
+        @pma_controlhost = config.dig(:pma_controlhost)
+        mysql_config = SmartMachine.config.grids.mysql.dig(@pma_controlhost&.to_sym)
+        raise "phpmyadmin | mysql config for #{@pma_controlhost} not found." unless mysql_config
+        @mysql_config_root_password = mysql_config.dig(:root_password)
+        @pma_controlport = mysql_config.dig(:port)
+        @pma_controluser = mysql_config.dig(:username)
+        @pma_controlpass = mysql_config.dig(:password)
+        @pma_pmadb = "phpmyadmin"
+
+        @name = name.to_s
+        @home_dir = File.expand_path('~')
+      end
+
+      def uper
+        raise "Error: Could not create container: #{@name}"  unless system(command.compact.join(' '), out: File::NULL)
+        raise "Error: Could not start container: #{@name}"   unless system("docker start #{@name}", out: File::NULL)
+        @networks.each do |network|
+          raise "Error: Could not connect container: #{network} - #{@name}" unless system("docker network connect #{network} #{@name}", out: File::NULL)
+        end
+
+        raise "Error: Could not setup database: #{@name}"    unless system(command_db_setup.compact.join(' '), out: File::NULL)
+        raise "Error: Could not setup tables: #{@name}"      unless system(command_db_tables_setup.compact.join(' '), out: File::NULL)
+
+        puts "Created, Started & Connected container: #{@name}"
+      end
+
+      def downer
+        @networks.each do |network|
+          raise "Error: Could not disconnect container: #{network} - #{@name}" unless system("docker network disconnect #{network} #{@name}", out: File::NULL)
+        end
+        raise "Error: Could not stop container: #{@name}"   unless system("docker stop '#{@name}'", out: File::NULL)
+        raise "Error: Could not remove container: #{@name}" unless system("docker rm '#{@name}'", out: File::NULL)
+
+        puts "Disconnected, Stopped & Removed container: #{@name}"
+      end
+
+      private
+
+      def command
+        [
+          'docker create',
+          "--name='#{@name}'",
+          "--env VIRTUAL_HOST=#{@host}",
+          "--env LETSENCRYPT_HOST=#{@host}",
+          "--env LETSENCRYPT_EMAIL=#{SmartMachine.config.sysadmin_email}",
+          '--env LETSENCRYPT_TEST=false',
+          "--env PMA_CONTROLHOST=#{@pma_controlhost}",
+          "--env PMA_CONTROLPORT=#{@pma_controlport}",
+          "--env PMA_CONTROLUSER=#{@pma_controluser}",
+          "--env PMA_CONTROLPASS=#{@pma_controlpass}",
+          "--env PMA_PMADB=#{@pma_pmadb}",
+          '--env PMA_QUERYHISTORYDB=true',
+          '--env HIDE_PHP_VERSION=true',
+          '--env PMA_ARBITRARY=1',
+          volumes,
+          "--restart='always'",
+          "--network='#{@networks.shift}'",
+          @image,
+          @command
+        ]
+      end
+
+      def volumes
+        volumes = []
+
+        if File.exist?("#{@home_dir}/machine/config/phpmyadmin/#{@name}/config.user.inc.php")
+          volumes.push("--volume='#{@home_dir}/smartmachine/config/phpmyadmin/#{@name}/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php'")
+        end
+
+        volumes.join(" ")
+      end
+
+      def command_db_setup
+        [
+          "docker exec -i #{@pma_controlhost}",
+          "bash -c \"exec mysql --defaults-extra-file=<(echo $'[client]\npassword='\"#{@mysql_config_root_password}\") -uroot --execute \\\"",
+          "CREATE DATABASE IF NOT EXISTS #{@pma_pmadb};",
+          "GRANT ALL PRIVILEGES ON #{@pma_pmadb}.* TO #{@pma_controluser}@'%';",
+          "\\\"\""
+        ]
+      end
+
+      def command_db_tables_setup
+        [
+          "docker cp #{@name}:/var/www/html/sql/create_tables.sql - | tar -xO |",
+          "docker exec -i #{@pma_controlhost} bash -c",
+          "\"exec mysql --defaults-extra-file=<(echo $'[client]\npassword='\"#{@mysql_config_root_password}\") -uroot\""
+        ]
+      end
+    end
+  end
+end

data/lib/smart_machine/grids/terminal/init.el

@@ -1,58 +1,29 @@
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(package-selected-packages
-   '(polymode ruby-electric ruby-electric-mode ruby-mode dockerfile-mode expand-region flycheck zenburn-theme multi-vterm vterm yaml-mode web-mode use-package undo-tree typescript-mode smartparens robe rbenv rainbow-delimiters projectile-rails osx-trash magit logview indent-guide diredfl dired-sidebar dired-narrow dired-git-info diff-hl company clipetty bundler)))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(diff-hl-change ((t (:foreground "#f7ca88" :background "#f7ca88"))))
- '(diff-hl-delete ((t (:foreground "#ab4642" :background "#ab4642"))))
- '(diff-hl-insert ((t (:foreground "#a1b56c" :background "#a1b56c")))))
+;;; init.el --- Emacs Init: Initial file that emacs loads at startup.
 
-;; Add melpa to package-archives list.
-(require 'package)
-(add-to-list 'package-archives
-             '("melpa" . "http://melpa.org/packages/") t)
+;;; Commentary:
+;; This file includes the basic setup necessary to get started with Emacs.
 
-;; use-package
-;; Ensure use-package is installed.
-(unless (package-installed-p 'use-package)
-  (package-refresh-contents)
-  (package-install 'use-package))
-;; Configure and load use-package.
-(setq use-package-always-ensure t)
-(eval-when-compile
-  (defvar use-package-verbose t)
-  (require 'use-package))
+;;; Code:
 
-;; Disable menu bar in emacs.
+;; Disable menu bar in Emacs.
 (menu-bar-mode -1)
 
-;; change backup file directory for emacs
+;; Change backup file directory for emacs.
 (setq backup-directory-alist `(("." . ,(concat user-emacs-directory "backups"))))
 
-;; Use gls instead of the default ls on darwain systems like Apple.
-;; coreutils is needed to be installed for gls. You can get it with brew install coreutils.
-;; This solves the --dired problem on macOS and lists the directories first in dired.
-(when (string= system-type "darwin")
-  (setq dired-use-ls-dired t
-        insert-directory-program "/usr/local/bin/gls"
-        dired-listing-switches "-aBhl --ignore=.DS_Store --ignore=.git --ignore=.bundle --ignore=.byebug_history --group-directories-first"))
+;; This lists the directories first and ignores some files and directories in dired.
+(setq dired-use-ls-dired t)
+(setq dired-listing-switches "-aBhl --ignore=.git --ignore=.bundle --ignore=.byebug_history --group-directories-first")
 
-;; Hide dired details on startup
+;; Hide dired details on startup.
 (add-hook 'dired-mode-hook
 	  (lambda ()
 	    (dired-hide-details-mode)))
 
-;; Setup initial screen
+;; Setup initial screen.
 (setq initial-buffer-choice (expand-file-name "."))
 
-;; Org mode key bindings
+;; Org mode key bindings.
 (global-set-key (kbd "C-c l") 'org-store-link)
 (global-set-key (kbd "C-c a") 'org-agenda)
 (global-set-key (kbd "C-c c") 'org-capture)
@@ -64,7 +35,7 @@
 ;; Highlight current line.
 (global-hl-line-mode +1)
 
-;; Revert buffers if they've changed on disk
+;; Revert buffers if they've changed on disk.
 (global-auto-revert-mode 1)
 (setq auto-revert-verbose nil)
 
@@ -80,31 +51,31 @@
      (add-to-list 'grep-find-ignored-directories "auto")
      (add-to-list 'grep-find-ignored-directories "elpa")))
 
-(use-package zenburn-theme
-  :ensure t
-  :config
-  (load-theme 'zenburn t)
-  (zenburn-with-color-variables
-    (custom-theme-set-faces
-     'zenburn
-     `(hl-line-face ((t (:background ,zenburn-bg+05 ))))
-     `(hl-line ((t (:background ,zenburn-bg+05 ))))
-     `(region ((nil (:background ,zenburn-bg+2))))
-     )))
+;; Add melpa to package-archives list.
+(require 'package)
+(add-to-list 'package-archives
+             '("melpa" . "http://melpa.org/packages/") t)
 
-(use-package logview
-  :ensure t)
+;; use-package
+;; Ensure use-package is installed.
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+;; Configure and load use-package.
+(setq use-package-always-ensure t)
+(eval-when-compile
+  (defvar use-package-verbose t)
+  (require 'use-package))
+
+(use-package logview)
 
-(use-package dired-hacks-utils
-  :ensure t)
+(use-package dired-hacks-utils)
 
 (use-package dired-narrow
-  :ensure t
   :bind (:map dired-mode-map
 	      ("/" . dired-narrow)))
 
 (use-package dired-subtree
-  :ensure t
   :after dired
   :bind (:map dired-mode-map
 	      ("TAB" . dired-subtree-toggle)
@@ -113,33 +84,21 @@
   (setq dired-subtree-use-backgrounds nil))
 
 (use-package dired-git-info
-  :ensure t
   :bind (:map dired-mode-map
 	      (")" . dired-git-info-mode)))
 
-(use-package dired-sidebar
-  :ensure t
-  :commands (dired-sidebar-toggle-sidebar)
-  :bind (("C-x C-n" . dired-sidebar-toggle-sidebar))
-  :init
-  (setq dired-sidebar-use-term-integration t)
-  (setq dired-sidebar-use-custom-font t))
-
-(use-package typescript-mode
-  :ensure t)
+;; Extra font lock rules for a more colourful dired.
+(use-package diredfl
+  :config
+  (diredfl-global-mode))
 
 (use-package clipetty
-  :ensure t
   :bind ("M-w" . clipetty-kill-ring-save))
 
-(use-package osx-trash
-  :config
-  (when (eq system-type 'darwin)
-    (osx-trash-setup))
-  (setq delete-by-moving-to-trash t))
-
 (use-package undo-tree
   :config
+  ;; Prevent undo tree files from polluting your git repo
+  (setq undo-tree-history-directory-alist `(("." . ,(concat user-emacs-directory "backups/undotree"))))
   (global-undo-tree-mode))
 
 (use-package indent-guide
@@ -156,17 +115,6 @@
   (require 'smartparens-config))
 (add-hook 'prog-mode-hook #'smartparens-mode)
 
-(use-package ruby-mode
-  :config
-  (add-to-list 'auto-mode-alist
-	       '("\\.\\(?:cap\\|gemspec\\|irbrc\\|gemrc\\|rake\\|rb\\|ru\\|thor\\)\\'" . ruby-mode))
-  (add-to-list 'auto-mode-alist
-	       '("\\(?:Brewfile\\|Capfile\\|Gemfile\\(?:\\.[a-zA-Z0-9._-]+\\)?\\|[rR]akefile\\)\\'" . ruby-mode)))
-
-(use-package ruby-electric
-  :config
-  (add-hook 'ruby-mode-hook 'ruby-electric-mode))
-
 (use-package robe
   :config
   (eval-after-load 'company '(push 'company-robe company-backends))
@@ -176,33 +124,6 @@
   :config
   (add-hook 'after-init-hook 'global-company-mode))
 
-(use-package bundler)
-
-(use-package rbenv
-  :config
-  (global-rbenv-mode))
-
-(use-package yaml-mode
-  :config
-  (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
-  (add-hook 'yaml-mode-hook '(lambda () (define-key yaml-mode-map "\C-m" 'newline-and-indent))))
-
-(use-package web-mode
-  :config
-  (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.js?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.jsx?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.css?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.scss?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.xml?\\'" . web-mode)))
-
 (use-package projectile
   :config
   (projectile-mode +1)
@@ -214,12 +135,6 @@
   (projectile-rails-global-mode)
   (define-key projectile-rails-mode-map (kbd "C-c r") 'projectile-rails-command-map))
 
-;; Extra font lock rules for a more colourful dired.
-(use-package diredfl
-  :ensure t
-  :config
-  (diredfl-global-mode))
-
 (use-package diff-hl
   :custom-face
   ;; Change colors for insert, delete and change indicators in diff-hl
@@ -244,8 +159,6 @@
 
 ;; A Git porcelain inside Emacs.
 (use-package magit
-  :ensure t
-
   :commands (magit-add-section-hook magit-section-initial-visibility-alist)
 
   :init
@@ -261,36 +174,53 @@
   (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-tags nil t)
   (add-to-list 'magit-section-initial-visibility-alist '(tags . hide)))
 
-;; Emacs-libvterm (vterm) is fully-fledged terminal emulator inside GNU Emacs based on libvterm, a C library.
-(use-package vterm
-  :ensure t
-  :config
-  (define-key vterm-mode-map (kbd "C-q") #'vterm-send-next-key)
-  :custom
-  (vterm-always-compile-module t))
-;; Managing multiple vterm buffers in Emacs.
-(use-package multi-vterm
-  :ensure t)
-
 ;; Flycheck is a modern on-the-fly syntax checking extension for GNU Emacs.
 (use-package flycheck
-  :ensure t
   :init
   (global-flycheck-mode))
 
 ;; Expand region increases the selected region by semantic units. Just keep pressing the key until it selects what you want.
 (use-package expand-region
-  :ensure t
   :bind
   ("C-=" . er/expand-region))
 
-(use-package dockerfile-mode
-  :ensure t)
+;; ruby-mode - comes included in latest emacs.
+(add-to-list 'auto-mode-alist
+	     '("\\.\\(?:cap\\|gemspec\\|irbrc\\|gemrc\\|rake\\|rb\\|ru\\|thor\\|god\\)\\'" . ruby-mode))
+(add-to-list 'auto-mode-alist
+	     '("\\(?:Brewfile\\|Capfile\\|Gemfile\\(?:\\.[a-zA-Z0-9._-]+\\)?\\|[rR]akefile\\)\\'" . ruby-mode))
+(use-package ruby-electric
+  :config
+  (eval-after-load "ruby-mode"
+    '(add-hook 'ruby-mode-hook 'ruby-electric-mode)))
+
+(use-package yaml-mode
+  :config
+  (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
+  (add-hook 'yaml-mode-hook '(lambda () (define-key yaml-mode-map "\C-m" 'newline-and-indent))))
+
+(use-package typescript-mode)
+
+(use-package web-mode
+  :config
+  (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.js?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.jsx?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.css?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.scss?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.xml?\\'" . web-mode)))
+
+(use-package dockerfile-mode)
 
 ;; Polymode is a framework for multiple major modes (MMM) inside a single Emacs buffer.
 (use-package polymode
-  :ensure t
-
   :config
   (with-eval-after-load "polymode"
     (eieio-oset-default pm-inner-chunkmode :adjust-face -2))

data/lib/smart_machine/machines/network.rb

@@ -0,0 +1,37 @@
+module SmartMachine
+  class Machines
+    class Network < SmartMachine::Base
+      def initialize(name:)
+        config = SmartMachine.config.network.dig(name.to_sym)
+        raise "network config for #{name} not found." unless config
+
+        @driver = config.dig(:driver)
+
+        @name = name.to_s
+        @home_dir = File.expand_path('~')
+      end
+
+      def uper
+        raise "Error: Could not create network: #{@name}" unless system(command.compact.join(' '), out: File::NULL)
+
+        puts "Created network: #{@name}"
+      end
+
+      def downer
+        raise "Error: Could not remove network: #{@name}" unless system("docker network rm '#{@name}'", out: File::NULL)
+
+        puts "Removed network: #{@name}"
+      end
+
+      private
+
+      def command
+        [
+          'docker network create',
+          "--driver=#{@driver}",
+          @name
+        ]
+      end
+    end
+  end
+end

data/lib/smart_machine/syncer.rb

@@ -44,7 +44,7 @@ module SmartMachine
         "-e 'ssh -p #{SmartMachine.credentials.machine[:port]}'",
         "--rsync-path='smartengine syncer rsync'",
         "--delete",
-        "--include={#{files_list}}",
+        files_list.map { |regex| "--include='#{regex}'" }.join(" "),
         "--exclude=*"
       ]
 
@@ -86,7 +86,7 @@ module SmartMachine
         'grids/terminal',
         'grids/terminal/***',
       ]
-      files.join(',')
+      files
     end
 
     def push_files_list
@@ -103,12 +103,16 @@ module SmartMachine
         'config',
         'config/mysql',
         'config/mysql/schedule.rb',
+        'config/phpmyadmin',
+        'config/phpmyadmin/***',
         'config/credentials.yml.enc',
         'config/environment.rb',
         'config/elasticsearch.yml',
         'config/minio.yml',
         'config/mysql.yml',
+        'config/network.yml',
         'config/nextcloud.yml',
+        'config/phpmyadmin.yml',
         'config/prereceiver.yml',
         'config/redis.yml',
         'config/terminal.yml',
@@ -128,7 +132,7 @@ module SmartMachine
 
         'tmp/***',
       ]
-      files.join(',')
+      files
     end
   end
 end

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

@@ -1,5 +1,6 @@
 mysqlone:
   port: 3306
+  networks: networkone
   root_password: <%= SmartMachine.credentials.dig(:mysqlone, :root_password) %>
   username: <%= SmartMachine.credentials.dig(:mysqlone, :username) %>
   password: <%= SmartMachine.credentials.dig(:mysqlone, :password) %>
@@ -7,6 +8,7 @@ mysqlone:
 
 # mysqltwo:
 #   port: 3307
+#   networks: networkone
 #   root_password: <%= SmartMachine.credentials.dig(:mysqltwo, :root_password) %>
 #   username: <%= SmartMachine.credentials.dig(:mysqltwo, :username) %>
 #   password: <%= SmartMachine.credentials.dig(:mysqltwo, :password) %>

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

@@ -0,0 +1,8 @@
+networkone:
+  driver: bridge
+
+networktwo:
+  driver: bridge
+
+# networkthree:
+#   driver: bridge

data/lib/smart_machine/templates/dotsmartmachine/config/phpmyadmin/phpmyadminone/config.user.inc.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * phpMyAdmin configuration
+ *
+ * All directives are explained in documentation in the doc/ folder
+ * or at <https://docs.phpmyadmin.net/>.
+ */

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

@@ -0,0 +1,11 @@
+phpmyadminone:
+  image: "phpmyadmin:5.2.1"
+  host: "yourphpmyadminone.yourdomain.com"
+  networks: ["networkone", "nginx-network"]
+  pma_controlhost: mysqlone
+
+# phpmyadmintwo:
+#   image: "phpmyadmin:5.2.1"
+#   host: "yourphpmyadmintwo.yourdomain.com"
+#   networks: ["networkone", "nginx-network"]
+#   pma_controlhost: mysqlone

data/lib/smart_machine/version.rb

@@ -16,9 +16,9 @@ module SmartMachine
 
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
-    PRE   = nil
+    PRE   = "dev"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/smart_machine.rb

@@ -27,12 +27,15 @@ require 'smart_machine/grids/minio'
 require 'smart_machine/grids/mysql'
 require 'smart_machine/grids/nextcloud'
 require 'smart_machine/grids/nginx'
+require 'smart_machine/grids/phpmyadmin'
 require 'smart_machine/grids/prereceiver'
 require 'smart_machine/grids/redis'
 # require 'smart_machine/grids/solr'
 require 'smart_machine/grids/terminal/wetty'
 require 'smart_machine/grids/terminal'
 
+require 'smart_machine/machines/network'
+
 module SmartMachine
   class Error < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartmachine
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.dev
 platform: ruby
 authors:
 - plainsource
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -185,11 +185,14 @@ files:
 - lib/smart_machine/commands/grid_commands/mysql.rb
 - lib/smart_machine/commands/grid_commands/nextcloud.rb
 - lib/smart_machine/commands/grid_commands/nginx.rb
+- lib/smart_machine/commands/grid_commands/phpmyadmin.rb
 - lib/smart_machine/commands/grid_commands/prereceiver.rb
 - lib/smart_machine/commands/grid_commands/redis.rb
 - lib/smart_machine/commands/grid_commands/sub_thor.rb
 - lib/smart_machine/commands/grid_commands/terminal.rb
 - lib/smart_machine/commands/machine.rb
+- lib/smart_machine/commands/machine_commands/network.rb
+- lib/smart_machine/commands/machine_commands/sub_thor.rb
 - lib/smart_machine/commands/syncer.rb
 - lib/smart_machine/commands/utilities.rb
 - lib/smart_machine/configuration.rb
@@ -202,6 +205,7 @@ files:
 - lib/smart_machine/grids/mysql/docker-entrypoint-initdb.d/.keep
 - lib/smart_machine/grids/nextcloud.rb
 - lib/smart_machine/grids/nginx.rb
+- lib/smart_machine/grids/phpmyadmin.rb
 - lib/smart_machine/grids/prereceiver.rb
 - lib/smart_machine/grids/prereceiver/Dockerfile
 - lib/smart_machine/grids/prereceiver/pre-receive
@@ -378,6 +382,7 @@ files:
 - lib/smart_machine/grids/terminal/wetty.rb
 - lib/smart_machine/logger.rb
 - lib/smart_machine/machine.rb
+- lib/smart_machine/machines/network.rb
 - lib/smart_machine/scp.rb
 - lib/smart_machine/ssh.rb
 - lib/smart_machine/syncer.rb
@@ -389,7 +394,10 @@ files:
 - 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/network.yml
 - lib/smart_machine/templates/dotsmartmachine/config/nextcloud.yml
+- lib/smart_machine/templates/dotsmartmachine/config/phpmyadmin.yml
+- lib/smart_machine/templates/dotsmartmachine/config/phpmyadmin/phpmyadminone/config.user.inc.php
 - lib/smart_machine/templates/dotsmartmachine/config/prereceiver.yml
 - lib/smart_machine/templates/dotsmartmachine/config/redis.yml
 - lib/smart_machine/templates/dotsmartmachine/config/terminal.yml
@@ -409,9 +417,9 @@ licenses:
 metadata:
   homepage_uri: https://github.com/plainsource/smartmachine
   bug_tracker_uri: https://github.com/plainsource/smartmachine/issues
-  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.1.0
-  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.1.0
-post_install_message: 
+  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.2.0.dev
+  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.2.0.dev
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -427,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Full-stack deployment framework for Rails.
 test_files: []