From 710fee280b6ca244ceee61d5607bf2d807e77cd6 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Tue, 26 May 2015 16:17:49 +0200
Subject: [PATCH] Deploy updates

---
 .ruby-version    |  1 -
 Capfile          |  2 +-
 Gemfile          |  2 +-
 Gemfile.lock     |  5 +----
 config/deploy.rb | 42 ++++++++++++++++++++++++++++++++++++------
 5 files changed, 39 insertions(+), 13 deletions(-)
 delete mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index ccbccc3d..00000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.2.0
diff --git a/Capfile b/Capfile
index 6b226745..da709e35 100644
--- a/Capfile
+++ b/Capfile
@@ -17,7 +17,7 @@ require 'capistrano/deploy'
 require 'capistrano/rvm'
 # require 'capistrano/rbenv'
 # require 'capistrano/chruby'
-require 'capistrano/bundler'
+require 'capistrano-bundler'
 require 'capistrano/rails/assets'
 # require 'capistrano/rails/migrations'
 require 'capistrano/puma'
diff --git a/Gemfile b/Gemfile
index c6e7c00d..3989f70a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ group :assets do
   #gem 'compass-rails'
   gem 'js-routes'
   gem "font-awesome-rails"
-  gem 'capistrano-local-precompile', require: false
+  #gem 'capistrano-local-precompile', require: false
   gem "airbrussh", require: false
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
diff --git a/Gemfile.lock b/Gemfile.lock
index 6d041673..6479d2ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,8 +115,6 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-local-precompile (0.0.2)
-      capistrano
     capistrano-rails (1.1.2)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
@@ -154,7 +152,7 @@ GEM
       execjs
     coffee-script-source (1.9.1)
     colored (1.2)
-    colorize (0.7.5)
+    colorize (0.7.7)
     cookiejar (0.3.2)
     couchrest (1.2.0)
       mime-types (~> 1.15)
@@ -486,7 +484,6 @@ DEPENDENCIES
   cancancan
   capistrano (~> 3.0)
   capistrano-bundler
-  capistrano-local-precompile
   capistrano-rails (~> 1.1)
   capistrano-rvm (~> 0.1)
   capistrano3-puma
diff --git a/config/deploy.rb b/config/deploy.rb
index 594d4f2e..d7bb87f8 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 # config valid only for Capistrano 3.1
 # lock '3.2.1'
-require 'capistrano/local_precompile'
+#require 'capistrano/local_precompile'
 
 set :application, 'mozo.bar'
 #set :repo_url, 'root@uflows.com:/var/git/qwaiter.git'
@@ -60,12 +60,12 @@ namespace :deploy do
       # Your restart mechanism here, for example:
        within release_path do
          #execute :rake, 'cache:clear', as: 'www-data'
-         with rails_env: fetch(:rails_env) do
-           execute :rake, 'dedigest_assets', as: 'www-data'
-         end
+         #with rails_env: fetch(:rails_env) do
+           #execute :rake, 'dedigest_assets', as: 'www-data'
+         #end
        end
-       execute :chown, "-R www-data:www-data", release_path
-       execute :chown, "-R www-data:www-data", release_path.join('public/assets/')
+       #execute :chown, "-R www-data:www-data", release_path
+       #execute :chown, "-R www-data:www-data", release_path.join('public/assets/')
        #execute :kill, capture("lsof -i:9022 -t") # kill counters, will reboot itself
        execute :touch, release_path.join('tmp/restart.txt')
     end
@@ -83,6 +83,36 @@ namespace :deploy do
 
   end
 
+  namespace :assets do
+
+    Rake::Task['deploy:assets:precompile'].clear_actions
+    Rake::Task['deploy:assets:backup_manifest'].clear_actions
+
+    desc 'Precompile assets locally and upload to servers'
+    task :precompile do
+      on roles(fetch(:assets_roles)) do
+        run_locally do
+          with rails_env: fetch(:rails_env) do
+            #execute 'bin/rake assets:precompile'
+            #execute 'bin/rake dedigest_assets'
+          end
+        end
+
+        #within release_path do
+          #with rails_env: fetch(:rails_env) do
+            #upload!('./public/assets/', "#{shared_path}/public/", recursive: true)
+          #end
+        #end
+        rsync_host = host
+        run_locally { execute "rsync -av --delete ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" }
+        execute :chown, "-R www-data:www-data", shared_path.join('public/assets/')
+
+        #run_locally { execute 'rm -rf public/assets' }
+      end
+    end
+
+  end
+
   after :publishing, :restart do
     #deploy.update_remote_cache
   end