matross 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDMxMzlkYzllYjdmZDc0NmJiMTBlYzk2NzUxZjU1MzI3NTFhMTc1ZA==
+    MGJkNDFkNjgyNTMwMjVhZWE4ZWUzZGQzYjg2YjY0MzI2ODJhNzZlMg==
   data.tar.gz: !binary |-
-    NjAwNzQyMzhmM2VkZTI1MDJkN2ZiOTFlMTVmNjA0NTYwNGM0OTQzYQ==
+    MDFhYTAwZmQxYTgxMDg2NGU4Njc5MTA5MzNjMjAyYTczYmJkMTEwNA==
 SHA512:
   metadata.gz: !binary |-
-    NjFkMjRiN2E2NWJiOTQ3YWM2MDE1Mzc1MTkxMGU4NzYwNzA3ZDE0YzMxNTNk
-    NGVmNGQ0ZjE0NDcyZTExODZjYTg5MzRmMGI0NzBhYTdhNDA1MDE2NzMxODhh
-    OTcxNjk1MTAxODZiYjVhYTZjY2MzMzdlODJhMDY4YzBjNTU0MTg=
+    ZWFiMDdjMWY4MWFkMGZjYzhiMzI5MDMyYTZkNzNiNTg4Mjk3ZTRhM2Y0NjZi
+    NjZiMjIwZWRjNzRjMDFmM2ZkOGJmODAzMWFiN2JkNWNjZDAyNmM2NjEzY2Ux
+    ODU5MGI3ZDkzNzRmZjllNDgzN2UyNTA0YTUyOTJhZmFmNDlkOGM=
   data.tar.gz: !binary |-
-    OTA4Yzc1MWRjNGZiOWJiY2EwMjgzNzM0OTIwMGUwZTMyYjU1MjQ4MzcwNzgy
-    OWEwMGRjNjNkYjY4NmUxOTVlODQwMDU0ZWEwNTlmMTJkMjI4NzA2YjAxZjVj
-    NTJhYzljZmVkZGEyMGQyYWY2NjVhNjI3ODliODU2ZTM2Y2Q0MWI=
+    MWNkNmFiYzE1MDYyNWZhMDQxNTJhZmI0MzA2OGZlNjMxOWNhMWJlOTUyMzI1
+    MTM1NzliYzA0NzQ3ZGZlNDJlY2ZjOGRiZTNkYmFkNDgzMjM4ODcwZWE3Nzli
+    MzUyM2E0M2M5NDM5YTdhNWY5MDJhNjQwY2RkYWViODE1M2E4ZWU=

data/lib/matross/base.rb

@@ -12,7 +12,7 @@ def template(from, to)
 end
 
 def dep_included?(dependency)
-  lockfile = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile)) 
+  lockfile = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
   if not lockfile.specs.any? { |gem| gem.name == dependency} then
     raise Matross::MissingDepError, "recipe requires the #{dependency} gem"
   end
@@ -26,5 +26,4 @@ namespace :base do
     run "#{sudo} ln -nfs #{shared_path}/config/logrotate /etc/logrotate.d/#{application}"
   end
   after "deploy:setup", "base:logrotate"
-
 end

data/lib/matross/delayed_job.rb

@@ -17,5 +17,4 @@ namespace :delayed_job do
     put procfile.result(binding), "#{shared_path}/Procfile.dj"
   end
   after "foreman:pre_setup", "delayed_job:procfile"
-
 end

data/lib/matross/faye.rb

@@ -29,5 +29,4 @@ namespace :faye do
     put procfile.result(binding), "#{shared_path}/Procfile.faye"
   end
   after "foreman:pre_setup", "faye:procfile"
-
 end

data/lib/matross/fog.rb

@@ -18,5 +18,4 @@ namespace :fog do
     run "ln -nfs #{fog_config} #{release_path}/config/fog_config.yml"
   end
   after "bundle:install", "fog:symlink"
-
 end

data/lib/matross/foreman.rb

@@ -98,5 +98,4 @@ namespace :foreman do
     run "cd #{shared_path}/upstart && rm -f Procfile*"
     run "cd /etc/init/ && #{sudo} rm #{application}*"
   end
-
 end

data/lib/matross/local_assets.rb

