wslave 0.0.18 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8df8f2d9fb3ddae0dfbc1d47fdf8107b20c455e3d4eadb15538e1d9483cfcb8
-  data.tar.gz: ab496e09948a4edf41cc828c01a34487cb7a29633c203356b231e967f582d4a9
+  metadata.gz: d5f66ec5135ab82042cc857c9f6f5b47e0ea95d5f52a995d43eed1c2d7319d86
+  data.tar.gz: 981881f07224bc43bf887f58a7561cc970dd6cad9dc8915206844bff08a4322b
 SHA512:
-  metadata.gz: c97f9515d2229be7bfee1b2e1df26347be54f178e47382bf67390651dba0aa10ec1158574e5aedd3e233ec610be25ae9a42afd03f4e27c427ea148780dad21aa
-  data.tar.gz: 9622367e6bd226bc525146f6792fb598220397528055946e393dbc1f1952215b1ade9b90a010420d30748944875105e545f68fa15896a9caddce594c4c3e1ee8
+  metadata.gz: d922fd571f7c599417333a3d462c30049e1448fdea965e0f8891f2a256d9179c9c5b670ac5f7f0710bcff5c921665a9e73f7fbf752543489944c21214bbecf3d
+  data.tar.gz: b6937ce57fa47c62393d771f02da7367a7f8c52329478f099d40306812fd614bb8f3feee114daf3e4d97b42f27a39bcce31d450e9168e8a29cb9fe66580a16d5

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

@@ -1,8 +1,8 @@
 server {                                                                       
     listen 80;
-	listen [::]:80;
+    listen [::]:80;
 
-	server_name <%= server[:name] %>;
+    server_name <%= server[:name] %>;
 
     root <%= server[:root] %>;
 

data/base/config/deploy.rb

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

data/base/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: mysql:5.7
+    image: mariadb:10.5.1-bionic
     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:7.2.6-apache
+FROM php:7.4-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart
 RUN apt-get update \
-&& apt-get install -y libpng-dev libjpeg-dev mysql-client mysql-common \
-&& 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,26 @@
+FROM ubuntu:18.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 mkdir /run/php
+
+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,32 @@
+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;
+    }
+} 

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/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"
@@ -35,7 +42,7 @@ class WSlaveCLI < Thor
   end
 
   desc 'server', "Starts the development server"
-  method_option :f, default: false, description: 'force close other servers first'
+  method_option :f, type: :boolean, default: false, description: 'force close other servers first'
   def server()
     puts 'Starting server...'
     require_relative '../lib/wslave_docker'
@@ -43,8 +50,8 @@ class WSlaveCLI < Thor
   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'
+  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'

data/lib/wslave_docker.rb

@@ -22,7 +22,6 @@ class WSlaveDocker
 
   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 != ''
+    if (version == 'edge' || version == 'master')
+      `cd #{path}/public/wordpress && git checkout master`
+    elsif version != ''
+      `cd #{path}/public/wordpress && git checkout #{version}-branch`
+    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")
-    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.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
+  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}/docker")
     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/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.0.18'
+  s.version     = '0.1.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,11 +20,13 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.11.0'
+  s.add_dependency 'capistrano', '= 3.11.2'
   s.add_dependency 'capistrano-git-with-submodules', '~> 2.0', '2.0.3'
   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', '0.20.0'
+  s.add_dependency 'git', '~> 1.5', '1.5.0'
+
+  s.add_dependency 'thor', '~> 0.20', '0.20.3'
   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.18
+  version: 0.1.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2020-03-03 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.0
+        version: 3.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.11.2
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -48,42 +48,62 @@ dependencies:
   name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !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
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  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'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +113,7 @@ dependencies:
         version: '0.20'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,27 +123,27 @@ dependencies:
         version: '0.20'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.3
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '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.
@@ -135,7 +155,6 @@ extra_rdoc_files: []
 files:
 - base/.gitignore
 - base/Capfile
-- base/Dockerfile
 - base/Gemfile
 - base/Rakefile
 - base/config/deploy-tools/gen-nginx-vhost.rb
@@ -148,6 +167,10 @@ files:
 - 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
@@ -179,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'