chicken_soup 0.3.0 → 0.4.0

data/chicken_soup.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.email                 = 'support@thekompanee.com'
   s.homepage              = 'http://github.com/jfelchner/chicken_soup'
 
-  s.summary               = "chicken_soup-#{ChickenSoup::VERSION}"
-  s.description           = %q[...for the Deployment Soul.  Why do you keep typing all that crap into your Capistrano recipes?  Are you too cool for standards?  Well, ARE YA!?]
+  s.summary               = "...for the Deployment Soul."
+  s.description           = %q[Why do you keep typing all that crap into your Capistrano recipes?  Are you too cool for standards?  Well, ARE YA!?]
 
   s.rdoc_options          = ["--charset = UTF-8"]
   s.extra_rdoc_files      = %w[README.md LICENSE]

data/lib/chicken_soup/capabilities/apache/apache-tasks.rb

@@ -6,7 +6,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :website do
     desc "Creates the site configuration for the files."
-    task :create do
+    task :create, :roles => :web do
       abort "Sorry, auto-installing sites is not supported on your version of Apache." unless exists?(:apache_disable_script)
 
       virtual_host_config = <<-VHOST
@@ -59,7 +59,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Completely removes the site configuration from the server (but leaves the files.)"
-    task :remove do
+    task :remove, :roles => :web do
       abort "Sorry, auto-removing sites is not supported on your version of Apache." unless exists?(:apache_disable_script)
 
       run "#{sudo} rm /etc/apache2/sites-available/#{deploy_site_name}"
@@ -67,7 +67,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Enable Site"
-    task :enable do
+    task :enable, :roles => :web do
       abort "Sorry, auto-enabling sites is not supported on your version of Apache." unless exists?(:apache_enable_script)
 
       run "#{sudo} #{apache_enable_script} #{deploy_site_name}"
@@ -75,7 +75,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Disable Site"
-    task :disable do
+    task :disable, :roles => :web do
       abort "Sorry, auto-disabling sites is not supported on your version of Apache." unless exists?(:apache_disable_script)
 
       run "#{sudo} #{apache_disable_script} #{deploy_site_name}"

data/lib/chicken_soup/capabilities/bundler/bundler-tasks.rb

@@ -8,12 +8,12 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :gems do
     desc "Install Bundled Gems"
-    task :install do
+    task :install, :roles => :app do
       run "cd #{latest_release} && bundle install --gemfile #{latest_release}/Gemfile --path #{shared_path}/bundle --deployment --quiet --without development test"
     end
 
     desc "Update Bundled Gems"
-    task :update do
+    task :update, :roles => :app do
       abort "I'm sorry Dave, but I can't let you do that. I have full control over production." if rails_env == 'production'
 
       run "cd #{latest_release} && bundle update"
@@ -22,7 +22,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :bundler do
     desc "Install Bundler"
-    task :install do
+    task :install, :roles => :app do
       bundler_install_command = "gem install bundler --version #{gem_packager_version} --no-ri --no-rdoc && gem cleanup bundler"
 
       if fetch(:capabilities).include? :rvm

data/lib/chicken_soup/capabilities/mysql/mysql-tasks.rb

@@ -15,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         variable.
       * The DB user will be granted all privileges on the DB.
     DESC
-    task :create do
+    task :create, :roles => :db do
       create_script = <<-CREATESCRIPT
         create database #{application_underscored} character set utf8;
         create user '#{application_underscored}'@'localhost' identified by '#{db_app_password}';
@@ -34,7 +34,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       * The script is executed as `root` and as such, the user will be prompted
         for `root`'s password.
     DESC
-    task :drop do
+    task :drop, :roles => :db do
       drop_script = <<-DROPSCRIPT
         drop user #{application_underscored}@localhost;
         drop database #{application_underscored};

data/lib/chicken_soup/capabilities/nginx/nginx-tasks.rb

@@ -6,16 +6,24 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :website do
     desc "Creates the site configuration for the files."
-    task :create do
+    task :create, :roles => :web do
       abort "Sorry, auto-installing sites is not supported on your installation of Nginx." unless exists?(:nginx_disable_script)
 
