wslave 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f66ec5135ab82042cc857c9f6f5b47e0ea95d5f52a995d43eed1c2d7319d86
-  data.tar.gz: 981881f07224bc43bf887f58a7561cc970dd6cad9dc8915206844bff08a4322b
+  metadata.gz: d7c39b73b05b1be955f9f28b0925120e1b11aa37bce3ef2ffcc5b272aef0ecf5
+  data.tar.gz: 75ab79a0688af02c2ae453e170a387e6677ebf4ca275a5ae1a45a4e2166f56e2
 SHA512:
-  metadata.gz: d922fd571f7c599417333a3d462c30049e1448fdea965e0f8891f2a256d9179c9c5b670ac5f7f0710bcff5c921665a9e73f7fbf752543489944c21214bbecf3d
-  data.tar.gz: b6937ce57fa47c62393d771f02da7367a7f8c52329478f099d40306812fd614bb8f3feee114daf3e4d97b42f27a39bcce31d450e9168e8a29cb9fe66580a16d5
+  metadata.gz: 8fa738f7f91f460a8e9a84a5fcc0d38b5251b6d95c6a2443ce7bde8454fcd47169dd720001a9a2caf0f9f322c616b508579770227b4c7a0a1f788a47ead14f7b
+  data.tar.gz: e8a2df80d986c1f24993a576d9e116f5f91c379fa037d028d427f870983d89d7e0a809d750e3f35cfae0fa5adbaba3cffc0023b8ee43392b9256620ee046432e

data/base/.gitignore

@@ -2,3 +2,4 @@ log
 .swp
 .swo
 db/tmp/*
+.vscode

data/base/Rakefile

@@ -3,6 +3,11 @@ require 'yaml'
 
 @opts = YAML.load_file('config/definitions.yml')
 
+desc "Print simple instructions."
+task :default do
+  puts 'Please call rake with a taks name, such as "db:dev", or list tasks with "rake -T".'
+end
+
 def rm_dbfile(profile)
   puts "Deleting db/#{profile}/wordpress.sql"
   FileUtils.rm("db/#{profile}/wordpress.sql") if File.exist?("db/#{profile}/wordpress.sql")

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

@@ -1,35 +1,51 @@
 server {                                                                       
-    listen 80;
-    listen [::]:80;
+  listen 80;
+  listen [::]:80;
 
-    server_name <%= server[:name] %>;
+  server_name <%= server[:name] %>;
 
-    root <%= server[:root] %>;
+  root <%= server[:root] %>;
 
-    access_log <%= server[:root] %>/access.log;
-    error_log <%= server[:root] %>/error.log;
+  access_log <%= server[:root] %>/access.log;
+  error_log <%= server[:root] %>/error.log;
 
-    index index.php;
+  index index.php;
 
-    location / {
-        rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+  location / {
+    rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
 
-        rewrite ^/$ /wordpress/index.php 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 ~ \.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 ~ /\. {
+    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.11.2"
+lock "3.16.0"
 
 require 'yaml'
 opts = YAML.load_file('config/definitions.yml')

data/base/config/deploy/production.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'date'
+require 'wslave_sage'
 
 opts = YAML.load_file('config/definitions.yml')
 db_info = YAML.load_file('config/database.yml')
@@ -13,12 +14,16 @@ 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"
 deploy_path = "#{multisite_root}/#{site_fqdn}"
 
-set :linked_dirs, %w{public/wp-content/uploads public/wordpress public/wp-content/upgrade public/wp-content/plugins tmp}
+set :linked_dirs, %w{public/wp-content/uploads public/wordpress public/wp-content/upgrade public/wp-content/plugins public/data tmp}
 set :linked_files, %w{public/wp-config.php}
 
 set :deploy_to, deploy_path
@@ -77,6 +82,61 @@ namespace :deploy do
     end
   end
 
+  desc 'Syncs the static data directory with rsync'
+  task :sync_static_data do
+    on roles(:web) do
+      `rsync -avzPhu --delete ./public/data/ #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/data/`
+    end
+  end
+
+  desc 'Uploads the static data directory'
+  task :upload_static_data do
+    on roles(:web) do
+      upload! './public/data', "#{deploy_path}/shared/public/data/", recursive: true
+    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
@@ -148,14 +208,17 @@ namespace :deploy do
         invoke('deploy:upload_wp')
         invoke('deploy:upload_plugins')
         invoke('deploy:upload_uploads')
+        invoke('deploy:upload_static_data')
       else
         invoke('deploy:sync_wp')
         invoke('deploy:sync_plugins')
         invoke('deploy:sync_uploads')
+        invoke('deploy:sync_static_data')
       end
       invoke('deploy')
       invoke('db:seed')
       invoke('deploy:chikan')
+      invoke('deploy:sage')
       invoke('deploy:set_permissions')
     end
   end

data/base/config/deploy/staging.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'date'
+require 'wslave_sage'
 
 opts = YAML.load_file('config/definitions.yml')
 db_info = YAML.load_file('config/database.yml')
@@ -13,21 +14,25 @@ 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"
 deploy_path = "#{multisite_root}/#{site_fqdn}"
 
-set :linked_dirs, %w{public/wp-content/uploads public/wordpress public/wp-content/upgrade public/wp-content/plugins tmp}
+set :linked_dirs, %w{public/wp-content/uploads public/wordpress public/wp-content/upgrade public/wp-content/plugins public/data tmp}
 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')
@@ -77,6 +82,61 @@ namespace :deploy do
     end
   end
 
+  desc 'Syncs the static data directory with rsync'
+  task :sync_static_data do
+    on roles(:web) do
+      `rsync -avzPhu --delete ./public/data/ #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/data/`
+    end
+  end
+
+  desc 'Uploads the static data directory'
+  task :upload_static_data do
+    on roles(:web) do
+      upload! './public/data', "#{deploy_path}/shared/public/data/", recursive: true
+    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
@@ -148,14 +208,17 @@ namespace :deploy do
         invoke('deploy:upload_wp')
         invoke('deploy:upload_plugins')
         invoke('deploy:upload_uploads')
+        invoke('deploy:upload_static_data')
       else
         invoke('deploy:sync_wp')
         invoke('deploy:sync_plugins')
         invoke('deploy:sync_uploads')
+        invoke('deploy:sync_static_data')
       end
       invoke('deploy')
       invoke('db:seed')
       invoke('deploy:chikan')
+      invoke('deploy:sage')
       invoke('deploy:set_permissions')
     end
   end

data/base/docker-compose.yml

@@ -1,8 +1,8 @@
-version: '3'
+version: '3.7'
 
 services:
   db:
-    image: mariadb:10.5.1-bionic
+    image: mariadb:10.5-focal
     volumes:
       - "./db/dev:/db"
       - "./db/active:/docker-entrypoint-initdb.d"

data/base/docker/apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.0-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart

data/base/docker/nginx/Dockerfile

@@ -1,11 +1,14 @@
-FROM ubuntu:18.04
+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 \
+# NOTE: When the PHP FPM version changes, you MUST update the 
+#  version named in base/docker/nginx/supervisord.conf and
+#  in base/docker/nginx/nginx.vhost, then rebuild the nweb image!
+RUN apt-get install -y nginx php7.4-fpm php-mysql \
 	libpng-dev libjpeg-dev \
 	mariadb-client mariadb-common \
 	supervisor curl
@@ -14,8 +17,6 @@ RUN adduser www-data root
 RUN mkdir /db \
 && chmod 777 /db
 
-RUN mkdir /run/php
-
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
     && ln -sf /dev/stderr /var/log/nginx/error.log
 

data/base/docker/nginx/nginx.vhost

@@ -1,32 +1,48 @@
 server {                                                                       
-    listen 80;
-	listen [::]:80;
+  listen 80;
+  listen [::]:80;
 
-	server_name testing;
+  server_name testing;
 
-    root /var/www/html;
+  root /var/www/html;
 
-    index index.php;
+  index index.php;
 
-    location / {
-        rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+  location / {
+    rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
 
-        rewrite ^/$ /wordpress/index.php 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 ~ \.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.4-fpm.sock;
     }
+  }
 
-    location ~ /\. {
-        deny all;
-        access_log off;
-        log_not_found off;
-    }
+  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

@@ -5,7 +5,7 @@ logfile_maxbytes=0
 pidfile=/run/supervisord.pid
 
 [program:php-fpm]
-command=php-fpm7.2 -F
+command=php-fpm7.4 -F
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr

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

@@ -8,6 +8,13 @@ class WSlaveCLI < Thor
     true
   end
 
+  desc 'version', "Prints the version of the installed WSlave"
+  def version()
+    require 'rubygems'
+    spec = Gem::Specification::load("#{__dir__}/../wslave.gemspec")
+    puts spec.version
+  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."
   option :version, default: '',
@@ -27,37 +34,6 @@ 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'])
-  end
-
-  desc 'server', "Starts the development server"
-  method_option :f, type: :boolean, default: false, description: 'force close other servers first'
-  def server()
-    puts 'Starting server...'
-    require_relative '../lib/wslave_docker'
-    WSlaveDocker.new().server(options['f'])
-  end
-
-  desc 'stop [options]', "Stops the development server"
-  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'])
-  end
-
   desc 'sync', "Synchronizes submodules and file permissions"
   def sync()
     require_relative '../lib/wslave_tools'
@@ -65,12 +41,76 @@ class WSlaveCLI < Thor
     WSlaveTools.sync()
   end
 
-  desc 'version', "Prints the version of the installed WSlave"
-  def version()
-    require 'rubygems'
-    spec = Gem::Specification::load("#{__dir__}/../wslave.gemspec")
-    puts spec.version
+  class Server < Thor
+    desc 'start [options]', "Starts the development server"
+    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(:start, options['f'])
+    end
+
+    desc 'stop [options]', "Stops the development server"
+    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().server(:stop, options['f'])
+    end
+
+    desc 'reset [options]', "Deletes all container data and volumes, then rebuilds and restarts the containers"
+    method_option :f, type: :boolean, default: false, description: 'force close other servers first'
+    def reset()
+      puts 'Stopping server...'
+      require_relative '../lib/wslave_docker'
+      WSlaveDocker.new().server(:reset, options['f'])
+    end
+
+    desc 'reset [options]', "Shuts down containers and deletes all container data and volumes"
+    method_option :f, type: :boolean, default: false, description: 'force close other servers first'
+    def remove()
+      puts 'Stopping server...'
+      require_relative '../lib/wslave_docker'
+      WSlaveDocker.new().server(:remove, options['f'])
+    end
+  end
+  desc 'server COMMAND [options]', "Control the development server container"
+  subcommand 'server', Server
+
+  class Sage < Thor
+    desc 'create THEME_NAME', "Creates a theme with the specified name using Sage"
+    def create(theme_name = "wslave_sage_theme")
+      require_relative '../lib/wslave_sage'
+      puts "Generating sage theme base for #{theme_name}"
+      WSlaveSage.new().create(theme_name)
+    end
+
+    desc 'update', "Updates theme generator components"
+    def update
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().update()
+    end
+
+    desc 'dev', "Starts a development server which dynamically compiles the theme"
+    def dev
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().dev()
+    end
+
+    desc 'build', "Builds the theme (generates development grade static assets)"
+    def build
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().build()
+    end
+
+    desc 'production', "Builds the theme (generates production grade static assets)"
+    def production
+      require_relative '../lib/wslave_sage'
+      WSlaveSage.new().production()
+    end
   end
+  desc 'sage COMMAND', "Generates and manages a Sage theme"
+  subcommand 'sage', Sage
 end
 
 WSlaveCLI.start(ARGV)

data/lib/wslave_docker.rb

@@ -6,18 +6,70 @@ class WSlaveDocker
     puts 'Initializing WSlave Docker Control'
   end
 
-  def server(force)
+  def server(command = :start, force = false)
+    case (command)
+    when :start
+      start(force)
+    when :stop
+      stop(force)
+    when :reset
+      reset(force)
+    when :remove
+      remove(force)
+    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)
     return unless _check()
     _force_down() if force
+    `docker-compose stop` # Shutdown existing instances
     _unfuck_dot_htaccess()
     WSlaveTools.set_dev_perms
+    `docker-compose build`
+    `docker-compose start -d`
+    `docker-compose up -d`
+  end
+
+  def stop(force = false)
+    return unless _check()
+    _force_down() if force
+    `docker-compose stop`
+  end
+
+  def reset(force = false)
+    return unless _check()
+    _force_down() if force
+    `docker-compose down -v`
+    `docker-compose build`
     `docker-compose up -d`
   end
 
-  def stop(force, volume)
+  def remove(force = false)
     return unless _check()
     _force_down() if force
-    `docker-compose down#{volume ? ' -v' : ''}`
+    `docker-compose down -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()

data/lib/wslave_new.rb

@@ -40,14 +40,14 @@ class WSlaveNew
     `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} && 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}-branch`
+      `cd #{path}/public/wordpress && git checkout #{version}`
     else
       `cd #{path}/public/wordpress && git checkout #{get_stable_branch_version("#{path}/public/wordpress")}-branch`
     end
-    `cd #{path} && git submodule update --init --recursive public/wordpress`
 
     puts "  > Preparing detached content directory"
     FileUtils.cp_r("#{path}/public/wordpress/wp-content", "#{path}/public/wp-content")
@@ -57,6 +57,9 @@ class WSlaveNew
     FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
     Dir.chdir path
 
+    puts "  > Preparing static data directory"
+    FileUtils.mkdir("#{path}/public/data") unless Dir.exist?("#{path}/public/data")
+
     puts "  > Setting permissions"
     WSlaveTools.set_dev_perms
 
@@ -71,12 +74,28 @@ class WSlaveNew
   end
 
   def get_stable_branch_version(path)
-    latest = '5.3' # 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_major = 5
+    latest_minor = 7
+
+    reg = /^(\d*)\.(\d)-branch$/
+    puts "> Checking for WordPress versions in: #{path}"
+    cdir = Dir.pwd()
+    Dir.chdir(path)
+    g = Git.open("./")
+    g.branches.remote.each do |branch|
+      ver = reg.match(branch.name)
+      if (ver) # If the branch matched the x.y-branch pattern
+        if ((ver[1].to_i >= latest_major) && (ver[2].to_i > latest_minor))
+          latest_major = ver[1].to_i
+          latest_minor = ver[2].to_i
+        end
+      end
+
+    end
+    Dir.chdir(cdir)
 
+    latest = "#{latest_major}.#{latest_minor}"
+    puts "> Detected latest WordPress version as: #{latest}"
     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

@@ -23,6 +23,8 @@ class WSlaveTools
       FileUtils.chmod(0775, "#{path}/public/wp-content/plugins")
       FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/upgrade")
       FileUtils.chmod(0775, "#{path}/public/wp-content/upgrade")
+      FileUtils.chown(nil, 'www-data', "#{path}/public/data")
+      FileUtils.chmod(0775, "#{path}/public/data")
 
       unless Dir.exist?("#{path}/db")
         FileUtils.mkdir("#{path}/db")

data/lib/wslave_update.rb

@@ -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_r("#{base_path}/docker", "#{path}/docker")
+    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

@@ -9,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.1.0'
+  s.version     = '0.3.0'
   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,13 +20,13 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.11.2'
-  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0', '2.0.3'
+  s.add_dependency 'capistrano', '= 3.16.0'
+  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 'git', '~> 1.5', '1.5.0'
+  s.add_dependency 'git', '~> 1.8', '1.8.1'
 
-  s.add_dependency 'thor', '~> 0.20', '0.20.3'
-  s.add_dependency 'haikunator', '~> 1.1', '1.1.0'
+  s.add_dependency 'thor', '~> 1.1', '1.1.0'
+  s.add_dependency 'haikunator', '~> 1.1', '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.2
+        version: 3.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.2
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '2.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,107 +43,107 @@ dependencies:
         version: '2.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !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
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !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.0
     - - "~>"
       - !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.0
     - - "~>"
       - !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.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 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.
@@ -164,6 +164,8 @@ files:
 - 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
@@ -202,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'