negroku 2.0.0.pre7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 359805e3a2df5b2269f1fc5d75c7bbe8d84d8b02
-  data.tar.gz: bfcbaa8204a7e548042179f999a028ca09a344f7
+  metadata.gz: 24cc285eb9ad2b4813daa33d542768b9d5b847d0
+  data.tar.gz: 7d75f4b9772ef0e518da35a78123fa87ff1a07ff
 SHA512:
-  metadata.gz: 6662dc3bba237e60b002d04bf7bcfb339958bf02ce3d2bf0801a9c6bac4fa0001e48904240346cd24d1fe4712bb98455bc782168af8e1900fb1a26c8e8a752a9
-  data.tar.gz: 8c41224e40842eedaf08e1b00f5bbd22cd4f60bb2abfdffaaebc68f28749982c6f3612317596686223386f3d41ef7cac4a9b2f767f69540e38d0aad06556ffcd
+  metadata.gz: fe22dc6821c831de3b2ca26cd7cf45720ecb6eadaff61f9f89f37303dfdfeb3b7ad63c52be882e601022274f1b1f631d1327742ce4c2314dc81ff5c3ba201da0
+  data.tar.gz: 0699cbe9a573d0e0ca403e579e6686ebb8bb50450319e3d595f173618cc340c202a1297d8466c52aee04ff776acdcb4294da0beeb37a7a2241f18e768f3a515b

data/lib/negroku/cli.rb

@@ -3,7 +3,7 @@ require 'capistrano/setup'
 require 'capistrano/deploy'
 
 # Load applications deploy config if it exists
-require './config/deploy' if File.exists? "./config/deploy"
+require './config/deploy' if File.exists? "./config/deploy.rb"
 
 require 'gli'
 require 'inquirer'

data/lib/negroku/deploy.rb

@@ -16,6 +16,8 @@ namespace :load do
 
     set :linked_files, fetch(:linked_files, []) + %w{}
   end
+
+  after "deploy", "deploy:cleanup"
 end
 
 # Load Negroku tasks

data/lib/negroku/helpers/watch.rb

@@ -1,9 +1,9 @@
-def watch_process(name, template = "tasks/eye/_#{name}.erb")
+def watch_process(name, options = {})
   processes = fetch(:eye_watched_processes, {})
 
-  processes[name] = {
-    template: template
-  }
+  options[:template] ||= "tasks/eye/_#{name}.erb"
+
+  processes[name] = options
 
   set :eye_watched_processes, processes
 end

data/lib/negroku/tasks/delayed_job.rake

@@ -7,6 +7,8 @@ namespace :load do
     set :delayed_job_workers, 1
     set :delayed_job_queues, nil
     set :delayed_job_pool, nil
+
+    set :delayed_job_prefix, -> { "#{fetch(:application)}" }
   end
 end
 

data/lib/negroku/tasks/eye/delayed_job.rake

@@ -1,21 +1,49 @@
 #########
 ## Adds support to monitor delayed_job processes through eye
 #########
+def delayed_job_args
+  args = []
+  args << "--queues=#{fetch(:delayed_job_queues).join(',')}" unless fetch(:delayed_job_queues).nil?
+  args << "--prefix=#{fetch(:delayed_job_prefix)}" unless fetch(:delayed_job_prefix).nil?
+  args << fetch(:delayed_job_pools, {}).map {|k,v| "--pool=#{k}:#{v}"}.join(' ') unless fetch(:delayed_job_pools).nil?
+  args.join(' ')
+end
+
+def delayed_job_bin
+  "#{fetch(:delayed_job_bin_path)}/delayed_job"
+end
+
+def delayed_job_start_command
+  "#{fetch(:rbenv_prefix)} bundle exec #{delayed_job_bin} #{delayed_job_args} -i \#{i} start"
+end
+
+def delayed_job_stop_command
+  "#{fetch(:rbenv_prefix)} bundle exec #{delayed_job_bin} -i \#{i} stop"
+end
 
 # Watch the delayed_job processes using the build in template
-watch_process(:delayed_job);
+namespace :eye do
+  task :watch_process do
+
+    watch_process(:delayed_job, {
+      start_command: delayed_job_start_command,
+      stop_command: delayed_job_stop_command
+    })
+
+  end
+end
 
 # Override start, restart and stop delayed_job tasks to so they call
 # the eye equivalents
-# namespace :unicorn do
-#   ['start','restart','stop'].each do |cmd|
-#     if Rake::Task.task_defined?("unicorn:#{cmd}")
-#       Rake::Task["unicorn:#{cmd}"].clear_actions
-#       # Reload or restart unicorn after the application is published
-#       desc "#{cmd} unicorn through eye"
-#       task cmd do
-#         invoke "eye:#{cmd}", 'unicorn'
-#       end
-#     end
-#   end
-# end
+namespace :delayed_job do
+  ['start','restart','stop'].each do |cmd|
+    if Rake::Task.task_defined?("delayed_job:#{cmd}")
+      Rake::Task["delayed_job:#{cmd}"].clear_actions
+      # Reload or restart delayed_job after the application is published
+      desc "using eye"
+      task cmd do
+        invoke "eye:#{cmd}", 'delayed-job'
+      end
+    end
+  end
+end

data/lib/negroku/tasks/eye/unicorn.rake

@@ -3,7 +3,13 @@
 #########
 
 # Watch the unicorn processes using the build in template
-watch_process(:unicorn);
+namespace :eye do
+  task :watch_process do
+
+    watch_process(:unicorn);
+
+  end
+end
 
 # Override start, restart and stop unicorn tasks to so they call
 # the eye equivalents

data/lib/negroku/tasks/eye.rake

@@ -12,6 +12,10 @@ namespace :load do
     # Local path to look for custom config template
     set :eye_application_template, -> { "config/deploy/#{fetch(:stage)}/eye.rb.erb" }
 
+    # Application level notifications
+    set :eye_notification_contact, -> { :monitor }
+    set :eye_notification_level, -> { :error }
+
     # Add eye to :rbenv_map_bins
     fetch(:rbenv_map_bins) << 'eye'
   end
@@ -23,28 +27,20 @@ namespace :eye do
   desc "Loads eye config and starts monitoring"
   task :load do
     on release_roles fetch(:eye_roles) do
-      within "#{current_path}" do
+      within current_path do
        execute :eye, :load, "#{shared_path}/config/eye.rb"
       end
     end
   end
 
   [:start,:restart, :info, :stop].each do |cmd|
-      # Single process
-    desc "Calls eye's #{cmd.to_s} on a process"
-    task "#{cmd}:process", [:name] do |t, args|
-      on release_roles fetch(:eye_roles) do
-        within "#{current_path}" do
-          execute :eye, cmd, "#{args[:name]}"
-        end
-      end
-    end
-    #
     desc "Calls eye's #{cmd.to_s} on the whole app"
-    task cmd do |t, args|
+    task cmd, [:mask] do |t, args|
       on release_roles fetch(:eye_roles) do
-        within "#{current_path}" do
-          execute :eye, cmd, "#{fetch(:application)}"
+        within current_path do
+            mask = fetch(:application)
+            mask +=  ":#{args[:mask]}" if args[:mask]
+            execute :eye, cmd, mask
         end
       end
     end
@@ -58,7 +54,7 @@ namespace :negroku do
   namespace :eye do
 
     desc "Upload eye configuration file"
-    task :setup do
+    task :setup => 'eye:watch_process' do
       on release_roles fetch(:eye_roles) do
         within "#{shared_path}/config" do
           processes = fetch(:eye_watched_processes, {})
@@ -78,7 +74,7 @@ namespace :negroku do
       end
     end
 
-    after "deploy:published", "negroku:eye:setup"
+    before "deploy:published", "negroku:eye:setup"
     after "negroku:eye:setup", "eye:load"
 
     define_logs(:eye, {

data/lib/negroku/tasks/unicorn.rake

@@ -78,7 +78,7 @@ namespace :negroku do
     end
 
     # Reload or restart unicorn after the application is published
-    after 'deploy:publishing', 'restart' do
+    after 'deploy:published', 'restart' do
       invoke 'negroku:unicorn:setup'
       invoke 'unicorn:restart'
     end

data/lib/negroku/templates/negroku/stage.rb.erb

@@ -11,3 +11,8 @@ set :branch,        '<%= data[:branch] %>'    # Optional, defaults to master
 
 # Rails configuration
 # set :rails_env,   'production'
+
+# Eye monitoring notifications
+# set :eye_notification_contact, :dev_team      # Optional, defaults to :monitor
+# set :eye_notification_level, :info            # Optional, defaults to :error
+

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

@@ -1,28 +1,21 @@
-cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[ ../ ../ ]))
+  group 'delayed-jobs' do
+    chain grace: 10.seconds
 
-config_path = File.join(cwd, %w{ config dj.yml } )
+    start_timeout 20.seconds
+    stop_timeout 20.seconds
+    restart_timeout 20.seconds
 
-workers_count = if File.exists?(config_path)
-  YAML.load_file(config_path).try(:[], :workers) || 5
-else
-  5
-end
+    workers_count = '<%= fetch(:delayed_job_workers || 1) %>'.to_i
 
