orats 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d8c43283eef490327ff90675b0e529a7357bab
-  data.tar.gz: 9a1776f981cc18005e89c35e44aa83801038e777
+  metadata.gz: 4f2c27bb2c2a590489d6a99623e2d7f558d379d9
+  data.tar.gz: 4094e0ed724bda3bb83c461afd5027009ea41807
 SHA512:
-  metadata.gz: a2682482822e5a30a57568a0696a44b00afc750d2bc2907e01e2399d29208b8525fe287db1ef59b3dc307f422a6be2daee586ba65c6cf2f2c8cbd0da8ba27bad
-  data.tar.gz: 355f88e955b843ab9d1f7bcb4b890e42c93551d3587dc00474101045dc1b546b131f4efa5d5c6843d42ddfcba43c319164a98fcb5fc99dd79c5d974c452bd6d3
+  metadata.gz: 380dd962f0246cb071c3bef38867bb1f0ed289ba796d9f95ff329e7a213766b61fec6573ded56bf9740c5d766584e280a2abe60c38b37c1f76b64fee0ef03769
+  data.tar.gz: 148b5771f26520873df6bb54f098a96d02f011fbd7d4d2b262fbe196b6550e4a1b7b72064fd955f09c671149f1fdafa57ee6f14cc58fe2e4a0cbb8f3fd515306

data/README.md

@@ -104,7 +104,7 @@ All of the changes have git commits to go with them. After generating a project
 - **Core changes**:
     - Use `postgres` as the primary SQL database
     - Use `redis` as the cache backend
-    - Use `puma` or `unicorn` as the web backend
+    - Use `unicorn` or `puma` as the web backend
     - Use `sidekiq` as a background worker
 - **Features**:
     - Configure scheduled jobs and tasks using `whenever`

data/lib/orats/cli.rb

@@ -50,7 +50,7 @@ module Orats
     option :template, default: '', aliases: '-t'
     option :custom, default: '', aliases: '-c'
     option :skip_server_start, type: :boolean, default: false, aliases: '-S'
-    option :backend, default: 'puma', aliases: '-b'
+    option :backend, default: 'unicorn', aliases: '-b'
     option :rc, default: ''
     desc 'new PATH [options]', 'Create a new orats application'
     long_desc File.read(File.join(File.dirname(__FILE__), 'cli_help/new'))

data/lib/orats/cli_help/new

@@ -24,6 +24,6 @@ Template features:
 
 Project features:
 
-`--backend` to switch to a different server backend, ie. unicorn
+`--backend` to switch to a different server backend, ie. puma
 
 `--skip-server-start` to skip automatically running puma and sidekiq [false]

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

@@ -41,7 +41,7 @@ module Orats
           gsub_postgres_info
           gsub_redis_info
           gsub_readme
-          gsub_unicorn if @options[:backend] == 'unicorn'
+          gsub_puma if @options[:backend] == 'puma'
 
           bundle_install
           bundle_binstubs
@@ -100,15 +100,16 @@ module Orats
           commit 'Update the readme'
         end
 
-        def gsub_unicorn
-          task 'Update files for switching to unicorn'
+        def gsub_puma
+          task 'Update files for switching to puma'
 
-          gsub_file "#{@target_path}/Procfile", 'puma -C config/puma.rb',
-                    'unicorn -c config/unicorn.rb'
-          gsub_file "#{@target_path}/Gemfile", "gem 'puma'", "#gem 'puma'"
-          gsub_file "#{@target_path}/Gemfile", "#gem 'unic", "gem 'unic"
+          gsub_file "#{@target_path}/Procfile", 'unicorn -c config/unicorn.rb',
+                    'puma -C config/puma.rb'
+          gsub_file "#{@target_path}/Gemfile",
+                    "gem 'unicorn'", "#gem 'unicorn'"
+          gsub_file "#{@target_path}/Gemfile", "#gem 'puma'", "gem 'puma'"
 
-          commit 'Switch from puma to unicorn'
+          commit 'Switch from unicorn to puma'
         end
 
         def bundle_install

data/lib/orats/templates/base.rb

@@ -164,6 +164,8 @@ def update_app_config
 
     # http://www.loc.gov/standards/iso639-2/php/English_list.php
     config.i18n.default_locale = ENV['DEFAULT_LOCALE'] unless ENV['DEFAULT_LOCALE'] == 'en'
+
+    config.paths['log'] = ENV['LOG_FILE']
     S
   end
 