-      passenger_friendly_error_messages = rails_env == :production ? "off" : "on"
+      passenger_friendly_error_pages = rails_env == :production ? "off" : "on"
 
       virtual_host_config = <<-VHOST
         server {
+          ###
+          # Server Details
+          #
             listen                          #{web_server_ip}:443;
-            server_name                     #{deploy_site_name} *.#{deploy_site_name};
+            server_name                     .#{deploy_site_name};
 
+            root                            #{deploy_to}/current/public;
+
+          ###
+          # Passenger and Rails
+          #
             passenger_enabled               on;
             passenger_friendly_error_pages  #{passenger_friendly_error_pages};
             passenger_min_instances         4;
@@ -23,39 +31,58 @@ Capistrano::Configuration.instance(:must_exist).load do
             rails_env                       #{rails_env};
             rack_env                        #{rails_env};
 
+          ###
+          # Performance and Security
+          #
+            client_max_body_size            3M;
+
+            location ~ /\. { deny  all; }       # This will deny access to any hidden file (beginning with a period)
+
+          ###
+          # SSL
+          #
             ssl                             on;
             ssl_certificate                 /etc/nginx/ssl/#{domain}.crt;
             ssl_certificate_key             /etc/nginx/ssl/#{domain}.key;
 
             ssl_session_timeout             5m;
 
+            ssl_protocols                   SSLv3 TLSv1;
             ssl_ciphers                     ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
             ssl_prefer_server_ciphers       on;
 
-            root                            #{deploy_to}/current/public;
-
-            client_max_body_size            3M;
-
+          ###
+          # Logs
+          #
             access_log                      /var/log/nginx/#{application}.access.log main;
             error_log                       /var/log/nginx/#{application}.error.log warn;
 
-            error_page                      500 501 504 505 506 507 508 509 /500.html;
-            error_page                      400 401 403 404 405 406 407 409 410 413 415 416 417 /404.html;
-            error_page                      422 444 /422.html;
-            error_page                      502 503 /public/maintenance.html;
+          ###
+          # Handle Errors
+          #
+            recursive_error_pages           on;
 
-            location / {
-              try_files /system/maintenance.html $request_uri;
+            error_page                      500 502 504 /500.html;
+            error_page                      400 /404.html;
+            error_page                      422 /422.html;
+            error_page                      503 @503;
+
+            if (-f $document_root/system/maintenance.html) {
+              return 503;
+            }
+
+            location @503 {
+              error_page 405 = $document_root/system/maintenance.html;
+
+              rewrite ^(.*)$ /system/maintenance.html break;
             }
         }
 
         server {
             listen                          #{web_server_ip}:80;
-            server_name                     #{deploy_site_name} *.#{deploy_site_name};
+            server_name                     .#{deploy_site_name};
 
-            location / {
-              rewrite ^ https://$http_host$request_uri? permanent
-            }
+            rewrite ^ https://$http_host$request_uri? permanent
         }
       VHOST
 
@@ -65,7 +92,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Completely removes the site configuration from the server (but leaves the files.)"
-    task :remove do
+    task :remove, :roles => :web do
       abort "Sorry, auto-removing sites is not supported on your installation of Nginx." unless exists?(:nginx_disable_script)
 
       run "#{sudo} rm /etc/nginx/sites-available/#{deploy_site_name}"
@@ -73,12 +100,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Enable Site"
-    task :enable do
+    task :enable, :roles => :web do
       abort "Sorry, auto-enabling sites is not supported on your installation of Nginx." unless exists?(:nginx_enable_script)
     end
 
     desc "Disable Site"
-    task :disable do
+    task :disable, :roles => :web do
       abort "Sorry, auto-disabling sites is not supported on your installation of Nginx." unless exists?(:nginx_disable_script)
     end
   end

data/lib/chicken_soup/capabilities/passenger/passenger-tasks.rb

@@ -8,14 +8,14 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       This task does nothing.
     DESC
-    task :start do ; end
+    task :start, :roles => :app do ; end
 
     desc <<-DESC
       There is no way to stop the application via Passenger.
 
       This task does nothing.
     DESC
-    task :stop do ; end
+    task :stop, :roles => :app do ; end
 
     desc <<-DESC
       Starts/Restarts the application.
@@ -24,7 +24,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       directory called `restart.txt`.  If the Last Access time for `restart.txt`
       changes, Passenger restarts the app.
     DESC
-    task :restart, :except => { :no_release => true } do
+    task :restart, :roles => :app do
       run "touch #{File.join( current_path, 'tmp', 'restart.txt' )}"
     end
   end

data/lib/chicken_soup/capabilities/shared/db-tasks.rb

@@ -22,12 +22,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       * After export, each file is zipped up using a bzip2 compression format.
     DESC
     namespace :backup do
-      task :default do
+      task :default, :roles => :db, :only => {:primary => true} do
         run "cd #{current_path} && BACKUP_DIRECTORY=#{shared_path}/db_backups #{rake} db:backup"
       end
 
       desc "[internal] Used to check to see if the db:backup task exists on the server."
-      task :check do
+      task :check, :roles => :db do
         backup_task_exists = capture("cd #{current_path} && #{rake} -T | grep db:backup | wc -l").chomp
         abort("There must be a task named db:backup in order to deploy.  If you do not want to backup your DB during deployments, set the skip_backup_before_migration variable to true in your deploy.rb.") if backup_task_exists == '0'
 
@@ -45,7 +45,7 @@ Capistrano::Configuration.instance(:must_exist).load do
               to run this in production, you'll need to log into the server and
               run the rake task manually or use Capistrano's `console` task.
     DESC
-    task :reset_and_seed do
+    task :reset_and_seed, :roles => :db do
       abort "I'm sorry Dave, but I can't let you do that. I have full control over production." if rails_env == 'production'
       db.backup
       run "cd #{current_path} && #{rake} db:reset_and_seed"
@@ -62,7 +62,7 @@ Capistrano::Configuration.instance(:must_exist).load do
               to run this in production, you'll need to log into the server and
               run the rake task manually or use Capistrano's `console` task.
     DESC
-    task :seed do
+    task :seed, :roles => :db do
       abort "I'm sorry Dave, but I can't let you do that. I have full control over production." if rails_env == 'production'
       db.backup
       run "cd #{current_path} && #{rake} db:seed"

data/lib/chicken_soup/capabilities/shared/web_server-tasks.rb

@@ -20,14 +20,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc <<-DESC
         Enables the website's application by removing the maintenance page.
       DESC
-      task :enable do
+      task :enable, :roles => :web do
         website.maintenance_mode.disable
       end
 
       desc <<-DESC
         Disables the website's application by installing the maintenance page.
       DESC
-      task :disable do
+      task :disable, :roles => :web do
         website.maintenance_mode.enable
       end
     end
@@ -41,7 +41,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         web servers are configured correctly) will make your application \
         web-accessible again.
       DESC
-      task :disable, :except => { :no_release => true } do
+      task :disable, :roles => :web do
         run "rm #{shared_path}/system/maintenance.html"
       end
 
@@ -61,7 +61,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         Further customization will require that you write your own task.
       DESC
-      task :enable, :except => { :no_release => true } do
+      task :enable, :roles => :web do
         on_rollback { rm "#{shared_path}/system/maintenance.html" }
 
         require 'erb'
@@ -77,22 +77,22 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :web_server do
     desc "Stop the web server"
-    task :stop do
+    task :stop, :roles => :web do
       run "#{sudo} #{web_server_control_script} stop"
     end
 
     desc "Start the web server"
-    task :start do
+    task :start, :roles => :web do
       run "#{sudo} #{web_server_control_script} start"
     end
 
     desc "Restart the web server"
-    task :restart do
+    task :restart, :roles => :web do
       run "#{sudo} #{web_server_control_script} restart"
     end
 
     desc "Reloads the web server configuration"
-    task :reload do
+    task :reload, :roles => :web do
       run "#{sudo} #{web_server_control_script} reload"
     end
   end

data/lib/chicken_soup/capabilities/unix/unix-checks.rb

@@ -21,9 +21,9 @@ Capistrano::Configuration.instance(:must_exist).load do
           :app_server_ip,
           :web_server_ip,
           :db_server_ip,
