producer-rails 0.0.5 → 0.0.6

data/lib/producer/rails/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Rails
-    VERSION = '0.0.5'.freeze
+    VERSION = '0.0.6'.freeze
   end
 end

data/lib/producer/rails.rb

@@ -13,62 +13,105 @@ module Producer
       end
     end
 
+    UNICORN_CONF_PATH     = 'config/unicorn.rb'.freeze
+    WWW_PID_PATH          = 'tmp/run/www.pid'.freeze
+    WWW_SOCK_PATH         = 'tmp/run/www.socke'.freeze
+    BUNDLER_UNSET_GROUPS  = %w[development test].freeze
+
     define_macro :deploy do
       app_path = get :app_path
 
       if ENV.key? 'DEPLOY_INIT'
-        ensure_dir      app_path, 0701
-        git_clone       get(:repository), app_path
-        app_init        app_path, get(:app_mkdir)
-        bundle_install  app_path
-        db_config       app_path
-        db_init         app_path
-        secrets_init    app_path
-        www_config      app_path
+        deploy_init app_path
       else
-        git_update      app_path
-        bundle_install  app_path
-        db_migrate      app_path
-        db_seed         app_path if (get :db_seed rescue false)
+        deploy_update app_path
       end
 
       assets_update app_path
 
+      deploy_restart
+    end
+
+    define_macro :deploy_init do |app_path = get(:app_path)|
+      app_path ||= get :app_path
+
+      ensure_dir      app_path, mode: 0701
+      git_clone       get(:repository), app_path
+      app_init        app_path,
+        dirs:   (get :app_mkdir, []),
+        files:  (get :app_mkfile, [])
+      db_config       app_path
+      bundle_install  app_path, (get :bundler_unset, [])
+      db_init         app_path
+      secrets_init    app_path
+      www_config      app_path
+    end
+
+    define_macro :deploy_update do |app_path = nil|
+      app_path ||= get :app_path
+
+      git_update      app_path
+      bundle_install  app_path
+      db_migrate      app_path
+      db_seed         app_path if set? :db_seed
+      www_config      app_path
+    end
 
-      www_pid_path  = get :www_pid_path
-      queue_workers = get :queue_workers
+    define_macro :deploy_restart do |app_path = nil|
+      app_path ||= get :app_path
 
       if ENV.key?('DEPLOY_INIT') || ENV.key?('DEPLOY_START')
-        www_start app_path, www_pid_path
-        app_start app_path, queue_workers
+        deploy_start
       else
-        app_stop
-        www_stop  app_path, www_pid_path
-        www_start app_path, www_pid_path
-        app_start app_path, queue_workers
+        deploy_stop
+        deploy_start
       end
     end
 
+    define_macro :deploy_stop do
+      app_path      ||= get :app_path
+      www_pid_path  = (get :www_pid_path, WWW_PID_PATH)
+      processes     = (get :processes, nil)
+
+      app_stop if processes
+      www_stop app_path, www_pid_path
+    end
+
+    define_macro :deploy_start do
+      app_path      ||= get :app_path
+      www_pid_path  = (get :www_pid_path, WWW_PID_PATH)
+      processes     = (get :processes, nil)
+
+      www_start app_path, www_pid_path
+      app_start app_path, processes if processes
+    end
+
     define_test :bundle_installed? do |gemfile|
       no_sh "bundle check #{gemfile}"
     end
 
-    define_macro :bundle_install do |path|
+    define_macro :bundle_install do |path, remove_groups = []|
       gemfile = "--gemfile #{path}/Gemfile"
+      without_groups = (remove_groups + BUNDLER_UNSET_GROUPS).join ' '
 
       condition { bundle_installed? gemfile }
 
-      sh "bundle install --without development test #{gemfile}"
+      sh "bundle install --without #{without_groups} #{gemfile}"
     end
 
-    define_macro :app_init do |path, dirs: []|
+    define_macro :app_init do |path, dirs: [], files: {}|
       run_dir = "#{path}/tmp/run"
+      dirs << 'public/assets'
       dirs.map! { |e| File.join(path, e) }
+      files = files.each_with_object({}) do |(k, v), m|
+        m[File.join(path, k)] = v
+      end
 
       condition { no_dir? run_dir }
 
-      mkdir run_dir, 0701
-      dirs.each { |e| mkdir e, 0700 }
+      mkdir run_dir, mode: 0701
+      dirs.each   { |e| mkdir e, mode: 0700 }
+      files.each  { |k, v| file_write k, v, mode: 0600 }
     end
 
     define_macro :db_config do |path|
@@ -118,12 +161,16 @@ production:
     end
 
     define_macro :www_config do |path|
-      www_config_path = File.join(path, get(:www_config_path))
+      www_config_path = File.join(
+        path,
+        (get :www_config_path, UNICORN_CONF_PATH)
+      )
       conf = <<-eoh
 worker_processes  #{get :www_workers}
+timeout           #{get :www_timeout, 60}
 preload_app       false
 pid               '#{get :www_pid_path}'
-listen            "\#{ENV['HOME']}/#{path}/#{get :www_sock_path}"
+listen            "\#{ENV['HOME']}/#{path}/#{(get :www_sock_path, WWW_SOCK_PATH)}"
       eoh
 
       condition { no_file_contains www_config_path, conf }
@@ -138,10 +185,10 @@ listen            "\#{ENV['HOME']}/#{path}/#{get :www_sock_path}"
       sh "cd #{path} && find public/assets -type f -exec chmod 644 {} \\;"
     end
 
-    define_macro :app_start do |app_path, queue_workers|
+    define_macro :app_start do |app_path, processes|
       condition { no_sh 'tmux has-session -t app' }
 
-      sh "cd #{app_path} && tmux new -d -s app 'foreman start -c queue=1,worker=#{queue_workers}; zsh'"
+      sh "cd #{app_path} && tmux new -d -s app 'foreman start -c #{processes}; zsh'"
     end
 
     define_macro :app_stop do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producer-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: producer-core
@@ -86,8 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 1.8.30
 signing_key: 
 specification_version: 3
 summary: producer rails addon
 test_files: []
+has_rdoc: