matross 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU0MjU2YTZkOWEyN2M0NmMzYjE3YWQ4NTU3Yzk5ODNhMDkyYTYyOA==
+    MDMxMzlkYzllYjdmZDc0NmJiMTBlYzk2NzUxZjU1MzI3NTFhMTc1ZA==
   data.tar.gz: !binary |-
-    NDk3YmEyZGEzZmU2ZTQwZTQyZWIyYjczNjIyYzhkYmQ1MWYwODk0Nw==
+    NjAwNzQyMzhmM2VkZTI1MDJkN2ZiOTFlMTVmNjA0NTYwNGM0OTQzYQ==
 SHA512:
   metadata.gz: !binary |-
-    MTZkYjk3MWRlN2VmZjVkNDkzYjA5YzBiZjlkNzIyMjZiNzYwZmY4NTA2NjEz
-    NTgzYjA2OGNlMThhNTAwN2M1ODcyNjhlMjA2NDgwOGJhNWRkNTU4N2Y1Mzc0
-    OTQ2Y2ZhNDYxYWFiZjc5YjU2MWU0YWU2MDIyNjk4ZWVkNTRkZGU=
+    NjFkMjRiN2E2NWJiOTQ3YWM2MDE1Mzc1MTkxMGU4NzYwNzA3ZDE0YzMxNTNk
+    NGVmNGQ0ZjE0NDcyZTExODZjYTg5MzRmMGI0NzBhYTdhNDA1MDE2NzMxODhh
+    OTcxNjk1MTAxODZiYjVhYTZjY2MzMzdlODJhMDY4YzBjNTU0MTg=
   data.tar.gz: !binary |-
-    ZDA5YmNmYmI0YzVkNjMxMDM0OTdkMGYxZGQ3YTgwNTNhNTIyMmE1ZGZhNWU5
-    MGZkZDNjNGY1ODJjNjQ3MmRjZWIzM2MxMDViY2FiOTdiMmNlNWM3ZjY3MWFj
-    NTlmYmYyMDk1MjgyODk3MDMzZDQ2ZTVlMWRjZWJmYTlhNGQzZTM=
+    OTA4Yzc1MWRjNGZiOWJiY2EwMjgzNzM0OTIwMGUwZTMyYjU1MjQ4MzcwNzgy
+    OWEwMGRjNjNkYjY4NmUxOTVlODQwMDU0ZWEwNTlmMTJkMjI4NzA2YjAxZjVj
+    NTJhYzljZmVkZGEyMGQyYWY2NjVhNjI3ODliODU2ZTM2Y2Q0MWI=

data/lib/matross/base.rb

@@ -8,7 +8,7 @@ def template(from, to)
   else
     erb = File.read(File.expand_path("../templates/#{from}", __FILE__))
   end
-  put ERB.new(erb).result(binding), to
+  put ERB.new(erb, nil, '-').result(binding), to
 end
 
 def dep_included?(dependency)

data/lib/matross/delayed_job.rb

@@ -5,7 +5,13 @@ namespace :delayed_job do
   desc "Writes the delayed job part of the Procfile"
   task :procfile, :roles => :dj do
     procfile_template = <<-EOF.gsub(/^\s+/, '')
-      dj: bundle exec rake jobs:work
+      <%- if exists?(:dj_queues) -%>
+        <%- dj_queues.each do |queue_name| -%>
+          dj_<%= queue_name %>: bundle exec rake jobs:work QUEUE=<%= queue_name %>
+        <%- end -%>
+      <%- else -%>
+        dj: bundle exec rake jobs:work
+      <%- end -%>
     EOF
     procfile = ERB.new(procfile_template, nil, '-')
     put procfile.result(binding), "#{shared_path}/Procfile.dj"

data/lib/matross/faye.rb

@@ -0,0 +1,33 @@
+dep_included? 'faye'
+dep_included? 'thin'
+
+_cset(:faye_config) { "#{shared_path}/config/faye_server.yml" }
+_cset(:faye_ru)     { "#{shared_path}/config/faye.ru" }
+
+namespace :faye do
+
+  desc "Creates the faye_server.yml in shared path"
+  task :setup, :roles => :app do
+    run "mkdir -p #{shared_path}/config"
+    template "faye/faye_server.yml.erb", faye_config
+    template "faye/faye.ru.erb", faye_ru
+  end
+  after "deploy:setup", "faye:setup"
+
+  desc "Updates the symlink for faye_server.yml for deployed release"
+  task :symlink, :roles => :app do
+    run "ln -nfs #{faye_config} #{release_path}/config/faye_server.yml"
+  end
+  after "bundle:install", "faye:symlink"
+
+  desc "Writes the faye part of the Procfile"
+  task :procfile, :roles => :faye do
+    procfile_template = <<-EOF.gsub(/^\s+/, '')
+      faye: bundle exec rackup  <%= faye_ru %> -s thin -E <%= rails_env %> -p <%= faye_port %>
+    EOF
+    procfile = ERB.new(procfile_template, nil, '-')
+    put procfile.result(binding), "#{shared_path}/Procfile.faye"
+  end
+  after "foreman:pre_setup", "faye:procfile"
+
+end

data/lib/matross/fog.rb

@@ -1,4 +1,9 @@
-_cset(:fog_config) { "#{shared_path}/config/fog_config.yml" }
+dep_included? "fog"
+
+_cset(:fog_config)  { "#{shared_path}/config/fog_config.yml" }
+_cset :fog_region,  "us-east-1"
+_cset :fog_public,  false
+
 namespace :fog do
 
   desc "Creates the fog_config.yml in shared path"

data/lib/matross/foreman.rb

@@ -82,6 +82,11 @@ namespace :foreman do
   end
   after "foreman:export", "foreman:log"
 
+  desc "Stop services"
+  task :stop, except: { no_release: true } do
+    run "#{sudo} stop #{application}"
+  end
+
   desc "Restart services"
   task :restart, except: { no_release: true } do
     run "#{sudo} start #{application} || #{sudo} restart #{application}"

data/lib/matross/mongoid.rb

@@ -0,0 +1,20 @@
+dep_included? "mongoid"
+
+_cset(:mongoid_config)  { "#{shared_path}/config/mongoid.yml" }
+
+namespace :mongoid do
+
+  desc "Creates the mongoid.yml file in shared path"
+  task :setup, :roles => :app do
+    run "mkdir -p #{shared_path}/config"
+    template "mongoid/mongoid.yml.erb", mongoid_config
+  end
+  after "deploy:setup", "mongoid:setup"
+
+  desc "Updates the symlink for mongoid.yml for deployed release"
+  task :symlink, :roles => :app do
+    run "ln -nfs #{mongoid_config} #{release_path}/config/mongoid.yml"
+  end
+  after "bundle:install", "mongoid:symlink"
+
+end

data/lib/matross/templates/faye/faye.ru.erb

@@ -0,0 +1,4 @@
+require 'faye'
+Faye::WebSocket.load_adapter('thin')
+bayeux = Faye::RackAdapter.new(:mount => '/faye', :timeout => 25)
+run bayeux

data/lib/matross/templates/faye/faye_server.yml.erb

@@ -0,0 +1,6 @@
+faye_server:
+  server: <%= roles[:faye].servers[0] %>
+  port: <%= faye_port %>
+  protocol: http
+  address: faye
+  local: <%= faye_local %>

data/lib/matross/templates/fog/fog_config.yml.erb

@@ -1,5 +1,5 @@
 aws_access_key_id: <%= fog_aws_access_key_id %>
 aws_secret_access_key: <%= fog_aws_secret_access_key %>
 directory: <%= fog_directory %>
-region: <%= defined?(fog_region) ? fog_region : 'us-east-1' %>
-public: <%= defined?(fog_public) ? fog_public : false %>
+region: <%= fog_region %>
+public: <%= fog_public %>

data/lib/matross/templates/mongoid/mongoid.yml.erb

@@ -0,0 +1,10 @@
+<%= rails_env %>:
+  sessions:
+    default:
+      database: <%= mongo_database.gsub("-", "_") %>
+      hosts:
+      <%- mongo_hosts.each do |host| -%>
+        - <%= host %>
+      <%- end -%>
+      <% if exists?(:mongo_user) %>username: <%= mongo_user %><% end %>
+      <% if exists?(:mongo_passwd) %>password: <%= mongo_passwd %><% end %>

data/lib/matross/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matross
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Artur Rodrigues
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,14 +71,19 @@ files:
 - lib/matross/base.rb
 - lib/matross/delayed_job.rb
 - lib/matross/errors.rb
+- lib/matross/faye.rb
 - lib/matross/fog.rb
 - lib/matross/foreman.rb
 - lib/matross/local_assets.rb
+- lib/matross/mongoid.rb
 - lib/matross/mysql.rb
 - lib/matross/nginx.rb
 - lib/matross/templates/base/logrotate.erb
+- lib/matross/templates/faye/faye.ru.erb
+- lib/matross/templates/faye/faye_server.yml.erb
 - lib/matross/templates/fog/fog_config.yml.erb
 - lib/matross/templates/foreman/process.conf.erb
+- lib/matross/templates/mongoid/mongoid.yml.erb
 - lib/matross/templates/mysql/database.yml.erb
 - lib/matross/templates/nginx/nginx_virtual_host_conf.erb
 - lib/matross/templates/unicorn/unicorn.rb.erb
@@ -105,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Our collection of opnionated Capistrano recipes