welaika-suspenders 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba7c8b0136a167dcc9ae6ce048ef674a079a52d
-  data.tar.gz: 13597374a2fdab6082ac299ec8b7a4b608e02423
+  metadata.gz: 24e81f09eaf562a6abd0864b2d899259d726b88f
+  data.tar.gz: 9e121e9379e17e6950757f63a04c4620df9099c4
 SHA512:
-  metadata.gz: aa56cc61ca09d0f4eda510c4a31173ec1567f78fac9c8f07c44c024e7f7ab966a9ba13e181ff23cd463435d2dad0dadd50b4e72453be640bca1e2852a4a31641
-  data.tar.gz: b784d2453f86f09038e6eaec9ab675dc7251a0b9353e96db02a62cd93242648b52d119b1d0d24a40b78fdbf576583de4c48d9af74861ed10604b45a4d7f7372c
+  metadata.gz: 7fce84b9298cc03e57335296481cddaa24ec555f20fa1db573914b556ce29d445f80d3096a700e19d2aa78f6c79c8c10c78e8c8c44448326b6e0ffcacf7ccd41
+  data.tar.gz: 273c0ed7a8615b8e626e31fee2c3618871a594982578c383fd88eadc157ca7e3f22333b8c8efa6171e1172c7f5b7e1e5e18fc594773bbad0cdee983e7ce376da

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.1

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.2.1
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    welaika-suspenders (2.7.1)
+    welaika-suspenders (2.8.0)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
       rails (= 4.2.0)
@@ -53,12 +53,19 @@ GEM
       sass (~> 3.3)
       thor
     builder (3.2.2)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     globalid (0.3.3)
@@ -70,12 +77,20 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.0)
     minitest (5.5.1)
     multi_json (1.10.1)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.0.1)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     rack (1.6.0)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -113,6 +128,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.0)
     sass (3.4.13)
+    slop (3.6.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -135,5 +151,6 @@ PLATFORMS
 
 DEPENDENCIES
   capybara (~> 2.2, >= 2.2.0)
+  pry-byebug
   rspec (~> 2.0)
   welaika-suspenders!

data/NEWS.md

@@ -1,3 +1,16 @@
+1.25.0 (March 7, 2015)
+
+* Configure Active Job queue adapter for test env
+* Use Ruby 2.2.1
+* Dasherize heroku app names
+* Update Bourbon to 4.2.0
+* Add ASSET_HOST to sample.env (defaults to HOST)
+* Set bin/deploy script as executable
+* Set email deliver method to :test for development
+* Include missing word in the Flutie description in README.
+* Remove unused dev gems: aruba & cucumber
+* Use skip_bundle class_option (rather than defining an empty run_bundle method)
+
 1.24.0 (February 3, 2015)
 
 * Remove things in Suspenders that Rails does for us now.

data/README.md

@@ -14,6 +14,10 @@ If you are using RVM, please create a new gemset named like `projectname`:
     rvm gemset create projectname
     rvm gemset use projectname
 
+If you want to use heroku, please install the [heroku toolbelt](https://toolbelt.heroku.com/) and run
+
+    heroku login
+
 Then run:
 
     welaika-suspenders projectname
@@ -67,3 +71,6 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - add `quiet_assets` gem
 - add `brakeman` gem
 - change `i18n_tasks` configuration: set `it` as base locale
+- set `Rome` as `time_zone`
+- set `:it` as `default_locale`
+- add [simplecov](https://github.com/colszowka/simplecov)

data/lib/suspenders/actions.rb

@@ -14,6 +14,14 @@ module Suspenders
       configure_environment(rails_env, config)
     end
 
+    def configure_application_file(config)
+      inject_into_file(
+        "config/application.rb",
+        "\n\n    #{config}",
+        before: "\n  end"
+      )
+    end
+
     def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",

data/lib/suspenders/app_builder.rb

@@ -214,7 +214,6 @@ end
     end
 
     def configure_background_jobs_for_rspec
-      copy_file 'background_jobs_rspec.rb', 'spec/support/background_jobs.rb'
       run 'rails g delayed_job:active_record'
     end
 
@@ -222,9 +221,30 @@ end
       copy_file 'action_mailer.rb', 'spec/support/action_mailer.rb'
     end
 
+    def configure_simplecov
+      simplecov_configuration = <<-RUBY
+require "simplecov"
+SimpleCov.start "rails" do
+  add_group "Queries", "app/queries"
+  add_group "Services", "app/services"
+  add_group "Validators", "app/validators"
+  add_group "Presenter", "app/presenters"
+end
+RUBY
+      prepend_to_file "spec/spec_helper.rb", simplecov_configuration
+    end
+
     def configure_locales
       remove_file "config/locales/en.yml"
       template "config_locales_it.yml.erb", "config/locales/it.yml"
+
+      replace_in_file "config/application.rb",
+        "# config.time_zone = 'Central Time (US & Canada)'",
+        "config.time_zone = 'Rome'"
+
+      replace_in_file "config/application.rb",
+        "# config.i18n.default_locale = :de",
+        "config.i18n.default_locale = :it"
     end
 
     def configure_rack_timeout
@@ -254,6 +274,13 @@ end
       inject_into_class 'config/application.rb', 'Application', config
     end
 
+    def configure_active_job
+      configure_application_file(
+        "config.active_job.queue_adapter = :delayed_job"
+      )
+      configure_environment "test", "config.active_job.queue_adapter = :inline"
+    end
+
     def fix_i18n_deprecation_warning
       config = <<-RUBY
     config.i18n.enforce_available_locales = true
@@ -314,14 +341,23 @@ end
       run 'git init'
     end
 
-    def create_heroku_apps(flags)
+    def create_staging_heroku_app(flags)
       rack_env = "RACK_ENV=staging RAILS_ENV=staging"
-      rails_serve_static_files = "RAILS_SERVE_STATIC_FILES=true"
-      staging_config = "#{rack_env} #{rails_serve_static_files}"
-      run_heroku "create #{app_name}-production #{flags}", "production"
-      run_heroku "create #{app_name}-staging #{flags}", "staging"
-      run_heroku "config:add #{staging_config}", "staging"
-      run_heroku "config:add #{rails_serve_static_files}", "production"
+      app_name = heroku_app_name_for("staging")
+
+      run_heroku "create #{app_name} #{flags}", "staging"
+      run_heroku "config:add #{rack_env}", "staging"
+    end
+
+    def create_production_heroku_app(flags)
+      app_name = heroku_app_name_for("production")
+
+      run_heroku "create #{app_name} #{flags}", "production"
+    end
+
+    def create_heroku_apps(flags)
+      create_staging_heroku_app(flags)
+      create_production_heroku_app(flags)
     end
 
     def set_heroku_remotes
@@ -336,7 +372,7 @@ end
     end
 
     def join_heroku_app(environment)
-      heroku_app_name = "#{app_name}-#{environment}"
+      heroku_app_name = heroku_app_name_for(environment)
       <<-SHELL
 if heroku join --app #{heroku_app_name} &> /dev/null; then
   git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
@@ -353,12 +389,18 @@ fi
       end
     end
 
-    def set_memory_management_variable
+    def set_heroku_memory_management_variable
       %w(staging production).each do |environment|
         run_heroku "config:add NEW_RELIC_AGGRESSIVE_KEEPALIVE=1", environment
       end
     end
 
+    def set_heroku_serve_static_files
+      %w(staging production).each do |environment|
+        run_heroku "config:add RAILS_SERVE_STATIC_FILES=true", environment
+      end
+    end
+
     def provide_deploy_script
       copy_file "bin_deploy", "bin/deploy"
 
@@ -462,5 +504,9 @@ end
     def serve_static_files_line
       "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end
+
+    def heroku_app_name_for(environment)
+      "#{app_name.dasherize}-#{environment}"
+    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -96,6 +96,7 @@ module Suspenders
       build :configure_i18n_for_test_environment
       build :configure_i18n_tasks
       build :configure_action_mailer_in_specs
+      build :configure_simplecov
     end
 
     def setup_production_environment
@@ -128,6 +129,7 @@ module Suspenders
       say 'Configuring app'
       build :configure_action_mailer
       build :configure_locales
+      build :configure_active_job
       build :configure_rack_timeout
       build :configure_simple_form
       build :configure_slim
@@ -161,9 +163,10 @@ module Suspenders
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
+        build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
-        build :set_memory_management_variable
+        build :set_heroku_memory_management_variable
         build :provide_deploy_script
       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 = "2.7.1"
+  VERSION = "2.8.0"
 end

data/spec/features/heroku_spec.rb

@@ -4,8 +4,7 @@ feature "Heroku" do
   scenario "Suspend a project for Heroku" do
     run_suspenders("--heroku=true")
 
-    expect(FakeHeroku).
-      to have_gem_included(project_path, "rails_stdout_logging")
+    expect(FakeHeroku).to have_gem_included(project_path, "rails_stdout_logging")
     expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
     expect(FakeHeroku).to have_created_app_for("production", "--region eu")
     expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
@@ -13,10 +12,10 @@ feature "Heroku" do
 
     bin_setup_path = "#{project_path}/bin/setup"
     bin_setup = IO.read(bin_setup_path)
-    app_name = SuspendersTestHelpers::APP_NAME
+    app_name = SuspendersTestHelpers::APP_NAME.dasherize
 
-    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
     expect(bin_setup).to include("heroku join --app #{app_name}-production")
+    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
     expect(File.stat(bin_setup_path)).to be_executable
 
     bin_deploy_path = "#{project_path}/bin/deploy"

data/spec/features/new_project_spec.rb

@@ -67,14 +67,16 @@ feature 'Suspend a new project with default configuration' do
     )
   end
 
-  scenario "set up available locales" do
+  scenario "set up locale and timezone" do
     run_suspenders
 
     result = IO.read("#{project_path}/config/application.rb")
 
-    expect(result).to match(
-      /^ +config.i18n.available_locales = \[:en, :it\]$/
-    )
+    expect(result).to match(/^ +config.i18n.enforce_available_locales = true$/)
+    expect(result).to match(/^ +config.i18n.available_locales = \[:en, :it\]$/)
+    expect(result).to match(/^ +config.i18n.default_locale = :it$/)
+
+    expect(result).to match(/^ +config.time_zone = 'Rome'$/)
   end
 
   scenario "raises on unpermitted parameters in all environments" do
@@ -136,6 +138,28 @@ feature 'Suspend a new project with default configuration' do
       to match(/^ +config.action_mailer.delivery_method = :letter_opener$/)
   end
 
+  scenario "set up simplecov" do
+    run_suspenders
+
+    spec_helper_file = IO.read("#{project_path}/spec/spec_helper.rb")
+    expect(spec_helper_file).to match(/^require "simplecov"$/)
+    expect(spec_helper_file).to match(/^SimpleCov.start "rails" do$/)
+  end
+
+  scenario "config active job queue adapter" do
+    run_suspenders
+
+    application_config = IO.read("#{project_path}/config/application.rb")
+    test_config = IO.read("#{project_path}/config/environments/test.rb")
+
+    expect(application_config).to match(
+      /^ +config.active_job.queue_adapter = :delayed_job$/
+    )
+    expect(test_config).to match(
+      /^ +config.active_job.queue_adapter = :inline$/
+    )
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
-require 'capybara/rspec'
-require 'bundler/setup'
+require "capybara/rspec"
+require "bundler/setup"
+require "pry-byebug"
 
 Bundler.require(:default, :test)
 

data/spec/support/fake_heroku.rb

@@ -23,16 +23,16 @@ class FakeHeroku
     end
   end
 
-  def self.has_created_app_for?(remote_name, flags = nil)
-    app_name = "#{SuspendersTestHelpers::APP_NAME}-#{remote_name}"
+  def self.has_created_app_for?(environment, flags = nil)
+    app_name = "#{SuspendersTestHelpers::APP_NAME.dasherize}-#{environment}"
 
-    expected_line = if flags
-      "create #{app_name} #{flags} --remote #{remote_name}\n"
-    else
-      "create #{app_name} --remote #{remote_name}\n"
-    end
+    command = if flags
+                "create #{app_name} #{flags} --remote #{environment}\n"
+              else
+                "create #{app_name} --remote #{environment}\n"
+              end
 
-    File.foreach(RECORDER).any? { |line| line == expected_line }
+    File.foreach(RECORDER).any? { |line| line == command }
   end
 
   def self.has_configured_vars?(remote_name, var)

data/spec/support/suspenders.rb

@@ -1,5 +1,5 @@
 module SuspendersTestHelpers
-  APP_NAME = 'dummy'
+  APP_NAME = "dummy_app"
 
   def remove_project_directory
     FileUtils.rm_rf(project_path)

data/suspenders.gemspec

@@ -31,4 +31,5 @@ weLaika's fork of the famous thoughbot suspenders gem.
 
   s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
+  s.add_development_dependency 'pry-byebug'
 end

data/templates/Gemfile.erb

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "airbrake"
-gem "bourbon", "~> 4.1.0"
+gem "bourbon", "~> 4.2.0"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"
@@ -54,6 +54,7 @@ group :test do
   gem "formulaic"
   gem "launchy"
   gem "shoulda-matchers", require: false
+  gem "simplecov", require: false
   gem "timecop"
   gem "webmock"
 end

data/templates/database_cleaner_rspec.rb

@@ -7,7 +7,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, :js => true) do
+  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :deletion
   end
 

data/templates/spec_helper.rb

@@ -8,6 +8,7 @@ RSpec.configure do |config|
 
   config.mock_with :rspec do |mocks|
     mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
   end
 
   config.order = :random

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -87,6 +87,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: |
   weLaika's fork of the famous thoughbot suspenders gem.
 email: info@welaika.com
@@ -133,7 +147,6 @@ files:
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
 - templates/application.css.sass
-- templates/background_jobs_rspec.rb
 - templates/bin_deploy
 - templates/bin_setup.erb
 - templates/bundler_audit.rake
@@ -173,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.2.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -181,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/templates/background_jobs_rspec.rb

@@ -1,19 +0,0 @@
-module BackgroundJobs
-  def run_background_jobs_immediately
-    delay_jobs = Delayed::Worker.delay_jobs
-    Delayed::Worker.delay_jobs = false
-    yield
-  ensure
-    Delayed::Worker.delay_jobs = delay_jobs
-  end
-end
-
-RSpec.configure do |config|
-  config.around(:each, type: :feature) do |example|
-    run_background_jobs_immediately do
-      example.run
-    end
-  end
-
-  config.include BackgroundJobs
-end