capifony 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b168e07e1c173b358ed5cdb9467fb690d5085a9e
-  data.tar.gz: 155fd4a31fe4e3b0ca319abc9bdbb3e687718d6e
+  metadata.gz: 63a49cfca1be6384d8d11dba3b49be49892e5db6
+  data.tar.gz: 796d9d09899de7a4a2bd54e94e657856382807af
 SHA512:
-  metadata.gz: 0cd77b0fa8b14b7b5c9b09dc3800a8153533e5baa0ab5cc1819124f7618c16dcd5912b5dc1da82c679626897bd550cc17da507fc69bf018d91b7a88525070b8d
-  data.tar.gz: 610507812169e062fc095fb71c8aec2d01df0683c7d4de4b82ff920fc7e3e9f12acd461a01dfb66c002855729bc0c6360bffa15a429df06dab6edc3fec86d612
+  metadata.gz: 26918b2ffc9114c1c7ce0218e830b77959d6837caa1dcfcaf823ad380e606d2414c0c20053298d89ccb058668cee65b109033e86568ef5870baea9d1086c605a
+  data.tar.gz: 9f23656a1293440ce3266a0c564878a8e024d50383598381f524e9736fcefe7953e73fb973b1bb2f495949423396ed62a268751310cdf79471ff0c50d1527e85

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 2.8.0 / August 1, 2014
+
+* Added: alternative way on Linux/Ubuntu to deploy using chmod option: access
+  recursively all users write permissions to following directory.
+* Added: rename database move commands to copy
+* Added: check for possible already existing acl on directory
+* Added: make `symfony:composer:install` run in interactive mode, to allow
+  `parameters.(ini|yml)` configuration using
+  `incenteev/composer-parameter-handle`
+
 ### 2.7.0 / May 16, 2014
 
 * Added: support for command `doctrine:mongodb:fixtures:load`

data/bin/capifony

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

data/lib/symfony1/database.rb

@@ -61,7 +61,7 @@ namespace :database do
     end
   end
 
-  namespace :move do
+  namespace :copy do
     desc "Dump remote database, download it to local & populate here"
     task :to_local, :roles => :db, :only => { :primary => true } do
 

data/lib/symfony2/database.rb

@@ -72,7 +72,7 @@ namespace :database do
     end
   end
 
-  namespace :move do
+  namespace :copy do
     desc "Dumps remote database, downloads it to local, and populates here"
     task :to_local, :roles => :db, :only => { :primary => true } do
       env       = fetch(:deploy_env, "remote")

data/lib/symfony2/deploy.rb

@@ -27,6 +27,9 @@ namespace :deploy do
           "setfacl -R -m u:#{user}:rwX -m u:#{webserver_user}:rwX %s",
           "setfacl -dR -m u:#{user}:rwx -m u:#{webserver_user}:rwx %s"
         ],
+        :chmod_alt => [
+          "chmod -R a+w %s"
+        ],
         :chown => ["chown -R #{webserver_user} %s"]
       }
 
@@ -43,7 +46,7 @@ namespace :deploy do
           dirs.each do |dir|
             is_owner = (capture "`echo stat #{dir} -c %U`").chomp == user
             if is_owner && permission_method != :chown
-              has_facl = (capture "getfacl --absolute-names #{dir} | grep #{webserver_user} | wc -l").chomp != "0"
+              has_facl = (capture "getfacl --absolute-names -t #{dir} | grep #{webserver_user}.*rwx | wc -l").chomp != "0"
               if (!has_facl)
                 methods[permission_method].each do |cmd|
                   try_sudo sprintf(cmd, dir)

data/lib/symfony2/symfony.rb

@@ -154,11 +154,76 @@ namespace :symfony do
       if use_composer_tmp
         logger.debug "Installing composer dependencies to #{$temp_destination}"
         capifony_pretty_print "--> Installing Composer dependencies in temp location"
-        run_locally "cd #{$temp_destination} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} install #{options}"
+
+        tmp_options = options
+
+        if deploy_via == :capifony_copy_local
+          # do not run scripts locally: they must be executed on the target server
+          tmp_options += " --no-scripts"
+        end
+
+        run_locally "cd #{$temp_destination} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} install #{tmp_options}"
         capifony_puts_ok
       else
         capifony_pretty_print "--> Installing Composer dependencies"
-        run "#{try_sudo} sh -c 'cd #{latest_release} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} install #{options}'"
+        
+        command = "#{try_sudo} sh -c 'cd #{latest_release} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} install #{options}'"
+        
+        if interactive_mode
+        
+            input = ''
+            print_wizard = false
+            close_header = true
+            run(command, { :pty => true, :eof => false }) do |channel, stream, data|
+                    
+                # on normal output
+                channel.on_data do |ch, data|
+                
+                    # check if composer is waiting for user input
+                    print_wizard = data =~ /:[[:space:]]*$/
+                    
+                    # avoid echoing the user input
+                    if input.strip != data.strip and not print_wizard
+                        logger.debug data
+                    end
+                    
+                    # if input has been requested
+                    if print_wizard
+                        
+                        if close_header
+                        
+                            # finalize the info string
+                            capifony_puts_ok
+                            
+                            # and open a new section
+                            capifony_pretty_print "--> Updating parameters"
+                            puts if logger.level == Logger::IMPORTANT
+                            
+                            close_header = false
+                        end
+                        
+                        print data
+                        
+                        # capture the user input
+                        input = $stdin.gets
+                        
+                        # send it to the remote process
+                        channel.send_data(input)
+                    end
+                end
+                
+                # on error
+                channel.on_extended_data do |ch, data|
+                    warn "[err :: #{ch[:server]}] #{data}"
+                end
+            end
+            
+            capifony_pretty_print "--> Parameters updated" if not close_header
+            
+        else
+            run command
+        end
+        
         capifony_puts_ok
       end
     end
@@ -176,7 +241,64 @@ namespace :symfony do
       end
 
       capifony_pretty_print "--> Updating Composer dependencies"
-      run "#{try_sudo} sh -c 'cd #{latest_release} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} update #{options}'"
+      
+      command = "#{try_sudo} sh -c 'cd #{latest_release} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} update #{options}'"
+        
+        if interactive_mode
+        
+            input = ''
+            print_wizard = false
+            close_header = true
+            run(command, { :pty => true, :eof => false }) do |channel, stream, data|
+                    
+                # on normal output
+                channel.on_data do |ch, data|
+                
+                    # check if composer is waiting for user input
+                    print_wizard = data =~ /:[[:space:]]*$/
+                    
+                    # avoid echoing the user input
+                    if input.strip != data.strip and not print_wizard
+                        logger.debug data
+                    end
+                    
+                    # if input has been requested
+                    if print_wizard
+                        
+                        if close_header
+                        
+                            # finalize the info string
+                            capifony_puts_ok
+                            
+                            # and open a new section
+                            capifony_pretty_print "--> Updating parameters"
+                            puts if logger.level == Logger::IMPORTANT
+                            
+                            close_header = false
+                        end
+                        
+                        print data
+                        
+                        # capture the user input
+                        input = $stdin.gets
+                        
+                        # send it to the remote process
+                        channel.send_data(input)
+                    end
+                end
+                
+                # on error
+                channel.on_extended_data do |ch, data|
+                    warn "[err :: #{ch[:server]}] #{data}"
+                end
+            end
+            
+            capifony_pretty_print "--> Parameters updated" if not close_header
+            
+        else
+            run command
+        end
+      
       capifony_puts_ok
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Konstantin Kudryashov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano