Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/v1.2.2' into develop

  • Loading branch information...
commit 8467d259b4513c175f8e25469e9ca79976f71079 2 parents eab248b + 63a27b6
@jjohnson-xx jjohnson-xx authored
Showing with 24 additions and 4 deletions.
  1. +1 −1  VERSION
  2. +11 −3 lib/ash/base.rb
  3. +12 −0 lib/ash/magento.rb
View
2  VERSION
@@ -1 +1 @@
-1.2.1
+1.2.2
View
14 lib/ash/base.rb
@@ -145,7 +145,7 @@
directories = (local_releases - local_releases.last(count)).map { |release|
File.join(releases_path, release) }.join(" ")
- directories.each do |dir|
+ directories.split(" ").each do |dir|
set_perms_dirs(dir)
set_perms_files(dir)
end
@@ -178,8 +178,16 @@
desc 'Copy distribution htaccess file'
task :htaccess, :roles => :web do
- run "mv #{latest_release}/htaccess.dist #{latest_release}/.htaccess" if
- remote_file_exists?("#{latest_release}/htaccess.dist")
+ case true
+ when remote_file_exists?("#{latest_release}/htaccess.#{stage}.dist")
+ run "mv #{latest_release}/htaccess.#{stage}.dist #{latest_release}/.htaccess"
+ when remote_file_exists?("#{latest_release}/htaccess.#{stage}")
+ run "mv #{latest_release}/htaccess.#{stage} #{latest_release}/.htaccess"
+ when remote_file_exists?("#{latest_release}/htaccess.dist")
+ run "mv #{latest_release}/htaccess.dist #{latest_release}/.htaccess"
+ else
+ logger.important "Failed to move the .htaccess file in #{latest_release} because an unknown pattern was used"
+ end
end
end
View
12 lib/ash/magento.rb
@@ -127,6 +127,18 @@
break if stream == :err
end
end
+
+ desc "Clear the Magento Cache"
+ task :cc, :roles => [:web, :app], :except => { :no_release => true } do
+ magento.purge_cache
+ sudo "rm -rf #{shared_path}/var/full_page_cache/*"
+ end
+
+ desc "Enable display errors"
+ task :enable_dev, :roles => :web, :except => { :no_release => true } do
+ run "perl -pi -e 's/#ini_set/ini_set/g' #{latest_release}/index.php"
+ end
+
end
# --------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.