suspenders 1.31.0 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc097cf89da27e8006356a8716c702f400b76631
-  data.tar.gz: 474d6fe3b9dd0b81dfa4be406e30fc7a2f38b991
+  metadata.gz: e4c2b69ad9b649ff93f1db328f9eaf6b895e4161
+  data.tar.gz: 4ff00b6fdb1af98288925b742469375a208ac6f9
 SHA512:
-  metadata.gz: 48f0762028d843e9a95d3e1c8c718ed557d0cf3cf38f8f54983f7e6b89c2799947007fa5a52840e6d975a52d1a405e333b4e827d597c235324305ea54dbf5a83
-  data.tar.gz: 9359e82fa9095de86f5c8940699f13cee98096d2c51bf80871c4609f0dd7223f8ac4e61ef35451df14e0780b98353f0efc3cab403e3d82697da098c6f5f1df0c
+  metadata.gz: 84e17680c1accc5fff345b16919ac7c0e3d88ccb677e828065893cbeb61a1a9cf7efde9add03be1e9a9c57f1b3154ecd4b0f343a8f0c12acc533118057b19b50
+  data.tar.gz: 13a16169ce1e54e6175afda0433849335fdfeac58d4c117d0ffc630e2c3265a3e93bde499336662e64d4aac6255a91e90d35f2dad4fc65ce1bf197a79c235637

data/NEWS.md

@@ -1,3 +1,13 @@
+1.32.0 (October 9, 2015)
+
+* Install Foreman automatically during setup script
+* Port always defaults to 3000
+* Provide shoulda-matchers config
+* Set CI auto-deploy for Heroku suspended apps
+* Configure capybara-webkit to block unknown URLs
+* Add mandatory environment variables to .sample.env
+* Other bugfixes
+
 1.31.0 (September 3, 2015)
 
 * Update to Ruby 2.2.3

data/lib/suspenders/app_builder.rb

@@ -28,7 +28,7 @@ module Suspenders
     end
 
     def provide_setup_script
-      template "bin_setup.erb", "bin/setup", port_number: port, force: true
+      template "bin_setup.erb", "bin/setup", force: true
       run "chmod a+x bin/setup"
     end
 
@@ -86,7 +86,7 @@ module Suspenders
       config = <<-RUBY
 
   # Ensure requests are only served from one, canonical host name
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("HOST")
+  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
       inject_into_file(
@@ -197,6 +197,13 @@ end
       copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
     end
 
+    def provide_shoulda_matchers_config
+      copy_file(
+        "shoulda_matchers_config_rspec.rb",
+        "spec/support/shoulda_matchers_config.rb"
+      )
+    end
+
     def configure_spec_support_features
       empty_directory_with_keep_file 'spec/features'
       empty_directory_with_keep_file 'spec/support/features'
@@ -253,10 +260,10 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
     end
 
     def configure_action_mailer
-      action_mailer_host "development", %{"localhost:#{port}"}
+      action_mailer_host "development", %{"localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
-      action_mailer_host "staging", %{ENV.fetch("HOST")}
-      action_mailer_host "production", %{ENV.fetch("HOST")}
+      action_mailer_host "staging", %{ENV.fetch("APPLICATION_HOST")}
+      action_mailer_host "production", %{ENV.fetch("APPLICATION_HOST")}
     end
 
     def configure_active_job
@@ -400,6 +407,20 @@ you can deploy to staging and production with:
       run "chmod a+x bin/deploy"
     end
 
+    def configure_automatic_deployment
+      staging_remote_name = heroku_app_name_for("staging")
+      deploy_command = <<-YML.strip_heredoc
+      deployment:
+        staging:
+          branch: master
+          commands:
+            - git remote add staging git@heroku.com:#{staging_remote_name}.git
+            - bin/deploy staging
+      YML
+
+      append_file "circle.yml", deploy_command
+    end
+
     def create_github_repo(repo_name)
       path_addition = override_path_for_tests
       run "#{path_addition} hub create #{repo_name}"
@@ -510,10 +531,6 @@ end
       SecureRandom.hex(64)
     end
 
-    def port
-      @port ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
-    end
-
     def serve_static_files_line
       "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end

data/lib/suspenders/generators/app_generator.rb

@@ -96,6 +96,7 @@ module Suspenders
       build :configure_rspec
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
+      build :provide_shoulda_matchers_config
       build :configure_spec_support_features
       build :configure_ci
       build :configure_i18n_for_test_environment
@@ -175,6 +176,7 @@ module Suspenders
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :provide_deploy_script
+        build :configure_automatic_deployment
       end
     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 = "1.31.0"
+  VERSION = "1.32.0"
 end

data/spec/features/heroku_spec.rb

@@ -35,6 +35,18 @@ RSpec.describe "Heroku" do
 
     expect(readme).to include("./bin/deploy staging")
     expect(readme).to include("./bin/deploy production")
+
+    circle_yml_path = "#{project_path}/circle.yml"
+    circle_yml = IO.read(circle_yml_path)
+
+    expect(circle_yml).to include <<-YML.strip_heredoc
+    deployment:
+      staging:
+        branch: master
+        commands:
+          - git remote add staging git@heroku.com:#{app_name}-staging.git
+          - bin/deploy staging
+    YML
   end
 
   it "suspends a project with extra Heroku flags" do

data/spec/features/new_project_spec.rb

@@ -111,6 +111,12 @@ RSpec.describe "Suspend a new project with default configuration" do
       to match(/^ +config.action_mailer.delivery_method = :test$/)
   end
 
+  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).not_to match(/"HOST"/)
+  end
+
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
     test_config = IO.read("#{project_path}/config/environments/test.rb")

data/templates/Gemfile.erb

@@ -43,11 +43,11 @@ group :development, :test do
 end
 
 group :test do
-  gem "capybara-webkit", ">= 1.2.0"
+  gem "capybara-webkit"
   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/bin_setup.erb

@@ -23,12 +23,11 @@ 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
+  printf 'port: 3000\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'
+  gem install foreman
 fi
 
 # Only if this isn't CI

data/templates/postgresql_database.yml.erb

@@ -4,8 +4,8 @@ development: &default
   encoding: utf8
   host: localhost
   min_messages: warning
-  pool: <%%= ENV.fetch("DB_POOL", 5) %>
-  reaping_frequency: <%%= ENV.fetch("DB_REAPING_FREQUENCY", 10) %>
+  pool: <%%= Integer(ENV.fetch("DB_POOL", 5)) %>
+  reaping_frequency: <%%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
   timeout: 5000
 
 test:
@@ -15,7 +15,7 @@ test:
 production: &deploy
   encoding: utf8
   min_messages: warning
-  pool: <%%= [ENV.fetch("MAX_THREADS", 5), ENV.fetch("DB_POOL", 5)].max %>
+  pool: <%%= [Integer(ENV.fetch("MAX_THREADS", 5)), Integer(ENV.fetch("DB_POOL", 5))].max %>
   timeout: 5000
   url:  <%%= ENV.fetch("DATABASE_URL", "") %>
 

data/templates/rails_helper.rb

@@ -4,7 +4,6 @@ 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 }
 
@@ -14,6 +13,9 @@ module Features
 end
 
 RSpec.configure do |config|
+  config.before(:each, js: true) do
+    page.driver.block_unknown_urls
+  end
   config.include Features, type: :feature
   config.infer_base_class_for_anonymous_controllers = false
   config.infer_spec_type_from_file_location!

data/templates/sample.env

@@ -4,3 +4,7 @@ APPLICATION_HOST=localhost: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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -137,6 +137,7 @@ files:
 - templates/rails_helper.rb
 - templates/sample.env
 - templates/secrets.yml
+- templates/shoulda_matchers_config_rspec.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
 - templates/staging.rb