-Eye.application 'delayed_job' do
-  working_dir cwd
-  stop_on_delete true
+    (0 ... workers_count.to_i).each do |i|
 
-  group 'dj' do
-    chain grace: 5.seconds
+    process "worker-#{i}" do
+      pid_file "tmp/pids/delayed_job.#{i}.pid"
+      start_command "<%= options[:start_command] %>"
+      stop_command "<%= options[:stop_command] %>"
+    end
 
-    (1 .. workers_count).each do |i|
-      process "dj-#{i}" do
-        pid_file "tmp/pids/delayed_job.#{i}.pid"
-        start_command "rake jobs:work"
-        daemonize true
-        stop_signals [:INT, 30.seconds, :TERM, 10.seconds, :KILL]
-        stdall "log/dj-#{i}.log"
-      end
     end
+
   end
-end
+

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

@@ -1,9 +1,6 @@
-  RAILS_ENV="<%= fetch(:rails_env) %>"
-
   process 'unicorn' do
-    env rbenv_root: "<%= fetch(:rbenv_path) %>", rbenv_version: "<%=fetch(:rbenv_ruby) %>"
     pid_file "<%= fetch(:unicorn_pid) %>"
-    start_command "<%= fetch(:rbenv_prefix) %> bundle exec unicorn -Dc <%= fetch(:unicorn_config_path) %> -E #{RAILS_ENV}"
+    start_command "<%= fetch(:rbenv_prefix) %> bundle exec unicorn -Dc <%= fetch(:unicorn_config_path) %> -E <%= fetch(:rails_env) %>"
     stdall "<%= fetch(:unicorn_log) %>"
 
     # stop signals:

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

@@ -1,19 +1,18 @@
-require 'eye-http'
-
-# Setups Eye global conf if not already
-Eye.config do
-  logger '/var/log/eye-global.log'
-  http :enable => true, :host => "0.0.0.0", :port => 12345
-end
-
 # Adding application
 Eye.application '<%= fetch(:application)%>' do
+  notify :<%= fetch(:eye_notification_contact) %>, :<%= fetch(:eye_notification_level) %>
+  notify :chat_room, :<%= fetch(:eye_notification_level) %>
+
+  load_env '<%= shared_path %>/.rbenv-vars'
+
+  env RBENV_ROOT: "<%= fetch(:rbenv_path) %>"
+  env RBENV_VERSION: "<%=fetch(:rbenv_ruby) %>"
+  env RAILS_ENV: "<%= fetch(:rails_env) %>"
 
   # All options inherits down to the config leafs.
   # except `env`, which merging down
-
-  stdall '<%= shared_path %>/log/eye.log'
   working_dir '<%= current_path %>'
+  stdall '<%= shared_path %>/log/eye.log'
 
   trigger :flapping, times: 10, within: 1.minute, retry_in: 10.minutes
 

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.0.0.pre7'
+  VERSION = '2.0.0'
 end

data/negroku.gemspec

@@ -21,17 +21,17 @@ spec = Gem::Specification.new do |s|
 
   s.add_runtime_dependency('rake', '~> 10.1')
   s.add_runtime_dependency('capistrano','~> 3.3.5')
-  s.add_runtime_dependency('capistrano-rbenv', '~> 2.0.2')
+  s.add_runtime_dependency('capistrano-rbenv', '~> 2.0.3')
   s.add_runtime_dependency('capistrano-rails', '~> 1.1.2')
-  s.add_runtime_dependency('capistrano-bundler', '~> 1.1.3')
+  s.add_runtime_dependency('capistrano-bundler', '~> 1.1.4')
   s.add_runtime_dependency('capistrano-npm', '~> 1.0.1')
   s.add_runtime_dependency('capistrano-nc', '~> 0.1.4')
 
   s.add_runtime_dependency('capistrano-nodenv', '~> 1.0.0')
-  s.add_runtime_dependency('capistrano-bower', '~> 1.0.0')
+  s.add_runtime_dependency('capistrano-bower', '~> 1.1.0')
   s.add_runtime_dependency('capistrano3-nginx', '~> 2.0.4')
   s.add_runtime_dependency('capistrano3-unicorn', '~> 0.2.1')
-  s.add_runtime_dependency('capistrano3-delayed-job', '~> 1.2.1')
+  s.add_runtime_dependency('capistrano3-delayed-job', '~> 1.3.0')
   s.add_runtime_dependency('whenever', '~> 0.9.4')
 
   s.add_runtime_dependency('gli','~> 2.12.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre7
+  version: 2.0.0
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: capistrano-npm
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: capistrano3-nginx
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement
@@ -357,9 +357,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14