wslave 0.0.17 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d188cdc015b755f1e01d0df9ef90799e820e51c96b35f33eb2de27ebfe36ef2e
-  data.tar.gz: b0ec2a12644b5a3375b17f2debb46b32b63c47331ab12410d24d4af6c1aab41c
+  metadata.gz: 61e948f1644206ed6520ad69e43583dbafe1200208eb007d7dab044e09d1c84f
+  data.tar.gz: 351b554954d11957292a027a440f7add6ee8156b7b5eeaa9d97fc7cbb9772fb9
 SHA512:
-  metadata.gz: ba61bfce1a0ac8e1132e4f0c9dd346f497357a0a67110bcbd5d8bf4191dd282e265661b351373f5ca8227a8b2ff9d473360558c8835e7b78594f95c5bc2eb0e6
-  data.tar.gz: ef22c14d6e42cd107148e088abd7121f491db53d4af8c73e213c4f5976b7ad6fb03ff94feffbb415502523d633fe370f1906dd3cfaf0d9c875fed0f8c9c07aaa
+  metadata.gz: b67317839d90324f73bdd34c998832be78d367174fe2c88737d615a9811b9c5c531ea0bed198461425307b2b7e6742e330a9258abe7a10b99f7af9b1630a4756
+  data.tar.gz: 2513942d0a62658f8a4b72bc0f2afcc3f933ad94c6f5507ad6f9a94c02571cdcfaa0b625049c9e2cf9f55d8789b3223f748c6eee3157a2b96dc0c986001d1d51

data/base/.gitignore

@@ -0,0 +1,5 @@
+log
+.swp
+.swo
+db/tmp/*
+.vscode

data/base/config/deploy-tools/gen-nginx-vhost.rb

@@ -0,0 +1,11 @@
+require 'erb'
+require 'yaml'
+require 'ostruct'
+
+def GenerateNginxConfig(profile = 'production', out_path= './')
+  config_path = File.dirname(File.expand_path(File.dirname(__FILE__)))
+  server = {}
+  #server[:name] =
+  #server[:root] =
+  #server[:php_sock_path] =
+end

data/base/config/deploy-tools/nginx.vhost.erb

@@ -0,0 +1,51 @@
+server {                                                                       
+  listen 80;
+  listen [::]:80;
+
+  server_name <%= server[:name] %>;
+
+  root <%= server[:root] %>;
+
+  access_log <%= server[:root] %>/access.log;
+  error_log <%= server[:root] %>/error.log;
+
+  index index.php;
+
+  location / {
+    rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+
+    rewrite ^/$ /wordpress/index.php last;
+
+    location ~ \.php {
+      if ($request_uri !~* "/wp-config.php") {
+        rewrite ^/wp-(.*)\.php$ /wordpress/wp-$1.php last;
+      }
+      rewrite ^/index\.php$ /wordpress/index.php last;
+      rewrite ^/wp-login\.php$ /hello.php last;
+      include snippets/fastcgi-php.conf;
+      fastcgi_pass unix:<%= server[:php_sock_path] %>;
+    }
+  }
+
+  location ~ /\. {
+    deny all;
+    access_log off;
+    log_not_found off;
+  }
+
+  location ~- \.(blade\.php)$ {
+    deny all;
+  }
+
+  location ~- composer\.(json|lock)$ {
+    deny all;
+  }
+
+  location ~- package(-lock)?\.json$ {
+    deny all;
+  }
+
+  location ~- yarn\.lock$ {
+    deny all;
+  }
+} 

data/base/config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock "3.10.0"
+lock "3.14.1"
 
 require 'yaml'
 opts = YAML.load_file('config/definitions.yml')

data/base/config/deploy/production.rb

@@ -1,10 +1,12 @@
 require 'yaml'
 require 'date'
+require 'wslave_sage'
 
 opts = YAML.load_file('config/definitions.yml')
 db_info = YAML.load_file('config/database.yml')
 
 deploy_user = opts['deployer']['user']
+deploy_group = opts['deployer']['www_data_group']
 host_addr = opts['deployer']['host']['production']
 multisite_root = opts['deployer']['root']
 site_fqdn = opts['deployer']['fqdn']['production']
@@ -12,6 +14,10 @@ site_fqdn = opts['deployer']['fqdn']['production']
 disable_rsync = (opts.include?('options') && opts['options'].include?('rsync_enabled') && 
           opts['options']['rsync_enabled'] == false)
 
+if (opts['deployer'].include?('branch') && opts['deployer']['branch'].include?('production'))
+  set :branch, opts['deployer']['branch']['production']
+end
+
 role :web, "#{deploy_user}@#{host_addr}" 
 
 set :tmp_dir, "#{multisite_root}/tmp"
@@ -76,10 +82,54 @@ namespace :deploy do
     end
   end
 
+  desc 'Builds and Syncs the project Sage theme'
+  task :sync_sage_theme do
+    on roles(:web) do
+      wss = WSlaveSage.new()
+      sage_theme_name = wss.theme_name?
+      if (sage_theme_name == '')
+        puts "Couldn't find a Sage theme for this project."
+      else
+        wss.production()
+        `rsync -avzPhu --delete ./public/wp-content/themes/#{sage_theme_name}/vendor/ #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/vendor/`
+        `rsync -avzPhu --delete ./public/wp-content/themes/#{sage_theme_name}/dist/ #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/dist/`
+      end
+    end
+  end
+
+  desc 'Builds and Uploads the project Sage theme'
+  task :upload_sage_theme do
+    on roles(:web) do
+      wss = WSlaveSage.new()
+      sage_theme_name = wss.theme_name?
+      if (sage_theme_name == '')
+        puts "Couldn't find a Sage theme for this project."
+      else
+        wss.production()
+        upload! "./public/wp-content/themes/#{sage_theme_name}/vendor/", "#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/", recursive: true
+        upload! "./public/wp-content/themes/#{sage_theme_name}/dist/", "#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/", recursive: true
+      end
+    end
+  end
+
+  desc 'Builds and Deploys the project Sage theme'
+  task :sage do
+    on roles(:web) do
+      if disable_rsync
+        invoke('deploy:upload_sage_theme')
+      else
+        invoke('deploy:sync_sage_theme')
+      end
+    end
+  end
+
   desc 'Finds and replaces localhost:8000 and your Staging address with the Production address'
   task :chikan do
     on roles(:web) do
-      puts 'Replacing localhost:8000 and Staging URLs with Production URLs...'
+      puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
+
+      # Set an anchor to first homogonize instances of URL's, then replace all the anchors
+      anchor = "URL_REPLACEMENT_ANCHOR_00000"
 
       # Create a backup, download it, and remove remote copy
       execute "mkdir -p #{deploy_path}/db/tmp"
@@ -91,18 +141,45 @@ namespace :deploy do
       # Regex replace in file
       db_data = File.read('db/tmp/wordpress.sql')
 
-      db_data = db_data.gsub(/localhost:8000/, "#{opts['deployer']['fqdn']['production']}")
+      # This may seem roundabout, but in order to avoid mangling the target URL we need to first
+      # replace instances of it with something that won't match
+      db_data = db_data.gsub(/#{opts['deployer']['fqdn']['production']}/, anchor)
+
+      # Set staging URL's to the anchor
       if opts['deployer']['fqdn']['staging'] != ''
-        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['staging']}/, "#{opts['deployer']['fqdn']['production']}")
+        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['staging']}/, anchor)
       end
 
+      # Set localhost entries to the anchor
+      db_data = db_data.gsub(/localhost\%3A8000/, anchor)
+      db_data = db_data.gsub(/localhost:8000/, anchor)
+
+      # Replace anchors with the correct target URL
+      db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['production']}")
+
+      # Save results
       File.open('db/tmp/wordpress.sql', "w") {|file| file.puts db_data }
 
       # Upload file and seed
       upload! 'db/tmp/wordpress.sql', "#{deploy_path}/db/tmp/wordpress.sql"
       execute "mysql -h#{db_info['production']['host']} -u#{db_info['production']['username']} -p#{db_info['production']['password']} #{db_info['production']['database']} < #{deploy_path}/db/tmp/wordpress.sql"
       execute "rm #{deploy_path}/db/tmp/*.sql"
-      `rm db/tmp/wordpress.sql`
+
+      # Remove work file
+      # `rm db/tmp/wordpress.sql`
+    end
+  end
+
+  desc 'Sets ownership permissions'
+  task :set_permissions do
+    on roles(:web) do
+      puts 'Setting permissions'
+      if deploy_group != nil
+        puts "Recrusively setting group to #{deploy_group}..."
+        execute "chown -R :#{deploy_group} #{deploy_path}"
+        puts 'Allowing group level Write permission...'
+        execute "chmod -R g+w #{deploy_path}"
+      end
     end
   end
 
@@ -125,17 +202,20 @@ namespace :deploy do
       invoke('deploy')
       invoke('db:seed')
       invoke('deploy:chikan')
+      invoke('deploy:sage')
+      invoke('deploy:set_permissions')
     end
   end
 
   desc 'Clear out remote DB tables and delete all remote files in deploy target directory'
   task :destruct do
     on roles(:web) do
-      execute "mysqldump --opt --user=#{db_info['production']['username']} " \
+      execute "mysql --user=#{db_info['production']['username']} " \
+        "--password=#{db_info['production']['password']} --host=#{db_info['production']['host']} " \
+        "-Nse 'show tables' #{db_info['production']['database']} | " \
+        "while read table; do echo \"drop table $table;\"; done | " \
+        "mysql --user=#{db_info['production']['username']} " \
         "--password=#{db_info['production']['password']} --host=#{db_info['production']['host']} " \
-        "--add-drop-table --no-data #{db_info['production']['database']} | " \
-        "grep -e '^DROP \| FOREIGN_KEY_CHECKS' | mysql -u#{db_info['production']['username']} " \
-        "-p#{db_info['production']['password']} -h#{db_info['production']['host']} " \
         "#{db_info['production']['database']}"
 
       execute "rm -rf #{deploy_path}/*"
@@ -181,6 +261,7 @@ namespace :data do
       download! "#{deploy_path}/shared/public/wp-content/uploads", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/plugins", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/upgrade", "./public/wp-content/", recursive: true
+      download! "#{deploy_path}/current/public/wp-content/themes", "./public/wp-content/", recursive: true
     end
   end
 
@@ -191,6 +272,7 @@ namespace :data do
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/uploads/ ./public/wp-content/uploads/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/plugins/ ./public/wp-content/plugins/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/upgrade/ ./public/wp-content/upgrade/`
+      `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/ ./public/wp-content/themes/`
     end
   end
 end

data/base/config/deploy/staging.rb

@@ -1,10 +1,12 @@
 require 'yaml'
 require 'date'
+require 'wslave_sage'
 
 opts = YAML.load_file('config/definitions.yml')
 db_info = YAML.load_file('config/database.yml')
 
 deploy_user = opts['deployer']['user']
+deploy_group = opts['deployer']['www_data_group']
 host_addr = opts['deployer']['host']['staging']
 multisite_root = opts['deployer']['root']
 site_fqdn = opts['deployer']['fqdn']['staging']
@@ -12,6 +14,10 @@ site_fqdn = opts['deployer']['fqdn']['staging']
 disable_rsync = (opts.include?('options') && opts['options'].include?('rsync_enabled') && 
           opts['options']['rsync_enabled'] == false)
 
+if (opts['deployer'].include?('branch') && opts['deployer']['branch'].include?('staging'))
+  set :branch, opts['deployer']['branch']['staging']
+end
+
 role :web, "#{deploy_user}@#{host_addr}" 
 
 set :tmp_dir, "#{multisite_root}/tmp"
@@ -22,11 +28,11 @@ set :linked_files, %w{public/wp-config.php}
 
 set :deploy_to, deploy_path
 
-
 namespace :deploy do
   desc "Generate wp-config.php for profile"
   task :wp_config do
     on roles(:web) do
+      invoke 'deploy:check:make_linked_dirs'
       require_relative '../deploy-tools/gen-wp-config'
       FileUtils.mkdir('./tmp') unless Dir.exist?('./tmp')
       GenerateWPConfig('staging', './tmp')
@@ -76,11 +82,55 @@ namespace :deploy do
     end
   end
 
+  desc 'Builds and Syncs the project Sage theme'
+  task :sync_sage_theme do
+    on roles(:web) do
+      wss = WSlaveSage.new()
+      sage_theme_name = wss.theme_name?
+      if (sage_theme_name == '')
+        puts "Couldn't find a Sage theme for this project."
+      else
+        wss.production()
+        `rsync -avzPhu --delete ./public/wp-content/themes/#{sage_theme_name}/vendor/ #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/vendor/`
+        `rsync -avzPhu --delete ./public/wp-content/themes/#{sage_theme_name}/dist/ #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/dist/`
+      end
+    end
+  end
+
+  desc 'Builds and Uploads the project Sage theme'
+  task :upload_sage_theme do
+    on roles(:web) do
+      wss = WSlaveSage.new()
+      sage_theme_name = wss.theme_name?
+      if (sage_theme_name == '')
+        puts "Couldn't find a Sage theme for this project."
+      else
+        wss.production()
+        upload! "./public/wp-content/themes/#{sage_theme_name}/vendor/", "#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/", recursive: true
+        upload! "./public/wp-content/themes/#{sage_theme_name}/dist/", "#{deploy_path}/current/public/wp-content/themes/#{sage_theme_name}/", recursive: true
+      end
+    end
+  end
+
+  desc 'Builds and Deploys the project Sage theme'
+  task :sage do
+    on roles(:web) do
+      if disable_rsync
+        invoke('deploy:upload_sage_theme')
+      else
+        invoke('deploy:sync_sage_theme')
+      end
+    end
+  end
+
   desc 'Finds and replaces localhost:8000 and your Production address with the Staging address'
   task :chikan do
     on roles(:web) do
       puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
 
+      # Set an anchor to first homogonize instances of URL's, then replace all the anchors
+      anchor = "URL_REPLACEMENT_ANCHOR_00000"
+
       # Create a backup, download it, and remove remote copy
       execute "mkdir -p #{deploy_path}/db/tmp"
       execute "mysqldump --opt --user=#{db_info['staging']['username']} --password=#{db_info['staging']['password']} --host=#{db_info['staging']['host']} #{db_info['staging']['database']} > #{deploy_path}/db/tmp/wordpress.sql"
@@ -91,18 +141,45 @@ namespace :deploy do
       # Regex replace in file
       db_data = File.read('db/tmp/wordpress.sql')
 
-      db_data = db_data.gsub(/localhost:8000/, "#{opts['deployer']['fqdn']['staging']}")
+      # This may seem roundabout, but in order to avoid mangling the target URL we need to first
+      # replace instances of it with something that won't match
+      db_data = db_data.gsub(/#{opts['deployer']['fqdn']['staging']}/, anchor)
+
+      # Set production URL's to the anchor
       if opts['deployer']['fqdn']['production'] != ''
-        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['production']}/, "#{opts['deployer']['fqdn']['staging']}")
+        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['production']}/, anchor)
       end
 
+      # Set localhost entries to the anchor
+      db_data = db_data.gsub(/localhost\%3A8000/, anchor)
+      db_data = db_data.gsub(/localhost:8000/, anchor)
+
+      # Replace anchors with the correct target URL
+      db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['staging']}")
+
+      # Save results
       File.open('db/tmp/wordpress.sql', "w") {|file| file.puts db_data }
 
       # Upload file and seed
       upload! 'db/tmp/wordpress.sql', "#{deploy_path}/db/tmp/wordpress.sql"
       execute "mysql -h#{db_info['staging']['host']} -u#{db_info['staging']['username']} -p#{db_info['staging']['password']} #{db_info['staging']['database']} < #{deploy_path}/db/tmp/wordpress.sql"
       execute "rm #{deploy_path}/db/tmp/*.sql"
-      `rm db/tmp/wordpress.sql`
+
+      # Remove work file
+      # `rm db/tmp/wordpress.sql`
+    end
+  end
+
+  desc 'Sets ownership permissions'
+  task :set_permissions do
+    on roles(:web) do
+      puts 'Setting permissions'
+      if deploy_group != nil
+        puts "Recrusively setting group to #{deploy_group}..."
+        execute "chown -R :#{deploy_group} #{deploy_path}"
+        puts 'Allowing group level Write permission...'
+        execute "chmod -R g+w #{deploy_path}"
+      end
     end
   end
 
@@ -125,17 +202,20 @@ namespace :deploy do
       invoke('deploy')
       invoke('db:seed')
       invoke('deploy:chikan')
+      invoke('deploy:sage')
+      invoke('deploy:set_permissions')
     end
   end
 
   desc 'Clear out remote DB tables and delete all remote files in deploy target directory'
   task :destruct do
     on roles(:web) do
-      execute "mysqldump --opt --user=#{db_info['staging']['username']} " \
+      execute "mysql --user=#{db_info['staging']['username']} " \
+        "--password=#{db_info['staging']['password']} --host=#{db_info['staging']['host']} " \
+        "-Nse 'show tables' #{db_info['staging']['database']} | " \
+        "while read table; do echo \"drop table $table;\"; done | " \
+        "mysql --user=#{db_info['staging']['username']} " \
         "--password=#{db_info['staging']['password']} --host=#{db_info['staging']['host']} " \
-        "--add-drop-table --no-data #{db_info['staging']['database']} | " \
-        "grep -e '^DROP \| FOREIGN_KEY_CHECKS' | mysql -u#{db_info['staging']['username']} " \
-        "-p#{db_info['staging']['password']} -h#{db_info['staging']['host']} " \
         "#{db_info['staging']['database']}"
 
       execute "rm -rf #{deploy_path}/*"
@@ -181,6 +261,7 @@ namespace :data do
       download! "#{deploy_path}/shared/public/wp-content/uploads", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/plugins", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/upgrade", "./public/wp-content/", recursive: true
+      download! "#{deploy_path}/current/public/wp-content/themes", "./public/wp-content/", recursive: true
     end
   end
 
@@ -191,6 +272,7 @@ namespace :data do
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/uploads/ ./public/wp-content/uploads/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/plugins/ ./public/wp-content/plugins/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/upgrade/ ./public/wp-content/upgrade/`
+      `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/ ./public/wp-content/themes/`
     end
   end
 end

data/base/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: mysql:5.7
+    image: mariadb:10.5.4-focal
     volumes:
       - "./db/dev:/db"
       - "./db/active:/docker-entrypoint-initdb.d"
@@ -12,7 +12,7 @@ services:
   web:
     depends_on:
       - db
-    build: .
+    build: ./docker/apache/
     volumes:
       - "./public:/var/www/html"
     ports:
@@ -20,3 +20,14 @@ services:
     environment:
       WORDPRESS_DB_HOST: db:3306
       WORDPRESS_DB_PASSWORD: wordpress
+  nweb:
+    depends_on:
+      - db
+    build: ./docker/nginx/
+    volumes:
+      - "./public:/var/www/html"
+    ports:
+      - "8001:80"
+    environment:
+      WORDPRESS_DB_HOST: db:3306
+      WORDPRESS_DB_PASSWORD: wordpress

data/base/{Dockerfile → docker/apache/Dockerfile}

@@ -1,13 +1,11 @@
-FROM php:5.6-apache
+FROM php:7.4-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart
 RUN apt-get update \
-&& apt-get install -y libpng12-dev libjpeg-dev mysql-client \
-&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+&& apt-get install -y libpng-dev libjpeg-dev mariadb-client mariadb-common libonig-dev \
 && docker-php-ext-install gd \
 && docker-php-ext-install mbstring \
-&& docker-php-ext-install mysql \
 && docker-php-ext-install mysqli \
 && docker-php-ext-install pdo \
 && docker-php-ext-install pdo_mysql \

data/base/docker/nginx/Dockerfile

@@ -0,0 +1,24 @@
+FROM ubuntu:20.04
+
+COPY nginx.vhost /etc/nginx/sites-enabled/default
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+RUN apt-get update
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
+RUN apt-get install -y nginx php-fpm php-mysql \
+	libpng-dev libjpeg-dev \
+	mariadb-client mariadb-common \
+	supervisor curl
+RUN apt-get clean
+RUN adduser www-data root
+RUN mkdir /db \
+&& chmod 777 /db
+
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
+EXPOSE 80
+
+STOPSIGNAL SIGTERM
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

data/base/docker/nginx/nginx.vhost

@@ -0,0 +1,48 @@
+server {                                                                       
+    listen 80;
+	listen [::]:80;
+
+	server_name testing;
+
+    root /var/www/html;
+
+    index index.php;
+
+    location / {
+        rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+
+        rewrite ^/$ /wordpress/index.php last;
+
+        location ~ \.php {
+            if ($request_uri !~* "/wp-config.php") {
+                rewrite ^/wp-(.*)\.php$ /wordpress/wp-$1.php last;
+            }
+            rewrite ^/index\.php$ /wordpress/index.php last;
+            rewrite ^/wp-login\.php$ /hello.php last;
+            include snippets/fastcgi-php.conf;
+            fastcgi_pass unix:/run/php/php7.2-fpm.sock;
+        }
+    }
+
+    location ~ /\. {
+        deny all;
+        access_log off;
+        log_not_found off;
+    }
+
+	location ~- \.(blade\.php)$ {
+		deny all;
+	}
+
+	location ~- composer\.(json|lock)$ {
+		deny all;
+	}
+
+	location ~- package(-lock)?\.json$ {
+		deny all;
+	}
+
+	location ~- yarn\.lock$ {
+		deny all;
+	}
+} 

data/base/docker/nginx/supervisord.conf

@@ -0,0 +1,23 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/run/supervisord.pid
+
+[program:php-fpm]
+command=php-fpm7.2 -F
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=false
+startretries=0
+
+[program:nginx]
+command=nginx -g 'daemon off;'
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=false
+startretries=0

data/base/public/.htaccess

@@ -14,3 +14,14 @@
   # BEGIN WordPress
   # END WordPress
 </IfModule>
+<FilesMatch ".+\.(blade\.php)$">
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all denied
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Deny from all
+    </IfModule>
+</FilesMatch>

data/bin/wslave

@@ -4,13 +4,20 @@ require 'fileutils'
 
 class WSlaveCLI < Thor
 
+  def self.exit_on_failure?
+    true
+  end
+
   desc 'new [APP_PATH]', "Generate a new app at APP_PATH"
   long_desc "Creates a new application in the current directory or in the specificed path."
-  method_option :version, default: ''
+  option :version, default: '',
+    desc: 'Specify the version, EG: "--version 5.3". To specify edge/development master use "--version edge".'
+  option :wspath, default: '',
+    desc: 'specify the path to the wslave distribution, EG: "--wspath ../wslave".'
   def new(path = './')
     require_relative '../lib/wslave_new'
     real_path = File.expand_path(path)
-    WSlaveNew.new(real_path, options['version'])
+    WSlaveNew.new(real_path, options['version'], options['wspath'])
   end
 
   desc 'update', "Updates toolchain"
@@ -20,35 +27,55 @@ class WSlaveCLI < Thor
     WSlaveUpdate.new()
   end
 
-  desc 'sage NAME', "Generate a theme with NAME"
-  long_desc "Generates a theme base with sage in the themes directory with the given" \
-    "NAME. A random name will be generated if you do not specify a NAME."
-  method_option :version, default: ''
-  def sage(name = '')
-    if name == ''
-      require 'haikunator'
-      name = Haikunator.haikunate(0)
-    end
-    puts "Generating sage theme base for #{name}"
-    require_relative '../lib/wslave_sage'
-    WSlaveSage.new(name, options['version'])
+  desc 'server COMMAND [options]', "Control the development server container. " \
+    "Commands include: start stop log console"
+  long_desc <<-LONGDESC
+    Start, stop, view logs for, or connect to a console in a development server container.
+    \x5
+    \x5  COMMANDs:
+    \x5  start    Starts a development server container. *Will restart the container if already running.
+    \x5  stop     Stops a running development container.
+    \x5  log      Connects to the container logs and follows them.
+    \x5  console  Gives a terminal connection to a bash console on the web container.
+    \x5\x5
+    Examples:
+    \x5 Start dev container servers
+    \x5 > wslave server start
+    \x5 Start or restart dev container servers after resetting all volumes (reinit)
+    \x5 > wslave server start -v
+    \x5 Force stop all dev container servers
+    \x5 > wslave server stop -f
+    \x5 Show logs
+    \x5 > wslave server logs
+
+
+    \x5 * If you do not specify a COMMAND the default is to start a server.
+    \x5 * If a server is alredy running this command will restart the server.
+  LONGDESC
+  method_option :v, type: :boolean, default: false, description: 'remove volume data'
+  method_option :f, type: :boolean, default: false, description: 'force close other servers first'
+  def server(command = 'start')
+    puts 'Starting server...'
+    require_relative '../lib/wslave_docker'
+    WSlaveDocker.new().server(command.to_sym, options['f'], options['v'])
   end
 
-  desc 'server', "Starts the development server"
-  method_option :f, default: false, description: 'force close other servers first'
-  def server()
+  desc 'start [options]', "Starts the development server (short for 'server start')"
+  method_option :v, type: :boolean, default: false, description: 'remove volume data'
+  method_option :f, type: :boolean, default: false, description: 'force close other servers first'
+  def start()
     puts 'Starting server...'
     require_relative '../lib/wslave_docker'
-    WSlaveDocker.new().server(options['f'])
+    WSlaveDocker.new().server(:start, options['f'], options['v'])
   end
 
-  desc 'stop [options]', "Stops the development server"
-  method_option :v, default: false, description: 'remove volume data'
-  method_option :f, default: false, description: 'force close other servers first'
+  desc 'stop [options]', "Stops the development server (short for 'server stop')"
+  method_option :v, type: :boolean, default: false, description: 'remove volume data'
+  method_option :f, type: :boolean, default: false, description: 'force close other servers first'
   def stop()
     puts 'Stopping server...'
     require_relative '../lib/wslave_docker'
-    WSlaveDocker.new().stop(options['f'], options['v'])
+    WSlaveDocker.new().server(:stop, options['f'], options['v'])
   end
 
   desc 'sync', "Synchronizes submodules and file permissions"
@@ -64,6 +91,33 @@ class WSlaveCLI < Thor
     spec = Gem::Specification::load("#{__dir__}/../wslave.gemspec")
     puts spec.version
   end
+
+  desc 'sage COMMAND', "Generate a theme with NAME"
+  long_desc "Generates a theme base with sage in the themes directory with the given " \
+    "NAME. A random name will be generated if you do not specify a NAME."
+  def sage(command = '', arg = '')
+    case command
+    when 'create'
+      require_relative '../lib/wslave_sage'
+      puts "Generating sage theme base for #{arg}"
+      WSlaveSage.new().create(arg)
+    when 'update'
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().update()
+    when 'dev'
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().dev()
+    when 'build'
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().build()
+    when 'production'
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().production()
+    else
+      puts "sage command \"#{command}\" not found."
+      puts "sage commands available: create update dev build production"
+    end
+  end
 end
 
 WSlaveCLI.start(ARGV)

data/lib/wslave_docker.rb

@@ -6,23 +6,54 @@ class WSlaveDocker
     puts 'Initializing WSlave Docker Control'
   end
 
-  def server(force)
+  def server(command = :start, force = false, volume = false)
+    case (command)
+    when :start
+      start(force, volume)
+    when :stop
+      stop(force, volume)
+    when :log
+      log()
+    when :console
+      console()
+    else
+      puts "server subcommand \"#{command.to_s}\" not found."
+      puts "Available commands: start stop log console"
+    end
+  end
+
+  def start(force = false, volume = false)
     return unless _check()
     _force_down() if force
+    `docker-compose down#{volume ? ' -v' : ''}` # Shutdown existing instances
     _unfuck_dot_htaccess()
     WSlaveTools.set_dev_perms
     `docker-compose up -d`
   end
 
-  def stop(force, volume)
+  def stop(force = false, volume = false)
     return unless _check()
     _force_down() if force
     `docker-compose down#{volume ? ' -v' : ''}`
   end
 
+  def log()
+    return unless _check()
+    begin
+      system("docker-compose logs -f")
+    rescue Exception => e
+      puts "\n\nEnding log trace. NOTE: Server containers are still running!\n\n"
+      return
+    end
+  end
+
+  def console()
+    return unless _check()
+    system("docker-compose exec web /bin/bash")
+  end
+
   def _check()
     return true if (File.exist?("./config/.wslave") &&
-                    File.exist?("Dockerfile") &&
                     File.exist?("docker-compose.yml"))
     puts "This does not appear to be the root of a WSlave managed app."
     false

data/lib/wslave_new.rb

@@ -1,43 +1,82 @@
 require 'fileutils'
 require 'rubygems'
+require 'pathname'
+require 'git'
+
 require_relative 'wslave_tools'
 
 class WSlaveNew
-  def initialize(path, version)
+  def initialize(path, version = '', wspath = '')
     puts '⚙ Initializing Toolchain・・・'
 
-    base_path = File.expand_path "#{__dir__}/../base/"
-    template_path = File.expand_path "#{__dir__}/../templates/"
+    if (wspath != '')
+      manual_path = true
+      if ((Pathname.new(wspath)).absolute?)
+        base_path = File.expand_path "#{wspath}/base/"
+        template_path = File.expand_path "#{wspath}/templates/"
+      else
+        base_path = File.expand_path "#{path}/#{wspath}/base/"
+        template_path = File.expand_path "#{path}/#{wspath}/templates/"
+      end
+    else
+      manual_path = false
+      wspath = "#{__dir__}/.."
+      base_path = File.expand_path "#{wspath}/base/"
+      template_path = File.expand_path "#{wspath}/templates/"
+    end
 
     FileUtils.mkdir_p path
 
     Dir.chdir path
-    
+
     puts "  > Setting up WordPress WSlave setup in: #{path}"
     FileUtils.cp_r Dir.glob("#{base_path}/*"), path
     FileUtils.cp_r Dir.glob("#{template_path}/*"), path
+    add_path_to_Gemspec(wspath, path) if manual_path
 
-    spec = Gem::Specification::load("#{__dir__}/../wslave.gemspec")
+    spec = Gem::Specification::load("#{wspath}/wslave.gemspec")
     File.open("#{path}/config/.wslave", 'w') {|f| f.write(spec.version)}
 
     `cd #{path} && git init && git add --all && git commit -am "initial commit by wslave"`
 
     `cd #{path} && git submodule add git://github.com/WordPress/WordPress.git public/wordpress`
-    `cd #{path}/public/wordpress && git checkout #{version}-branch` if version != ''
     `cd #{path} && git submodule update --init --recursive public/wordpress`
+    if (version == 'edge' || version == 'master')
+      `cd #{path}/public/wordpress && git checkout master`
+    elsif version != ''
+      `cd #{path}/public/wordpress && git checkout #{version}`
+    else
+      `cd #{path}/public/wordpress && git checkout #{get_stable_branch_version("#{path}/public/wordpress")}-branch`
+    end
 
     puts "  > Preparing detached content directory"
     FileUtils.cp_r("#{path}/public/wordpress/wp-content", "#{path}/public/wp-content")
-    FileUtils.mkdir("#{path}/public/wp-content/uploads")
+    FileUtils.mkdir("#{path}/public/wp-content/uploads") unless Dir.exist?("#{path}/public/wp-content/uploads")
     FileUtils.touch("#{path}/public/wp-content/uploads/.gitkeep")
-    FileUtils.mkdir("#{path}/public/wp-content/upgrade")
+    FileUtils.mkdir("#{path}/public/wp-content/upgrade") unless Dir.exist?("#{path}/public/wp-content/upgrade")
     FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
     Dir.chdir path
 
     puts "  > Setting permissions"
     WSlaveTools.set_dev_perms
-    
+
     `cd #{path} && git add --all && git commit -am "Add and initialize WordPress#{version}"`
     puts "  > Done!"
   end
+
+  def add_path_to_Gemspec(wspath, path)
+    gemtext = File.read("#{path}/Gemfile")
+    gemtext.gsub!("gem 'wslave'", "gem 'wslave', path: '#{wspath}'")
+    File.open("#{path}/Gemfile", "w") {|gemfile| gemfile.puts gemtext}
+  end
+
+  def get_stable_branch_version(path)
+    latest = '5.4' # This is just a fallback (latest at time of update)
+    # TODO Implementation requires this issue be resolved: https://github.com/ruby-git/ruby-git/issues/424
+    #g = Git.open(path)
+    #g.brances.remote.each do |branch|
+    #end
+
+    latest
+  end
 end

data/lib/wslave_sage.rb

@@ -1,9 +1,76 @@
+require 'yaml'
+
 class WSlaveSage
-  def initialize(name, version)
+  attr_reader :theme_name
+
+  def initialize()
+    @theme_name = ''
+  end
+
+  def create(name)
     unless File.exist?("./config/.wslave")
       puts "This command must be run in the root of a WSlave setup"
     end
-  
-    `cd public/wp-content/themes && composer create-project roots/sage #{name} #{version}`
+
+    name = 'wslave-sage-theme' if name.empty?
+    project_root = Dir.pwd
+
+    puts "Creating Sage theme at public/wp-content/themes/#{name}"
+    `cd public/wp-content/themes && composer create-project roots/sage #{name} dev-master`
+
+    Dir.chdir project_root
+    _write_wslave_sage_config(name)
+    _overwrite_sage_webpack_browsersync_config
+  end
+
+  def update()
+    return unless _check()
+    system("cd public/wp-content/themes/#{@theme_name} && yarn && yarn build")
+  end
+
+  def dev()
+    return unless _check()
+    system("cd public/wp-content/themes/#{@theme_name} && yarn start")
+  end
+
+  def build()
+    return unless _check()
+    system("cd public/wp-content/themes/#{@theme_name} && yarn build")
+  end
+
+  def production()
+    return unless _check()
+    system("cd public/wp-content/themes/#{@theme_name} && yarn build:production")
+  end
+
+  def theme_name?()
+    return '' unless _check()
+    @theme_name
+  end
+
+  def _write_wslave_sage_config(name)
+    File.open("./config/sage.yml", 'w') {|f| YAML.dump({theme: name}, f)}
+  end
+
+  def _overwrite_sage_webpack_browsersync_config
+    return unless _check()
+    theme_info = YAML.load_file("./config/sage.yml")
+    Dir.chdir "#{Dir.pwd}/public/wp-content/themes/#{theme_info[:theme]}"
+
+    webpack_config_path = './webpack.mix.js'
+    new_webpack_config = File.read(webpack_config_path).gsub(
+      /browserSync\('sage.test'\)/, "browserSync('localhost:8000')"
+    )
+    File.open(webpack_config_path, 'w') { |f| f.puts new_webpack_config }
+  end
+
+  def _check()
+    if (File.exist?("./config/.wslave") && File.exist?("./config/sage.yml"))
+      theme_info = YAML.load_file("./config/sage.yml")
+      @theme_name = theme_info[:theme]
+      return true
+    end
+    puts "This does not appear to be the root of a WSlave managed app with a Sage theme."
+    false
   end
 end

data/lib/wslave_tools.rb

@@ -3,7 +3,6 @@ require 'fileutils'
 class WSlaveTools
   def self.wslave_root?()
     return true if (File.exist?("./config/.wslave") &&
-                    File.exist?("Dockerfile") &&
                     File.exist?("docker-compose.yml"))
     puts "This does not appear to be the root of a WSlave managed app."
     puts "Run command again from the root directory of a WSlave app."

data/lib/wslave_update.rb

@@ -9,7 +9,7 @@ class WSlaveUpdate
     path = Dir.pwd
     if !File.exist?("#{path}/config/.wslave")
     	puts "!!!This command must be run in a WSlave generated project!!!"
-	return
+	    return
     end
 
     base_path = File.expand_path "#{__dir__}/../base/"
@@ -21,7 +21,7 @@ class WSlaveUpdate
     FileUtils.cp("#{base_path}/Capfile", "#{path}/Capfile")
     # FileUtils.cp("#{base_path}/Gemfile", "#{path}/Gemfile")
     FileUtils.cp("#{base_path}/Rakefile", "#{path}/Rakefile")
-    FileUtils.cp("#{base_path}/Dockerfile", "#{path}/Dockerfile")
+    FileUtils.cp_r("#{base_path}/docker", "#{path}/")
     FileUtils.cp("#{base_path}/docker-compose.yml", "#{path}/docker-compose.yml")
     FileUtils.cp("#{base_path}/public/.htaccess", "#{path}/public/.htaccess")
     FileUtils.cp_r(Dir.glob("#{base_path}/config/*"), "#{path}/config")

data/templates/config/definitions.yml

@@ -1,5 +1,7 @@
 deployer:
-  user: 
+  user:
+  # Uncomment this line if you are not on a shared host/if your web server runs under a different user than what you specified in the user field above
+  # www_data_group: www-data
   host:
     staging: 
     production: 
@@ -7,6 +9,9 @@ deployer:
   fqdn: 
     staging: 
     production: 
+  branch: 
+    staging: master
+    production: master
 app:
   name:
   repo:

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.0.17'
+  s.version     = '0.2.2'
   s.licenses     = ['GPL-3.0', 'AGPL-3.0']
   s.summary     = '"Word Slave" generates and controls a WordPress installation'
   s.description = 'Word Slave includes the wslave command and a control library to generate a ' \
@@ -20,10 +20,13 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.10.0'
-  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0'
-  s.add_dependency 'capistrano-scm-copy', '~> 0.7'
+  s.add_dependency 'capistrano', '= 3.14.1'
+  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0', '2.0.4'
+  s.add_dependency 'capistrano-scm-copy', '~> 0.7', '0.7.0'
+  s.add_dependency 'capistrano-file-permissions', '~> 1.0', '1.0.0'
 
-  s.add_dependency 'thor', '~> 0.20'
-  s.add_dependency 'haikunator', '~> 1.1'
+  s.add_dependency 'git', '~> 1.7', '1.7.0'
+
+  s.add_dependency 'thor', '~> 1.0', '1.0.1'
+  s.add_dependency 'haikunator', '~> 1.1', '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.2.2
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.14.1
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,20 +61,69 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: capistrano-file-permissions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  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.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        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: '0.20'
+        version: '1.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +131,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +141,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Word Slave includes the wslave command and a control library to generate
   a "best practice" WordPress installation and includes a pre-rolled Docker setup
   for running a development server and a Capistrano setup for deployment.
@@ -89,19 +153,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- base/.gitignore
 - base/Capfile
-- base/Dockerfile
 - base/Gemfile
 - base/Rakefile
+- base/config/deploy-tools/gen-nginx-vhost.rb
 - base/config/deploy-tools/gen-salts.rb
 - base/config/deploy-tools/gen-wp-config.rb
+- base/config/deploy-tools/nginx.vhost.erb
 - base/config/deploy-tools/wp-config.php.erb
 - base/config/deploy-tools/wp-config.php.local
 - base/config/deploy.rb
 - base/config/deploy/.production.rb.swp
+- base/config/deploy/.staging.rb.swp
 - base/config/deploy/production.rb
 - base/config/deploy/staging.rb
 - base/docker-compose.yml
+- base/docker/apache/Dockerfile
+- base/docker/nginx/Dockerfile
+- base/docker/nginx/nginx.vhost
+- base/docker/nginx/supervisord.conf
 - base/public/.htaccess
 - base/public/wp-config.php
 - bin/wslave
@@ -133,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'