@@ -180,8 +182,7 @@ ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
 end
     S
   end
-  commit 'Configure the mailer/redis, update the timezone and adjust ' + \
-             ' the validation output'
+  commit 'Configure various application wide settings'
 end
 
 def update_database_config

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

@@ -28,6 +28,7 @@ ACTION_MAILER_DEFAULT_TO: 'me@app_name.com'
 #        test: app_name_test
 DATABASE_URL: 'postgresql://db_user@db_location:db_port/app_name?encoding=utf8&pool=5&timeout=5000'
 CACHE_URL: 'redis://cache_location:cache_port/0'
+BACKGROUND_URL: 'redis://cache_location:cache_port/0'
 
 # listen on a tcp port or unix socket
 LISTEN_ON: '0.0.0.0:3000'
@@ -43,15 +44,15 @@ THREADS_MAX: 1
 WORKERS: 1
 
 # this should equal the database pool size
-SIDEKIQ_CONCURRENCY: 5
+BACKGROUND_THREADS: 5
 
 # the name of the service
-# this gets combined with LOG_PATH and RUN_STATE_PATH to form a full path
+# this gets combined with 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
-LOG_PATH: 'log'
+# the log file that both the app and sidekiq write to
+# in production you might consider /var/log/user.log to leverage syslog
+LOG_FILE: 'log/app_name.log'
 
 # the path that will contain pids and sockets
 # in production you will likely want to set this to '/var/run/app_name'

data/lib/orats/templates/includes/new/rails/Gemfile

@@ -12,8 +12,8 @@ gem 'font-awesome-rails', '~> 4.1.0'
 gem 'pg', '~> 0.17.1'
 gem 'redis-rails', '~> 4.0.0'
 
-gem 'puma', '~> 2.9.0'
-#gem 'unicorn', '~> 4.8.3'
+gem 'unicorn', '~> 4.8.3'
+#gem 'puma', '~> 2.9.0'
 gem 'sidekiq', '~> 3.2.1'
 gem 'sinatra', '>= 1.4.5', require: false
 

data/lib/orats/templates/includes/new/rails/Procfile

@@ -1,3 +1,3 @@
-web: puma -C config/puma.rb | grep -v --line-buffered ' 304 -'
+web: unicorn -c config/unicorn.rb | grep -v --line-buffered ' 304 -'
 worker: sidekiq -C config/sidekiq.yml
-log: tail -f log/development.log | grep -xv --line-buffered '^[[:space:]]*' | grep -v --line-buffered '/assets/'
+log: tail -f $LOG_FILE | grep -xv --line-buffered '^[[:space:]]*' | grep -v --line-buffered '/assets/' | grep -v --line-buffered 'HTTP/1.1' 

data/lib/orats/templates/includes/new/rails/config/initializers/sidekiq.rb

@@ -1,6 +1,6 @@
 sidekiq_config = {
-    url:       ENV['CACHE_URL'],
-    namespace: "ns_app::sidekiq_#{Rails.env}"
+  url:       ENV['BACKGROUND_URL'],
+  namespace: "ns_app::sidekiq_#{Rails.env}"
 }
 
 Sidekiq.configure_server do |config|

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

@@ -19,9 +19,8 @@ pidfile "#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}.pid"
 # uploads you may want to increase this.
 worker_timeout 30
 
-# The paths to where logs will be written to.
-stdout_redirect "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.access.log",
-                "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.error.log"
+# The file that gets logged to.
+stdout_redirect ENV['LOG_FILE'], ENV['LOG_FILE']
 
 # Preload the application before starting the workers.
 preload_app!

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

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

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

@@ -20,9 +20,9 @@ pid "#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}.pid"
 # uploads you may want to increase this.
 timeout 30
 
-# The paths to where logs will be written to.
-stdout_path "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.access.log"
-stderr_path "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.error.log"
+# The file that gets logged to.
+stdout_path ENV['LOG_FILE']
+stderr_path ENV['LOG_FILE']
 
 # Combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings:
 # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow

data/lib/orats/version.rb

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

data/test/integration/cli_test.rb

@@ -23,8 +23,8 @@ class TestCLI < Minitest::Test
     assert_new '--template auth'
   end
 
-  def test_new_with_unicorn
-    assert_new '--backend unicorn'
+  def test_new_with_puma
+    assert_new '--backend puma'
   end
 
   def test_new_with_invalid_template

metadata

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