capifony 2.2.3 → 2.2.4

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 2.2.4 / December 13, 2012
+
+* Fixed a typo
+* Fix #294
+* extended fallback code when using
+* symlinks for file systems that don't support them
+* Fix travis config
+* Fix symfony:assets:update_version, add sh tests. Fixes #282
+* Fix whitespaces
+* Use config_path var instead of hardcoded value
+* deploy:migrate primary restriction is not cascaded
+
 ### 2.2.3 / November 28, 2012
 
 * #273. Create only one run call in the task and Tests

data/bin/capifony

@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.2.3'
+capifony_version = '2.2.4'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -20,7 +20,7 @@ OptionParser.new do |opts|
     exit 0
   end
 
-  opts.on("-s", "--symfony VERSION", "Capify specific symfony verion (1|2)") do |version|
+  opts.on("-s", "--symfony VERSION", "Capify specific symfony version (1|2)") do |version|
     symfony_version = version.to_i
   end
 
@@ -122,7 +122,7 @@ files.each do |file, content|
   else
     unless File.exists?(File.dirname(file))
       puts "[add] making directory '#{File.dirname(file)}'"
-      FileUtils.mkdir(File.dirname(file))
+      FileUtils.mkdir_p(File.dirname(file))
     end
     puts "[add] writing '#{file}'"
     File.open(file, "w") { |f| f.write(content) }

data/lib/capifony_symfony1.rb

@@ -58,14 +58,14 @@ def deep_merge(hash1, hash2)
     if(hash1 == nil && hash2 == nil)
       return nil
     end
-  
+
     #the config.yml may not have 'all' key but instead 'dev' 'prod' and so on
     if(hash1 == nil && hash2 != nil)
       return hash2 # no need to merge
     end
 
-    #if only the 'all' key is specified 
-    #There might not be a second has to cascade to 
+    #if only the 'all' key is specified
+    #There might not be a second has to cascade to
     if(hash2 == nil && hash1 != nil)
       return hash1;
     end

data/lib/capifony_symfony2.rb

@@ -84,7 +84,7 @@ module Capifony
 
         # Need to clear *_dev controllers
         set :clear_controllers,     true
-        
+
         # Controllers to clear
         set :controllers_to_clear, ['app_*.php']
 
@@ -246,7 +246,7 @@ 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'

data/lib/symfony1/database.rb

@@ -23,7 +23,7 @@ namespace :database do
       get file, "backups/#{filename}"
       begin
         FileUtils.ln_sf(filename, "backups/#{application}.remote_dump.latest.sql.gz")
-      rescue NotImplementedError # hack for windows which doesnt support symlinks
+      rescue Exception # fallback for file systems that don't support symlinks
         FileUtils.cp_r("backups/#{filename}", "backups/#{application}.remote_dump.latest.sql.gz")
       end
       run "#{try_sudo} rm #{file}"
@@ -54,7 +54,7 @@ namespace :database do
 
       begin
         FileUtils.ln_sf(filename, "backups/#{application}.local_dump.latest.sql.gz")
-      rescue NotImplementedError # hack for windows which doesnt support symlinks
+      rescue Exception # fallback for file systems that don't support symlinks
         FileUtils.cp_r("backups/#{filename}", "backups/#{application}.local_dump.latest.sql.gz")
       end
       FileUtils.rm(tmpfile)
@@ -69,7 +69,7 @@ namespace :database do
 
       begin
         zipped_file_path  = `readlink -f backups/#{application}.remote_dump.latest.sql.gz`.chop  # gunzip does not work with a symlink
-      rescue NotImplementedError # hack for windows which doesnt support symlinks
+      rescue Exception # fallback for file systems that don't support symlinks
         zipped_file_path  = "backups/#{application}.remote_dump.latest.sql.gz"
       end
       unzipped_file_path   = "backups/#{application}_dump.sql"

data/lib/symfony1/propel.rb

@@ -54,4 +54,4 @@ namespace :symfony do
       end
     end
   end
-end
+end

data/lib/symfony2/database.rb

@@ -30,7 +30,7 @@ namespace :database do
       get file, "backups/#{filename}"
       begin
         FileUtils.ln_sf(filename, "backups/#{application}.#{env}_dump.latest.sql.gz")
-      rescue NotImplementedError # hack for windows which doesnt support symlinks
+      rescue Exception # fallback for file systems that don't support symlinks
         FileUtils.cp_r("backups/#{filename}", "backups/#{application}.#{env}_dump.latest.sql.gz")
       end
       run "#{try_sudo} rm #{file}"
@@ -63,7 +63,7 @@ namespace :database do
 
       begin
         FileUtils.ln_sf(filename, "backups/#{application}.local_dump.latest.sql.gz")
-      rescue NotImplementedError # hack for windows which doesnt support symlinks
+      rescue Exception # fallback for file systems that don't support symlinks
         FileUtils.cp_r("backups/#{filename}", "backups/#{application}.local_dump.latest.sql.gz")
       end
       FileUtils.rm(tmpfile)

data/lib/symfony2/doctrine.rb

@@ -78,7 +78,7 @@ namespace :symfony do
 
     namespace :migrations do
       desc "Executes a migration to a specified version or the latest available version"
-      task :migrate, :roles => :app, :except => { :no_release => true } do
+      task :migrate, :roles => :app, :only => { :primary => true }, :except => { :no_release => true } do
         currentVersion = nil
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} --no-ansi doctrine:migrations:status --env=#{symfony_env_prod}'", :once => true do |ch, stream, out|
           if stream == :out and out =~ /Current Version:.+\(([\w]+)\)/

data/lib/symfony2/symfony.rb

@@ -25,7 +25,7 @@ namespace :symfony do
   namespace :assets do
     desc "Updates assets version (in config.yml)"
     task :update_version, :roles => :app, :except => { :no_release => true } do
-      run "#{try_sudo} sed -i 's/\\(assets_version: \\)\\([a-zA-Z0-9_]*\\)\\(.*\\)$/\\1 \"#{real_revision[0,7]}\"\\3/g' #{latest_release}/#{app_path}/config/config.yml"
+      run "#{try_sudo} sed -i 's/\\(assets_version:[ ]*\\)\\([a-zA-Z0-9_]*\\)\\(.*\\)$/\\1#{real_revision[0,7]}\\3/g' #{latest_release}/#{app_config_path}/config.yml"
     end
 
     desc "Installs bundle's assets"
@@ -193,7 +193,7 @@ 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

metadata

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