negroku 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d53aec7f354efc4a17bad4e9486214fc4ff710
-  data.tar.gz: b6c15222c644ad3c8238b55c71ea155277cbb07a
+  metadata.gz: 9638f23e921f10eca6d3a6b6b237bb9c6bd5acc3
+  data.tar.gz: e36ab13c316e591e03e82177e47322a4e90e52f0
 SHA512:
-  metadata.gz: d350d87e50c3c4063f1aeb33701addfcb61375a1132ade613ad41f5648d4cf58aeff32352ecc932cc9cb74a4c665eaea3f4eef4dac181091ca02ea0651e2345a
-  data.tar.gz: 1b8c3cd3b982dbcae2e5e72a07c2f607744c44792d3341ef75db350674ea57ad420964c7e717a84f12a15c0efe3bfd1d80d32f338e3c4e422cdea76961072883
+  metadata.gz: 9c9b772a996117b173b892674588fa005c880dbe89bf5909156317bbf8d383256d89ebd718534b28c884374ad07dae005f1693736c3e15ab6a522bd991930722
+  data.tar.gz: 563dfe701079158e130cca8a2456fcf49a47e314181d73b2f00ff48793c4977482915507ac90b30acbf730598cd1ccc9a24fad022d405222bd99828fecf75cfb

data/lib/negroku/cli/stage.rb

@@ -1,3 +1,5 @@
+include Capistrano::DSL
+
 module Negroku::Stage
   extend self
 
@@ -10,7 +12,10 @@ module Negroku::Stage
     }
 
     add_stage_file config
-    Negroku::Env.bulk(config[:stage_name]) if ask_set_vars
+    if ask_set_vars
+      load deploy_config_path
+      Negroku::Env.bulk(config[:stage_name])
+    end
   end
 
   def ask_set_vars

data/lib/negroku/tasks/rbenv.rake

@@ -22,7 +22,7 @@ namespace :rbenv do
     desc "Show current environmental variables"
     task :show do
       on release_roles :app do
-        within current_path do
+        within shared_path do
           execute :rbenv, 'vars'
         end
       end

data/lib/negroku/tasks/unicorn.rake

@@ -50,6 +50,10 @@ namespace :load do
     # Set the app server socket if nginx is being used
     set :app_server_socket, -> { fetch(:unicorn_socket) } if required? 'capistrano/nginx'
 
+    ## Eye monitoring
+    set :unicorn_master_cpu_checks, "check :cpu, :every => 30, :below => 80, :times => 3"
+    set :unicorn_master_memory_checks, "check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]"
+
   end
 end
 

data/lib/negroku/templates/negroku/Capfile.erb

@@ -43,4 +43,4 @@ require 'negroku/eye/unicorn'
 require 'negroku/deploy'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
-Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

data/lib/negroku/templates/tasks/eye/_unicorn.erb

@@ -10,15 +10,18 @@
     # soft restart
     restart_command "kill -USR2 {PID}"
 
-    check :cpu, :every => 30, :below => 80, :times => 3
-    check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
+    # Master process checks
+    <%= fetch(:unicorn_master_cpu_checks) %>
+    <%= fetch(:unicorn_master_memory_checks) %>
 
     start_timeout 100.seconds
     restart_grace 30.seconds
 
     monitor_children do
       stop_command "kill -QUIT {PID}"
-      check :cpu, :every => 30, :below => 80, :times => 3
-      check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
+
+      # Children processes checks
+      <%= fetch(:unicorn_children_cpu_checks, fetch(:unicorn_master_cpu_checks)) %>
+      <%= fetch(:unicorn_children_memory_checks, fetch(:unicorn_master_memory_checks)) %>
     end
   end

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.3.5'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc