matross 0.2.1 → 0.2.2

data/lib/matross/foreman.rb

@@ -7,28 +7,27 @@ _cset :foreman_procs, {}
 namespace :foreman do
 
   desc "Pre-setup, creates the shared upstart folder"
-  task :pre_setup do
+  task :pre_setup, except: {no_release: true } do 
     run "mkdir -p #{shared_path}/upstart"
   end
   before "foreman:setup", "foreman:pre_setup"
 
   desc "Merges all partial Procfiles and defines a specific dotenv"
-  task :setup do
-    run "cat $(test -f #{current_path}/Procfile && echo -n \"#{current_path}/Procfile\") #{shared_path}/Procfile.* > #{shared_path}/Procfile-matross"
-    run "rm #{shared_path}/Procfile.*"
-
-    dotenv_template = <<-EOF.gsub(/^\s+/, '')
-      RAILS_ENV=#{rails_env.to_s.shellescape}
+  task :setup, except: { no_release: true } do
+    cmd = <<-EOF.gsub(/^\s+/, '')
+      rm -f #{shared_path}/Procfile-matross;
+      for file in #{current_path}/Procfile #{shared_path}/Procfile.*; do \ 
+        cat $file >> #{shared_path}/Procfile-matross;
+      done;
+      rm -f #{shared_path}/Procfile.*;
+      cat <(RAILS_ENV=#{rails_env.to_s.shellescape}) $(test -f #{current_path}/.env && echo \"$_\") > #{shared_path}/.env-matross;
     EOF
-    dotenv = ERB.new(dotenv_template, nil, '-')
-    put dotenv.result(binding), "#{shared_path}/.env-matross-partial"
-    run "cat $(test -f #{current_path}/.env && echo \"$_\") #{shared_path}/.env-matross-partial > #{shared_path}/.env-matross"
-    run "rm #{shared_path}/.env-matross-partial"
+    run cmd, shell: "/bin/bash"
   end
   before "foreman:export", "foreman:setup"
 
   desc "Export the Procfile to Ubuntu's upstart scripts"
-  task :export, :roles => [:app, :dj] do
+  task :export, except: { no_release: true } do
     matross_path = "#{shared_path}/matross"
     run "mkdir -p #{matross_path}"
     upload File.expand_path("../templates/foreman", __FILE__), matross_path,
@@ -62,14 +61,14 @@ namespace :foreman do
   before "deploy:restart", "foreman:export"
 
   desc "Symlink configuration scripts"
-  task :symlink, :roles => [:app, :dj], :except => { :no_release => true } do
+  task :symlink, except: { no_release: true } do
     run "ln -nfs #{shared_path}/Procfile-matross #{current_path}/Procfile-matross"
     run "ln -nfs #{shared_path}/.env-matross #{current_path}/.env-matross"
   end
   after "foreman:setup", "foreman:symlink"
 
   desc "Symlink upstart logs to application shared/log"
-  task :log, :roles => [:app, :dj] do
+  task :log, except: { no_release: true } do
     capture("ls #{shared_path}/upstart -1").split(/\r?\n/).each { |line|
       log = File.basename(line.sub(/\.conf\Z/, ".log"))
       run <<-EOF.gsub(/^\s+/, '')
@@ -82,13 +81,13 @@ namespace :foreman do
   after "foreman:export", "foreman:log"
 
   desc "Restart services"
-  task :restart, :roles => [:app, :dj] do
+  task :restart, except: { no_release: true } do
     run "#{sudo} start #{application} || #{sudo} restart #{application}"
   end
   after "deploy:restart", "foreman:restart"
 
   desc "Remove upstart scripts"
-  task :remove, :roles => [:app, :dj] do
+  task :remove, except: { no_release: true } do
     run "cd #{shared_path}/upstart && rm -f Procfile*"
     run "cd /etc/init/ && #{sudo} rm #{application}*"
   end

data/lib/matross/mysql.rb

@@ -13,9 +13,9 @@ namespace :db do
 
   desc "Updates the symlink for database.yml for the just deployed release"
   task :symlink, :roles => [:app, :dj] do
-    run "ln -nfs #{database_config} #{current_path}/config/database.yml"
+    run "ln -nfs #{database_config} #{release_path}/config/database.yml"
   end
-  before "deploy:restart", "db:symlink"
+  after "bundle:install", "db:symlink"
 
   desc "Creates the application database"
   task :create, :roles  => [:db] do
@@ -36,7 +36,7 @@ namespace :db do
                           "--password=#{mysql_passwd} "\
                           "--host=#{mysql_host} "\
                           "--execute=\"#{sql}\"").to_i
-    run "cd #{current_path} &&"\
+    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"

data/lib/matross/version.rb

@@ -1,3 +1,3 @@
 module Matross
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: matross
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
+  prerelease: 
 platform: ruby
 authors:
 - Artur Rodrigues
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,25 +93,27 @@ files:
 homepage: https://github.com/innvent/matross
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Our collection of opnionated Capistrano recipes
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGMyNGNmMmE4NGNiYzljMjk1MjIxODQ2ZTE1YTViZDI2MDhiZTNmYg==
-  data.tar.gz: !binary |-
-    YTczNTRmMzlmMWYyNTMzYTBhOTQ0YTgxNDA3ZTM4M2M3MjE4N2Q4Zg==
-SHA512:
-  metadata.gz: !binary |-
-    ZjczZjU3MDdlMGE1NTQyNzNjMjc0YjNiNWYwODNlY2U5ZWI5YTNkODE5ZjJi
-    NmQyZWE4OTllNzAyNzUwNzE5MjAyMzgyMWNmMDE5YTMyZDZjNjVmYWQ4NTE0
-    ZGRkNDdlZDU3NGM3NTY4YmZkZjE5MzYzYzg1YTZjZTA2MzRiYjY=
-  data.tar.gz: !binary |-
-    NjBkOWUyMDBmYjFiZmFjMTZlMzlhNzQ3OGFiN2U0MmRhMzk0N2UwOGU5Yjdh
-    YTg3Y2EwZDczNjI3ZWE4ODA0YzMzYjNkZDdlYzliNmEwODU4NzlmMGRkOTc3
-    OTM0ZDc1ODc5YmUxYjA1NDcwMWEyZjVhNGI2ODcxMDdlMzQyZmE=