capistrano-contao 0.0.5 → 0.0.6

data/capistrano-contao.gemspec

@@ -13,7 +13,7 @@ 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.5'
+  gem.version       = '0.0.6'
 
   # Runtime dependencies
   gem.add_dependency 'rake'

data/lib/capistrano/ext/contao.rb

@@ -45,32 +45,25 @@ Capistrano::Configuration.instance(:must_exist).load do
       db_credentials = fetch :db_credentials
 
       localconfig = File.read('config/examples/localconfig.php.erb')
-
-      config = TechnoGate::Contao::Application.config.contao_global_config
-
-      if !config || config.install_password.blank? || config.encryption_key.blank?
-        message = <<-EOS
-          You did not set the install password, and the encryption key in your
-          #{ENV['HOME']}/.contao/config.yml, I cannot generate a localconfig
-          since the required configuration keys are missing.
-        EOS
-        message.gsub!(/ [ ]+/, ' ').gsub!(/\n/, '').gsub!(/^ /, '')
-        logger.important message if logger
-        abort 'Required configurations are not set'
-      else
-        config = config.clone
-        config.application_name = TechnoGate::Contao::Application.name
-        config.db_server_app = fetch :db_server_app
-        config.db_database   = fetch :db_database_name
-
-        [:hostname, :port, :username, :password].each do |item|
-          if db_credentials[item].present?
-            config.send "db_#{item}=", db_credentials[item]
-          end
-        end
-
-        write ERB.new(localconfig).result(binding), localconfig_php_config_path
+      load 'config/initializers/contao.rb'
+      TechnoGate::Contao::Application.load_global_config!
+
+      config = TechnoGate::Contao::Application.config.dup
+
+      db_credentials_for_config = {
+        'host'     => db_credentials[:hostname],
+        'port'     => db_credentials[:port].present? ? db_credentials[:port] : nil,
+        'user'     => db_credentials[:username],
+        'pass'     => db_credentials[:password],
+        'database' => fetch(:db_database_name),
+      }
+
+      config.contao.global.send("#{fetch :db_server_app}=", ActiveSupport::OrderedOptions.new)
+      db_credentials_for_config.each do |k, v|
+        config.contao.global.send("#{fetch :db_server_app}").send("#{k}=", v)
       end
+
+      write ERB.new(localconfig, nil, '-').result(binding), localconfig_php_config_path
     end
 
     desc '[internal] Link files from contao to inside public folder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-contao
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2574736369799232917
+      hash: -3757429442387583918
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23