caploy 0.1.5 → 0.1.6

data/lib/caploy/recipes/defaults.rb

@@ -5,7 +5,7 @@ Capistrano::Configuration.instance.load do
   set :keep_releases, 10
   set :use_sudo, false
 
-  set :protocol, :both
+  set :nginx_protocol, :both
 
   set :scm, :git
   set :git_enable_submodules, false
@@ -25,6 +25,35 @@ Capistrano::Configuration.instance.load do
   # if you want to remove the dump file after loading
   set :db_local_clean, true
 
+  namespace :deploy do
+    desc "deploy always with migrations"
+    task :default do
+      deploy.migrations
+    end
+
+    namespace :cache do
+      desc "Flush cache"
+      task :clear, :roles => :app do
+        run "cd #{current_path} && #{rake} cache:clear  RAILS_ENV=#{stage}"
+      end
+    end
+
+    task :set_branch_info_file, :roles => :app do
+      run "cd #{release_path} && echo \"#{branch}\" > CURRENT_BRANCH"
+    end
+
+    desc "build missing paperclip styles"
+    task :build_missing_paperclip_styles, :roles => :app do
+      run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec rake paperclip:refresh:missing_styles"
+    end
+
+    desc 'Show deployed revision'
+    task :revision, :roles => :app do
+      run "cat #{current_path}/REVISION"
+    end
+
+  end
+
   task :test_and_prepare_cap_env do
     abort "You must set :user before using defaults" unless fetch(:user, nil)
     abort "You must set :repository before using defaults" unless fetch(:repository, nil)

data/lib/caploy/recipes/nginx.rb

@@ -28,7 +28,7 @@ Capistrano::Configuration.instance.load do
     end
 
     task :setup, :roles => :web do
-      protocol = fetch(:protocol, nil).to_s
+      protocol = fetch(:nginx_protocol, nil).to_s
       template_path = File.expand_path('../../templates/nginx/vhost.erb', __FILE__)
       vars = {
           'application' => application,
@@ -46,7 +46,8 @@ Capistrano::Configuration.instance.load do
           'optional_nginx_https_content' => fetch(:optional_nginx_https_content, ''),
           'cert_type' => fetch(:cert_type, 'pem'),
           'key_type' => fetch(:cert_type, 'key'),
-          'serve_static_files' => fetch(:serve_static_files, true),
+          'serve_static_files' => fetch(:nginx_serve_static_files, true),
+          'new_relic_support' => fetch(:nginx_new_relic_support, false)
       }
 
       sites_path = fetch(:nginx_sites_enabled_path, "/etc/nginx/sites-enabled")
@@ -76,7 +77,7 @@ Capistrano::Configuration.instance.load do
     end
 
     task :uninstall do
-      protocol = fetch(:protocol, nil)
+      protocol = fetch(:nginx_protocol, nil)
       sites_path = fetch(:nginx_sites_enabled_path, "/etc/nginx/sites-enabled")
 
       with_user(fetch(:setup_user, user)) do

data/lib/caploy/recipes/setup.rb

@@ -5,7 +5,8 @@ Capistrano::Configuration.instance.load do
       task :create_config_files, :roles => :app do
         run "mkdir -p #{shared_path}/config/"
         config_file_to_setup.each do |config_file|
-          put(File.read(config_file_path(config_file)), "#{shared_path}/config/#{config_file}", :via => :scp)
+          local_path = config_file_path(config_file)
+          put(File.read(local_path), "#{shared_path}/config/#{config_file}", :via => :scp) if local_path
         end
       end
 
@@ -20,7 +21,7 @@ Capistrano::Configuration.instance.load do
 
       task :database, :roles => :db do
         _cset :db_admin_user, 'root'
-        _cset :db_admin_password, Capistrano::CLI.password_prompt("Type your mysql password for user '#{db_admin_user}' (not set if empty): ")
+        _cset :db_admin_password, Capistrano::CLI.password_prompt("\e[0;31mType your mysql password for user '#{db_admin_user}' (not set if empty and ENTER): ")
         _cset :db_name, application.gsub(/\W+/, '')[0..5] + '_' + rails_env.to_s
         _cset :db_user_name, application
         _cset :db_user_password, ''
@@ -44,8 +45,12 @@ end
 
 def config_file_path(config_file_name)
   config_file = "#{rails_root}/config/#{config_file_name}"
-  raise "No config file '#{config_file}'" unless File.exists? config_file
-  config_file
+  if File.exists? config_file
+    config_file
+  else
+    puts "\e[0;31mNo config file '#{config_file}'"
+    nil
+  end
 end
 
 def database_exits?

data/lib/caploy/recipes/symlink.rb

@@ -4,7 +4,7 @@ Capistrano::Configuration.instance.load do
     desc <<-DESC
       Symlink shared directories and files.
     DESC
-    task :symlink_dependencies, :roles => :web, :except => {:no_release => true} do
+    task :symlink_dependencies, :roles => :app, :except => {:no_release => true} do
       shared_directories_to_link   = fetch(:shared_directories_to_link, [])
       directories_to_create        = fetch(:directories_to_create, [])
       files_to_delete              = fetch(:files_to_delete, [])

data/lib/caploy/recipes/unicorn.rb

@@ -103,29 +103,28 @@ module Unicorn
               end
             end
           end
-        end
-
-        after "deploy:restart", "unicorn:reload"
 
-        desc "Setup unicorn"
-        task :setup, :roles => :app, :except => {:no_release => true} do
-          run "mkdir -p \"#{shared_path}/config/unicorn\""
-          config_path = "#{shared_path}/config/unicorn/#{rails_env}.rb"
-          template_path = File.expand_path('../../templates/unicorn/unicorn.rb.erb', __FILE__)
-          vars = {
-              'application' => application,
-              'current_path' => current_path,
-              'unicorn_pid' => unicorn_pid,
-              'unicorn_std_log' => unicorn_std_log,
-              'unicorn_err_log' => unicorn_err_log,
-              'stage' => stage,
-              'unicorn_listen_backlog' => unicorn_listen_backlog,
-              'unicorn_worker_processes' => unicorn_worker_processes,
-              'sidekiq_redis_count' => sidekiq_redis_count
-          }
-          put(render_erb_template(template_path, vars), config_path)
+          desc "Setup unicorn"
+          task :setup, :roles => :app, :except => {:no_release => true} do
+            run "mkdir -p \"#{shared_path}/config/unicorn\""
+            config_path = "#{shared_path}/config/unicorn/#{rails_env}.rb"
+            template_path = File.expand_path('../../templates/unicorn/unicorn.rb.erb', __FILE__)
+            vars = {
+                'application' => application,
+                'current_path' => current_path,
+                'unicorn_pid' => unicorn_pid,
+                'unicorn_std_log' => unicorn_std_log,
+                'unicorn_err_log' => unicorn_err_log,
+                'stage' => stage,
+                'unicorn_listen_backlog' => unicorn_listen_backlog,
+                'unicorn_worker_processes' => unicorn_worker_processes,
+                'sidekiq_redis_count' => sidekiq_redis_count
+            }
+            put(render_erb_template(template_path, vars), config_path)
+          end
         end
 
+        after :"deploy:restart", :"unicorn:reload"
         after :"deploy:setup", :"unicorn:setup";
 
         namespace :deploy do

data/lib/caploy/templates/nginx/vhost.erb

