wslave 0.0.15 → 0.2.0

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

@@ -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}/")
     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

@@ -1,5 +1,7 @@
 deployer:
-  user: 
+  user:
+  # Uncomment this line if you are not on a shared host/if your web server runs under a different user than what you specified in the user field above
+  # www_data_group: www-data
   host:
     staging: 
     production: 
@@ -7,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.0.15'
+  s.version     = '0.2.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,10 +20,13 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.10.0'
-  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0'
-  s.add_dependency 'capistrano-scm-copy', '~> 0.7'
+  s.add_dependency 'capistrano', '= 3.14.1'
+  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 'thor', '~> 0.20'
-  s.add_dependency 'haikunator', '~> 1.1'
+  s.add_dependency 'git', '~> 1.7', '1.7.0'
+
+  s.add_dependency 'thor', '~> 1.0', '1.0.1'
+  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.15
+  version: 0.2.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.14.1
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - "~>"
       - !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
@@ -52,20 +61,69 @@ dependencies:
     - - "~>"
       - !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'
+    - - '='
+      - !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'
+    - - '='
+      - !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.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +131,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +141,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 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.
@@ -89,18 +153,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- base/.gitignore
 - base/Capfile
-- base/Dockerfile
 - base/Gemfile
 - base/Rakefile
+- base/config/deploy-tools/gen-nginx-vhost.rb
 - base/config/deploy-tools/gen-salts.rb
 - base/config/deploy-tools/gen-wp-config.rb
+- base/config/deploy-tools/nginx.vhost.erb
 - 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
 - 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
@@ -132,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'