@@ -20,7 +20,5 @@ namespace :deploy do
         RAILS_ENV=#{rails_env.to_s.shellescape} #{rake} assets:clean
       CMD
     end
-
   end
-
 end

data/lib/matross/mongoid.rb

@@ -16,5 +16,4 @@ namespace :mongoid do
     run "ln -nfs #{mongoid_config} #{release_path}/config/mongoid.yml"
   end
   after "bundle:install", "mongoid:symlink"
-
 end

data/lib/matross/mysql.rb

@@ -2,20 +2,20 @@ dep_included? 'mysql2'
 
 _cset(:database_config) { "#{shared_path}/config/database.yml" }
 
-namespace :db do
+namespace :mysql do
 
   desc "Creates the database.yml file in shared path"
   task :setup, :roles => [:app, :dj] do
     run "mkdir -p #{shared_path}/config"
     template "mysql/database.yml.erb", database_config
   end
-  after "deploy:setup", "db:setup"
+  after "deploy:setup", "mysql:setup"
 
   desc "Updates the symlink for database.yml for deployed release"
   task :symlink, :roles => [:app, :dj] do
     run "ln -nfs #{database_config} #{release_path}/config/database.yml"
   end
-  after "bundle:install", "db:symlink"
+  after "bundle:install", "mysql:symlink"
 
   desc "Creates the application database"
   task :create, :roles  => [:db] do
@@ -24,7 +24,7 @@ namespace :db do
     EOF
     run "mysql --user=#{mysql_user} --password=#{mysql_passwd} --host=#{mysql_host} --execute=\"#{sql}\""
   end
-  after "db:setup", "db:create"
+  after "mysql:setup", "mysql:create"
 
   desc "Loads the application schema into the database"
   task :schema_load, :roles => [:db] do
@@ -39,5 +39,5 @@ namespace :db do
     run "cd #{release_path} &&"\
       "RAILS_ENV=#{rails_env.to_s.shellescape} bundle exec rake db:schema:load" if table_count == 0
   end
-  after "db:symlink", "db:schema_load"
+  after "mysql:symlink", "mysql:schema_load"
 end

data/lib/matross/nginx.rb

@@ -14,5 +14,18 @@ namespace :nginx do
     run "#{sudo} /etc/init.d/nginx reload"
   end
   after "deploy:setup", "nginx:reload"
+  after "nginx:lock",   "nginx:reload"
+  after "nginx:unlock", "nginx:reload"
 
+  desc "Enable Basic Auth on the stage"
+  task :lock, :roles => :web do
+    run "#{sudo} sed -i /auth_basic/d /etc/nginx/sites-available/#{application}"
+    nginx_lock = "        auth_basic \"Restricted\";\n        auth_basic_user_file #{shared_path.gsub('/', '\\/')}\\/.htpasswd;"
+    run "#{sudo} sed -i 's/.*location @#{application}.*/&\n#{nginx_lock}/' /etc/nginx/sites-available/#{application}"
+    run "echo #{htpasswd.shellescape} > #{shared_path}/.htpasswd"
+  end
+
+  task :unlock, :roles => :web do
+    run "#{sudo} sed -i /auth_basic/d /etc/nginx/sites-available/#{application}"
+  end
 end

data/lib/matross/templates/nginx/nginx_virtual_host_conf.erb

@@ -8,7 +8,7 @@ server {
     server_name <%= server_name %>;
 
     keepalive_timeout 5;
-    root <%= "#{deploy_to}/current/public" %>;
+    root <%= deploy_to %>/current/public;
     try_files $uri @<%= application %>;
 
     location @<%= application %> {
@@ -26,6 +26,6 @@ server {
 
     error_page 500 502 504 /500.html;
     location = /500.html {
-        root /home/ubuntu/vandal/current/public;
+        root <%= deploy_to %>/current/public;
     }
 }

data/lib/matross/unicorn.rb

@@ -22,5 +22,4 @@ namespace :unicorn do
     put procfile.result(binding), "#{shared_path}/Procfile.web"
   end
   after "foreman:pre_setup", "unicorn:procfile"
-
 end

data/lib/matross/version.rb

@@ -1,3 +1,3 @@
 module Matross
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matross
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Artur Rodrigues
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler