welaika-suspenders 2.23.0 → 2.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe829c6d51e19782944b5685839aab374a0beb6
-  data.tar.gz: 9a9b41d93bb39c3e8a0b84b5613e570bdd5574c2
+  metadata.gz: e2f82e071962fef84f1eb7ca1deecc5c8acd3d4c
+  data.tar.gz: 7d6b86a5f22994f77f71fe00cce6d5f5268ac3a0
 SHA512:
-  metadata.gz: de6b9bf1f9c87a2b6032549f94acfe44614e5bbfa1e8f29915f5943e007134f3a0f7c70daf0abffe84bec1ee80d24901152c1f30a0b35217281011825ab6d414
-  data.tar.gz: f83d2baacdc8076c9b7afacb675c258ad6ec658317c21a275e929007edb8b7139ca6965cb022584b46277d6f066eb71a0bcee42d740ade120324381b01b86766
+  metadata.gz: fa13059af0f52dd92a341eb1c3c2f42590fde2ea4d1637c6af67b6605474b963486d2d1e01e22e50df6d2f93e75028596dbbdb43838ad82f242b71b52671524a
+  data.tar.gz: 8959f5757c6d5324c5fe8e797933ab92be1bed480de98577e9c8547200e3faf39377a3975221b5eda921018cbb29aac4dea1e4c04079afaf9401326e9c9577d4

data/CONTRIBUTING.md

@@ -13,6 +13,9 @@ Set up your machine:
 
     ./bin/setup
 
+If you're having trouble installing `capybara-webkit` check their [installation
+instructions](https://github.com/thoughtbot/capybara-webkit#qt-dependency-and-installation-issues).
+
 Make sure the tests pass:
 
     rake

data/NEWS.md

@@ -1,8 +1,30 @@
-master (unreleased)
+1.38.0 (April 15, 2016)
 
+* Update bourbon to `v5.0.0.beta.5`
+* Drops staging environment in favor of configuration through env variables
+* Bugfix: failing migrations were not making Heroku deploys fail
+
+1.37.0 (March 13, 2016)
+
+* Remove `RAILS_ENV` definitions
+* Set development `action_mailer.delivery_method` to `:file`
+  so that mails are copied to `./tmp/mails/` directory for easy development
+  access.
+* Update Bourbon to v5.0.0.beta.3
+* Update Bitters to v1.3
+* Update Autoprefixer config, drop support for IE 9, IE 10 and iOS 7
+* Better db support in linux environments
+* Replaces coffeescript with babel
+* Update CSS tests to ignore transitions
+
+1.36.0 (February 26, 2016)
+
+* Update Bitters to v1.2
+* Remove deprecated `fix_i18n_deprecation_warning` method
 * Switch from Airbrake to Honeybadger
 * Generate applications with `rack_mini_profiler` (disabled by default, enabled
   by setting `RACK_MINI_PROFILER=1`)
+* Heroku Pipelines bug fixes
 
 1.35.0 (December 30, 2015)
 

data/README.md

@@ -87,3 +87,4 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - lint factory girl's factories
 - remove automatic deployment
 - use airbrake instead of honeybadger
+- use coffeescript instead of es6

data/bin/welaika-suspenders

@@ -6,7 +6,12 @@ $LOAD_PATH << source_path
 
 require 'suspenders'
 
-if ['-v', '--version'].include? ARGV[0]
+if ARGV.empty?
+  puts "Please provide a path for the new application"
+  puts
+  puts "See --help for more info"
+  exit 0
+elsif ['-v', '--version'].include? ARGV[0]
   puts Suspenders::VERSION
   exit 0
 end

data/lib/suspenders/adapters/heroku.rb

@@ -25,11 +25,9 @@ module Suspenders
       end
 
       def create_staging_heroku_app(flags)
-        rack_env = "RACK_ENV=staging RAILS_ENV=staging"
         app_name = heroku_app_name_for("staging")
 
         run_toolbelt_command "create #{app_name} #{flags}", "staging"
-        run_toolbelt_command "config:add #{rack_env}", "staging"
       end
 
       def create_production_heroku_app(flags)

data/lib/suspenders/app_builder.rb

@@ -193,20 +193,6 @@ module Suspenders
       )
     end
 
-    def setup_staging_environment
-      staging_file = 'config/environments/staging.rb'
-      copy_file 'staging.rb', staging_file
-
-      config = <<-RUBY
-
-Rails.application.configure do
-  # ...
-end
-      RUBY
-
-      append_file staging_file, config
-    end
-
     def setup_secret_token
       template 'secrets.yml', 'config/secrets.yml', force: true
     end
@@ -228,6 +214,13 @@ end
       copy_file '_javascript.html.slim', 'app/views/application/_javascript.html.slim'
     end
 
+    def create_shared_css_overrides
+      copy_file(
+        "_css_overrides.html.erb",
+        "app/views/application/_css_overrides.html.erb",
+      )
+    end
+
     def create_application_layout
       remove_file 'app/views/layouts/application.html.erb'
       template 'suspenders_layout.html.slim',
@@ -442,7 +435,6 @@ you can deploy to staging and production with:
     def create_binstubs
       bundle_command "binstubs brakeman"
       bundle_command "binstubs rubocop"
-      bundle_command "binstubs i18n-tasks"
     end
 
     def copy_miscellaneous_files

data/lib/suspenders/generators/app_generator.rb

@@ -34,7 +34,6 @@ module Suspenders
       invoke :setup_development_environment
       invoke :setup_test_environment
       invoke :setup_production_environment
-      invoke :setup_staging_environment
       invoke :setup_secret_token
       invoke :create_suspenders_views
       invoke :configure_app
@@ -119,11 +118,6 @@ module Suspenders
       build :setup_asset_host
     end
 
-    def setup_staging_environment
-      say 'Setting up the staging environment'
-      build :setup_staging_environment
-    end
-
     def setup_secret_token
       say 'Moving secret token out of version control'
       build :setup_secret_token
@@ -134,6 +128,7 @@ module Suspenders
       build :create_partials_directory
       build :create_shared_flashes
       build :create_shared_javascripts
+      build :create_shared_css_overrides
       build :create_application_layout
     end
 

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.23.0"
+  VERSION = "2.24.0"
 end

data/spec/features/github_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe "GitHub" do
   it "suspends a project with --github option" do
     repo_name = 'test'
     run_suspenders("--github=#{repo_name}")
+    setup_app_dependencies
 
     expect(FakeGithub).to have_created_repo(repo_name)
   end

data/spec/features/heroku_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe "Heroku" do
     before(:all) do
       clean_up
       run_suspenders("--heroku=true")
+      setup_app_dependencies
     end
 
     it "suspends a project for Heroku" do
@@ -33,7 +34,7 @@ RSpec.describe "Heroku" do
       bin_setup_path = "#{project_path}/bin/setup_review_app"
       bin_setup = IO.read(bin_setup_path)
 
-      expect(bin_setup).to include("heroku run rake db:migrate --app #{app_name}-staging-pr-$1")
+      expect(bin_setup).to include("heroku run rake db:migrate --exit-code --app #{app_name}-staging-pr-$1")
       expect(bin_setup).to include("heroku ps:scale worker=1 --app #{app_name}-staging-pr-$1")
       expect(bin_setup).to include("heroku restart --app #{app_name}-staging-pr-$1")
       expect(File.stat(bin_setup_path)).to be_executable
@@ -41,7 +42,7 @@ RSpec.describe "Heroku" do
       bin_deploy_path = "#{project_path}/bin/deploy"
       bin_deploy = IO.read(bin_deploy_path)
 
-      expect(bin_deploy).to include("heroku run rake db:migrate")
+      expect(bin_deploy).to include("heroku run rake db:migrate --exit-code")
       expect(File.stat(bin_deploy_path)).to be_executable
 
       readme = IO.read("#{project_path}/README.md")
@@ -66,6 +67,7 @@ RSpec.describe "Heroku" do
     before(:all) do
       clean_up
       run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
+      setup_app_dependencies
     end
 
     it "suspends a project with extra Heroku flags" do

data/spec/features/new_project_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     drop_dummy_database
     remove_project_directory
     run_suspenders
+    setup_app_dependencies
   end
 
   it "uses custom Gemfile" do
@@ -28,14 +29,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
-  it "inherits staging config from production" do
-    staging_file = IO.read("#{project_path}/config/environments/staging.rb")
-    config_stub = "Rails.application.configure do"
-
-    expect(staging_file).to match(/^require_relative "production"/)
-    expect(staging_file).to match(/#{config_stub}/), staging_file
-  end
-
   it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
@@ -173,6 +166,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(prod_env_file).not_to match(/"HOST"/)
   end
 
+  it "configures email interceptor in smtp config" do
+    smtp_file = IO.read("#{project_path}/config/smtp.rb")
+    expect(smtp_file).
+      to match(/RecipientInterceptor.new\(ENV\["EMAIL_RECIPIENTS"\]\)/)
+  end
+
   it "configures language in html element" do
     layout_path = "/app/views/layouts/application.html.slim"
     layout_file = IO.read("#{project_path}#{layout_path}")

data/spec/support/suspenders.rb

@@ -20,6 +20,16 @@ module SuspendersTestHelpers
     end
   end
 
+  def setup_app_dependencies
+    if File.exist?(project_path)
+      Dir.chdir(project_path) do
+        Bundler.with_clean_env do
+          `bundle check || bundle install`
+        end
+      end
+    end
+  end
+
   def drop_dummy_database
     if File.exist?(project_path)
       Dir.chdir(project_path) do

data/suspenders.gemspec

@@ -29,5 +29,9 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.4'
+  s.add_development_dependency 'simple_form', '~> 3.2'
+  s.add_development_dependency 'title', '~> 0.0'
+  s.add_development_dependency 'quiet_assets', '~> 1.1'
+  s.add_development_dependency 'capybara-webkit', '~> 1.8'
   s.add_development_dependency 'pry-byebug'
 end

data/templates/Gemfile.erb

@@ -4,7 +4,7 @@ ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "airbrake"
 gem "autoprefixer-rails"
-gem "bourbon", "~> 4.2.0"
+gem "bourbon", "5.0.0.beta.5"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "draper"
@@ -37,7 +37,7 @@ group :development, :test do
   gem "awesome_print"
   gem "brakeman", require: false
   gem "bullet"
-  gem "bundler-audit", require: false
+  gem "bundler-audit", ">= 0.5.0", require: false
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "faker"

data/templates/README.md.erb

@@ -7,7 +7,33 @@ with the necessary dependencies to run and test this app:
 
     % ./bin/setup
 
-It assumes you have a machine equipped with Ruby, Postgres, etc.
+It assumes you have a machine equipped with Ruby, Postgres or MySQL, Node, Qt and ImageMagick.
+
+To install Ruby, read the [rbenv guide](https://github.com/rbenv/rbenv#installation)
+or the [rvm guide](https://rvm.io/rvm/install).
+
+To install Postgres:
+
+    $ brew install postgresql
+    
+To install MySQL:
+    
+    $ brew tap homebrew/versions
+    $ brew install mysql55
+    $ brew link --force mysql55
+    
+To install Node:
+
+    $ brew install node
+    
+To install Qt:
+
+    $ brew install qt5
+    $ brew link --force qt5
+    
+To install ImageMagick:
+
+    $ brew install imagemagick
 
 After setting up, you can run the application using [Heroku Local]:
 

data/templates/_css_overrides.html.erb

@@ -0,0 +1,7 @@
+<% if Rails.env.test? %>
+  <style type="text/css">
+    * {
+      transition-property: none !important;
+    }
+  </style>
+<% end %>

data/templates/app.json.erb

@@ -2,16 +2,19 @@
   "name":"<%= app_name.dasherize %>",
   "scripts":{},
   "env":{
-    "AIRBRAKE_API_KEY":{
+    "APPLICATION_HOST":{
       "required":true
     },
     "EMAIL_RECIPIENTS":{
       "required":true
     },
-    "RACK_ENV":{
+    "HEROKU_APP_NAME": {
+      "required":true
+    },
+    "HEROKU_PARENT_APP_NAME": {
       "required":true
     },
-    "RAILS_ENV":{
+    "RACK_ENV":{
       "required":true
     },
     "SECRET_KEY_BASE":{

data/templates/bin_deploy

@@ -8,5 +8,5 @@ branch="$(git symbolic-ref HEAD --short)"
 target="${1:-staging}"
 
 git push "$target" "$branch:master"
-heroku run rake db:migrate --remote "$target"
+heroku run rake db:migrate --exit-code --remote "$target"
 heroku restart --remote "$target"

data/templates/bin_setup_review_app.erb

@@ -14,6 +14,6 @@ heroku pg:backups restore \
   DATABASE_URL \
   --confirm <%= app_name.dasherize %>-staging-pr-$1 \
   --app <%= app_name.dasherize %>-staging-pr-$1
-heroku run rake db:migrate --app <%= app_name.dasherize %>-staging-pr-$1
+heroku run rake db:migrate --exit-code --app <%= app_name.dasherize %>-staging-pr-$1
 heroku ps:scale worker=1 --app <%= app_name.dasherize %>-staging-pr-$1
 heroku restart --app <%= app_name.dasherize %>-staging-pr-$1

data/templates/browserslist

@@ -1,4 +1,3 @@
 Last 2 versions
-Explorer >= 10
-iOS >= 7.1
+Explorer >= 11
 Android >= 4.4

data/templates/rails_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RACK_ENV"] = "test"
 
 require File.expand_path("../../config/environment", __FILE__)
 abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]

data/templates/smtp.rb

@@ -7,3 +7,7 @@ SMTP_SETTINGS = {
   port: "587",
   user_name: ENV.fetch("SMTP_USERNAME")
 }
+
+if ENV["EMAIL_RECIPIENTS"].present?
+  Mail.register_interceptor RecipientInterceptor.new(ENV["EMAIL_RECIPIENTS"])
+end

data/templates/suspenders_layout.html.slim

@@ -17,3 +17,4 @@ html lang="it"
     = render "flashes"
     = yield
     = render "javascript"
+    = render "css_overrides"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.24.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: title
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: quiet_assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +170,7 @@ files:
 - templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
+- templates/_css_overrides.html.erb
 - templates/_flashes.html.slim
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
@@ -126,7 +183,6 @@ files:
 - templates/browserslist
 - templates/bundler_audit.rake
 - templates/capybara_webkit.rb
-- templates/circle.yml.erb
 - templates/config_locales_it.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
@@ -153,7 +209,6 @@ files:
 - templates/slim.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
-- templates/staging.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.slim
 homepage: http://github.com/welaika/welaika-suspenders
@@ -177,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/templates/circle.yml.erb

@@ -1,6 +0,0 @@
-database:
-  override:
-    - bin/setup
-test:
-  override:
-    - bin/rake

data/templates/staging.rb

@@ -1,5 +0,0 @@
-require_relative "production"
-
-Mail.register_interceptor(
-  RecipientInterceptor.new(ENV.fetch("EMAIL_RECIPIENTS"))
-)