wslave 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f19d84a47dbf216cbe71bbe9484a14b2884707
-  data.tar.gz: 3e12604338f17a7325ba9ac7f773eee6b08770c4
+  metadata.gz: 58645e2dc583bfadc3b2bc439a8e72e9bcd98d2b
+  data.tar.gz: 6c028b51d4b5e302f93cc5739545a7a9632a13b3
 SHA512:
-  metadata.gz: b32b603ef3c6e920a244d898692510a05becaefded65edca93f246f01e550f71b242f431de1effe153324d274e252859364b73acebfe50cd07f9d2679b343765
-  data.tar.gz: 3cf50f5eeec130cde368f3a67f906c9f749bc338f820a6ccccca07829195ce9b7572e750d66892d9998afdc3fabace4332dadc73d29ec04ec385bbaa6ba932ca
+  metadata.gz: 37ecc69147551a32752071f7e7379aa4dbc9e6079c9a9a6f2edabea2fa788d610531dc543d87e600443b3a1cf2adfda612bcfd6d523208ffe41d91709b227b42
+  data.tar.gz: e2be211c0fcc96c4d415700b246dc1d83d13269a6c5ed77881ebcd757793dbbdf6a9fa120e5cf55b53dc89dfb1e3872b00ae2e5339b3b857b07adf35aeaed420

data/base/Rakefile

@@ -10,8 +10,10 @@ namespace :db do
     desc 'Backup development container database to db/dev (container must be running)'
     task :backup do
       rm_dbfile('dev')
-      puts "Creating backup of development database..."
+      puts 'Creating backup of development database...'
       sh 'docker-compose exec db sh -c "exec mysqldump --single-transaction -hlocalhost -uroot -pwordpress wordpress > /db/wordpress.sql"'
+      sh 'docker-compose exec db sh -c "chown :www-data /db/wordpress.sql"'
+      sh 'docker-compose exec db sh -c "chmod 664 /db/wordpress.sql"'
     end
 
     desc 'Set the development container database image to the active image'

data/base/config/deploy.rb

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

data/lib/wslave_docker.rb

@@ -36,7 +36,7 @@ class WSlaveDocker
   def _unfuck_dot_htaccess()
     begin
       FileUtils.cp_r("#{__dir__}/../base/public/.htaccess", "./public/.htaccess")
-      FileUtils.chmod(0444, "./public/.htaccess")
+      # FileUtils.chmod(0444, "./public/.htaccess")
     rescue => e
       # noop
     end

data/lib/wslave_tools.rb

@@ -10,16 +10,54 @@ class WSlaveTools
     false
   end
 
-  def self.set_dev_perms
+  def self.set_dev_perms(path = '.')
     begin
-      FileUtils.chown(nil, 'www-data', 'public/wp-content/themes')
-      FileUtils.chmod(0775, 'public/wp-content/themes')
-      FileUtils.chown(nil, 'www-data', 'public/wp-content/uploads')
-      FileUtils.chmod(0775, 'public/wp-content/uploads')
-      FileUtils.chown(nil, 'www-data', 'public/wp-content/plugins')
-      FileUtils.chmod(0775, 'public/wp-content/plugins')
-      FileUtils.chown(nil, 'www-data', 'public/wp-content/upgrade')
-      FileUtils.chmod(0775, 'public/wp-content/upgrade')
+      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/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/plugins")
+      FileUtils.chmod(0775, "#{path}/public/wp-content/plugins")
+      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")
+      end
+      FileUtils.chown(nil, 'www-data', "#{path}/db")
+      FileUtils.chmod(0775, "#{path}/db")
+
+      unless Dir.exist?("#{path}/db/active")
+        FileUtils.mkdir("#{path}/db/active")
+        FileUtils.touch("#{path}/db/active/.gitkeep")
+      end
+      FileUtils.chown(nil, 'www-data', "#{path}/db/active")
+      FileUtils.chmod(0775, "#{path}/db/active")
+
+      unless Dir.exist?("#{path}/db/dev")
+        FileUtils.mkdir("#{path}/db/dev")
+        FileUtils.touch("#{path}/db/dev/.gitkeep")
+      end
+      FileUtils.chown(nil, 'www-data', "#{path}/db/dev")
+      FileUtils.chmod(0775, "#{path}/db/dev")
+
+      unless Dir.exist?("#{path}/db/staging")
+        FileUtils.mkdir("#{path}/db/staging")
+        FileUtils.touch("#{path}/db/staging/.gitkeep")
+      end
+      FileUtils.chown(nil, 'www-data', "#{path}/db/staging")
+      FileUtils.chmod(0775, "#{path}/db/staging")
+
+      unless Dir.exist?("#{path}/db/production")
+        FileUtils.mkdir("#{path}/db/production")
+        FileUtils.touch("#{path}/db/production/.gitkeep")
+      end
+      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" \
         " >>> Unable to make folders writable for devlopment. <<<\n" \
@@ -27,6 +65,9 @@ class WSlaveTools
     end
   end
 
+  def self._check_and_mk_dirs(path = '.')
+  end
+
   def self.update_submodules
     `git submodule update --init --recursive`
   end

data/lib/wslave_update.rb

@@ -19,7 +19,7 @@ class WSlaveUpdate
     Dir.chdir path
     
     FileUtils.cp("#{base_path}/Capfile", "#{path}/Capfile")
-    FileUtils.cp("#{base_path}/Gemfile", "#{path}/Gemfile")
+    # FileUtils.cp("#{base_path}/Gemfile", "#{path}/Gemfile")
     FileUtils.cp("#{base_path}/Rakefile", "#{path}/Rakefile")
     FileUtils.cp("#{base_path}/Dockerfile", "#{path}/Dockerfile")
     FileUtils.cp("#{base_path}/docker-compose.yml", "#{path}/docker-compose.yml")
@@ -33,6 +33,6 @@ class WSlaveUpdate
     File.open("#{path}/config/.wslave", 'w') {|f| f.write(spec.version)}
 
     Dir.chdir path
-    WSlaveTools.set_dev_perms 
+    WSlaveTools.set_dev_perms(path) 
   end
 end

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.0.11'
+  s.version     = '0.0.12'
   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,7 +20,7 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.9.1'
+  s.add_dependency 'capistrano', '= 3.10.0'
   s.add_dependency 'capistrano-git-with-submodules', '~> 2.0'
   s.add_dependency 'capistrano-scm-copy', '~> 0.7'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: 3.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'