deployinator 0.1.3 → 0.1.4

data/lib/deployinator/built-in.rb

@@ -1,6 +1,7 @@
 set :deploy_log_level,            "debug"
 set :webserver_socket_path,       -> { shared_path.join('run') }
 set :deploy_templates_path,       "templates/deploy"
+set :jobs_app_name,               "jobs"
 
 # Default deploy_to directory is /var/www/my_app
 # set :deploy_to, '/var/www/my_app'
@@ -81,6 +82,33 @@ def deploy_run_bluepill(host)
     current_path.join('config', 'bluepill.rb')
   )
 end
+def deploy_bluepill_restart(host)
+  execute("docker", "exec", "--tty",
+    fetch(:ruby_container_name),
+    shared_path.join('bundle', 'bin', 'bluepill'),
+    fetch(:application), "restart")
+end
+def deploy_bluepill_stop(host)
+  execute("docker", "exec", "--tty",
+    fetch(:ruby_container_name),
+    shared_path.join('bundle', 'bin', 'bluepill'),
+    fetch(:application), "stop")
+end
+def deploy_run_bluepill_jobs(host)
+  execute(
+    "docker", "run", "--tty", "--detach",
+    "--name", fetch(:ruby_jobs_container_name),
+    "-e", "GEM_HOME=#{shared_path.join('bundle')}",
+    "-e", "GEM_PATH=#{shared_path.join('bundle')}",
+    "-e", "BUNDLE_GEMFILE=#{current_path.join('Gemfile')}",
+    "-e", "PATH=#{shared_path.join('bundle', 'bin')}:$PATH",
+    "--restart", "always", "--memory", "#{fetch(:ruby_jobs_container_max_mem_mb)}m",
+    "--volume", "#{fetch(:deploy_to)}:#{fetch(:deploy_to)}:rw",
+    "--entrypoint", shared_path.join('bundle', 'bin', 'rabid_jobs_tasker'),
+    fetch(:ruby_image_name), "--rails_root", current_path,
+    "--environment", fetch(:rails_env), "--pid", "#{fetch(:webserver_socket_path)}/jobs.pid"
+  )
+end
 def deploy_run_cadvisor(host)
   execute(
     "docker", "run", "--detach",
@@ -172,15 +200,3 @@ def deploy_install_bundler(host)
     "--bindir", shared_path.join('bundle', 'bin'),
     "--no-ri", "--no-rdoc", "--quiet", "bundler", "-v'#{fetch(:bundler_version)}'\"")
 end
-def deploy_bluepill_restart(host)
-  execute("docker", "exec", "--tty",
-    fetch(:ruby_container_name),
-    shared_path.join('bundle', 'bin', 'bluepill'),
-    fetch(:application), "restart")
-end
-def deploy_bluepill_stop(host)
-  execute("docker", "exec", "--tty",
-    fetch(:ruby_container_name),
-    shared_path.join('bundle', 'bin', 'bluepill'),
-    fetch(:application), "stop")
-end

data/lib/deployinator/check.rb

@@ -1,7 +1,7 @@
 namespace :deploy do
   namespace :check do
 
-    task :bundle_command_map => ['deployinator:deployment_user'] do
+    task :bundle_command_map do
       set :bundle_binstubs, -> { shared_path.join('bundle', 'bin') }
       set :bundle_gemfile,  -> { release_path.join('Gemfile') }
       SSHKit.config.command_map[:bundle] = sshkit_bundle_command_map
@@ -40,15 +40,13 @@ namespace :deploy do
     # TODO make this better
     before 'deploy:check', :templates do
       run_locally do
-        keys_template     = File.expand_path("./#{fetch(:deploy_templates_path)}/deployment_authorized_keys.erb")
-        bluepill_template = File.expand_path("./#{fetch(:deploy_templates_path)}/bluepill.rb.erb")
-        unicorn_template  = File.expand_path("./#{fetch(:deploy_templates_path)}/unicorn.rb.erb")
-        {
-          "You need a #{fetch(:deploy_templates_path)}/deployment_authorized_keys.erb file."          => keys_template,
-          "You need a #{fetch(:deploy_templates_path)}/bluepill.rb.erb file."  => bluepill_template,
-          "You need a #{fetch(:deploy_templates_path)}/unicorn.rb.erb file."   => unicorn_template,
-        }.each do |message, file|
-          fatal(message) and raise unless File.exists? file
+        path = fetch(:deploy_templates_path)
+        keys_template          = File.expand_path("./#{path}/deployment_authorized_keys.erb")
+        bluepill_template      = File.expand_path("./#{path}/bluepill.rb.erb")
+        unicorn_template       = File.expand_path("./#{path}/unicorn.rb.erb")
+        templates = [keys_template, bluepill_template, unicorn_template]
+        templates.each do |file|
+          fatal("You need a #{file} template file.") and raise unless File.exists? file
         end
       end
     end

data/lib/deployinator/config.rb

@@ -18,22 +18,25 @@ namespace :deployinator do
   desc 'Write example config files'
   task :write_example_configs do
     run_locally do
-      execute "mkdir", "-p", "config/deploy", fetch(:deploy_templates_path, 'templates/deploy')
+      path = fetch(:deploy_templates_path, 'templates/deploy')
+      execute "mkdir", "-p", "config/deploy", path
       {
         "examples/Capfile"                        => "Capfile#{fetch(:example)}",
         "examples/config/deploy.rb"               => "config/deploy#{fetch(:example)}.rb",
         "examples/config/deploy/staging.rb"       => "config/deploy/staging#{fetch(:example)}.rb",
-        "examples/Dockerfile"                     => "#{fetch(:deploy_templates_path, 'templates/deploy')}/Dockerfile#{fetch(:example)}",
-        "examples/deployment_authorized_keys.erb" => "#{fetch(:deploy_templates_path, 'templates/deploy')}/deployment_authorized_keys#{fetch(:example)}.erb",
-        "examples/unicorn.rb.erb"                 => "#{fetch(:deploy_templates_path, 'templates/deploy')}/unicorn#{fetch(:example)}.rb.erb",
-        "examples/bluepill.rb.erb"                => "#{fetch(:deploy_templates_path, 'templates/deploy')}/bluepill#{fetch(:example)}.rb.erb"
+        "examples/Dockerfile"                     => "#{path}/Dockerfile#{fetch(:example)}",
+        "examples/deployment_authorized_keys.erb" =>
+          "#{path}/deployment_authorized_keys#{fetch(:example)}.erb",
+        "examples/unicorn.rb.erb"                 => "#{path}/unicorn#{fetch(:example)}.rb.erb",
+        "examples/bluepill.rb.erb"                => "#{path}/bluepill#{fetch(:example)}.rb.erb",
       }.each do |source, destination|
         config = File.read(File.dirname(__FILE__) + "/#{source}")
         File.open("./#{destination}", 'w') { |f| f.write(config) }
         info "Wrote '#{destination}'"
       end
       unless fetch(:example).empty?
-        info "Now remove the '#{fetch(:example)}' portion of their names or diff with existing files and add the needed lines."
+        info("Now remove the '#{fetch(:example)}' portion of their names " +
+          "or diff with existing files and add the needed lines.")
       end
     end
   end

data/lib/deployinator/deploy.rb

@@ -35,7 +35,7 @@ namespace :deploy do
     # Overwrite :assets:precompile to use docker
     Rake::Task["deploy:assets:precompile"].clear_actions
     namespace :assets do
-      task :precompile => ['deployinator:deployment_user'] do
+      task :precompile do
         on roles(fetch(:assets_roles)) do |host|
           deploy_assets_precompile(host)
         end
@@ -72,7 +72,7 @@ namespace :deploy do
     end
   end
 
-  task :install_bundler => ['deployinator:deployment_user'] do
+  task :install_bundler do
     on roles(:app) do |host|
       unless file_exists?(shared_path.join('bundle', 'bin', 'bundle'))
         deploy_install_bundler(host)
@@ -82,7 +82,7 @@ namespace :deploy do
   before 'bundler:install', 'deploy:install_bundler'
 
   desc 'Restart application using bluepill restart inside the docker container.'
-  task :restart => ['deployinator:webserver_user', :install_config_files] do
+  task :restart => [:install_config_files, 'deploy:check:settings'] do
     on roles(:app) do |host|
       name = fetch(:ruby_container_name)
       if container_exists?(name)
@@ -108,22 +108,22 @@ namespace :deploy do
 
   desc 'Restart application by recreating the docker container.'
   namespace :restart do
-    task :force do
+    task :force => [:install_config_files, 'deploy:check:settings'] do
       on roles(:app) do |host|
-        if container_exists?(fetch(:ruby_container_name))
-          if container_is_running?(fetch(:ruby_container_name))
+        name = fetch(:ruby_container_name)
+        if container_exists?(name)
+          if container_is_running?(name)
             deploy_bluepill_stop(host)
             sleep 5
-            execute("docker", "stop", fetch(:ruby_container_name))
-            execute("docker", "wait", fetch(:ruby_container_name))
-          else
+            execute("docker", "stop", name)
+            execute("docker", "wait", name)
           end
           begin
-            execute("docker", "rm",   fetch(:ruby_container_name))
+            execute("docker", "rm",   name)
           rescue
             sleep 5
             begin
-              execute("docker", "rm",   fetch(:ruby_container_name))
+              execute("docker", "rm",   name)
             rescue
               fatal "We were not able to remove the container for some reason. Try running 'cap <stage> deploy:restart:force' again."
             end
@@ -143,12 +143,9 @@ namespace :deploy do
 #    end
 #  end
 
-  task :install_config_files => ['deployinator:deployment_user', 'deployinator:webserver_user'] do
+  task :install_config_files do
     on roles(:app) do |host|
-      set :bluepill_config, -> { "bluepill.rb" }
-      set :unicorn_config,  -> { "unicorn.rb" }
-      set :socket_path,     -> { fetch(:webserver_socket_path) }
-      [fetch(:bluepill_config), fetch(:unicorn_config)].each do |config_file|
+      ["bluepill.rb", "unicorn.rb"].each do |config_file|
         template_path = File.expand_path("./#{fetch(:deploy_templates_path)}/#{config_file}.erb")
         generated_config_file = ERB.new(File.new(template_path).read).result(binding)
         set :final_path, -> { release_path.join('config', config_file) }

data/lib/deployinator/examples/Capfile

@@ -22,6 +22,7 @@ require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 
 require 'deployinator'
+require 'deployinator/jobs'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

data/lib/deployinator/examples/Dockerfile

@@ -1,4 +1,3 @@
-# vi: ft=config
 FROM ubuntu:12.04
 MAINTAINER david amick <docker@davidamick.com>
 

data/lib/deployinator/examples/config/deploy/staging.rb

@@ -1,12 +1,15 @@
 ##### deployinator
 ### ------------------------------------------------------------------
-set  :domain,                       "my-app-staging.example.com"
+set  :domain,                         "my-app-staging.example.com"
 server fetch(:domain),
-  :user                             => fetch(:deployment_username),
-  :roles                            => ["app", "web", "db"]
-set :rails_env,                     'production'
-set :ruby_image_name,               "snarlysodboxer/ruby:1.9.3-p547"
-set :ruby_container_name,           "#{fetch(:domain)}-ruby-bluepill"
-set :ruby_container_max_mem_mb,     "1024"
-set :postgres_port,                 "5432"
+  :user                               => fetch(:deployment_username),
+  :roles                              => ["app", "web", "db"]
+set :rails_env,                       'production'
+set :ruby_image_name,                 "snarlysodboxer/ruby:1.9.3-p547"
+set :ruby_container_name,             "#{fetch(:domain)}-ruby-bluepill"
+set :ruby_container_max_mem_mb,       "1024"
+set :postgres_port,                   "5432"
+### deployinator jobs
+set :ruby_jobs_container_name,        "#{fetch(:domain)}-ruby-bluepill_jobs"
+set :ruby_jobs_container_max_mem_mb,  "512"
 ### ------------------------------------------------------------------

data/lib/deployinator/jobs.rb

@@ -0,0 +1,55 @@
+namespace :deploy do
+  namespace :jobs do
+
+    desc 'Restart jobs using bluepill restart inside the docker container.'
+    task :restart => ['deploy:check:settings'] do
+      on roles(:app) do |host|
+        name = fetch(:ruby_jobs_container_name)
+        if container_exists?(name)
+          if container_is_restarting?(name)
+            execute("docker", "stop", name)
+          end
+          if container_is_running?(name)
+            restart_container(fetch(:ruby_jobs_container_name))
+          else
+            start_container(name)
+          end
+        else
+          as :root do
+            execute("rm", "-f", fetch(:webserver_socket_path).join('jobs.pid'))
+          end
+          warn "Starting a new container named #{name} on #{host}"
+          deploy_run_bluepill_jobs(host)
+          check_stayed_running(name)
+        end
+      end
+    end
+    after 'deploy:restart', :restart
+
+    desc 'Restart application by recreating the docker container.'
+    namespace :restart do
+      task :force => ['deploy:check:settings'] do
+        on roles(:app) do |host|
+          name = fetch(:ruby_jobs_container_name)
+          if container_exists?(name)
+            if container_is_running?(name)
+              execute("docker", "stop", name)
+            end
+            begin
+              execute("docker", "rm",   name)
+            rescue
+              sleep 5
+              begin
+                execute("docker", "rm",   name)
+              rescue
+                fatal "We were not able to remove the container for some reason. Try running 'cap <stage> deploy:jobs:restart:force' again."
+              end
+            end
+          end
+          Rake::Task['deploy:jobs:restart'].invoke
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deployinator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -71,6 +71,7 @@ files:
 - lib/deployinator/config.rb
 - lib/deployinator/helpers.rb
 - lib/deployinator/built-in.rb
+- lib/deployinator/jobs.rb
 - lib/deployinator/examples/Capfile
 - lib/deployinator/examples/config/deploy.rb
 - lib/deployinator/examples/config/deploy/staging.rb