slining 1.1.0 → 1.2.0

data/templates/Gemfile.erb

@@ -11,11 +11,11 @@ gem "email_validator"
 gem "flutie"
 gem "haml-rails", "~> 0.9"
 gem "high_voltage"
-gem "i18n-tasks"
 gem "jquery-rails"
 gem "newrelic_rpm", ">= 3.9.8"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
+gem "puma"
 gem "rack-canonical-host"
 gem "rails", "<%= Slining::RAILS_VERSION %>"
 gem "recipient_interceptor"
@@ -23,9 +23,9 @@ gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "title"
 gem "uglifier"
-gem "unicorn"
 
 group :development do
+  gem "quiet_assets"
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"
@@ -33,12 +33,14 @@ end
 
 group :development, :test do
   gem "awesome_print"
+  gem "bullet"
   gem "bundler-audit", require: false
   gem "byebug"
   gem "dotenv-rails"
   gem "factory_girl_rails"
+  gem "i18n-tasks"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.1.0"
+  gem "rspec-rails", "~> 3.3.0"
 end
 
 group :test do
@@ -46,7 +48,7 @@ group :test do
   gem "database_cleaner"
   gem "formulaic"
   gem "launchy"
-  gem "shoulda-matchers", require: false
+  gem "shoulda-matchers"
   gem "simplecov", require: false
   gem "timecop"
   gem "webmock"

data/templates/Procfile

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

data/templates/README.md.erb

@@ -12,15 +12,11 @@ your machine with [this script].
 
 [this script]: https://github.com/thoughtbot/laptop
 
-After setting up, you can run the application using [foreman]:
+After setting up, you can run the application using [Heroku Local]:
 
-    % foreman start
+    % heroku local
 
-If you don't have `foreman`, see [Foreman's install instructions][foreman]. It
-is [purposefully excluded from the project's `Gemfile`][exclude].
-
-[foreman]: https://github.com/ddollar/foreman
-[exclude]: https://github.com/ddollar/foreman/pull/437#issuecomment-41110407
+[Heroku Local]: https://devcenter.heroku.com/articles/heroku-local
 
 ## Guidelines
 

data/templates/bin_setup.erb

@@ -16,21 +16,11 @@ if [ ! -f .env ]; then
 fi
 
 # Set up database and add any development seed data
-bundle exec rake db:setup dev:prime
+bin/rake dev:prime
 
 # Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
 mkdir -p .git/safe
 
-# Pick a port for Foreman
-if ! grep --quiet --no-messages --fixed-strings 'port' .foreman; then
-  printf 'port: <%= config[:port_number] %>\n' >> .foreman
-fi
-
-if ! command -v foreman > /dev/null; then
-  printf 'Foreman is not installed.\n'
-  printf 'See https://github.com/ddollar/foreman for install instructions.\n'
-fi
-
 # Only if this isn't CI
 # if [ -z "$CI" ]; then
 # fi

data/templates/capybara_webkit.rb

@@ -0,0 +1,5 @@
+Capybara.javascript_driver = :webkit
+
+Capybara::Webkit.configure do |config|
+  config.block_unknown_urls
+end

data/templates/circle.yml.erb

@@ -0,0 +1,9 @@
+checkout:
+  post:
+    - cp .sample.env .env
+database:
+  override:
+    - bin/setup
+test:
+  override:
+    - bin/rake

data/templates/{development_seeds.rb → dev.rake}

@@ -2,7 +2,7 @@ if Rails.env.development? || Rails.env.test?
   require "factory_girl"
 
   namespace :dev do
-    desc "Seed data for development environment"
+    desc "Sample data for local development environment"
     task prime: "db:setup" do
       include FactoryGirl::Syntax::Methods
 

data/templates/disable_xml_params.rb

@@ -1,3 +1 @@
-# Protect against injection attacks
-# http://www.kb.cert.org/vuls/id/380039
 ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/dotfiles/.ctags

@@ -0,0 +1,2 @@
+--recurse=yes
+--exclude=vendor

data/templates/factories.rb

@@ -0,0 +1,2 @@
+FactoryGirl.define do
+end

data/templates/postgresql_database.yml.erb

@@ -4,9 +4,19 @@ development: &default
   encoding: utf8
   host: localhost
   min_messages: warning
-  pool: 2
+  pool: <%%= Integer(ENV.fetch("DB_POOL", 5)) %>
+  reaping_frequency: <%%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
   timeout: 5000
 
 test:
   <<: *default
   database: <%= app_name %>_test
+
+production: &deploy
+  encoding: utf8
+  min_messages: warning
+  pool: <%%= [Integer(ENV.fetch("MAX_THREADS", 5)), Integer(ENV.fetch("DB_POOL", 5))].max %>
+  timeout: 5000
+  url:  <%%= ENV.fetch("DATABASE_URL", "") %>
+
+staging: *deploy

data/templates/puma.rb

@@ -0,0 +1,19 @@
+# https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
+
+# 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.
+workers Integer(ENV.fetch("WEB_CONCURRENCY", 2))
+threads_count = Integer(ENV.fetch("MAX_THREADS", 2))
+threads(threads_count, threads_count)
+
+preload_app!
+
+rackup DefaultRackup
+environment ENV.fetch("RACK_ENV", "development")
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end

data/templates/rails_helper.rb

@@ -1,9 +1,9 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../../config/environment", __FILE__)
+abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]
 
 require "rspec/rails"
-require "shoulda/matchers"
 
 Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |file| require file }
 
@@ -20,4 +20,3 @@ RSpec.configure do |config|
 end
 
 ActiveRecord::Migration.maintain_test_schema!
-Capybara.javascript_driver = :webkit

data/templates/sample.env

@@ -1,6 +1,10 @@
-# http://ddollar.github.com/foreman/
+# https://github.com/ddollar/forego
+APPLICATION_HOST=localhost:3000
 ASSET_HOST=localhost:3000
-HOST=localhost:3000
+EXECJS_RUNTIME=Node
 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

data/templates/shoulda_matchers_config_rspec.rb

@@ -0,0 +1,6 @@
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

data/templates/slining_gitignore

@@ -4,7 +4,6 @@
 *.swp
 /.bundle
 /.env
-/.foreman
 /coverage/*
 /db/*.sqlite3
 /log/*

data/templates/spec_helper.rb

@@ -16,6 +16,7 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  config.example_status_persistence_file_path = "tmp/rspec_examples.txt"
   config.order = :random
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slining
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - vaporware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Slining is a base Rails project that you can upgrade. It is used by
   vaporware to get a jump start on a working app. Use Slining if you're in a
@@ -66,13 +80,12 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - README.md
+- RELEASING.md
 - Rakefile
 - bin/rake
 - bin/rspec
@@ -80,10 +93,12 @@ files:
 - bin/slining
 - lib/slining.rb
 - lib/slining/actions.rb
+- lib/slining/adapters/heroku.rb
 - lib/slining/app_builder.rb
 - lib/slining/generators/app_generator.rb
 - lib/slining/version.rb
 - slining.gemspec
+- spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
 - spec/features/github_spec.rb
@@ -105,12 +120,16 @@ files:
 - templates/bin_setup.erb
 - templates/browserslist
 - templates/bundler_audit.rake
+- templates/capybara_webkit.rb
+- templates/circle.yml.erb
 - templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
-- templates/development_seeds.rb
+- templates/dev.rake
 - templates/disable_xml_params.rb
+- templates/dotfiles/.ctags
 - templates/errors.rb
+- templates/factories.rb
 - templates/factory_girl_rspec.rb
 - templates/flashes_helper.rb
 - templates/hound.yml
@@ -118,16 +137,16 @@ files:
 - templates/json_encoding.rb
 - templates/newrelic.yml.erb
 - templates/postgresql_database.yml.erb
+- templates/puma.rb
 - templates/rails_helper.rb
 - templates/sample.env
 - templates/secrets.yml
+- templates/shoulda_matchers_config_rspec.rb
 - templates/slining_gitignore
 - templates/slining_layout.html.erb.erb
 - templates/smtp.rb
 - templates/spec_helper.rb
 - templates/staging.rb
-- templates/travis.yml.erb
-- templates/unicorn.rb
 homepage: http://github.com/vaporware/slining
 licenses:
 - MIT
@@ -141,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm: 2.2.2
-cache: bundler
-sudo: false
-before_install:
-  - "echo '--colour' > ~/.rspec"
-  - git config --global user.name 'Travis CI'
-  - git config --global user.email 'travis-ci@example.com'
-install: bundle install
-notifications:
-  email: false

data/Gemfile.lock

@@ -1,123 +0,0 @@
-PATH
-  remote: .
-  specs:
-    slining (1.0.1)
-      bundler (~> 1.3)
-      rails (= 4.2.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
-      builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
-      arel (~> 6.0)
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.0)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.5)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec (~> 3.2)
-  slining!
-
-BUNDLED WITH
-   1.10.4