capistrano_recipes 1.0.5 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDQ0OTc5NzU4YjFlYjdmMjg5YzcyYWQ3MjBiZmI5Nzg1MWNhYTMxMw==
-  data.tar.gz: !binary |-
-    N2U2ZjM3Y2RhOTgwNmM0YWE1YzM3YWUyMDkzMWVmZTczODhkMjQwMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGJiM2Y0NTY0OGEwNGQzYjllMTIwZWEwZjkzM2QxYmRhMTEyMGI2YWRjMTdh
-    MTcxNTg5MjM4NzNlYzE5Y2M3N2RlNDIyOTZhNzk4NWNkMjFjYzJmZjdhMjkz
-    OTNlYmJmZjdjMGY4NmQxNmZjMTc2MjM5Y2ZmYzMxNjVkYmEwN2I=
-  data.tar.gz: !binary |-
-    ZDgzM2IwMTRkNTQ2OTczOGIzZTZmOWQwYzk4OGFhMGE3ZTgwNWZjYWRiMGRk
-    YTUyM2NjZDdlYzIzNmU0YzdmZjQwZDA5YWI0NTU3NzI1YzJlMWQzODVlZGVm
-    OTcwYmFhYjk4NTllOTZlN2EwNzE5NDFhOGY4OTgyOGI2NmFjZmY=
+SHA1:
+  metadata.gz: 122570754efd076c4abea7cf73802fefd22c5607
+  data.tar.gz: 0556b85e858cba70703becfea75f6053aa057051
+SHA512:
+  metadata.gz: 213dff16815537617f6cf526fe132a316a1ae956841c35061fdcfb2550d78efa938696189f53c3796c195da42fe713acd0042c55f8dc26d80d418dc3b2d50918
+  data.tar.gz: 6e77174d533b8998da024ca38713a771e6e695952e4e1ca0e8fe2217346a31e940a2f545cdb0fa60e67404d2974880fcaeb37de753d83137b564fffde526f7c4

data/capistrano_recipes.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'capistrano_recipes'
-  s.version       = '1.0.5'
+  s.version       = '1.1.0'
   s.authors       = ['Fernando Aleman']
   s.email         = ['fernandoaleman@mac.com']
   s.description   = 'Capistrano recipes to make your deployments fast and easy'

data/lib/capistrano/recipes/nginx.rb

@@ -46,14 +46,46 @@ module CapistranoRecipes
 
         # Nginx ssl key file
         _cset :nginx_ssl_key, lambda { "#{application}.key" }
+        
+        # Whether or not to use auth basic
+        _cset :use_auth_basic, false
+        
+        # Nginx auth basic username
+        _cset :nginx_auth_basic_username, lambda { ask "Enter #{rails_env} auth basic username " }
+        
+        # Nginx auth basic password
+        _cset :nginx_auth_basic_password, lambda { password_prompt "Enter #{rails_env} auth basic password " }
+        
+        # Nginx htpasswd path on server
+        _cset :nginx_htpasswd_path, lambda{ "#{shared_path}/htpasswd" }
+        
+        # Nginx htpasswd file on server
+        _cset :nginx_htpasswd_file, lambda{ File.join nginx_htpasswd_path, "htpasswd" }
 
         def using_ssl?
           fetch(:use_ssl)
         end
+        
+        def using_auth_basic?
+          fetch(:use_auth_basic)
+        end
 
         namespace :nginx do
+          desc 'Add HTTP Basic Authentication'
+          task :auth_basic, :roles => :web, :except => { :no_release => true } do
+            htpasswd = "#{nginx_auth_basic_username}:#{%Q{#{nginx_auth_basic_password}}.crypt(%Q{#{application}})}"
+            commands = []
+            commands << "mkdir -p #{nginx_htpasswd_path}"
+            commands << "if (test -f #{nginx_htpasswd_file}); then #{sudo} mv #{nginx_htpasswd_file} /tmp/htpasswd; fi"
+            commands << "echo '#{htpasswd}' >> /tmp/htpasswd"
+            commands << "#{sudo} mv /tmp/htpasswd #{nginx_htpasswd_file}"
+
+            run commands.join(" && ")
+          end
+          
           desc 'Create and upload nginx vhost'
           task :setup, :roles => :web, :except => { :no_release => true } do
+            auth_basic if using_auth_basic?
             upload_template nginx_local_site_available_template, nginx_remote_site_available_file
             run "#{sudo} ln -nfs #{nginx_remote_site_available_file} #{nginx_remote_site_enabled_link}"
             restart

data/lib/capistrano/recipes/templates/nginx.vhost.erb

@@ -18,7 +18,12 @@ server {
   root <%= current_path %>/public;
   access_log <%= shared_path %>/log/access.log main;
   error_log <%= shared_path %>/log/error.log info;
-
+  
+  <% if using_auth_basic? %>
+  auth_basic "Restricted Access";
+  auth_basic_user_file <%= nginx_htpasswd_file %>;
+	
+  <% end %>
   # Rewrite all the requests to the maintenance.html
   # page if it exists in the doc root. This is for
   # capistrano's disable web task
@@ -76,7 +81,12 @@ server {
   root <%= current_path %>/public;
   access_log <%= shared_path %>/log/ssl-access.log main;
   error_log <%= shared_path %>/log/ssl-error.log info;
-
+  
+  <% if using_auth_basic? %>
+  auth_basic "Restricted Access";
+  auth_basic_user_file <%= nginx_htpasswd_file %>;
+	
+  <% end %>
   ssl                   on;
   ssl_certificate       <%= File.join nginx_ssl_certs_path, nginx_ssl_cert %>;
   ssl_certificate_key   <%= File.join nginx_ssl_private_path, nginx_ssl_key %>;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Fernando Aleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -101,17 +101,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Capistrano deployment recipes