-          :web_server_name,
-          :app_server_name,
-          :db_server_name
+          :web_servers,
+          :app_servers,
+          :db_servers
         ]
 
         verify_variables(required_variables)

data/lib/chicken_soup/capabilities/unix/unix-defaults.rb

@@ -23,9 +23,9 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         _cset :default_server_name,   domain
 
-        _cset(:app_server_name)       { default_server_name }
-        _cset(:web_server_name)       { default_server_name }
-        _cset(:db_server_name)        { default_server_name }
+        _cset(:app_servers)           { default_server_name }
+        _cset(:web_servers)           { default_server_name }
+        _cset(:db_servers)            { default_server_name }
 
         # Evidently roles can't be assigned in a namespace :-/
         set_unix_server_roles
@@ -35,8 +35,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "[internal] This task is only here because `role` cannot be used within a `namespace`"
   task :set_unix_server_roles do
-    role :web,                  web_server_name, :primary => true
-    role :app,                  app_server_name, :primary => true
-    role :db,                   db_server_name,  :primary => true
+    role :web,                  web_servers
+    role :app,                  app_servers
+    role :db,                   db_servers, :primary => true
   end
 end

data/lib/chicken_soup/capabilities/unix/unix-tasks.rb

@@ -30,7 +30,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         Note: This task will also work for setting up shared directories for user uploads, etc.
       DESC
-      task :setup do
+      task :setup, :roles => :app do
         global_shared_elements.each do |shared_file|
           base_dir_of_shared_file         = shared_file.match(%r{/?((?:.*)/)})[1]
           run "mkdir -p '#{shared_path}/#{base_dir_of_shared_file}'"
@@ -38,12 +38,13 @@ Capistrano::Configuration.instance(:must_exist).load do
           remote_shared_file              = "#{shared_path}/#{shared_file}"
           local_shared_file               = "#{Dir.pwd}/#{shared_file}"
           local_environment_specific_file = "#{local_shared_file}.#{rails_env}"
+          permissions                     = File.directory? local_shared_file ? "755" : "600"
 
           if File.exists?(local_environment_specific_file)
-            top.upload(local_environment_specific_file, remote_shared_file, :mode => "600")
+            top.upload(local_environment_specific_file, remote_shared_file, :mode => permissions)
           elsif !remote_file_exists?(remote_shared_file)
             if File.exists?(local_shared_file)
-              top.upload(local_shared_file, remote_shared_file, :mode => "600")
+              top.upload(local_shared_file, remote_shared_file, :mode => permissions)
             else
               abort "I'm sorry Dave, but I couldn't find a local file or directory at '#{local_shared_file}' or '#{local_environment_specific_file}'"
             end
@@ -56,7 +57,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         By default, these live in the shared directory that Capistrano sets up.
       DESC
-      task :symlink do
+      task :symlink, :roles => :app do
         global_shared_elements.each do |shared_file|
           run "ln -nfs #{shared_path}/#{shared_file} #{latest_release}/#{shared_file}"
         end

data/lib/chicken_soup/version.rb

@@ -1,3 +1,3 @@
 module ChickenSoup
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,84 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chicken_soup
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - thekompanee
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-15 00:00:00 -05:00
+date: 2011-07-18 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153155400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153155400
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &2153154900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.2.15
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153154900
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2172657540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2172657540
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2172657080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2172657080
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2172656620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
-  version_requirements: *id005
-description: ...for the Deployment Soul.  Why do you keep typing all that crap into your Capistrano recipes?  Are you too cool for standards?  Well, ARE YA!?
+  prerelease: false
+  version_requirements: *2172656620
+description: Why do you keep typing all that crap into your Capistrano recipes?  Are
+  you too cool for standards?  Well, ARE YA!?
 email: support@thekompanee.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -145,30 +143,28 @@ files:
 has_rdoc: true
 homepage: http://github.com/jfelchner/chicken_soup
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset = UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: chicken_soup
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: chicken_soup-0.3.0
-test_files: 
+summary: ! '...for the Deployment Soul.'
+test_files:
 - spec/support/focused.rb