kstrano 0.0.29 → 0.0.30

data/bin/kumafy

@@ -16,7 +16,9 @@ STAGING_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/staging.r
 BUILD_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/build.xml"
 PHPCS_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/phpcs.xml"
 PHPMD_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/phpmd.xml"
+PHPDOX_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/phpdox.xml"
 PHPUNIT_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/phpunit.xml.dist"
+APPTEST_GIST = "https://raw.github.com/Kunstmaan/kStrano/master/config/app_test.php"
 
 def update_capfile(base, context, force)
   file = File.join(base, "Capfile")
@@ -129,12 +131,16 @@ def update_jenkins_config(ui, base, context, force)
   end
   
   build_dir = File.join(base, "build")
+  web_dir = File.join(base, "web")
   Dir.mkdir(build_dir) unless File.directory?(build_dir)
+  Dir.mkdir(web_dir) unless File.directory?(web_dir)
   
   {
     File.join(build_dir, "phpcs.xml") => PHPCS_GIST, 
     File.join(build_dir, "phpmd.xml") => PHPMD_GIST,
-    File.join(base, "app", "phpunit.xml.dist") => PHPUNIT_GIST
+    File.join(build_dir, "phpdox.xml") => PHPDOX_GIST,
+    File.join(base, "app", "phpunit.xml.dist") => PHPUNIT_GIST,
+    File.join(web_dir, "app_test.php") => APPTEST_GIST
   }.each do |file, gist|
     write = true
     

data/lib/kstrano.rb

@@ -1,9 +1,20 @@
 # PHP binary to execute
 set :php_bin, "php"
-# Symfony console bin
-set :symfony_console, app_path + "/console"
+
+set :copy_vendors, true
 
 set :force_schema, false
+set :force_migrations, false
+
+set :webserver_user,    "www-data"
+set :permission_method, :acl
+
+set :dump_assetic_assets, true
+set :interactive_mode, true
+set :clear_controllers, false # set this by default to false, because it's quiet dangerous for existing projects. You need to make sure it doesn't delete your app.php
+
+# http://getcomposer.org/doc/03-cli.md
+set :composer_options,      "--no-scripts --verbose --prefer-dist --optimize-autoloader"
 
 require "#{File.dirname(__FILE__)}/helpers/git_helper.rb"
 require "#{File.dirname(__FILE__)}/helpers/kuma_helper.rb"
@@ -12,42 +23,56 @@ require 'etc'
 
 namespace :kuma do
 
-  desc "Run fixcron for the current project"
-  task :fixcron do
-    sudo "sh -c 'if [ -f /opt/kDeploy/tools/fixcron.py ] ; then cd /opt/kDeploy/tools/; python fixcron.py #{application}; fi'"
-  end
+  namespace :ssh_socket do
 
-  desc "Run fixperms for the current project"
-  task :fixperms do
-    sudo "sh -c 'if [ -f /opt/kDeploy/tools/fixperms.py ] ; then cd /opt/kDeploy/tools/; python fixperms.py #{application}; fi'"
-  end
+    task :fix do
+      sudo "chmod 777 -R `dirname $SSH_AUTH_SOCK`"
+    end
 
-  desc "Make the SSH Authentication socket reachable for project user"
-  task :fix_ssh_socket do
-    sudo "chmod 777 -R `dirname $SSH_AUTH_SOCK`"
-  end
+    task :unfix do
+      sudo "chmod 775 -R `dirname $SSH_AUTH_SOCK`"
+    end
 
-  desc "Make the SSH Authentication socket reachable for project user"
-  task :unfix_ssh_socket do
-    sudo "chmod 775 -R `dirname $SSH_AUTH_SOCK`"
   end
 
-  desc "Reload PHP5 fpm"
-  task :fpmreload do
-    sudo "/etc/init.d/php5-fpm reload"
+  namespace :fix do
+
+    desc "Run fixcron for the current project"
+    task :cron do
+      sudo "sh -c 'if [ -f /opt/kDeploy/tools/fixcron.py ] ; then cd /opt/kDeploy/tools/; python fixcron.py #{application}; fi'"
+    end
+
+    desc "Run fixperms for the current project"
+    task :perms do
+      sudo "sh -c 'if [ -f /opt/kDeploy/tools/fixperms.py ] ; then cd /opt/kDeploy/tools/; python fixperms.py #{application}; fi'"
+    end
+
   end
 
-  desc "Restart PHP5 fpm"
-  task :fpmrestart do
-    sudo "/etc/init.d/php5-fpm restart"
+  namespace :fpm do
+
+    desc "Reload PHP5 fpm"
+    task :reload do
+      sudo "/etc/init.d/php5-fpm reload"
+    end
+
+    desc "Restart PHP5 fpm"
+    task :restart do
+      sudo "/etc/init.d/php5-fpm restart"
+    end
+
   end
 
-  desc "Clear the APC cache"
-  task :apcclear do
-    serverproject = domain.split('.')[0]
-    sudo "sh -c 'curl https://raw.github.com/gist/3987685/ > /home/projects/#{serverproject}/site/apcclear.php'"
-    sudo "chmod 777 /home/projects/#{serverproject}/site/apcclear.php"
-    sudo "curl http://#{domain}/apcclear.php"
+  namespace :apc do
+
+    desc "Clear the APC cache"
+    task :clear do
+      serverproject = domain.split('.')[0]
+      sudo "sh -c 'curl https://raw.github.com/gist/3987685/ > /home/projects/#{serverproject}/site/apcclear.php'"
+      sudo "chmod 777 /home/projects/#{serverproject}/site/apcclear.php"
+      sudo "curl http://#{domain}/apcclear.php"
+    end
+
   end
 
 end
@@ -55,65 +80,69 @@ end
 namespace :deploy do
 
   task :create_symlink, :except => { :no_release => true } do
