ms_deploy 0.0.10 → 0.0.11

data/lib/ms_deploy/recipes/bundler.rb

@@ -17,7 +17,7 @@ Capistrano::Configuration.instance.load do
 
   namespace :bundler do
     task :install_gem do
-      run "cd #{release_path} && gem install bundler --pre --no-ri --no-rdoc"
+      run "cd #{release_path} && gem install bundler --no-ri --no-rdoc"
     end
   end
 

data/lib/ms_deploy/recipes/deploy/assets.rb

@@ -1,15 +1,15 @@
 Capistrano::Configuration.instance.load do
-
+  # http://www.bencurtis.com/2011/12/skipping-asset-compilation-with-capistrano/
   namespace :deploy do
     namespace :assets do
-      desc "Compile assets"
-      task :compile, :roles => :web do
-        run "cd #{release_path}; RAILS_ENV=#{rails_env} #{rake} assets:precompile"
+      task :precompile, :roles => :web, :except => { :no_release => true } do
+        from = source.next_revision(current_revision)
+        if capture("cd #{latest_release} && #{source.local.log(from)} lib/assets/ vendor/assets/ app/assets/ | wc -l").to_i > 0
+          run %Q{cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile}
+        else
+          logger.info "Skipping asset pre-compilation because there were no asset changes"
+        end
       end
-
-      after 'deploy', 'deploy:assets:compile'
-      after 'deploy:migrations', 'deploy:assets:compile'
-
     end
   end
 end

data/lib/ms_deploy/recipes/deploy/puma.rb

@@ -0,0 +1,26 @@
+Capistrano::Configuration.instance.load do
+
+  set :puma_binary, fetch(:puma_binary, "bundle exec puma")
+  set :pumactl_binary, fetch(:pumactl_binary,  "bundle exec pumactl")
+  set :puma_state, fetch(:puma_state,  "tmp/puma_state")
+  set :puma_tcp_port, fetch(:puma_tcp_port,  nil)
+  set :puma_tcp_port, fetch(:puma_control_tcp_port,  9292)
+  set :puma_control_tcp_port, fetch(:puma_control_tcp_port,  puma_tcp_port.to_i + 1)
+  set :puma_thread_pool, '0:16'
+
+  namespace :deploy do
+    task :start, :roles => :app, :except => { :no_release => true } do
+      set :puma_socket, fetch(:puma_socket,  "unix:///tmp/sockets/#{application}_#{rails_env}.sock")
+
+      tcp = puma_tcp_port.nil? ? '' : "-b tcp://127.0.0.1:#{puma_tcp_port}"
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} #{puma_binary} -t #{puma_thread_pool} -S #{puma_state} --control tcp://127.0.0.1:#{puma_control_tcp_port} -b #{puma_socket} #{tcp}" # --control-token xxx
+    end
+    task :stop, :roles => :app, :except => { :no_release => true } do
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} #{pumactl_binary} -S #{puma_state} stop"
+    end
+    task :restart, :roles => :app, :except => { :no_release => true } do
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} #{pumactl_binary} -S #{puma_state} restart"
+    end
+  end
+
+end

data/lib/ms_deploy/templates/vhost.erb

@@ -28,6 +28,18 @@ server {
   # path for static files
   root <%= project_root %>/public;
 
+  ### Stop Image and Document Hijacking
+  #location ~* (\.jpg|\.png|\.css)$ {
+  #  if ($http_referer !~ ^(http://mydomain.com) ) {
+  #    return 405;
+  #  }
+  #}
+
+  location ~* \.(ico|css|js|gif|jpe?g|png)(\?[0-9]+)?$ {
+    expires max;
+    break;
+  }
+
   # Prefer to serve static files directly from nginx to avoid unnecessary
   # data copies from the application server.
   #

data/lib/ms_deploy/version.rb

@@ -1,3 +1,3 @@
 module MsDeploy
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &77667400 !ruby/object:Gem::Requirement
+  requirement: &89146810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77667400
+  version_requirements: *89146810
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &77666540 !ruby/object:Gem::Requirement
+  requirement: &89146600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77666540
+  version_requirements: *89146600
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &77665970 !ruby/object:Gem::Requirement
+  requirement: &89146390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77665970
+  version_requirements: *89146390
 description: capistrano deployment task for my projects
 email:
 - michael.schiller@gmx.de
@@ -59,6 +59,7 @@ files:
 - lib/ms_deploy.rb
 - lib/ms_deploy/recipes/bundler.rb
 - lib/ms_deploy/recipes/deploy/assets.rb
+- lib/ms_deploy/recipes/deploy/puma.rb
 - lib/ms_deploy/recipes/deploy/setup.rb
 - lib/ms_deploy/recipes/deploy/symlink.rb
 - lib/ms_deploy/recipes/deploy/unicorn.rb