@@ -20,71 +20,53 @@ upstream <%= application %>_<%= stage %>_<%= protocol %>_server {
 <%= optional_nginx_https_content if protocol == 'https' %>
 
 server {
-
   server_name <%= domain %>;
-
 <% if protocol == 'https' %>
-
   listen 443 ssl;
 
   ssl_certificate      <%= nginx_cert_dir %>/<%= application %>_cert.<%= cert_type %>;
   ssl_certificate_key  <%= nginx_cert_dir %>/<%= application %>_cert.<%= key_type %>;
-
   #ssl_ciphers               SSLv3+HIGH:RC4+MEDIUM:!aNULL:!eNULL:!3DES:!MD5:@STRENGTH;
   #ssl_prefer_server_ciphers on;
   #ssl_protocols             SSLv3;
   #ssl_session_cache         shared:SSL:10m;
 
   keepalive_timeout    70;
-
 <% else %>
-
   listen 80;
 
   # ~2 seconds is often enough for most folks to parse HTML/CSS and
   # retrieve needed images/icons/frames, connections are cheap in
   # nginx so increasing this is generally safe...
   #keepalive_timeout 5;
-
 <% end %>
 
   client_max_body_size 4G;
 
 <% if serve_static_files %>
-
   # path for static files
   root <%= project_root %>/public;
-
 <% if with_file_expire_max %>
   location ~* \.(ico|css|js|gif|jpe?g|png)(\?[0-9]+)?$ {
     expires max;
     break;
   }
 <% end %>
-
 <% end %>
+<%= optional_http_content if protocol == 'http' %>
+<%= optional_https_content if protocol == 'https' %>
 
-  <%= optional_http_content if protocol == 'http' %>
-  <%= optional_https_content if protocol == 'https' %>
+  location / {
+    # headers we want forwarded to the upstream server
 
-  # Prefer to serve static files directly from nginx to avoid unnecessary
-  # data copies from the application server.
-  #
-  # try_files directive appeared in in nginx 0.7.27 and has stabilized
-  # over time.  Older versions of nginx (e.g. 0.6.x) requires
-  # "if (!-f $request_filename)" which was less efficient:
-  # http://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
-  try_files $uri/index.html $uri.html $uri @app;
+  <% if new_relic_support %>
+    proxy_set_header X-Queue-Start "t=${msec}000";
+  <% end %>
 
-  location / {
     # an HTTP header important enough to have its own Wikipedia entry:
     #   http://en.wikipedia.org/wiki/X-Forwarded-For
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-    # enable this if and only if you use HTTPS, this helps Rack
-    # set the proper protocol for doing redirects:
-    # proxy_set_header X-Forwarded-Proto https;
-
     # pass the Host: header from the client right along so redirects
     # can be set properly within the Rack application
     proxy_set_header Host $http_host;
@@ -106,6 +88,8 @@ server {
     # proxy_buffering off;
 
   <% if protocol == 'https' %>
+    # enable this if and only if you use HTTPS, this helps Rack
+    # set the proper protocol for doing redirects:
     # This makes sure that Rack::SslEnforcer knows it's being accessed over SSL.
     proxy_set_header X-Forwarded-Proto https;
   <% end %>
@@ -114,11 +98,10 @@ server {
       proxy_pass http://<%= application %>_<%= stage %>_<%= protocol %>_server;
       break;
     }
-
-    <% if auth_basic_title %>
+  <% if auth_basic_title %>
     auth_basic            "<%= auth_basic_title %>";
     auth_basic_user_file  <%= auth_basic_password_file %>;
-    <% end %>
+  <% end %>
   }
 
   # Rails error pages

data/lib/caploy/version.rb

@@ -1,3 +1,3 @@
 module Caploy
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: caploy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
   prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Michael Schiller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -29,13 +29,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.4
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -45,13 +45,13 @@ dependencies:
         version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -61,13 +61,13 @@ dependencies:
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
+  type: :runtime
   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
@@ -77,13 +77,13 @@ dependencies:
         version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: capistrano-file_db
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -93,13 +93,13 @@ dependencies:
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: capistrano-uptodate
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -109,13 +109,13 @@ dependencies:
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -125,13 +125,13 @@ dependencies:
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: erubis
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false