capistrano-contao 0.0.2 → 0.0.3

data/capistrano-contao.gemspec

@@ -13,12 +13,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'capistrano-contao'
   gem.require_paths = ['lib']
-  gem.version       = '0.0.2'
+  gem.version       = '0.0.3'
 
   # Runtime dependencies
   gem.add_dependency 'rake'
   gem.add_dependency 'activesupport'
+  gem.add_dependency 'capistrano', '>= 2.12.0'
   gem.add_dependency 'capistrano-database'
   gem.add_dependency 'capistrano-utils'
   gem.add_dependency 'capistrano-server'
+  gem.add_dependency 'capistrano-content'
 end

data/lib/capistrano/ext/contao.rb

@@ -8,12 +8,16 @@ require 'capistrano/ext/contao_assets'
 require 'capistrano/ext/database'
 require 'capistrano/ext/server'
 require 'capistrano/ext/deploy'
+require 'capistrano/ext/item'
+require 'capistrano/ext/content'
 
 unless Capistrano::Configuration.respond_to?(:instance)
   abort 'capistrano/ext/contao requires capistrano 2'
 end
 
 Capistrano::Configuration.instance(:must_exist).load do
+  Rails.env = 'production'
+
   namespace :contao do
     desc '[internal] Setup contao'
     task :setup, :roles => :app, :except => { :no_release => true } do
@@ -37,7 +41,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc '[internal] Setup contao localconfig'
     task :setup_localconfig, :roles => :app, :except => { :no_release => true } do
-      localconfig_php_config_path = "#{fetch :shared_path}/config/public_system_config_localconfig.php"
+      localconfig_php_config_path = "#{fetch :shared_path}/items/public,system,config,localconfig.php"
       on_rollback { run "rm -f #{localconfig_php_config_path}" }
       db_credentials = fetch :db_credentials
 
@@ -71,32 +75,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc '[internal] Link files from contao to inside public folder'
-    task :link_contao_files, :roles => :app, :except => { :no_release => true } do
-      files = exhaustive_list_of_files_to_link("#{fetch :latest_release}/contao", "#{fetch :latest_release}/public")
-      commands = files.map do |list|
-        "#{try_sudo} ln -nsf #{list[0]} #{list[1]}"
-      end
-
-      begin
-        run commands.join(';')
-      rescue Capistrano::CommandError
-        abort 'Unable to create to link contao files'
-      end
+    task :link_files, :roles => :app, :except => { :no_release => true } do
+      deep_link "#{fetch :latest_release}/contao",
+        "#{fetch :latest_release}/public"
     end
 
     desc '[internal] Fix contao symlinks to the shared path'
     task :fix_links, :roles => :app, :except => { :no_release => true } do
-      latest_release = fetch :latest_release
-      shared_path = fetch :shared_path
-
-      # Remove files
-      run <<-CMD
-        #{try_sudo} rm -rf #{latest_release}/public/system/logs
-      CMD
-
-      # Create symlinks
       run <<-CMD
-        #{try_sudo} ln -nsf #{shared_path}/logs #{latest_release}/public/system/logs
+        #{try_sudo} rm -rf #{fetch :latest_release}/public/system/logs;
+        #{try_sudo} ln -nsf #{fetch :shared_path}/logs #{fetch :latest_release}/public/system/logs
       CMD
     end
   end
@@ -105,11 +93,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   after 'deploy:setup', 'contao:setup'
   after 'contao:setup', 'contao:setup_shared_folder'
   after 'contao:setup', 'contao:setup_localconfig'
-  after 'deploy:finalize_update', 'contao:link_contao_files'
-  after 'contao:link_contao_files', 'contao:fix_links'
+  after 'deploy:finalize_update', 'contao:link_files'
+  after 'contao:link_files', 'contao:fix_links'
 
   # Assets
-  after 'contao:link_contao_files', 'contao:assets:deploy'
+  before 'deploy:finalize_update', 'contao:assets'
 
   # Database credentions
   before 'contao:setup_localconfig', 'db:credentials'

data/lib/capistrano/ext/contao_assets.rb

@@ -6,13 +6,18 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :contao do
     namespace :assets do
       desc '[internal] Upload contao assets'
-      task :deploy, :roles => :app, :except => { :no_release => true } do
-        path = File.join 'public', Rails.application.config.assets.prefix
-        upload(path, "#{fetch :latest_release}/#{path}", :via => :scp, :recursive => true)
+      task :default, :roles => :app, :except => { :no_release => true } do
+        transaction do
+          precompile
+          path = File.join 'public', Rails.application.config.assets.prefix
+          upload(path, "#{fetch :latest_release}/#{path}", :via => :scp, :recursive => true)
+          clean
+        end
       end
 
       desc '[internal] Generate assets'
       task :precompile, :roles => :app, :except => { :no_release => true } do
+        on_rollback { find_and_execute_task 'contao:assets:clean' }
         run_locally 'bundle exec rake assets:precompile'
       end
 
@@ -22,7 +27,4 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
   end
-
-  before 'contao:assets:deploy', 'contao:assets:precompile'
-  after  'contao:assets:deploy', 'contao:assets:clean'
 end

data/lib/capistrano/ext/deploy.rb

@@ -35,7 +35,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         #{try_sudo} mkdir -p \
           #{fetch :deploy_to} \
           #{backup_path} \
-          #{fetch :shared_path}/{items,__system__,config} \
+          #{fetch :shared_path}/items \
+          #{fetch :shared_path}/__system__ \
           #{fetch :logs_path, ''}
       CMD
     end

data/lib/capistrano/ext/item.rb

@@ -0,0 +1,39 @@
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort 'capistrano/ext/item requires capistrano 2'
+end
+
+Capistrano::Configuration.instance(:must_exist).load do
+  set :shared_item_path, -> { "#{fetch :shared_path}/items" }
+
+  namespace :item do
+    desc '[internal] Symlink all items'
+    task :link, :roles => :app do
+      link_items fetch(:shared_item_path),
+        fetch(:latest_release)
+    end
+
+    desc '[internal] Setup shared items'
+    task :setup, :roles => :app do
+      fetch(:shared_items, []).each do |item|
+        item_shared_path = "#{fetch :shared_item_path}/#{item.gsub /\//, ','}"
+        item_public_path = "#{fetch :latest_release}/#{item}"
+
+        unless remote_file_exists? item_shared_path
+          if remote_file_exists? "#{item_public_path}.default"
+            run "#{try_sudo} cp #{item_public_path}.default #{item_shared_path}"
+            logger.important "#{item_public_path}.default copied to #{item_shared_path}"
+          else
+            write '', item_shared_path
+            logger.important "#{item_shared_path} has been initialized with an empty file"
+          end
+        end
+      end
+    end
+  end
+
+  # Internal Dependencies
+  before 'item:link', 'item:setup'
+
+  # External Dependencies
+  before 'deploy:restart', 'item:link'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-contao
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: capistrano-database
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-content
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capistrano recipes for Contao deployment
 email:
 - wael.nasreddine@gmail.com
@@ -109,6 +141,7 @@ files:
 - lib/capistrano/ext/custom_colors.rb
 - lib/capistrano/ext/decouple_from_rails.rb
 - lib/capistrano/ext/deploy.rb
+- lib/capistrano/ext/item.rb
 - lib/capistrano/monkey_patches/fix_capture_conflict.rb
 homepage: http://technogate.github.com/contao
 licenses: []
@@ -128,9 +161,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3411963624336550606
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -138,3 +168,4 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files: []
+has_rdoc: