capifony 2.2.2 → 2.2.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.2.3 / November 28, 2012
+
+* #273. Create only one run call in the task and Tests
+* #273. Make mor flexible clear_controllers
+* Ensure the remote database password is not logged in plaintext
+* Create a new variable to allow execute set_permissions automatically
+
 ### 2.2.2 / November 13, 2012
 
 * test when running symfony:composer:{install,update} with enabled copy_vendors

data/bin/capifony

@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.2.2'
+capifony_version = '2.2.3'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"

data/lib/capifony_symfony2.rb

@@ -84,6 +84,9 @@ module Capifony
 
         # Need to clear *_dev controllers
         set :clear_controllers,     true
+        
+        # Controllers to clear
+        set :controllers_to_clear, ['app_*.php']
 
         # Files that need to remain the same between deploys
         set :shared_files,          false
@@ -103,6 +106,9 @@ module Capifony
         # Method used to set permissions (:chmod, :acl, or :chown)
         set :permission_method,     false
 
+        # Execute set permissions
+        set :use_set_permissions,   false
+
         # Model manager: (doctrine, propel)
         set :model_manager,         "doctrine"
 
@@ -213,6 +219,10 @@ module Capifony
 
           symfony.bootstrap.build
 
+          if use_set_permissions
+            symfony.deploy.set_permissions
+          end
+
           if model_manager == "propel"
             symfony.propel.build.model
           end
@@ -236,8 +246,13 @@ module Capifony
           if dump_assetic_assets
             symfony.assetic.dump            # Dump assetic assets
           end
-
+  
           if clear_controllers
+            # If clear_controllers is an array set controllers_to_clear,
+            # else use the default value 'app_*.php'
+            if clear_controllers.is_a? Array
+              set(:controllers_to_clear) { clear_controllers }
+            end
             symfony.project.clear_controllers
           end
         end

data/lib/symfony1/database.rb

@@ -12,7 +12,11 @@ namespace :database do
       end
 
       sql_dump_cmd = generate_sql_command('dump', config)
+      logger.debug sql_dump_cmd.gsub(/(--password=)([^ ]+)/, '\1\'********\'')    # Log the command with a masked password
+      saved_log_level = logger.level
+      logger.level = Capistrano::Logger::IMPORTANT    # Change log level so that the real command (containing a plaintext password) is not displayed
       try_sudo "#{sql_dump_cmd} | gzip -c > #{file}"
+      logger.level = saved_log_level
 
       require "fileutils"
       FileUtils.mkdir_p("backups")

data/lib/symfony2/symfony.rb

@@ -193,8 +193,13 @@ namespace :symfony do
     desc "Clears all non production environment controllers"
     task :clear_controllers do
       capifony_pretty_print "--> Clear controllers"
+      
+      command = "#{try_sudo} sh -c 'cd #{latest_release} && rm -f"
+      controllers_to_clear.each do |link|
+        command += " #{web_path}/" + link
+      end
+      run command + "'"
 
-      run "#{try_sudo} sh -c 'cd #{latest_release} && rm -f #{web_path}/app_*.php'"
       capifony_puts_ok
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-13 00:00:00 Z
+date: 2012-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano