wslave 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee627106f6ba97b14f1adf9d636ef8b66a9ffcf89c996b59bb077633f2f1eaa
-  data.tar.gz: 1d31cf735fbeacb810f2558fd7c3b49af4fcef1a7421f27511aa89b0dbba0dee
+  metadata.gz: d7c39b73b05b1be955f9f28b0925120e1b11aa37bce3ef2ffcc5b272aef0ecf5
+  data.tar.gz: 75ab79a0688af02c2ae453e170a387e6677ebf4ca275a5ae1a45a4e2166f56e2
 SHA512:
-  metadata.gz: ce2bce83363782e099e55132d5cf63730e4ebf16f5588446c69149a536c2d90a250eb94f07dc0748c820106513e210d31b889274c5df6bbcd52d33a4143e474c
-  data.tar.gz: 53fe21ad452756017e8a4ad0c7ef93b200f08b877b531776e80898e345cdd6f6608db58ffb6d4cb3af81754a97e2abf4329f65bb8b15d5d0032adff703c34fdf
+  metadata.gz: 8fa738f7f91f460a8e9a84a5fcc0d38b5251b6d95c6a2443ce7bde8454fcd47169dd720001a9a2caf0f9f322c616b508579770227b4c7a0a1f788a47ead14f7b
+  data.tar.gz: e8a2df80d986c1f24993a576d9e116f5f91c379fa037d028d427f870983d89d7e0a809d750e3f35cfae0fa5adbaba3cffc0023b8ee43392b9256620ee046432e

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

@@ -33,19 +33,19 @@ server {
     log_not_found off;
   }
 
-  location ~- \.(blade\.php)$ {
+  location ~* \.(blade\.php)$ {
     deny all;
   }
 
-  location ~- composer\.(json|lock)$ {
+  location ~* composer\.(json|lock)$ {
     deny all;
   }
 
-  location ~- package(-lock)?\.json$ {
+  location ~* package(-lock)?\.json$ {
     deny all;
   }
 
-  location ~- yarn\.lock$ {
+  location ~* yarn\.lock$ {
     deny all;
   }
 } 

data/base/config/deploy.rb

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

data/base/docker-compose.yml

@@ -1,8 +1,8 @@
-version: '3'
+version: '3.7'
 
 services:
   db:
-    image: mariadb:10.5.4-focal
+    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

@@ -5,7 +5,10 @@ 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

data/base/docker/nginx/nginx.vhost

@@ -1,48 +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)$ {
+	location ~* \.(blade\.php)$ {
 		deny all;
 	}
 
-	location ~- composer\.(json|lock)$ {
+	location ~* composer\.(json|lock)$ {
 		deny all;
 	}
 
-	location ~- package(-lock)?\.json$ {
+	location ~* package(-lock)?\.json$ {
 		deny all;
 	}
 
-	location ~- yarn\.lock$ {
+	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/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,57 +34,6 @@ class WSlaveCLI < Thor
     WSlaveUpdate.new()
   end
 
-  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 '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(:start, options['f'], options['v'])
-  end
-
-  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().server(:stop, options['f'], options['v'])
-  end
-
   desc 'sync', "Synchronizes submodules and file permissions"
   def sync()
     require_relative '../lib/wslave_tools'
@@ -85,39 +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
 
-  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'
+  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 #{arg}"
-      WSlaveSage.new().create(arg)
-    when 'update'
+      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()
-    when 'dev'
+    end
+
+    desc 'dev', "Starts a development server which dynamically compiles the theme"
+    def dev
       require_relative '../lib/wslave_sage'
       WSlaveSage.new().dev()
-    when 'build'
+    end
+
+    desc 'build', "Builds the theme (generates development grade static assets)"
+    def build
       require_relative '../lib/wslave_sage'
       WSlaveSage.new().build()
-    when 'production'
+    end
+
+    desc 'production', "Builds the theme (generates production grade static assets)"
+    def 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
+  desc 'sage COMMAND', "Generates and manages a Sage theme"
+  subcommand 'sage', Sage
 end
 
 WSlaveCLI.start(ARGV)

data/lib/wslave_docker.rb

@@ -6,12 +6,16 @@ class WSlaveDocker
     puts 'Initializing WSlave Docker Control'
   end
 
-  def server(command = :start, force = false, volume = false)
+  def server(command = :start, force = false)
     case (command)
     when :start
-      start(force, volume)
+      start(force)
     when :stop
-      stop(force, volume)
+      stop(force)
+    when :reset
+      reset(force)
+    when :remove
+      remove(force)
     when :log
       log()
     when :console
@@ -22,19 +26,35 @@ class WSlaveDocker
     end
   end
 
-  def start(force = false, volume = false)
+  def start(force = false)
     return unless _check()
     _force_down() if force
-    `docker-compose down#{volume ? ' -v' : ''}` # Shutdown existing instances
+    `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, volume = false)
+  def stop(force = false)
     return unless _check()
     _force_down() if force
-    `docker-compose down#{volume ? ' -v' : ''}`
+    `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 remove(force = false)
+    return unless _check()
+    _force_down() if force
+    `docker-compose down -v`
   end
 
   def log()

data/lib/wslave_new.rb

@@ -57,7 +57,7 @@ class WSlaveNew
     FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
     Dir.chdir path
 
-    puts "  > Preparing statid data directory"
+    puts "  > Preparing static data directory"
     FileUtils.mkdir("#{path}/public/data") unless Dir.exist?("#{path}/public/data")
 
     puts "  > Setting permissions"
@@ -74,12 +74,28 @@ class WSlaveNew
   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_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/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.2.3'
+  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.14.1'
+  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.7', '1.7.0'
+  s.add_dependency 'git', '~> 1.8', '1.8.1'
 
-  s.add_dependency 'thor', '~> 1.0', '1.0.1'
-  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.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 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.14.1
+        version: 3.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -90,40 +90,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
         version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ dependencies:
         version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        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