daddy 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb76215406b7530b3655cd133994c330b290aca
-  data.tar.gz: d696bbc27b93e262c04c1be646111fe4dd641b72
+  metadata.gz: adebf94afd27d89f889ea11223950555d34a33c5
+  data.tar.gz: 7242fa1f7bb280e389ac351f9af2b43d5a2448af
 SHA512:
-  metadata.gz: 0237c217d406c327f5e2869f41b69619a8b499345c1393c5da126ac1b68d6938b1a1cf969aaf46f6b8d75dddd289ac60327ea52bd2113d71fe8f1340315996f8
-  data.tar.gz: c512a727686dd5eae3e74f300f108f45081d0848bc11fcd947a2c3c290aa26de479518362299bb9e07b693d56836324ee015c5e660b96e41bc61767d351417c0
+  metadata.gz: 5f29678c5d49c00800672439c38dbcc07a32db0f3be094009786e12cdfc9d9005883261cb422a91db3dd082ac8c20bf0c4d4e656ac70e4c3d6e6fe4c93ed4d34
+  data.tar.gz: 5c690f51b37b6fa374f158b2220710dcabf82c632c3e3869ff4bc0f0edf00da414b0c7ec206878f4dae158168c450ad7aece8a84c65f56a4cd742dfdcb5727e3

data/itamae/cookbooks/unicorn/install.rb

@@ -1,9 +1,7 @@
 require 'daddy/itamae'
 
 template 'config/unicorn.rb' do
-  variables :rails_root => ENV['RAILS_ROOT'],
-      :worker_processes => ENV['RAILS_ROOT'] == 'production' ? 2 : 1,
-      :timeout => 300
+  variables :timeout => 300
 end
 
 case os_version
@@ -16,7 +14,8 @@ when /rhel-6\.(.*?)/
     mode '755'
     variables :app_name => ENV['APP_NAME'],
         :rails_env => ENV['RAILS_ENV'],
-        :rails_root => ENV['RAILS_ROOT']
+        :rails_root => ENV['RAILS_ROOT'],
+        :worker_processes => ENV['RAILS_ROOT'] == 'production' ? 2 : 1
   end
 when /rhel-7\.(.*?)/
   template "/etc/systemd/system/#{ENV['APP_NAME']}.service" do
@@ -29,7 +28,7 @@ when /rhel-7\.(.*?)/
         :rails_env => ENV['RAILS_ENV'],
         :rails_root => ENV['RAILS_ROOT'],
         :user => ENV['USER'],
-        :timeout => 305
+        :worker_processes => ENV['RAILS_ROOT'] == 'production' ? 2 : 1
   end
 
   execute 'systemctl daemon-reload' do

data/itamae/cookbooks/unicorn/templates/init.d/app.erb

@@ -13,6 +13,7 @@ PID=${RAILS_ROOT}/tmp/pids/unicorn.pid
 CONFIG=${RAILS_ROOT}/config/unicorn.rb
 
 export PATH="${PATH}":/usr/local/bin
+export WORKER_PROCESSES=<%= @worker_processes %>
 
 start() {
   echo -n 'Starting <%= @app_name %>: '

data/itamae/cookbooks/unicorn/templates/systemd/app.service.erb

@@ -8,6 +8,7 @@ User = <%= @user %>
 WorkingDirectory = <%= @rails_root %>
 SyslogIdentifier = <%= @app_name %>
 PIDFile = <%= @rails_root %>/tmp/pids/unicorn.pid
+Environment="WORKER_PROCESSES=<%= @worker_processes %>"
 ExecStart = /usr/local/bin/bundle exec unicorn_rails -c <%= @rails_root %>/config/unicorn.rb -E <%= @rails_env %> -D
 ExecStop = <%= `which kill`.strip %> -s QUIT $MAINPID
 

data/itamae/cookbooks/unicorn/templates/unicorn.rb.erb

@@ -1,6 +1,6 @@
 rails_root = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}"
 
-worker_processes <%= @worker_processes %>
+worker_processes ENV['WORKER_PROCESSES'] || 1
 working_directory rails_root
 
 listen "#{rails_root}/tmp/sockets/unicorn.sock"

data/lib/daddy/test_help.rb

@@ -11,7 +11,12 @@ if ENV["COVERAGE"]
   end
 
   SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start 'rails' 
+  SimpleCov.start do
+    add_filter '/features/'
+    add_filter '/test/'
+    add_filter '/user_stories/'
+    add_filter '/vendor/'
+  end
 end
 
 case ENV['FORMAT'].to_s.downcase

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.16'
+  VERSION = '0.5.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara