capifony 2.1.11 → 2.1.12

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 2.1.12 / August 6, 2012
+
+* Enable options for assets:install
+* Looked for sf1 settings DB file instead of sf2 one
+* Add ability to tail `dev|prod.log`
+* Put remote tmp directory in a variable so that it can be overriden
+
 == 2.1.11 / July 20, 2012
 
 * Fix hard-coded "app" references

data/lib/capifony.rb

@@ -7,6 +7,8 @@ set :symfony_env_prod,  "prod"
 # PHP binary to execute
 set :php_bin,           "php"
 
+set :remote_tmp_dir,    "/tmp"
+
 def prompt_with_default(var, default, &block)
   set(var) do
     Capistrano::CLI.ui.ask("#{var} [#{default}] : ", &block)

data/lib/symfony1/database.rb

@@ -3,7 +3,7 @@ namespace :database do
     desc "Dump remote database"
     task :remote, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.remote_dump.#{Time.now.strftime("%Y-%m-%d_%H-%M-%S")}.sql.gz"
-      file      = "/tmp/#{filename}"
+      file      = "#{remote_tmp_dir}/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 
@@ -95,8 +95,8 @@ namespace :database do
 
       database.dump.local
 
-      upload(file, "/tmp/#{filename}", :via => :scp)
-      run "gunzip -c /tmp/#{filename} > /tmp/#{sqlfile}"
+      upload(file, "#{remote_tmp_dir}/#{filename}", :via => :scp)
+      run "gunzip -c #{remote_tmp_dir}/#{filename} > #{remote_tmp_dir}/#{sqlfile}"
 
       run "cat #{shared_path}/config/databases.yml" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
@@ -107,12 +107,12 @@ namespace :database do
 
       sql_import_cmd = generate_sql_command('import', config)
 
-      run "#{sql_import_cmd} < /tmp/#{sqlfile}" do |ch, stream, data|
+      run "#{sql_import_cmd} < #{remote_tmp_dir}/#{sqlfile}" do |ch, stream, data|
         puts data
       end
 
-      run "rm /tmp/#{filename}"
-      run "rm /tmp/#{sqlfile}"
+      run "rm #{remote_tmp_dir}/#{filename}"
+      run "rm #{remote_tmp_dir}/#{sqlfile}"
     end
   end
 end

data/lib/symfony2.rb

@@ -50,6 +50,8 @@ set :dump_assetic_assets,   false
 
 # Assets install
 set :assets_install,        true
+set :assets_symlinks,       false
+set :assets_relative,       false
 
 # Whether to update `assets_version` in `config.yml`
 set :update_assets_version, false

data/lib/symfony2/database.rb

@@ -6,7 +6,7 @@ namespace :database do
     desc "Dumps remote database"
     task :remote, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.remote_dump.#{Time.now.to_i}.sql.gz"
-      file      = "/tmp/#{filename}"
+      file      = "#{remote_tmp_dir}/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 
@@ -101,26 +101,26 @@ namespace :database do
 
       database.dump.local
 
-      upload(file, "/tmp/#{filename}", :via => :scp)
-      run "gunzip -c /tmp/#{filename} > /tmp/#{sqlfile}"
+      upload(file, "#{remote_tmp_dir}/#{filename}", :via => :scp)
+      run "gunzip -c #{remote_tmp_dir}/#{filename} > #{remote_tmp_dir}/#{sqlfile}"
 
-      run "cat #{shared_path}/config/databases.yml" do |ch, st, data|
+      run "cat #{current_path}/#{app_path}/config/parameters.yml" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
       end
 
       case config['database_driver']
       when "pdo_mysql", "mysql"
-        run "mysql -u#{config['database_user']} --password='#{config['database_password']}' #{config['database_name']} < /tmp/#{sqlfile}" do |ch, stream, data|
+        run "mysql -u#{config['database_user']} --password='#{config['database_password']}' #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}" do |ch, stream, data|
           puts data
         end
       when "pdo_pgsql", "pgsql"
-        run "psql -U #{config['database_user']} #{config['database_name']} < /tmp/#{sqlfile}" do |ch, stream, data|
+        run "psql -U #{config['database_user']} #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}" do |ch, stream, data|
           puts data
         end
       end
 
-      run "rm /tmp/#{filename}"
-      run "rm /tmp/#{sqlfile}"
+      run "rm #{remote_tmp_dir}/#{filename}"
+      run "rm #{remote_tmp_dir}/#{sqlfile}"
     end
   end
 end

data/lib/symfony2/symfony.rb

@@ -6,6 +6,22 @@ namespace :symfony do
     stream "cd #{latest_release} && #{php_bin} #{symfony_console} #{task_arguments} --env=#{symfony_env_prod}"
   end
 
+  namespace :logs do
+    [:tail, :tail_dev].each do |action|
+      lines = ENV['lines'].nil? ? '50' : ENV['lines']
+      log   = action.to_s == 'tail' ? 'prod.log' : 'dev.log'
+      desc "Tail #{log}"
+      task action, :roles => :app, :except => { :no_release => true } do
+        run "tail -n #{lines} -f #{shared_path}/#{log_path}/#{log}" do |channel, stream, data|
+          trap("INT") { puts 'Interupted'; exit 0; }
+          puts
+          puts "#{channel[:host]}: #{data}"
+          break if stream == :err
+        end
+      end
+    end
+  end
+
   namespace :assets do
     desc "Updates assets version (in config.yml)"
     task :update_version, :roles => :app, :except => { :no_release => true } do
@@ -16,7 +32,17 @@ namespace :symfony do
     task :install, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Installing bundle's assets"
 
-      run "cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{web_path} --env=#{symfony_env_prod}"
+      install_options = ''
+
+      if true == assets_symlinks then
+          install_options += " --symlink"
+      end
+
+      if true == assets_relative then
+          install_options += " --relative"
+      end
+
+      run "cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{web_path} #{install_options} --env=#{symfony_env_prod}"
       puts_ok
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 2
   - 1
-  - 11
-  version: 2.1.11
+  - 12
+  version: 2.1.12
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-20 00:00:00 Z
+date: 2012-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano