capistrano-cul 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba8aa2d215d9e7bd5a08cf20c9d2cc4b68612ca
-  data.tar.gz: b3991585daed81c5bab294d5ba67bb277730a5db
+  metadata.gz: 2d08bd99ee59976271ab8640c51fd056aa82b7f1
+  data.tar.gz: 699fffbfb4d982bbebe1e5d9e9956aefd8b66c52
 SHA512:
-  metadata.gz: 6b37fd6d3e4b6d71304f91629dfc1cd55bb34d5ee20b9e4df95331c645fe9d07335537d117850c395cf89840b49572a4897ef6347a8fe0b214bdea5f839cd3f2
-  data.tar.gz: d1406e40206bb9701a53cd9df10134b291a626abdc8acd6ed6c079c1942ccf2ebdb7c087c817d29e5af55db3321bdebf695ddc421d658ce0766a9d388c281439
+  metadata.gz: 1c6fde504264cd5bd7baf29f54f895db501b609f97759b21403076e961147e8aa99c2f9745fe0c1cb3b563cc22c57ccc5bc37a06ea961b49c44d89393d92dc7d
+  data.tar.gz: 7d0fb86de4e4326477994e15b24e5144d6a725240e7b65dc5f25164d0ee0d181db553b3c4bf187632d64ceac8cd7c081b90a7eff6729d814d752266fa2f141ed

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/capistrano/tasks/wp/migrate.cap

@@ -13,19 +13,17 @@ namespace :cul do
         require_cap_params!([:wp_docroot, :wp_content_path])
 
         if fetch(:multisite, false)
-          puts "Since this is a multisite, you'll need to specify the source instance multisite url to continue:"
-          set :source_site_multisite_url, ask('source multisite full install url (e.g. https://blogs.cul.columbia.edu)')
+          puts "Since this is a multisite, you'll need to specify the source multisite instance domain to continue:"
+          set :source_site_multisite_url, ask('source multisite instance domain (e.g. blogs.cul.columbia.edu)')
           fetch(:source_site_multisite_url)
 
-          puts "And you'll also need to specify the destination instance multisite url to continue:"
-          set :destination_site_multisite_url, ask('destination multisite full install url (e.g. https://blogs-dev.cul.columbia.edu)')
+          puts "And you'll also need to specify the destination multisite instance domain to continue:"
+          set :destination_site_multisite_url, ask('destination multisite instance domain (e.g. blogs-dev.cul.columbia.edu)')
           fetch(:destination_site_multisite_url)
         end
 
-        # TODO: Verify that destination wordpress has already had the setup and deploy tasks run for it
+        # TODO: Would be nice to verify that destination wordpress has already had the setup and deploy tasks run for it
         set :src_wp_docroot, ask("server path to source WordPress installation (to copy from)")
-        #set :src_wp_docroot, '/cul/cul0/lito/vmounts/haydn/var-www/kennedyprize/html'
-        #set :src_wp_docroot, '/cul/cul0/ldpd/culblogs/prod/ssl-html'
 
         # Confirm operation because it is destructive
         puts "\nWARNING: This operation will obliterate all content in environment [#{fetch(:stage)}] and replace it with content from [#{fetch(:src_wp_docroot)}]."
@@ -69,14 +67,14 @@ namespace :cul do
               # EXCLUDE plugins, themes, mu-plugins, uploads, and blogs.dir
               "-not \\( -path './plugins/*' -o -path './mu-plugins/*' -o -path './themes/*' -o -path './uploads/*' -o -path './blogs.dir/*' \\) " +
               # EXCLUDE certain unwanted files and paths
-              "-a -not \\( -name '.nfs*' \\) " +
+              "-a -not \\( -name '.nfs*' -o -name 'config.tmp.*' \\) " +
               "-a -not \\( -path '*/.git*' -o -path '*/.svn*' -o -path '*/.hg*' \\) "
 
             find_upload_dirs = '. -type f ' +
               # INCLUDE ONLY uploads and blogs.dir
               "\\( -path './uploads/*' -o -path './blogs.dir/*' \\) " +
               # EXCLUDE certain unwanted files and paths
-              "-a -not \\( -name '.nfs*' \\) " +
+              "-a -not \\( -name '.nfs*' -o -name 'config.tmp.*' \\) " +
               "-a -not \\( -path '*/.git*' -o -path '*/.svn*' -o -path '*/.hg*' \\) " +
               # INCLUDE ONLY certain file extensions
               "-a \\( " + JSON.parse(capture(:wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'eval', '"echo cul_allowed_upload_file_extensions_as_json();"')).map{ |allowed_file_extension|
@@ -128,6 +126,9 @@ namespace :cul do
 
           execute :rsync, *rsync_params
 
+          # clean up path_to_list_of_files_to_copy file
+          execute :rm, path_to_list_of_files_to_copy
+
           # Next, create symlinks to repo-managed plugins and themes, which will also recreate plugins, mu-plugins, and themes directories
 
           within fetch(:wp_docroot) do

data/lib/capistrano/tasks/wp.cap

@@ -2,7 +2,7 @@ CUL_ALLOWED_UPLOAD_TYPES_PLUGIN_NAME = 'cul-allowed-upload-types'
 CUL_ALLOWED_UPLOAD_TYPES_REPO_URL = "https://github.com/cul/#{CUL_ALLOWED_UPLOAD_TYPES_PLUGIN_NAME}"
 
 # Set cul_allowed_uplaod_types_version here so it can be overridden by env config
-set :cul_allowed_uplaod_types_version, 'v0.2.0'
+set :cul_allowed_uplaod_types_version, 'v0.5.0'
 
 namespace :cul do
   namespace :wp do
@@ -244,8 +244,8 @@ namespace :cul do
           start_time = Time.now
 
           if fetch(:multisite, false)
-            puts "Since this is a multisite, you'll need to specify the source multisite url to continue:"
-            set :multisite_url, ask('full multisite install url (e.g. https://blogs.cul.columbia.edu)')
+            puts "Since this is a multisite, you'll need to specify the source multisite instance domain to continue:"
+            set :multisite_url, ask('source multisite instance domain (e.g. blogs.cul.columbia.edu)')
 
             execute :wp, "--url=#{fetch(:multisite_url)}", 'search-replace', "'#{fetch(:search_string)}'", "'#{fetch(:replacement_string)}'", '--all-tables', '--skip-columns=guid'
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cul
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Carla Galarza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano