orats 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d673cccc421756a9ce6a7398c8a5953245f7c7
-  data.tar.gz: 9bea9a885137b89ff186287604a54bec948ff159
+  metadata.gz: 98a4802b7b1d109d7bd50407c2fb82082a0fd51c
+  data.tar.gz: 26e2ff60d48cd9b36b884c4dd1bf15ff22d1a94b
 SHA512:
-  metadata.gz: 0b6b7592f901be422559dca5b4409e9fd2db5ff579100d5e472d6d522a44cdcfc8e68614a1172ce046f3371385ad414b62a743e014ecdc9ec7691ea32a6bc55e
-  data.tar.gz: 52d2a71d2b084bb80a55e0f97531d3fe6d1738bad452d623452c900d74af8520d43f2f85c27d9a79e1dccee7c00893e46b734e49aa5ef02c21f001a9d1252c3e
+  metadata.gz: dd92db4f7de6310a1da383eff6bcbe9e8cccd4a672adad6da092d434d8a0c59cb5f4bf8f9640f108de81bb2ff22682d37351fd9a67f0f7e42249a81504661910
+  data.tar.gz: 8bcbffa756969375179cf174002003bb7f5c6ab07377b0d53f702e2e9a6c191b469f106508bc443157bcd9d0b093a48d726e9ef4a69dc40127b4a0226ce997e6

data/lib/orats/commands/new/rails.rb

@@ -38,6 +38,7 @@ module Orats
         end
 
         def rails_template_actions
+          create_env_paths
           gsub_postgres_info
           gsub_redis_info
           gsub_readme
@@ -52,6 +53,17 @@ module Orats
           generate_favicons
         end
 
+        def create_env_paths
+          task 'Create the log and run state paths'
+
+          service = File.basename(@target_path)
+          paths = "log/#{service} tmp/#{service} log/sidekiq tmp/sidekiq"
+
+          run_from @target_path, "mkdir #{paths}"
+
+          commit 'Add log and run state paths'
+        end
+
         def gsub_postgres_info
           task 'Update the DATABASE_URL'
 

data/lib/orats/templates/includes/new/rails/.env

@@ -36,17 +36,20 @@ THREADS_MIN: 0
 THREADS_MAX: 1
 
 # this should equal the number of CPU cores in production
-# in development mode it set to 0 so puma does not go into cluster mode, unicorn
-# will also correctly function with 0 workers in development mode
+# it is reasonable to keep it at 1 for development
 WORKERS: 1
 
 # this should equal the database pool size
 SIDEKIQ_CONCURRENCY: 5
 
+# the name of the service
+# this gets combined with LOG_PATH and RUN_STATE_PATH to form a full path
+SERVICE: 'app_name'
+
 # the path where logs get written to
-# in production you might consider /var/log/app_name
+# in production you might consider /var/log
 LOG_PATH: 'log'
 
 # the path that will contain pids and sockets
-# in production you will likely want to set this to '/var/run/app_name'
+# in production you will likely want to set this to '/var/run'
 RUN_STATE_PATH: 'tmp'

data/lib/orats/templates/includes/new/rails/config/puma.rb

@@ -6,15 +6,17 @@ workers ENV['WORKERS'].to_i
 if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
   bind 'tcp://0.0.0.0:3000'
 else
-  bind "unix:#{ENV['RUN_STATE_PATH']}/app_name"
+  bind "unix:#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}/#{ENV['SERVICE']}"
 end
 
-pidfile "#{ENV['RUN_STATE_PATH']}/app_name.pid"
+pidfile "#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}/#{ENV['SERVICE']}.pid"
 
 worker_timeout 30
 
-stdout_redirect "#{ENV['LOG_PATH']}/app_name.stdout.log",
-                "#{ENV['LOG_PATH']}/app_name.stderr.log"
+stdout_redirect "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}/" + \
+                "#{ENV['SERVICE']}.access.log",
+                "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}/" + \
+                "#{ENV['SERVICE']}.error.log"
 
 preload_app!
 

data/lib/orats/templates/includes/new/rails/config/sidekiq.yml

@@ -1,5 +1,5 @@
 ---
-:pidfile: "<%= ENV['RUN_STATE_PATH'] %>/sidekiq.pid"
+:pidfile: "<%= ENV['RUN_STATE_PATH'] %>/sidekiq/sidekiq.pid"
 :concurrency: <%= ENV['SIDEKIQ_CONCURRENCY'].to_i %>
 :queues:
   - default

data/lib/orats/templates/includes/new/rails/config/unicorn.rb

@@ -6,15 +6,16 @@ worker_processes ENV['WORKERS'].to_i
 if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
   listen '0.0.0.0:3000'
 else
-  listen "unix:#{ENV['RUN_STATE_PATH']}/app_name", backlog: 64
+  listen "unix:#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}/#{ENV['SERVICE']}",
+         backlog: 64
 end
 
-pid "#{ENV['RUN_STATE_PATH']}/app_name.pid"
+pid "#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}/#{ENV['SERVICE']}.pid"
 
 timeout 30
 
-stdout_path "#{ENV['LOG_PATH']}/app_name.stdout.log"
-stderr_path "#{ENV['LOG_PATH']}/app_name.stderr.log"
+stdout_path "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}/#{ENV['SERVICE']}.access.log"
+stderr_path "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}/#{ENV['SERVICE']}.error.log"
 
 preload_app true
 

data/lib/orats/version.rb

@@ -1,4 +1,4 @@
 # set the version of this gem
 module Orats
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor