capifony 2.2.0 → 2.2.1

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 2.2.1 / November 2, 2012
+
+* Move warn message to the description. Fix #201
+* Update README (tests)
+* Updated capistrano-maintenance version
+* IMPORTANT: Fix maintenance tasks by adding a new dependency (capistrano-maintenance)
+* Fix test, add more tests for the composer copy feature
+* fix tests
+* Update spec/capifony_symfony2_symfony_spec.rb
+* Update lib/symfony2/symfony.rb
+* Update lib/symfony2/symfony.rb
+* Ignore "No such file or directory" on deploy:web:enable
+* Added doctrine:fixtures:load
+* [symfony1] Fix bad command with use_sudo = false
+* Refactor symfony:vendors and symfony:cache tasks based on @leek work
+* Fix composer tasks
+
 ### 2.2.0 / October 22, 2012
 
 * Minor fixes

data/README.md

@@ -42,11 +42,11 @@ Read the [capifony documentation](http://capifony.org/)
 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
+    BUNDLE_GEMFILE=.gemfile bundle install
 
 Then, run the tests using **Rake**:
 
-    rake spec
+    BUNDLE_GEMFILE=.gemfile bundle exec rake spec
 
 For more information, see the `.travis.yml` file.
 

data/bin/capifony

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

data/lib/capifony_symfony2.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'capistrano'
+require 'capistrano/maintenance'
 require 'colored'
 require 'fileutils'
 require 'inifile'

data/lib/symfony1/symfony.rb

@@ -103,7 +103,7 @@ namespace :symfony do
           cmd << "cp #{release_path}/web/#{app}_#{env}.php #{release_path}/web/#{app}.php"
         end
 
-        run "#{try_sudo} -s #{cmd.join(';')}" if cmd.join(';')
+        run "#{try_sudo} sh -c '#{cmd.join(';')}'" if cmd.join(';')
       end
     end
   end

data/lib/symfony2/doctrine.rb

@@ -69,6 +69,13 @@ namespace :symfony do
       end
     end
 
+    namespace :fixtures do
+      desc "Load data fixtures"
+      task :load, :roles => :app, :except => { :no_release => true } do
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:fixtures:load --env=#{symfony_env_prod}'", :once => true
+      end
+    end
+
     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

data/lib/symfony2/symfony.rb

@@ -58,28 +58,22 @@ namespace :symfony do
   end
 
   namespace :vendors do
-    desc "Runs the bin/vendors script to install the vendors (fast if already installed)"
-    task :install, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Installing vendors"
-
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} install'"
-      capifony_puts_ok
-    end
-
-    desc "Runs the bin/vendors script to reinstall the vendors"
-    task :reinstall, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Reinstalling vendors"
-
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} install --reinstall'"
-      capifony_puts_ok
-    end
-
-    desc "Runs the bin/vendors script to upgrade the vendors"
-    task :upgrade, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Upgrading vendors"
+    [:install, :reinstall, :upgrade].each do |action|
+      desc "Runs the bin/vendors script to #{action.to_s} the vendors"
+      task action, :roles => :app, :except => { :no_release => true } do
+        capifony_pretty_print "--> #{action.to_s.capitalize}ing vendors"
+
+        cmd = action.to_s
+        case action
+        when :reinstall
+          cmd = "install --reinstall"
+        when :upgrade
+          cmd = "update"
+        end
 
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} update'"
-      capifony_puts_ok
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} #{cmd}'"
+        capifony_puts_ok
+      end
     end
   end
 
@@ -102,6 +96,12 @@ namespace :symfony do
   namespace :composer do
     desc "Gets composer and installs it"
     task :get, :roles => :app, :except => { :no_release => true } do
+      if remote_file_exists?("#{previous_release}/composer.phar")
+        capifony_pretty_print "--> Copying Composer from previous release"
+        run "#{try_sudo} sh -c 'cp #{previous_release}/composer.phar #{latest_release}/'"
+        capifony_puts_ok
+      end
+
       if !remote_file_exists?("#{latest_release}/composer.phar")
         capifony_pretty_print "--> Downloading Composer"
 
@@ -117,7 +117,7 @@ namespace :symfony do
     desc "Updates composer"
     task :self_update, :roles => :app, :except => { :no_release => true } do
       capifony_pretty_print "--> Updating Composer"
-      try_sudo "#{composer_bin} self-update"
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} self-update'"
       capifony_puts_ok
     end
 
@@ -127,7 +127,7 @@ namespace :symfony do
         symfony.composer.self_update
       else
         symfony.composer.get
-        composer_bin = "#{php_bin} composer.phar"
+        set :composer_bin, "#{php_bin} composer.phar"
       end
 
       capifony_pretty_print "--> Installing Composer dependencies"
@@ -141,7 +141,7 @@ namespace :symfony do
         symfony.composer.self_update
       else
         symfony.composer.get
-        composer_bin = "#{php_bin} composer.phar"
+        set :composer_bin, "#{php_bin} composer.phar"
       end
 
       capifony_pretty_print "--> Updating Composer dependencies"
@@ -155,7 +155,7 @@ namespace :symfony do
         symfony.composer.self_update
       else
         symfony.composer.get
-        composer_bin = "#{php_bin} composer.phar"
+        set :composer_bin, "#{php_bin} composer.phar"
       end
 
       capifony_pretty_print "--> Dumping an optimized autoloader"
@@ -165,22 +165,20 @@ namespace :symfony do
   end
 
   namespace :cache do
-    desc "Clears cache"
-    task :clear, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Clearing cache"
-
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:clear --env=#{symfony_env_prod}'"
-      run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
-      capifony_puts_ok
-    end
-
-    desc "Warms up an empty cache"
-    task :warmup, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Warming up cache"
+    [:clear, :warmup].each do |action|
+      desc "Cache #{action.to_s}"
+      task action, :roles => :app, :except => { :no_release => true } do
+        case action
+        when :clear
+          capifony_pretty_print "--> Clearing cache"
+        when :warmup
+          capifony_pretty_print "--> Warming up cache"
+        end
 
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:warmup --env=#{symfony_env_prod}'"
-      run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
-      capifony_puts_ok
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:#{action.to_s} --env=#{symfony_env_prod}'"
+        run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
+        capifony_puts_ok
+      end
     end
   end
 

data/lib/symfony2/web.rb

@@ -19,15 +19,9 @@ namespace :deploy do
       should either be a plaintext or an erb file.
 
       Further customization will require that you write your own task.
-    DESC
-    task :disable, :roles => :web, :except => { :no_release => true } do
-      require 'erb'
-      on_rollback { run "rm #{latest_release}/#{web_path}/#{maintenance_basename}.html" }
-
-      warn <<-EOHTACCESS
 
-        # Please add something like this to your site's Apache htaccess to redirect users to the maintenance page.
-        # More Info: http://www.shiftcommathree.com/articles/make-your-rails-maintenance-page-respond-with-a-503
+      Add something like this to your site's Apache htaccess to redirect users to the maintenance page.
+      More Info: http://www.shiftcommathree.com/articles/make-your-rails-maintenance-page-respond-with-a-503
 
         ErrorDocument 503 /#{maintenance_basename}.html
         RewriteEngine On
@@ -36,7 +30,7 @@ namespace :deploy do
         RewriteCond %{SCRIPT_FILENAME} !#{maintenance_basename}.html
         RewriteRule ^.*$  -  [redirect=503,last]
 
-        # Or if you are using Nginx add this to your server config:
+      Or if you are using Nginx add this to your server config:
 
         if (-f $document_root/maintenance.html) {
           return 503;
@@ -46,7 +40,10 @@ namespace :deploy do
           rewrite  ^(.*)$  /maintenance.html last;
           break;
         }
-      EOHTACCESS
+    DESC
+    task :disable, :roles => :web, :except => { :no_release => true } do
+      require 'erb'
+      on_rollback { run "rm #{latest_release}/#{web_path}/#{maintenance_basename}.html" }
 
       reason   = ENV['REASON']
       deadline = ENV['UNTIL']
@@ -63,7 +60,7 @@ namespace :deploy do
       web-accessible again.
     DESC
     task :enable, :roles => :web, :except => { :no_release => true } do
-      run "#{try_sudo} rm #{latest_release}/#{web_path}/#{maintenance_basename}.html"
+      run "#{try_sudo} rm -f #{latest_release}/#{web_path}/#{maintenance_basename}.html"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 Z
+date: 2012-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 49
         segments: 
         - 2
-        - 11
-        - 0
-        version: 2.11.0
+        - 13
+        - 5
+        version: 2.13.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,22 @@ dependencies:
         version: 2.0.2
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: capistrano-maintenance
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id004
 description: "    Capistrano is an open source tool for running scripts on multiple servers. It\xE2\x80\x99s primary use is for easily deploying applications. While it was built specifically for deploying Rails apps, it\xE2\x80\x99s pretty simple to customize it to deploy other types of applications. This package is a deployment \"recipe\" to work with symfony (both 1 and 2) applications.\n"
 email: 
 - ever.zet@gmail.com