kstrano 1.1.0.alpha.1 → 1.1.0.alpha.2

data/lib/kstrano.rb

@@ -11,6 +11,8 @@ set :port, 22
 set :shared_files, false
 set :shared_children, false
 
+set :copy_node_modules, true
+set :copy_bower_vendors, true
 
 namespace :files do
   namespace :move do
@@ -167,6 +169,10 @@ namespace :frontend do
     task :install do
       run "#{try_sudo} -i sh -c 'cd #{latest_release} && npm install'"
     end
+
+    task :copy, :except => { :no_release => true } do
+      run "#{try_sudo} sh -c 'modulesDir=#{current_path}/node_modules; if [ -d $modulesDir ] || [ -h $modulesDir ]; then cp -a $modulesDir #{latest_release}/node_modules; fi;'"
+    end
   end
 
   namespace :bower do
@@ -174,6 +180,29 @@ namespace :frontend do
     task :install do
       run "#{try_sudo} -i sh -c 'cd #{latest_release} && bower install'"
     end
+
+    task :copy, :except => { :no_release => true } do
+      run "#{try_sudo} sh -c 'vendorDir=#{current_path}/web/vendor; if [ -d $vendorDir ] || [ -h $vendorDir ]; then cp -a $vendorDir #{latest_release}/web/vendor; fi;'"
+    end
+  end
+
+  namespace :grunt do
+    desc "Executes the grunt build task"
+    task :build do
+      run "#{try_sudo} -i sh -c 'cd #{latest_release} && grunt build'"
+    end
+  end
+end
+
+before "frontend:npm:install" do
+  if copy_node_modules
+    frontend.npm.copy
+  end
+end
+
+before "frontend:bower:install" do
+  if copy_bower_vendors
+    frontend.bower.copy
   end
 end
 

data/lib/kstrano_symfony2.rb

@@ -27,6 +27,7 @@ module KStrano
 
         set :npm_install, true
         set :bower_install, true
+        set :grunt_build, true
 
         namespace :database do
           namespace :move do
@@ -70,7 +71,7 @@ module KStrano
                   hostname = "#{server_project_name}.#{hostname}"
                 end
                 sudo "curl http://#{hostname}/apcclear.php"
-                sudo "pkill -QUIT -e -f \"^php-fpm: pool #{application} \" "
+                sudo "pkill -QUIT -f \"^php-fpm: pool #{application} \" "
               end
             end
         end
@@ -93,7 +94,7 @@ module KStrano
           namespace :prefer do
             desc "Deploy without copying the vendors from a previous install and use composer option --prefer-source"
             task :source, :roles => :app, :except => { :no_release => true } do
-              set :composer_options, "--no-scripts --verbose --prefer-source --optimize-autoloader"
+              set :composer_options, "--no-dev --no-scripts --verbose --prefer-source --optimize-autoloader"
               deploy.clean
             end
 
@@ -133,11 +134,16 @@ module KStrano
 
         ["symfony:composer:install", "symfony:composer:update", "symfony:vendors:install", "symfony:vendors:upgrade"].each do |action|
           after action do |variable|
+            if bower_install
+              frontend.bower.install
+            end
+
             if npm_install
+              frontend.npm.install
             end
 
-            if bower_install
-              frontend.bower.install
+            if grunt_build
+              frontend.grunt.build
             end
           end
         end
@@ -153,4 +159,4 @@ end
 
 if Capistrano::Configuration.instance
   KStrano::Symfony2.load_into(Capistrano::Configuration.instance)
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kstrano
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.1
+  version: 1.1.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capifony