wslave 0.3.8 → 0.3.9

data/base/docker/nginx/supervisord.conf

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

data/base/docker/nginx/wp-cli.yml

@@ -0,0 +1,9 @@
+# Set user to www-data to try and avoid root owned files being created
+user: www-data
+path: /var/www/html/wordpress
+# Core is managed seperately by git, so disable core file commands
+disabled_commands:
+  - core download
+  - core install
+  - core update
+  - config create

data/base/docker-compose.yml

@@ -6,6 +6,8 @@ services:
     volumes:
       - "./db/dev:/db"
       - "./db/active:/docker-entrypoint-initdb.d"
+    ports:
+      - "8003:3306"
     environment:
       MYSQL_ROOT_PASSWORD: wordpress
       MYSQL_DATABASE: wordpress

data/base/public/wp-config.php

@@ -1,51 +1,23 @@
 <?php
-/**
- * The base configuration for WordPress
- *
- * The wp-config.php creation script uses this file during the
- * installation. You don't have to use the web site, you can
- * copy this file to "wp-config.php" and fill in the values.
- *
- * This file contains the following configurations:
- *
- * * MySQL settings
- * * Secret keys
- * * Database table prefix
- * * ABSPATH
- *
- * @link https://codex.wordpress.org/Editing_wp-config.php
- *
- * @package WordPress
- */
-
-// ** MySQL settings - You can get this info from your web host ** //
+/** DB Info */
 /** The name of the database for WordPress */
 define('DB_NAME', 'wordpress');
-
 /** MySQL database username */
 define('DB_USER', 'root');
-
 /** MySQL database password */
 define('DB_PASSWORD', 'wordpress');
-
 /** MySQL hostname */
-define('DB_HOST', 'db');
-
+if (php_sapi_name() == "cli") {
+	define('DB_HOST', '127.0.0.1:8003');
+} else {
+	define('DB_HOST', 'db');
+}
 /** Database Charset to use in creating database tables. */
 define('DB_CHARSET', 'utf8');
-
 /** The Database Collate type. Don't change this if in doubt. */
 define('DB_COLLATE', '');
 
-/**#@+
- * Authentication Unique Keys and Salts.
- *
- * Change these to different unique phrases!
- * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
- * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
- *
- * @since 2.6.0
- */
+/** Auth Filler */
 define('AUTH_KEY',         'put your unique phrase here');
 define('SECURE_AUTH_KEY',  'put your unique phrase here');
 define('LOGGED_IN_KEY',    'put your unique phrase here');
@@ -82,14 +54,19 @@ define('WP_DEBUG', false);
 /* That's all, stop editing! Happy blogging. */
 
 /** Absolute path to the WordPress directory. */
-if ( !defined('ABSPATH') )
-  define('ABSPATH', dirname(__FILE__) . '/wordpress/');
-
-define('WP_HOME', 'http://' . $_SERVER['HTTP_HOST']);
-define('WP_SITEURL', 'http://' . $_SERVER['HTTP_HOST'] . '/wordpress');
-define('WP_CONTENT_DIR', realpath(ABSPATH . '../wp-content/'));
+if (!defined('ABSPATH'))
+  define('ABSPATH', dirname(__FILE__) . '/wordpress');
+
+if (php_sapi_name() == "cli") {
+	define('WP_HOME', 'http://localhost:8001');
+} else {
+	define('WP_HOME', 'http://' . $_SERVER['HTTP_HOST']);
+}
+define('WP_SITEURL', WP_HOME . '/wordpress');
+define('WP_CONTENT_DIR', realpath(ABSPATH . '../wp-content'));
 define('WP_CONTENT_URL', WP_HOME . '/wp-content');
 //define('WP_TEMP_DIR', realpath(ABSPATH . '../../tmp/'));
+
 define('FS_METHOD', 'direct');
 
 define('FORCE_SSL_ADMIN', false);

data/base/wp-cli.yml

@@ -0,0 +1,8 @@
+path: public/wordpress
+url: http://localhost:8001
+# Core is managed seperately by git, so disable core file commands
+disabled_commands:
+  - core download
+  - core install
+  - core update
+  - config create

data/bin/wslave

@@ -25,8 +25,8 @@ class WSlaveCLI < Thor
   option :wppath, default: '',
     desc: 'specify the path to a cloned git wordpress distribution, EG: "--wppath /shared/wordpress".
       NOTE: This is relative to the new app path.
-      NOTE: If no data is found in this directory, wslave will clone the official WordPress repository here and 
-      copy it. Also, if there is data here that does not match the format of the official WordPress repository, 
+      NOTE: If no data is found in this directory, wslave will clone the official WordPress repository here and
+      copy it. Also, if there is data here that does not match the format of the official WordPress repository,
       most wslave functionality will probably be broken.'
   def new(path = './')
     require_relative '../lib/wslave_new'
@@ -80,6 +80,18 @@ class WSlaveCLI < Thor
       require_relative '../lib/wslave_docker'
       WSlaveDocker.new().server(:remove, options['f'])
     end
+
+    desc 'log', "Starts tracing the log"
+    def log()
+      require_relative '../lib/wslave_docker'
+      WSlaveDocker.new().log()
+    end
+
+    desc 'console', "Opens a shell/console connection in the nweb container (container must be running)"
+    def console()
+      require_relative '../lib/wslave_docker'
+      WSlaveDocker.new().console()
+    end
   end
   desc 'server COMMAND [options]', "Control the development server container"
   subcommand 'server', Server

data/lib/wslave_docker.rb

@@ -69,7 +69,7 @@ class WSlaveDocker
 
   def console()
     return unless _check()
-    system("docker-compose exec web /bin/bash")
+    system("docker-compose exec nweb sh -c \"cd /var/www/html; exec /bin/bash\"")
   end
 
   def _check()

data/lib/wslave_tools.rb

@@ -20,19 +20,26 @@ class WSlaveTools
 
       FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/themes")
       FileUtils.chmod(0775, "#{path}/public/wp-content/themes")
+      # NOTE: The following lines have been commented out and "replaced" with
+      #   the above two, which grant blanket ownership to everything in
+      #   wp-content. If there are no problems with this going forward,
+      #   this note and the commented lines below should be deleted in a
+      #   future update.
+      #FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/themes")
+      #FileUtils.chmod(0775, "#{path}/public/wp-content/themes")
 
-      FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/uploads")
-      FileUtils.chmod(0775, "#{path}/public/wp-content/uploads")
+      #FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/uploads")
+      #FileUtils.chmod(0775, "#{path}/public/wp-content/uploads")
 
-      FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/plugins")
-      FileUtils.chmod(0775, "#{path}/public/wp-content/plugins")
-      
-      unless Dir.exist?("#{path}/public/wp-content/upgrade")
-        FileUtils.mkdir("#{path}/public/wp-content/upgrade")
-        FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
-      end
-      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/wp-content/plugins")
+      #FileUtils.chmod(0775, "#{path}/public/wp-content/plugins")
+      #
+      #unless Dir.exist?("#{path}/public/wp-content/upgrade")
+      #  FileUtils.mkdir("#{path}/public/wp-content/upgrade")
+      #  FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
+      #end
+      #FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/upgrade")
+      #FileUtils.chmod(0775, "#{path}/public/wp-content/upgrade")
 
       unless Dir.exist?("#{path}/db")
         FileUtils.mkdir("#{path}/db")
@@ -68,10 +75,18 @@ class WSlaveTools
       FileUtils.chown(nil, 'www-data', "#{path}/db/production")
       FileUtils.chmod(0775, "#{path}/db/production")
 
-    rescue Errno::EPERM
-      puts "!!!WARNING!!! Your user does not belong to the www-data group!\n" \
+    # The main reason the exception will fire is becasue the user doesn't belong to the
+    #   www-data group; but there's other reasons such as the file being somehow being 
+    #   owned by root or the system not even supporting permissions (like some 
+    #   installations of Windows?).
+    rescue Errno::EPERM => detail
+      puts "!!!WARNING!!! Unable to assign www-data group permissions! \n" \
         " >>> Unable to make folders writable for devlopment. <<<\n" \
         " >>> You will not be able to edit files or themes in the WP dev container! <<<\n"
+        " >>> NOTE: Check that your user belongs to the www-data group. <<<\n" \
+        " >>> NOTE: Check that the files in public/ are owned by *your* user. <<<\n"
+      
+      print " >>>> Original error: " + detail.message
     end
   end
 

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.3.8'
+  s.version     = '0.3.9'
   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 ' \
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   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.10', '1.10.2'
+  s.add_dependency 'git', '~> 1.11', '1.11.0'
 
   s.add_dependency 'thor', '~> 1.2', '1.2.1'
   s.add_dependency 'haikunator', '~> 1.1', '1.1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -90,20 +90,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -173,8 +173,10 @@ files:
 - base/docker/nginx/nginx.vhost
 - base/docker/nginx/php.ini
 - base/docker/nginx/supervisord.conf
+- base/docker/nginx/wp-cli.yml
 - base/public/.htaccess
 - base/public/wp-config.php
+- base/wp-cli.yml
 - bin/wslave
 - lib/wslave_docker.rb
 - lib/wslave_new.rb