capifony 2.1.16 → 2.2.0

data/{CHANGELOG → CHANGELOG.md}

@@ -1,4 +1,50 @@
-== 2.1.16 / September 25, 2012
+### 2.2.0 / October 22, 2012
+
+* Minor fixes
+* Clean output in tests
+* Fix travis build
+* Dump autoloader generation
+* Refactor specs
+* Update CHANGELOG
+* Fix #244
+* Correct pretty_print on composer:get based on @simonchrz's patch
+* Enable web tasks
+* Update gemspec file
+* Make version consistent with capistrano
+* Add UPGRADE file
+* Fix command again
+* Fix missing method
+* Fix command
+* Rename files
+* Improve command
+* Remove old README.ja.md as it's not maintained anymore
+* Add note about tests in README
+* Update CHANGELOG
+* Minor fixes
+* Add tests for propel namespace
+* Add tests for doctrine namespace
+* Fix travis-ci setup
+* Add more tests for the symfony namespace (Symfony2)
+* Fix encoding
+* Trying to fix dependencies
+* Add testing tools to gemfile
+* fix gemfile
+* Add travis/bundler configs, bump version to 2.2.x-dev
+* Introducing a test suite
+* Refactored Symfony2 code
+* Fix conflict with the pp gem
+* cd command not found when composer self-update
+* Fix #240
+* Fixing spelling mistakes an code
+* Fix composer tasks
+* Fixing logic in deep_merge method for symfony1
+* Fix symfony:doctrine:migrations:migrate when using pty by not using try_sudo. Also log current database version with level info.
+* Fixed a problem with case-insensitivity. This worked on OS X, but not on Linux, because the file system is case sensitive.
+* Take capistrano/ext/multistage parameter deploy_env into account when using different deploy environments.
+* Avoid the unnecessary use of try_sudo to make remote dumps work, as Capifony doesn't seem to check if use_sudo is false.
+* Added patch-5 branch modifications from https://github.com/leek/capifony/tree/patch-5 to enable using parameters.ini config files.
+
+### 2.1.16 / September 25, 2012
 
 * Add composer:dump_autoload to the finalize_update after hook
 * Add new task to allow composer dump-autoload
@@ -7,7 +53,7 @@
 * run "#{try_sudo}"
 * Use try_sudo instead of run
 
-== 2.1.15 / September 10, 2012
+### 2.1.15 / September 10, 2012
 
 * Fix #203
 * Preliminary testing seems to show that this is generally how try_sudo was meant to be implemented, and is in fact how it is required to be implemented to work with things that depend on the output of run.
@@ -21,11 +67,11 @@
 * set_permissions: fix for acl method
 * Fix this fucking dumb task. #195
 
-== 2.1.14 / August 22, 2012
+### 2.1.14 / August 22, 2012
 
 * Fix escaping in clear controllers #195
 
-== 2.1.13 / August 21, 2012
+### 2.1.13 / August 21, 2012
 
 * check all .php files in stead of only _app.php
 * fix clear controllers to also work with try_sudo
@@ -39,14 +85,14 @@
 * Fix running doctrine migrations with allocated PTY
 * Update lib/symfony1.rb
 
-== 2.1.12 / August 6, 2012
+### 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
+### 2.1.11 / July 20, 2012
 
 * Fix hard-coded "app" references
 * Fix hard-coded path to "app"
@@ -58,7 +104,7 @@
 * Fix #163
 * fix elsif synthax
 
-== 2.1.10 / July 16, 2012
+### 2.1.10 / July 16, 2012
 
 * Fix CS
 * Add ownership check before changing permissions
@@ -78,11 +124,11 @@
 * Since `:roles` isn't used in Capifony, these need `:no_release` *at least*.
 * Fixing missing `pretty_print`.
 
-== 2.1.9 / July 3, 2012
+### 2.1.9 / July 3, 2012
 
 * fixed regression
 
-== 2.1.8 / July 2, 2012
+### 2.1.8 / July 2, 2012
 
 * bugfixes
 * fix database tasks to use role :db
@@ -96,7 +142,7 @@
 * added human readable messages in deploy related tasks.
 * removed unexistent Doctrine commands
 
-== 2.1.7 / June 21, 2012
+### 2.1.7 / June 21, 2012
 
 * added maintenance page feature for Symfony2, use symfony 1.4 tasks
   (project:disable, project:enable) to do the same.
@@ -112,78 +158,78 @@
   working directory.
 * bugfixes.
 
-== 2.1.6 / April 12, 2012
+### 2.1.6 / April 12, 2012
 
 * bugfixes
 
-== 2.1.3 / September 27, 2011
+### 2.1.3 / September 27, 2011
 
 * propel support for Symfony2 (by @willdurand)
 * cache warmup and assets install configurable (by @gigo6000)
 * always use --no-debug with assetic (by @fernanDOTdo)
 * fixed assetic bug (by @mbontemps)
 
-== 2.1.2 / August 11, 2011
+### 2.1.2 / August 11, 2011
 
 * fix for vendors install
 
-== 2.1.1 / July 13, 2011
+### 2.1.1 / July 13, 2011
 
 * support for rubygems 1.8
 
-== 2.1.0 / June 24, 2011
+### 2.1.0 / June 24, 2011
 
 * fully support different app path
 
-== 2.0.9 / June 15, 2011
+### 2.0.9 / June 15, 2011
 
 * migrations fixed in Symfony2
 
-== 2.0.8 / June 14, 2011
+### 2.0.8 / June 14, 2011
 
 * update_vendors functionality support (via @weaverryan)
 
-== 2.0.7 / June 9, 2011
+### 2.0.7 / June 9, 2011
 
 * more modular behavior (thanks Alif Rachmawadi)
 * cache:clear command fix (thanks Marijn Huizendveld)
 
-== 2.0.6 / May 4, 2011
+### 2.0.6 / May 4, 2011
 
 * add write access to cache folder for deployer's usergroup
 
-== 2.0.5 / May 3, 2011
+### 2.0.5 / May 3, 2011
 
 * made the Symfony2 console command configurable (symfony_console) (thanks @ruudk)
 * added --env=#{symfony_env_prod} to every Symfony2 console command (thanks @ruudk)
 
-== 2.0.4 / April 23, 2011
+### 2.0.4 / April 23, 2011
 
 * shared lib support in symfony1 (thanks @jakzal)
 
-== 2.0.3 / April 16, 2011
+### 2.0.3 / April 16, 2011
 
 * windows support for symfony1 database: tasks (thanks @akloboucnik)
 
-== 2.0.2 / April 6, 2011
+### 2.0.2 / April 6, 2011
 
 * db migration task refactoring (thanks @schmittjoh)
 
-== 2.0.1 / March 30, 2011
+### 2.0.1 / March 30, 2011
 
 * fixed wrong assetic command
 
-== 2.0.0 / March 22, 2011
+### 2.0.0 / March 22, 2011
 
 * optimized shared commands in symfony1 scripts
 * added symfony2 deployment strategy
 * added `use_orm` option to symfony1 recipes. Turn it off if you don't use ORM
 
-== 0.4.2 / September 23, 2010
+### 0.4.2 / September 23, 2010
 
 * added `symfony:doctrine:compile` task
 
-== 0.4.1 / June 17, 2010
+### 0.4.1 / June 17, 2010
 
 * added `symfony_env_local` variable, specifying local symfony environment to work with
 * added third parameter (blocks) to `prompt_with_default` (as in `ask`)
@@ -191,46 +237,46 @@
 * added confirmation dialogs to destructive ORM tasks
 * run `project:clear-controllers` only on `prod` environment
 
-== 0.4.0 / June 16, 2010
+### 0.4.0 / June 16, 2010
 
 * added propel tasks (thanks to http://github.com/arlo)
 * added orm abstraction
 * added doctrine/symfony tasks
 * huge refactoring of mostly everything (thanks to http://github.com/arlo)
 
-== 0.3.3 / June 13, 2010
+### 0.3.3 / June 13, 2010
 
 * added ability to change called php binary (thanks to http://github.com/xgorse)
 
-== 0.3.2 / June 12, 2010
+### 0.3.2 / June 12, 2010
 
 * fixed :finalize_update hooks (clear_controllers task now runs)
 
-== 0.3.1 / June 11, 2010
+### 0.3.1 / June 11, 2010
 
 * fixed deployment bug with new shared link instruction
 
-== 0.3.0 / June 11, 2010
+### 0.3.0 / June 11, 2010
 
 * fixed incorrect links bug (thanks to arlo)
 * added database dumpers tasks
 * database:move:* now uses database dumpers to actually dump
 
-== 0.2.2 / June 6, 2010
+### 0.2.2 / June 6, 2010
 
 * deployment bug with `mkdir shared/config` fixed
 
-== 0.2.1 / June 5, 2010
+### 0.2.1 / June 5, 2010
 
 * dependency fix
 
-== 0.2.0 / June 5, 2010
+### 0.2.0 / June 5, 2010
 
 * some fixes
 * symfony:check_configuration task
 * database move tasks
 * shared folder tasks (move to_local, move to_remote)
 
-== 0.1.0 / June 3, 2010
+### 0.1.0 / June 3, 2010
 
 First ever working version.

data/README.md

@@ -1,6 +1,8 @@
 Deploying symfony Applications with Capistrano
 ==============================================
 
+[![Build Status](https://secure.travis-ci.org/everzet/capifony.png?branch=master)](http://travis-ci.org/everzet/capifony)
+
 Capistrano is an open source tool for running scripts on multiple servers.
 Its primary use is for easily deploying applications. While it was built
 specifically for deploying Rails apps, it’s pretty simple to customize it
@@ -35,6 +37,19 @@ lot easier.
 
 Read the [capifony documentation](http://capifony.org/)
 
+## Running the test suite ##
+
+You need a set of dependencies in order to run the capifony's test suite.
+You can use **Bundler** to install these dependencies:
+
+    bundle install --gemfile=.gemfile
+
+Then, run the tests using **Rake**:
+
+    rake spec
+
+For more information, see the `.travis.yml` file.
+
 
 ## Contributors ##
 

data/UPGRADE.md

@@ -0,0 +1,30 @@
+UPGRADE FROM 2.1.x TO 2.2.x
+===========================
+
+Upgrading your capifony configuration from **2.1.x** to **2.2.x** is quite easy.
+If you don't have a custom `Capfile` file, delete it and recreate it using the
+following command:
+
+    capifony .
+
+Important: This is mandatory for both symfony 1.x and Symfony2 projects.
+
+If you have a custom `Capfile` file, you just have to change the way you load
+capifony. In capifony 2.1.x and for Symfony2 projects, the line below was used
+to load capifony:
+
+    load Gem.find_files('symfony2.rb').first.to_s
+
+You have to replace this line by the following one:
+
+    require 'capifony_symfony2'
+
+For symfony 1.x projects, the line below was used for the same purpose:
+
+    load Gem.find_files('symfony1.rb').first.to_s
+
+You have to replace it by the following line:
+
+    load Gem.find_files('capifony_symfony1.rb').first.to_s
+
+That's all.

data/bin/capifony

@@ -5,6 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
+capifony_version = '2.2.0'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -14,6 +15,11 @@ OptionParser.new do |opts|
     exit 0
   end
 
+  opts.on("-v", "--version", "") do
+    puts "capifony v#{capifony_version}"
+    exit 0
+  end
+
   opts.on("-s", "--symfony VERSION", "Capify specific symfony verion (1|2)") do |version|
     symfony_version = version.to_i
   end
@@ -38,7 +44,7 @@ elsif !File.exists?(ARGV.first)
 elsif !File.directory?(ARGV.first)
   abort "`#{ARGV.first}' is not a directory."
 elsif ARGV.length > 1
-  abort "Too many arguments; please specify only the directory to capify."
+  abort "Too many arguments; please specify only the directory to capifony."
 end
 
 def unindent(string)
@@ -53,8 +59,8 @@ if symfony_version == 2
   files = {
     "Capfile" => unindent(<<-FILE),
       load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-      Dir['vendor/**/Resources/recipes/*.rb'].each { |bundle| load(bundle) }
-      load Gem.find_files('symfony2.rb').first.to_s
+
+      require 'capifony_symfony2'
       load '#{symfony_app_path}/config/deploy'
     FILE
 
@@ -86,7 +92,8 @@ else
     "Capfile" => unindent(<<-FILE),
       load 'deploy' if respond_to?(:namespace) # cap2 differentiator
       Dir['plugins/*/lib/recipes/*.rb'].each { |plugin| load(plugin) }
-      load Gem.find_files('symfony1.rb').first.to_s
+
+      load Gem.find_files('capifony_symfony1.rb').first.to_s
       load 'config/deploy'
     FILE
 

data/lib/{symfony1.rb → capifony_symfony1.rb}

@@ -54,8 +54,19 @@ end
 
 def deep_merge(hash1, hash2)
 
+    #if both 'all' and env keys are nil break
+    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(hash2 == nil)
+    if(hash2 == nil && hash1 != nil)
       return hash1;
     end
     hash1.merge(hash2){|key, subhash1, subhash2|

data/lib/capifony_symfony2.rb

@@ -0,0 +1,255 @@
+# encoding: utf-8
+require 'capistrano'
+require 'colored'
+require 'fileutils'
+require 'inifile'
+require 'yaml'
+require 'zlib'
+
+module Capifony
+  module Symfony2
+    def self.load_into(configuration)
+      configuration.load do
+
+        load_paths.push File.expand_path('../', __FILE__)
+        load 'capifony'
+        load 'symfony2/symfony'
+        load 'symfony2/database'
+        load 'symfony2/deploy'
+        load 'symfony2/doctrine'
+        load 'symfony2/propel'
+        load 'symfony2/web'
+
+        # Symfony application path
+        set :app_path,              "app"
+
+        # Symfony web path
+        set :web_path,              "web"
+
+        # Symfony console bin
+        set :symfony_console,       app_path + "/console"
+
+        # Symfony log path
+        set :log_path,              app_path + "/logs"
+
+        # Symfony cache path
+        set :cache_path,            app_path + "/cache"
+
+        # Symfony config file path
+        set :app_config_path,       app_path + "/config"
+
+        # Symfony config file (parameters.(ini|yml|etc...)
+        set :app_config_file,       "parameters.yml"
+
+        # Symfony bin vendors
+        set :symfony_vendors,       "bin/vendors"
+
+        # Symfony build_bootstrap script
+        set :build_bootstrap,       "bin/build_bootstrap"
+
+        # Whether to use composer to install vendors.
+        # If set to false, it will use the bin/vendors script
+        set :use_composer,          false
+
+        # Path to composer binary
+        # If set to false, Capifony will download/install composer
+        set :composer_bin,          false
+
+        # Options to pass to composer when installing/updating
+        set :composer_options,      "--no-scripts --verbose --prefer-dist"
+
+        # Whether to update vendors using the configured dependency manager (composer or bin/vendors)
+        set :update_vendors,        false
+
+        # run bin/vendors script in mode (upgrade, install (faster if shared /vendor folder) or reinstall)
+        set :vendors_mode,          "reinstall"
+
+        # Whether to run cache warmup
+        set :cache_warmup,          true
+
+        # Use AsseticBundle
+        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
+
+        # Need to clear *_dev controllers
+        set :clear_controllers,     true
+
+        # Files that need to remain the same between deploys
+        set :shared_files,          false
+
+        # Dirs that need to remain the same between deploys (shared dirs)
+        set :shared_children,       [log_path, web_path + "/uploads"]
+
+        # Asset folders (that need to be timestamped)
+        set :asset_children,        [web_path + "/css", web_path + "/images", web_path + "/js"]
+
+        # Dirs that need to be writable by the HTTP Server (i.e. cache, log dirs)
+        set :writable_dirs,         [log_path, cache_path]
+
+        # Name used by the Web Server (i.e. www-data for Apache)
+        set :webserver_user,        "www-data"
+
+        # Method used to set permissions (:chmod, :acl, or :chown)
+        set :permission_method,     false
+
+        # Model manager: (doctrine, propel)
+        set :model_manager,         "doctrine"
+
+        # Symfony2 version
+        set(:symfony_version)       { guess_symfony_version }
+
+        # If set to false, it will never ask for confirmations (migrations task for instance)
+        # Use it carefully, really!
+        set :interactive_mode,      true
+
+        def load_database_config(data, env)
+          read_parameters(data)['parameters']
+        end
+
+        def read_parameters(data)
+          if '.ini' === File.extname(app_config_file) then
+            File.readable?(data) ? IniFile::load(data) : IniFile.new(data)
+          else
+            YAML::load(data)
+          end
+        end
+
+        def guess_symfony_version
+          capture("cd #{latest_release} && #{php_bin} #{symfony_console} --version |cut -d \" \" -f 3")
+        end
+
+        def remote_file_exists?(full_path)
+          'true' == capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
+        end
+
+        def remote_command_exists?(command)
+          'true' == capture("if [ -x \"$(which #{command})\" ]; then echo 'true'; fi").strip
+        end
+
+        STDOUT.sync
+        $error = false
+        $pretty_errors_defined = false
+
+        # Be less verbose by default
+        logger.level = Capistrano::Logger::IMPORTANT
+
+        def capifony_pretty_print(msg)
+          if logger.level == Capistrano::Logger::IMPORTANT
+            pretty_errors
+
+            msg = msg.slice(0, 57)
+            msg << '.' * (60 - msg.size)
+            print msg
+          else
+            puts msg.green
+          end
+        end
+
+        def capifony_puts_ok
+          if logger.level == Capistrano::Logger::IMPORTANT && !$error
+            puts '✔'.green
+          end
+
+          $error = false
+        end
+
+        def pretty_errors
+          if !$pretty_errors_defined
+            $pretty_errors_defined = true
+
+            class << $stderr
+              @@firstLine = true
+              alias _write write
+
+              def write(s)
+                if @@firstLine
+                  s = '✘' << "\n" << s
+                  @@firstLine = false
+                end
+
+                _write(s.red)
+                $error = true
+              end
+            end
+          end
+        end
+
+        after "deploy:finalize_update" do
+          if use_composer
+            if update_vendors
+              symfony.composer.update
+            else
+              symfony.composer.install
+            end
+          else
+            if update_vendors
+              vendors_mode.chomp # To remove trailing whiteline
+              case vendors_mode
+              when "upgrade" then symfony.vendors.upgrade
+              when "install" then symfony.vendors.install
+              when "reinstall" then symfony.vendors.reinstall
+              end
+            end
+          end
+
+          symfony.bootstrap.build
+
+          if model_manager == "propel"
+            symfony.propel.build.model
+          end
+
+          if use_composer
+            symfony.composer.dump_autoload
+          end
+
+          if assets_install
+            symfony.assets.install          # Publish bundle assets
+          end
+
+          if update_assets_version
+            symfony.assets.update_version   # Update `assets_version`
+          end
+
+          if cache_warmup
+            symfony.cache.warmup            # Warmup clean cache
+          end
+
+          if dump_assetic_assets
+            symfony.assetic.dump            # Dump assetic assets
+          end
+
+          if clear_controllers
+            symfony.project.clear_controllers
+          end
+        end
+
+        before "deploy:update_code" do
+          msg = "--> Updating code base with #{deploy_via} strategy"
+
+          if logger.level == Capistrano::Logger::IMPORTANT
+            pretty_errors
+            puts msg
+          else
+            puts msg.green
+          end
+        end
+
+        after "deploy:create_symlink" do
+          puts "--> Successfully deployed!".green
+        end
+      end
+
+    end
+  end
+end
+
+if Capistrano::Configuration.instance
+  Capifony::Symfony2.load_into(Capistrano::Configuration.instance)
+end