capistrano-exts 1.13.2 → 1.14.1

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/README.md

@@ -7,6 +7,8 @@ doing by hand far too often. It provides many helpful post-deployment tasks to
 help you import/export database and contents as well as sync one stage with
 another.
 
+[![Click here to lend your support to: Open Source Projects and make a donation at www.pledgie.com !](http://www.pledgie.com/campaigns/16123.png?skin_name=chrome)](http://www.pledgie.com/campaigns/16123)
+
 # Installation
 
 Install the gem

data/capistrano-exts.gemspec

@@ -26,19 +26,17 @@ EOD
   s.require_paths = ["lib"]
 
   # Run-time dependencies
-  s.add_dependency('capistrano', '~>2.8.0')
-  s.add_dependency('capistrano_colors', '~>0.5.5')
-  s.add_dependency('i18n', '~>0.6.0')
-  s.add_dependency('activesupport', '~>3.1.0')
+  s.add_dependency 'capistrano'
+  s.add_dependency 'capistrano_colors'
+  s.add_dependency 'i18n'
+  s.add_dependency 'activesupport', '~>3.2.3'
 
   # Development dependencies
-  s.add_development_dependency('guard', '~>0.6.2')
-  s.add_development_dependency('guard-bundler', '~>0.1.3')
-  s.add_development_dependency('guard-rspec', '~>0.4.3')
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-bundler'
+  s.add_development_dependency 'guard-rspec'
 
   # Development / Test dependencies
-  s.add_development_dependency('rspec', '~>2.6.0')
-  # s.add_development_dependency('mocha', '~>0.2.12')
-  # s.add_development_dependency('factory_girl', '~>2.0.5')
-  # s.add_development_dependency('faker19', '~>1.0.5')
-end
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+end

data/lib/capistrano-exts/receipts/contao.rb

@@ -17,8 +17,13 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   namespace :contao do
-    desc "[internal] Setup contao shared contents"
+    desc "[internal] Setup contao"
     task :setup, :roles => :app, :except => { :no_release => true } do
+      # Empty task, the rest should hook to it
+    end
+
+    desc "[internal] Setup contao shared contents"
+    task :setup_shared_folder, :roles => :app, :except => { :no_release => true } do
       shared_path = fetch :shared_path
       run <<-CMD
         #{try_sudo} mkdir -p #{shared_path}/logs &&
@@ -35,29 +40,31 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "[internal] Setup contao's localconfig"
     task :setup_localconfig, :roles => :app, :except => { :no_release => true } do
       localconfig_php_config_path = "#{fetch :shared_path}/config/public_system_config_localconfig.php"
-      unless remote_file_exists?(localconfig_php_config_path)
-        on_rollback { run "rm -f #{localconfig_php_config_path}" }
-
-        localconfig = File.read("public/system/config/localconfig.php.sample")
-        mysql_credentials = fetch :mysql_credentials
-        mysql_db_name = fetch :mysql_db_name
-
-        # localconfig
-        if mysql_credentials.blank?
-          logger.info "WARNING: The mysql credential file can't be found, localconfig has just been copied from the sample file"
-        end
-
-        # Add MySQL credentials
-        unless localconfig.blank? or mysql_credentials.blank?
-          localconfig.gsub!(/#DB_HOST#/, mysql_credentials[:host])
-          localconfig.gsub!(/#DB_USER#/, mysql_credentials[:user])
-          localconfig.gsub!(/#DB_PASS#/, mysql_credentials[:pass])
-          localconfig.gsub!(/#DB_NAME#/, mysql_db_name)
-        end
-
-        put localconfig, localconfig_php_config_path
-      else
-        logger.info "WARNING: The file '#{localconfig_php_config_path}' already exists, not overwriting."
+      on_rollback { run "rm -f #{localconfig_php_config_path}" }
+
+      localconfig = File.read("config/examples/localconfig.php.erb")
+      mysql_credentials = fetch :mysql_credentials
+
+      mysql_host = mysql_credentials[:host]
+      mysql_user = mysql_credentials[:user]
+      mysql_password = mysql_credentials[:pass]
+      mysql_database = fetch :mysql_db_name
+      contao_env = :production
+
+      put ERB.new(localconfig).result(binding), localconfig_php_config_path
+    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
     end
 
@@ -76,14 +83,36 @@ Capistrano::Configuration.instance(:must_exist).load do
         #{try_sudo} ln -nsf #{shared_path}/logs #{latest_release}/public/system/logs
       CMD
     end
+
+    desc "Upload contao assets"
+    task :upload_assets, :roles => :app, :except => { :no_release => true } do
+      upload("public/resources", "#{fetch :latest_release}/public/resources", :via => :scp, :recursive => true)
+    end
+
+    desc "[internal] Generate production assets"
+    task :generate_production_assets, :roles => :app, :except => { :no_release => true } do
+      run_locally "bundle exec rake CONTAO_ENV=production assets:precompile"
+    end
+
+    desc "[internal] Generate development assets"
+    task :generate_development_assets, :roles => :app, :except => { :no_release => true } do
+      run_locally "bundle exec rake assets:precompile"
+    end
   end
 
   # Dependencies
   after "deploy:setup", "contao:setup"
+  after "contao:setup", "contao:setup_shared_folder"
   after "contao:setup", "contao:setup_localconfig"
-  after "deploy:finalize_update", "contao:fix_links"
+  after "deploy:finalize_update", "contao:link_contao_files"
+  after "contao:link_contao_files", "contao:fix_links"
+
+  # Assets
+  after "contao:link_contao_files", "contao:upload_assets"
+  before "contao:upload_assets", "contao:generate_production_assets"
+  after  "contao:upload_assets", "contao:generate_development_assets"
 
   # Mysql Credentials
   before "contao:setup_localconfig", "mysql:credentials"
   before "contao:setup_db", "mysql:credentials"
-end
+end

data/lib/capistrano-exts/receipts/functions.rb

@@ -30,6 +30,39 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
+  # Return an array of arrays of files to link
+  #
+  # @param [String] Absolute path to folder from which to link
+  # @param [String] Absolute path to folder to which to link
+  # @return [Array]
+  def exhaustive_list_of_files_to_link(from, to)
+    script = <<-END
+exhaustive_list_of_files_to_link() {
+  files="";
+
+  for f in `ls -A1 ${1}`; do
+    file="${2}/${f}";
+    f="${1}/${f}";
+    if [[ -e "${file}" ]]; then
+      files="${files} `exhaustive_list_of_files_to_link ${f} ${file}`";
+    else
+      files="${files} ${f}:${file}";
+    fi;
+  done;
+  echo "${files}";
+};
+    END
+
+    script << "exhaustive_list_of_files_to_link '#{from}' '#{to}';"
+
+    begin
+      files = capture(script).strip.split(' ')
+      files.map {|f| f.split(':')}
+    rescue Capistrano::CommandError
+      abort "Unable to get files list"
+    end
+  end
+
   def link_files(path, files = {})
     files.each do |f|
       file_name = f.dup.gsub(/\//, '_')
@@ -39,10 +72,16 @@ Capistrano::Configuration.instance(:must_exist).load do
             #{try_sudo} cp -a #{latest_release}/#{f} #{path}/#{file_name}
           CMD
         rescue Capistrano::CommandError
-          run <<-CMD
-            #{try_sudo} touch #{path}/#{file_name}
-          CMD
-          logger.info "WARNING: You should edit '#{path}/#{file_name}' or re-create it as a folder if that's your intention."
+          if remote_file_exists?("#{latest_release}/#{f}.default")
+            run <<-CMD
+              #{try_sudo} cp #{latest_release}/#{f}.default #{path}/#{file_name}
+            CMD
+          else
+            run <<-CMD
+              #{try_sudo} touch #{path}/#{file_name}
+            CMD
+            logger.info "WARNING: You should edit '#{path}/#{file_name}' or re-create it as a folder if that's your intention."
+          end
         end
       end
 
@@ -151,4 +190,4 @@ password: #{credentials[:pass]}
   def try_bundle_exec
     "bundle exec"
   end
-end
+end

data/lib/capistrano-exts/receipts/web.rb

@@ -103,7 +103,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         put result, "#{fetch :shared_path}/__system__/maintenance/index.html", :mode => 0644
       end
 
-      if fetch(:web_server_app) == :apache
+      if !exists?(:web_server_app) || fetch(:web_server_app) == :apache
         warn <<-EOHTACCESS
 
           # Please add something like this to your site's htaccess to redirect users to the maintenance page.

data/lib/capistrano-exts/version.rb

@@ -2,11 +2,11 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 13
-      TINY = 2
+      MINOR = 14
+      TINY = 1
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,96 +9,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152862420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152862420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &2152857600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152857600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157929640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157929640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157929180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157929180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157928720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157928720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2157928260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157928260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157927800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157927800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157927340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157927340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Capistrano exts is a set of helper tasks to help with the initial
   server
 
@@ -198,9 +254,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3949251139176994680
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Set of helper tasks to help with the initial server configuration and application