onotole 1.0.17 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29f7121f3678b16024d4c63c4c5d524a2dec2c9b
-  data.tar.gz: cb1ebda44477cfabce626e99e413814c44b3a95b
+  metadata.gz: 68a3157ab702129ca0c8d08a375737a13438f9a9
+  data.tar.gz: 0cd75e6d0032cdd98a9fef728f41de62c6f621a1
 SHA512:
-  metadata.gz: e888f6a97e17fb5cd78c436005d86c7b03ffd137ae05d255c1ce0f6757bf9fb2cc5bf7e3780a587fc4a78eafbb40ea652015b7beac2173e009b5d634b170b9c2
-  data.tar.gz: e2d5d94444b6316009574172ef63914c6eade8b5392c1a7f95ad9cb0f6d8f50cd0f97f1d322795a8f7a7527c7da7340b326592f4c9f7d56a0e9f42cfb53eb926
+  metadata.gz: 3c9447a725d61a612fb3e197a455a8f95438e24ec36a4765cb6e9f234f3fdaa839053d224daf14989bb7d76011f7b39178edc7c62c465779ebadbc8f07de133c
+  data.tar.gz: e4d1fbd54f3c5da017a960cdcb80ff138d2079286475fed5d51cdc3495954c9531cd971a90bf140592d7da95d05d552b1bacbcebca612d7b63d1b7743dc828e7

data/Gemfile

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'rubycritic', require: false, group: :development
-
 gemspec

data/README.md

@@ -210,6 +210,15 @@ And testing gems like:
   RSpec matchers
 * [Timecop](https://github.com/ferndopolis/timecop-console) for testing time
 
+## ENV Variables
+
+All variables are stored in `.env` file and calls with project name prefix. It 
+made for avoid name space problems with placing more than 1 of Onotole created 
+app on 1 server. Onotole prefix all `env` variables with `#{app_name}` and now 
+you will not have any problems with export variables in production. With this 
+thick you can easy use ENV export tool or just put ENV variables in `.bashrc` 
+without name space conflicts.
+
 ## Other goodies
 
 Onotole also comes with:
@@ -221,8 +230,8 @@ Onotole also comes with:
 * A [low database connection pool limit][pool]
 * [Safe binstubs][binstub]
 * [t() and l() in specs without prefixing with I18n][i18n]
-* An automatically-created `SECRET_KEY_BASE` environment variable in all
-  environments
+* An automatically-created `#{APP_NAME}_SECRET_KEY_BASE` environment variable in
+ all environments
 * The analytics adapter [Segment][segment] (and therefore config for Google
   Analytics, Intercom, Facebook Ads, Twitter Ads, etc.)
 * Check existing of app DB and ask about continuation if base persisted 

data/lib/onotole/adapters/heroku.rb

@@ -42,7 +42,7 @@ module Onotole
       def set_heroku_rails_secrets
         %w(staging production).each do |environment|
           run_toolbelt_command(
-            "config:add SECRET_KEY_BASE=#{generate_secret}",
+            "config:add #{app_builder.app_name.dasherize.upcase}_SECRET_KEY_BASE=#{generate_secret}",
             environment
           )
         end

data/lib/onotole/app_builder.rb

@@ -93,7 +93,7 @@ module Onotole
     end
 
     def configure_puma
-      copy_file 'puma.rb', 'config/puma.rb'
+      template 'puma.rb.erb', 'config/puma.rb'
     end
 
     # def rvm_bundler_stubs_install

data/lib/onotole/default_frontend.rb

@@ -9,11 +9,12 @@ module Onotole
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
                       "# config.action_controller.asset_host = 'http://assets.example.com'",
-                      'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
+                      "config.action_controller.asset_host = ENV.fetch('#{app_name.upcase}_ASSET_HOST',"\
+                      " ENV.fetch('#{app_name.upcase}_APPLICATION_HOST'))"
 
       replace_in_file 'config/initializers/assets.rb',
                       "config.assets.version = '1.0'",
-                      'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
+                      "config.assets.version = (ENV['#{app_name.upcase}_ASSETS_VERSION'] || '1.0')"
 
       inject_into_file(
         'config/environments/production.rb',

data/lib/onotole/default_scripts.rb

@@ -30,7 +30,7 @@ module Onotole
     end
 
     def set_up_forego
-      copy_file 'Procfile', 'Procfile'
+      template 'Procfile.erb', 'Procfile', force: true
     end
 
     def setup_staging_environment
@@ -48,7 +48,11 @@ end
     end
 
     def setup_secret_token
-      template 'secrets.yml', 'config/secrets.yml', force: true
+      copy_file 'secrets.yml', 'config/secrets.yml', force: true
+      # strange bug with ERB in ERB. solved this way
+      replace_in_file 'config/secrets.yml',
+                      "<%= ENV['SECRET_KEY_BASE'] %>",
+                      "<%= ENV['#{app_name.upcase}_SECRET_KEY_BASE'] %>"
     end
 
     def disallow_wrapping_parameters
@@ -103,6 +107,7 @@ end
 
     def copy_dotfiles
       directory 'dotfiles', '.', force: true
+      template 'dotenv.erb', '.env'
     end
 
     def setup_spring
@@ -161,11 +166,11 @@ end
       config = <<-RUBY
 
   if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+    ENV["#{app_name.upcase}_APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
   end
 
   # Ensure requests are only served from one, canonical host name
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
+  config.middleware.use Rack::CanonicalHost, ENV.fetch("#{app_name.upcase}_APPLICATION_HOST")
       RUBY
 
       inject_into_file(

data/lib/onotole/mail.rb

@@ -4,7 +4,7 @@ module Onotole
     def configure_action_mailer
       action_mailer_host 'development', %("localhost:3000")
       action_mailer_host 'test', %("www.example.com")
-      action_mailer_host 'production', %{ENV.fetch("APPLICATION_HOST")}
+      action_mailer_host 'production', %{ENV.fetch("#{app_name.upcase}_APPLICATION_HOST")}
     end
 
     def configure_action_mailer_in_specs
@@ -12,7 +12,7 @@ module Onotole
     end
 
     def configure_smtp
-      copy_file 'smtp.rb', 'config/smtp.rb'
+      template 'smtp.rb.erb', 'config/smtp.rb', force: true
 
       prepend_file 'config/environments/production.rb',
                    %{require Rails.root.join("config/smtp")\n}

data/lib/onotole/version.rb

@@ -2,5 +2,5 @@
 module Onotole
   RAILS_VERSION = '~> 4.2.0'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.0.17'
+  VERSION = '1.1.0'
 end

data/spec/adapters/heroku_spec.rb

@@ -34,17 +34,13 @@ module Onotole
         Heroku.new(app_builder).set_heroku_rails_secrets
 
         expect(app_builder).to(
-          have_configured_var('staging', 'SECRET_KEY_BASE')
+          have_configured_var('staging', "#{app_name.dasherize.upcase}_SECRET_KEY_BASE")
         )
         expect(app_builder).to(
-          have_configured_var('production', 'SECRET_KEY_BASE')
+          have_configured_var('production', "#{app_name.dasherize.upcase}_SECRET_KEY_BASE")
         )
       end
 
-      def app_name
-        OnotoleTestHelpers::APP_NAME
-      end
-
       def have_configured_var(remote_name, var)
         have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
       end

data/spec/features/heroku_spec.rb

@@ -17,11 +17,8 @@ RSpec.describe 'Heroku' do
       )
       expect(FakeHeroku).to have_created_app_for('staging')
       expect(FakeHeroku).to have_created_app_for('production')
-      expect(FakeHeroku).to have_configured_vars('staging', 'SECRET_KEY_BASE')
-      expect(FakeHeroku).to have_configured_vars(
-        'production',
-        'SECRET_KEY_BASE'
-      )
+      expect(FakeHeroku).to have_configured_vars('staging', "#{app_name.dasherize.upcase}_SECRET_KEY_BASE")
+      expect(FakeHeroku).to have_configured_vars('production', "#{app_name.dasherize.upcase}_SECRET_KEY_BASE")
       expect(FakeHeroku).to have_setup_pipeline_for(app_name)
 
       bin_setup_path = "#{project_path}/bin/setup"

data/spec/features/new_project_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe 'Suspend a new project with default configuration' do
   end
 
   it 'loads secret_key_base from env' do
-    expect(secrets_file).to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
+    expect(secrets_file).to match /secret_key_base: <%= ENV\[('|")#{app_name.upcase}_SECRET_KEY_BASE('|")\] %>/
   end
 
   it 'adds bin/setup file' do
@@ -119,7 +119,7 @@ RSpec.describe 'Suspend a new project with default configuration' do
 
   it 'uses APPLICATION_HOST, not HOST in the production config' do
     prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
-    expect(prod_env_file).to match(/("|')APPLICATION_HOST("|')/)
+    expect(prod_env_file).to match /("|')#{app_name.upcase}_APPLICATION_HOST("|')/
     expect(prod_env_file).not_to match(/("|')HOST("|')/)
   end
 

data/spec/support/onotole.rb

@@ -42,6 +42,10 @@ module OnotoleTestHelpers
     @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
   end
 
+  def app_name
+    OnotoleTestHelpers::APP_NAME
+  end
+
   private
 
     def tmp_path

data/templates/Procfile.erb

@@ -0,0 +1,2 @@
+web: bundle exec puma -p $4: <%= "#{app_name.upcase}_PORT" %> -C ./config/puma.rb
+worker: bundle exec rake jobs:work

data/templates/app.json.erb

@@ -14,22 +14,22 @@
     "RAILS_ENV":{
       "required":true
     },
-    "SECRET_KEY_BASE":{
+    "<%= "#{app_name.upcase}_SECRET_KEY_BASE" %>":{
       "generator":"secret"
     },
-    "SMTP_ADDRESS":{
+    "<%= "#{app_name.upcase}_SMTP_ADDRESS" %>":{
       "required":true
     },
-    "SMTP_DOMAIN":{
+    "<%= "#{app_name.upcase}_SMTP_DOMAIN" %>":{
       "required":true
     },
-    "SMTP_PASSWORD":{
+    "<%= "#{app_name.upcase}_SMTP_PASSWORD" %>":{
       "required":true
     },
-    "SMTP_USERNAME":{
+    "<%= "#{app_name.upcase}_SMTP_USERNAME" %>":{
       "required":true
     },
-    "WEB_CONCURRENCY":{
+    "<%= "#{app_name.upcase}_WEB_CONCURRENCY" %>":{
       "required":true
     }
   },

data/templates/dotenv.erb

@@ -0,0 +1,13 @@
+# https://github.com/ddollar/forego
+<%= "#{app_name.upcase}_ASSET_HOST=localhost:3000" %>
+<%= "#{app_name.upcase}_APPLICATION_HOST=localhost:3000" %>
+<%= "#{app_name.upcase}_PORT=3000" %>
+RACK_ENV=development
+<%= "#{app_name.upcase}_SECRET_KEY_BASE=development_secret" %>
+EXECJS_RUNTIME=Node
+<%= "#{app_name.upcase}_SMTP_ADDRESS=smtp.example.com" %>
+<%= "#{app_name.upcase}_SMTP_DOMAIN=example.com" %>
+<%= "#{app_name.upcase}_SMTP_PASSWORD=password" %>
+<%= "#{app_name.upcase}_SMTP_USERNAME=username" %>
+<%= "#{app_name.upcase}_WEB_CONCURRENCY=1" %>
+<%= "#{app_name.upcase}_MAX_THREADS=16" %>

data/templates/{puma.rb → puma.rb.erb}

@@ -3,7 +3,7 @@
 
 # The environment variable WEB_CONCURRENCY may be set to a default value based
 # on dyno size. To manually configure this value use heroku config:set
-# WEB_CONCURRENCY.
+# #{app_name}_WEB_CONCURRENCY.
 #
 # Increasing the number of workers will increase the amount of resting memory
 # your dynos use. Increasing the number of threads will increase the amount of
@@ -13,8 +13,8 @@
 # Starting with a low number of workers and threads provides adequate
 # performance for most applications, even under load, while maintaining a low
 # risk of overusing memory.
-workers Integer(ENV.fetch('WEB_CONCURRENCY', 2))
-threads_count = Integer(ENV.fetch('MAX_THREADS', 2))
+workers Integer(ENV.fetch('<%= "#{app_name.upcase}_WEB_CONCURRENCY" %>', 2))
+threads_count = Integer(ENV.fetch('<%= "#{app_name.upcase}_MAX_THREADS" %>', 2))
 threads(2, threads_count)
 
 preload_app!

data/templates/secrets.yml

@@ -1,5 +1,5 @@
 default: &default
-  secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %>
+  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
 
 development:
   <<: *default

data/templates/smtp.rb.erb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+SMTP_SETTINGS = {
+  address:              ENV.fetch(<%= "#{app_name.upcase}_SMTP_ADDRESS" %>), # example: "smtp.sendgrid.net"
+  authentication:       :plain,
+  domain:               ENV.fetch(<%= "#{app_name.upcase}_SMTP_DOMAIN" %>), # example: "heroku.com"
+  enable_starttls_auto: true,
+  password:             ENV.fetch(<%= "#{app_name.upcase}_SMTP_PASSWORD" %>),
+  port:                 '587',
+  user_name:            ENV.fetch(<%= "#{app_name.upcase}_SMTP_USERNAME" %>)
+}.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onotole
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.1.0
 platform: ruby
 authors:
 - kvokka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,7 @@ files:
 - spec/support/fake_heroku.rb
 - spec/support/onotole.rb
 - templates/Gemfile.erb
-- templates/Procfile
+- templates/Procfile.erb
 - templates/README.md.erb
 - templates/_analytics.html.erb
 - templates/_flashes.html.erb
@@ -139,8 +139,8 @@ files:
 - templates/devise.ru.yml
 - templates/devise_rspec.rb
 - templates/disable_xml_params.rb
+- templates/dotenv.erb
 - templates/dotfiles/.ctags
-- templates/dotfiles/.env
 - templates/dotfiles/.rspec
 - templates/errors.rb
 - templates/factories.rb
@@ -156,12 +156,12 @@ files:
 - templates/onotole_layout.html.erb.erb
 - templates/onotole_overcommit.yml
 - templates/postgresql_database.yml.erb
-- templates/puma.rb
+- templates/puma.rb.erb
 - templates/rails_helper.rb
 - templates/rubocop.yml
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb
-- templates/smtp.rb
+- templates/smtp.rb.erb
 - templates/spec_helper.rb
 - templates/staging.rb
 - templates/tinymce.yml

data/templates/Procfile

@@ -1,2 +0,0 @@
-web: bundle exec puma -p $PORT -C ./config/puma.rb
-worker: bundle exec rake jobs:work

data/templates/dotfiles/.env

@@ -1,13 +0,0 @@
-# https://github.com/ddollar/forego
-ASSET_HOST=localhost:3000
-APPLICATION_HOST=localhost:3000
-PORT=3000
-RACK_ENV=development
-SECRET_KEY_BASE=development_secret
-EXECJS_RUNTIME=Node
-SMTP_ADDRESS=smtp.example.com
-SMTP_DOMAIN=example.com
-SMTP_PASSWORD=password
-SMTP_USERNAME=username
-WEB_CONCURRENCY=1
-MAX_THREADS=16

data/templates/smtp.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-SMTP_SETTINGS = {
-  address:              ENV.fetch('SMTP_ADDRESS'), # example: "smtp.sendgrid.net"
-  authentication:       :plain,
-  domain:               ENV.fetch('SMTP_DOMAIN'), # example: "heroku.com"
-  enable_starttls_auto: true,
-  password:             ENV.fetch('SMTP_PASSWORD'),
-  port:                 '587',
-  user_name:            ENV.fetch('SMTP_USERNAME')
-}.freeze