wslave 0.0.15 → 0.2.0

data/base/docker-compose.yml

@@ -1,28 +1,33 @@
-version: '2'
+version: '3'
 
 services:
   db:
-    image: mysql:5.7
+    image: mariadb:10.5.4-focal
     volumes:
       - "./db/dev:/db"
       - "./db/active:/docker-entrypoint-initdb.d"
-    restart: always
     environment:
       MYSQL_ROOT_PASSWORD: wordpress
       MYSQL_DATABASE: wordpress
-
   web:
     depends_on:
       - db
-    build: .
+    build: ./docker/apache/
     volumes:
       - "./public:/var/www/html"
     ports:
       - "8000:80"
-    restart: always
     environment:
       WORDPRESS_DB_HOST: db:3306
       WORDPRESS_DB_PASSWORD: wordpress
-volumes:
-    db_data:
-      driver: local
+  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