-      on_rollback do
-        if previous_release
-          try_sudo "ln -sf #{previous_release} #{current_path}; true"
-        else
-          logger.important "no previous release to rollback to, rollback of symlink skipped"
-        end
+    on_rollback do
+      if previous_release
+        try_sudo "ln -sf #{previous_release} #{current_path}; true"
+      else
+        logger.important "no previous release to rollback to, rollback of symlink skipped"
       end
-      try_sudo "ln -sfT #{latest_release} #{current_path}"
     end
+    try_sudo "ln -sfT #{latest_release} #{current_path}"
+  end
 
-end
+  desc "Deploy and run pending migrations"
+  task :migrations, :roles => :app, :except => { :no_release => true }, :only => { :primary => true } do
+    set :force_migrations, true
+    deploy.update
+    deploy.restart
+  end
 
-namespace :symfony do
+  namespace :schema do
+
+    desc "Deploy and update the schema"
+    task :update, :roles => :app, :except => { :no_release => true }, :only => { :primary => true } do
+      set :force_schema, true
+      deploy.update
+      deploy.restart
+    end
 
-  desc "Copy vendors from previous release"
-  task :copy_vendors, :except => { :no_release => true } do
-    pretty_print "--> Copying vendors from previous release"
-    try_sudo "mkdir #{release_path}/vendor"
-    try_sudo "sh -c 'if [ -d #{previous_release}/vendor ] ; then cp -a #{previous_release}/vendor/* #{release_path}/vendor/; fi'"
-    puts_ok
   end
 
-  namespace :doctrine do
-    namespace :schema do
+end
 
-      desc "Update the database schema."
-      task :update do
-        if force_schema
-          try_sudo "sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:update --env=#{symfony_env_prod} --force'", :once => true
-        end
-      end
+# make it possible to run schema:update and migrations:migrate at the right place in the flow
+after "symfony:bootstrap:build" do
+  if model_manager == "doctrine"
+    if force_schema
+      symfony.doctrine.schema.update
+    end
 
+    if force_migrations
+      symfony.doctrine.migrations.migrate
     end
   end
-
 end
 
-before "symfony:vendors:install", "symfony:copy_vendors" # Symfony2 2.0.x
-before "symfony:composer:install", "symfony:copy_vendors" # Symfony2 2.1
-before "symfony:composer:update", "symfony:copy_vendors" # Symfony2 2.1
-
 # Fix the SSH socket so that it's reachable for the project user, this is needed to pass your local ssh keys to github
-before "symfony:vendors:install", "kuma:fix_ssh_socket"
-before "symfony:vendors:reinstall", "kuma:fix_ssh_socket"
-before "symfony:vendors:upgrade", "kuma:fix_ssh_socket"
-before "symfony:composer:update", "kuma:fix_ssh_socket"
-before "symfony:composer:install", "kuma:fix_ssh_socket"
-after "symfony:vendors:install", "kuma:unfix_ssh_socket"
-after "symfony:vendors:reinstall", "kuma:unfix_ssh_socket"
-after "symfony:vendors:upgrade", "kuma:unfix_ssh_socket"
-after "symfony:composer:update", "kuma:unfix_ssh_socket"
-after "symfony:composer:install", "kuma:unfix_ssh_socket"
-
-# ask to update the schema
-after "symfony:bootstrap:build", "symfony:doctrine:schema:update"
+before "symfony:vendors:install", "kuma:ssh_socket:fix"
+before "symfony:vendors:reinstall", "kuma:ssh_socket:fix"
+before "symfony:vendors:upgrade", "kuma:ssh_socket:fix"
+before "symfony:composer:update", "kuma:ssh_socket:fix"
+before "symfony:composer:install", "kuma:ssh_socket:fix"
+after "symfony:vendors:install", "kuma:ssh_socket:unfix"
+after "symfony:vendors:reinstall", "kuma:ssh_socket:unfix"
+after "symfony:vendors:upgrade", "kuma:ssh_socket:unfix"
+after "symfony:composer:update", "kuma:ssh_socket:unfix"
+after "symfony:composer:install", "kuma:ssh_socket:unfix"
 
 # clear the cache before the warmup
 before "symfony:cache:warmup", "symfony:cache:clear"
 
+# set the right permissions on the vendor folder ... 
+after "symfony:composer:copy_vendors" do
+  sudo "chown -R #{application}:#{application} #{latest_release}/vendor"
+end
+
 # Before update_code:
 ## Make the cached_copy readable for the current user
 before "deploy:update_code" do
@@ -138,8 +167,8 @@ before "deploy:finalize_update" do
 end
 
 after "deploy:finalize_update" do
-  kuma.fpmreload
-  kuma.apcclear
+  kuma.fpm.reload
+  kuma.apc.clear
 end
 
 before :deploy do
@@ -147,10 +176,7 @@ before :deploy do
   %x(ssh-add)
 end
 
-# After deploy:
-## Notify the people on campfire of this deploy
-## Notify airbrake to add a new deploy to the deploy history
 after :deploy do
-  kuma::fixcron
+  kuma.fix.cron
   deploy::cleanup ## cleanup old releases
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kstrano
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: capifony
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
   requirement: !ruby/object:Gem::Requirement
@@ -43,38 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: capistrano_colors
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-- !ruby/object:Gem::Dependency
-  name: capifony
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.15
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.15
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.11
-description: Deploying applications with Capistrano, Jenkins and GIT.
+description: Deploying symfony2 applications for the kDeploy server setup.
 email: support@kunstmaan.be
 executables:
 - kumafy
@@ -160,5 +128,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Deploying applications with Capistrano, Jenkins and GIT.
+summary: Deploying symfony2 applications for the kDeploy server setup.
 test_files: []