capistrano-cul 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da6c2bee3ddded589694efdcf93f211ba7deab6
-  data.tar.gz: fc9fa5f5e9de5cc55682e7d9598d56f0302b1213
+  metadata.gz: 161c5a342d46c0ab1d91da08ed039d91d75e9afa
+  data.tar.gz: 974295390ae434f9b2092e9c6f2592360f3f9d60
 SHA512:
-  metadata.gz: 4a18bd826ed7cfb61e7bbaa7710a573c78dfc6845a44ddbd5eae1988ba852cd89b128f23e312c194f109d2245282a8eaac5d9dff0a9279619d0ab9cbe3303881
-  data.tar.gz: 0f788a729b1f170f4b9e0d1d08e015ef00138f163f1bd721f6d9077172c396081b58704b7bbc0764d91304573e6e4b57745ecbfae5733b1095aed5833876ac02
+  metadata.gz: 33997e92ca28ff3af7e25dbdcd0d4ec5228c9f5adaefde025a08aa2cae89ec385e18058c293d11961155e8fc92341ca5c79e02264dca4b71b1641423f4783ea7
+  data.tar.gz: 3ed6a1652ecf0d239a3cf21f5c9617de61b028a6e11b3658e0c0b83e09c33b830028dfce54544ed52fc61ac5b449228c3e37933ba15858ad52ae72d07e6545e4

data/README.md

@@ -89,8 +89,8 @@ set :wp_custom_themes # (hash) Map of custom theme file/directory names to repo-
 Here's a sample configuration:
 
 ```ruby
-set :wp_docroot, "#{fetch(:deploy_to)}/wp_docroot"
-set :wp_data_path, "/path/to/data/directory/#{fetch(:application)}_#{fetch(:stage)}"
+set :wp_docroot, "#{fetch(:deploy_to)}/wp-docroot"
+set :wp_content_path, "#{fetch(:deploy_to)}/wp-content"
 set :multisite, false
 set :title, 'Amazing WordPress Site'
 

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/capistrano/tasks/wp.cap

@@ -20,7 +20,7 @@ namespace :cul do
       # capture version before running any other commands.
       puts "Setting up wp_version: #{fetch(:wp_version)}"
 
-      require_cap_params!([:branch, :wp_version, :wp_docroot, :wp_data_path])
+      require_cap_params!([:branch, :wp_version, :wp_docroot, :wp_content_path])
 
       on roles(:web) do
         wp_docroot_wp_config_file_path = File.join(fetch(:wp_docroot), 'wp-config.php')
@@ -30,7 +30,7 @@ namespace :cul do
         shared_wp_config_file_path = shared_path.join('wp-config.php')
         shared_robots_txt_file_path = shared_path.join('robots.txt')
 
-        wp_data_wp_content_path = File.join(fetch(:wp_data_path), 'wp-content')
+        wp_content_path = fetch(:wp_content_path)
 
         invoke 'deploy' # Deploy before doing setup
 
@@ -40,8 +40,8 @@ namespace :cul do
         # Make full path to wp_docroot directory if not exist
         execute :mkdir, '-p', fetch(:wp_docroot)
 
-        # Make full path to wp_data_path if not exist
-        execute :mkdir, '-p', fetch(:wp_data_path)
+        # Make full path to wp_content_path if not exist
+        execute :mkdir, '-p', wp_content_path
 
         # If wp_docroot/wp-includes does not exist, do wordpress download
         unless test("[ -d #{File.join(fetch(:wp_docroot), 'wp-includes')} ]")
@@ -67,15 +67,15 @@ namespace :cul do
         # Create symlink for wp_document_root robots.txt to 'shared' version.
         execute :ln, '-sf', shared_robots_txt_file_path, wp_docroot_robots_txt_file_path
 
-        # Check for wp-content directory at wp_data_wp_content_path. Create if it doesn't exist.
-        unless test("[ -d #{wp_data_wp_content_path} ]")
+        # Check for actual wp-content directory at wp_content_path. Create if it doesn't exist.
+        unless test("[ -d #{wp_content_path} ]")
           # If no wp-config.php file is found in the 'shared' directory, copy WordPress built-in wp-config-sample.php to there
-          execute :cp, '-r', wp_docroot_wp_content_path, wp_data_wp_content_path
+          execute :cp, '-r', wp_docroot_wp_content_path, wp_content_path
         end
         # Delete original wp-content directory
         execute :rm, '-rf', wp_docroot_wp_content_path
-        # Create symlink for wp_document_root wp-content to wp_data_wp_content_path
-        execute :ln, '-sf', wp_data_wp_content_path, wp_docroot_wp_content_path
+        # Create symlink for wp_document_root wp-content to wp_content_path
+        execute :ln, '-sf', wp_content_path, wp_docroot_wp_content_path
       end
 
       symlink_custom_plugins_and_themes
@@ -112,34 +112,34 @@ namespace :cul do
 
     def self.symlink_custom_plugins_and_themes
       on roles(:web) do
-        wp_data_wp_content_path = File.join(fetch(:wp_data_path), 'wp-content')
-        wp_data_plugin_path = File.join(wp_data_wp_content_path, 'plugins')
-        wp_data_mu_plugin_path = File.join(wp_data_wp_content_path, 'mu-plugins')
-        wp_data_themes_path = File.join(wp_data_wp_content_path, 'themes')
+        wp_content_path = fetch(:wp_content_path)
+        wp_content_plugin_path = File.join(wp_content_path, 'plugins')
+        wp_content_mu_plugin_path = File.join(wp_content_path, 'mu-plugins')
+        wp_content_themes_path = File.join(wp_content_path, 'themes')
 
-        if test("[ -d #{wp_data_wp_content_path} ]")
+        if test("[ -d #{wp_content_path} ]")
 
           # Create necessary directories
-          execute :mkdir, '-p', wp_data_plugin_path
-          execute :mkdir, '-p', wp_data_mu_plugin_path
-          execute :mkdir, '-p', wp_data_themes_path
+          execute :mkdir, '-p', wp_content_plugin_path
+          execute :mkdir, '-p', wp_content_mu_plugin_path
+          execute :mkdir, '-p', wp_content_themes_path
 
           # Remove old symlinks
-          [wp_data_plugin_path, wp_data_themes_path].each do |dir|
+          [wp_content_plugin_path, wp_content_mu_plugin_path, wp_content_themes_path].each do |dir|
             execute :find, dir, '-maxdepth 1', '-type l', '-exec rm {} \;'
           end
 
           # Add latest symlinks
           fetch(:wp_custom_plugins, {}).each do |plugin, repo_relative_path|
-            execute :ln, '-sf', File.join(current_path, repo_relative_path), File.join(wp_data_plugin_path, plugin)
+            execute :ln, '-sf', File.join(current_path, repo_relative_path), File.join(wp_content_plugin_path, plugin)
           end
 
           fetch(:wp_custom_mu_plugins, {}).each do |mu_plugin, repo_relative_path|
-            execute :ln, '-sf', File.join(current_path, repo_relative_path), File.join(wp_data_mu_plugin_path, mu_plugin)
+            execute :ln, '-sf', File.join(current_path, repo_relative_path), File.join(wp_content_mu_plugin_path, mu_plugin)
           end
 
           fetch(:wp_custom_themes, {}).each do |theme, repo_relative_path|
-            execute :ln, '-sf', File.join(current_path, repo_relative_path), File.join(wp_data_themes_path, theme)
+            execute :ln, '-sf', File.join(current_path, repo_relative_path), File.join(wp_content_themes_path, theme)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cul
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Carla Galarza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Common capistrano tasks shared across projects at CUL