welaika-suspenders 2.24.0 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2f82e071962fef84f1eb7ca1deecc5c8acd3d4c
-  data.tar.gz: 7d6b86a5f22994f77f71fe00cce6d5f5268ac3a0
+  metadata.gz: 35275d2042fd17e7555c3395e05fc82256ec40a5
+  data.tar.gz: e946e11fa1984ae6607fcd4283989c26accbae5f
 SHA512:
-  metadata.gz: fa13059af0f52dd92a341eb1c3c2f42590fde2ea4d1637c6af67b6605474b963486d2d1e01e22e50df6d2f93e75028596dbbdb43838ad82f242b71b52671524a
-  data.tar.gz: 8959f5757c6d5324c5fe8e797933ab92be1bed480de98577e9c8547200e3faf39377a3975221b5eda921018cbb29aac4dea1e4c04079afaf9401326e9c9577d4
+  metadata.gz: 28a6065760b7660c88390c0f32075c36e3c03e7573943eaa4f36634a62ebf9126e19d45a0328c10f881a000052a5893ad0186979daa1b65d874abe2ef4b47463
+  data.tar.gz: af6c24992c6fc71b47c5f925e053075f5f72a62951954b2384c151c0f1fb6d8af8fdb3e9ae271c16fe3a006a72fddd0e57dc5df9dab89b86246bd761afde5338

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.3.0
+rvm: 2.3.1
 cache: bundler
 sudo: false
 before_install:

data/CONTRIBUTING.md

@@ -29,6 +29,9 @@ Make the tests pass:
 
     rake
 
+Mention how your changes affect the project to other developers and users in the
+`NEWS.md` file.
+
 Write a [good commit message][commit].
 Push to your fork.
 [Submit a pull request][pr].

data/NEWS.md

@@ -1,3 +1,32 @@
+master
+
+1.40.0 (June 25, 2016)
+
+* Upgrade bourbon to 5.0.0.beta.6
+* Update Neat to 1.8.0
+* `APPLICATION_HOST` bug fix in production environment (was used before it was
+  defined)
+* Update comment around Pipelines: it is now a Heroku core plugin
+* Drop unneeded `WEB_CONCURRENCY` from `app.json` file
+* Introduce a `suspenders:stylesheet_base` generator. The `application.scss`
+  must list the imports in a specific order. This removes the `application.css`.
+
+1.39.0 (May 25, 2016)
+
+* Update to Ruby 2.3.1
+* Make new apps "deployable to Heroku" by default.
+* Make the help text returned when running `suspenders -h` Suspenders specific
+* Bugfix: Configure `static_cache_control` in production environment
+* Replace NewRelic with Skylight
+* Drop initializer for disabling XML parser
+* Start moving suspenders features into different Rails Generators
+* Set default `application_host` in Heroku
+* Update the viewport meta tag
+
+1.38.1 (April 20, 2016)
+
+* Bugfix: add bitters as suspenders’ dependency back.
+
 1.38.0 (April 15, 2016)
 
 * Update bourbon to `v5.0.0.beta.5`

data/RELEASING.md

@@ -4,7 +4,7 @@
 2. Update `NEWS.md` to reflect the changes since last release.
 3. Commit changes. There shouldn't be code changes, and thus CI doesn't need to
    run, you can then add `[ci skip]` to the commit message.
-4. Tag the release: `git tag vVERSION -a`. The tag message should contain the
+4. Tag the release: `git tag vVERSION -a -s`. The tag message should contain the
    appropriate `NEWS.md` subsection.
 5. Push changes: `git push --tags`
 6. Build and publish to rubygems:

data/USAGE

@@ -0,0 +1,13 @@
+Description:
+    Suspenders is a Rails template with thoughtbot standard
+    defaults, ready to deploy to Heroku.
+
+    For full details on the changes we've made compared to
+    a vanilla Rails app, check our GitHub project:
+        https://github.com/thoughtbot/suspenders
+
+Example:
+    suspenders ~/Code/weblog
+
+    This generates a Rails installation in ~/Code/weblog configured
+    with our preferred defaults.

data/lib/suspenders.rb

@@ -1,5 +1,7 @@
 require 'suspenders/version'
 require 'suspenders/generators/app_generator'
+require 'suspenders/generators/static_generator'
+require 'suspenders/generators/stylesheet_base_generator'
 require 'suspenders/actions'
 require "suspenders/adapters/heroku"
 require 'suspenders/app_builder'

data/lib/suspenders/adapters/heroku.rb

@@ -16,14 +16,6 @@ module Suspenders
         app_builder.append_file "bin/setup", remotes
       end
 
-      def set_up_heroku_specific_gems
-        app_builder.inject_into_file(
-          "Gemfile",
-          %{\n\s\sgem "rails_stdout_logging"},
-          after: /group :staging, :production do/,
-        )
-      end
-
       def create_staging_heroku_app(flags)
         app_name = heroku_app_name_for("staging")
 
@@ -45,7 +37,7 @@ module Suspenders
         end
       end
 
-      def provide_review_apps_setup_script
+      def create_review_apps_setup_script
         app_builder.template(
           "bin_setup_review_app.erb",
           "bin/setup_review_app",
@@ -54,18 +46,17 @@ module Suspenders
         app_builder.run "chmod a+x bin/setup_review_app"
       end
 
-      def create_heroku_pipelines_config_file
+      def create_heroku_application_manifest_file
         app_builder.template "app.json.erb", "app.json"
       end
 
       def create_heroku_pipeline
-        pipelines_plugin = `heroku plugins | grep pipelines`
+        pipelines_plugin = `heroku help | grep pipelines`
         if pipelines_plugin.empty?
-          puts "You need heroku pipelines plugin. Run: heroku plugins:install heroku-pipelines"
+          puts "You need heroku pipelines plugin. Run: brew upgrade heroku-toolbelt"
           exit 1
         end
 
-        heroku_app_name = app_builder.app_name.dasherize
         run_toolbelt_command(
           "pipelines:create #{heroku_app_name} \
             -a #{heroku_app_name}-staging --stage staging",
@@ -88,6 +79,15 @@ module Suspenders
         end
       end
 
+      def set_heroku_application_host
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "config:add APPLICATION_HOST=#{heroku_app_name}-#{environment}.herokuapp.com",
+            environment,
+          )
+        end
+      end
+
       private
 
       attr_reader :app_builder
@@ -105,8 +105,12 @@ fi
         SHELL
       end
 
+      def heroku_app_name
+        app_builder.app_name.dasherize
+      end
+
       def heroku_app_name_for(environment)
-        "#{app_builder.app_name.dasherize}-#{environment}"
+        "#{heroku_app_name}-#{environment}"
       end
 
       def generate_secret

data/lib/suspenders/app_builder.rb

@@ -6,15 +6,15 @@ module Suspenders
     extend Forwardable
 
     def_delegators :heroku_adapter,
-                   :create_heroku_pipelines_config_file,
+                   :create_heroku_application_manifest_file,
                    :create_heroku_pipeline,
                    :create_production_heroku_app,
                    :create_staging_heroku_app,
-                   :provide_review_apps_setup_script,
+                   :create_review_apps_setup_script,
                    :set_heroku_rails_secrets,
                    :set_heroku_remotes,
-                   :set_heroku_serve_static_files,
-                   :set_up_heroku_specific_gems
+                   :set_heroku_application_host,
+                   :set_heroku_serve_static_files
 
     def readme
       template 'README.md.erb', 'README.md'
@@ -36,11 +36,7 @@ module Suspenders
     end
 
     def raise_on_missing_assets_in_test
-      inject_into_file(
-        "config/environments/test.rb",
-        "\n  config.assets.raise_runtime_errors = true",
-        after: "Rails.application.configure do",
-      )
+      configure_environment "test", "config.assets.raise_runtime_errors = true"
     end
 
     def raise_on_delivery_errors
@@ -152,7 +148,6 @@ module Suspenders
     ENV["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")
       RUBY
 
@@ -164,17 +159,7 @@ module Suspenders
     end
 
     def enable_rack_deflater
-      config = <<-RUBY
-
-  # Enable deflate / gzip compression of controller-generated responses
-  config.middleware.use Rack::Deflater
-      RUBY
-
-      inject_into_file(
-        "config/environments/production.rb",
-        config,
-        after: serve_static_files_line
-      )
+      configure_environment "production", "config.middleware.use Rack::Deflater"
     end
 
     def setup_asset_host
@@ -186,10 +171,9 @@ module Suspenders
         "config.assets.version = '1.0'",
         'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
 
-      inject_into_file(
-        "config/environments/production.rb",
-        '  config.static_cache_control = "public, max-age=#{1.year.to_i}"',
-        after: serve_static_files_line
+      configure_environment(
+        "production",
+        'config.static_cache_control = "public, max-age=31557600"',
       )
     end
 
@@ -237,6 +221,16 @@ module Suspenders
       bundle_command 'exec rake db:create db:migrate'
     end
 
+    def replace_gemfile(path)
+      template 'Gemfile.erb', 'Gemfile', force: true do |content|
+        if path
+          content.gsub(%r{gem .suspenders.}) { |s| %{#{s}, path: "#{path}"} }
+        else
+          content
+        end
+      end
+    end
+
     def set_ruby_to_version_being_used
       create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
@@ -300,6 +294,12 @@ module Suspenders
       replace_in_file "config/application.rb",
         "# config.time_zone = 'Central Time (US & Canada)'",
         "config.time_zone = 'Rome'"
+
+      available_locales_config = <<-RUBY
+    config.i18n.available_locales = [:en, :it]
+      RUBY
+
+      inject_into_class 'config/application.rb', 'Application', available_locales_config
     end
 
     def configure_rack_timeout
@@ -324,14 +324,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       action_mailer_host "production", %{ENV.fetch("APPLICATION_HOST")}
     end
 
-    def configure_available_locales
-      config = <<-RUBY
-    config.i18n.available_locales = [:en, :it]
-      RUBY
-
-      inject_into_class 'config/application.rb', 'Application', config
-    end
-
     def configure_active_job
       configure_application_file(
         "config.active_job.queue_adapter = :delayed_job"
@@ -351,12 +343,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       copy_file "Procfile", "Procfile"
     end
 
-    def setup_stylesheets
-      remove_file 'app/assets/stylesheets/application.css'
-      copy_file 'application.sass',
-        'app/assets/stylesheets/application.sass'
-    end
-
     def setup_default_directories
       [
         'app/forms',
@@ -393,7 +379,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       create_production_heroku_app(flags)
     end
 
-    def provide_deploy_script
+    def create_deploy_script
       copy_file "bin_deploy", "bin/deploy"
 
       instructions = <<-MARKDOWN
@@ -484,10 +470,6 @@ you can deploy to staging and production with:
         "Rails.application.routes.draw do\nend"
     end
 
-    def disable_xml_params
-      copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
-    end
-
     def setup_default_rake_task
       append_file 'Rakefile' do
         <<-EOS
@@ -519,9 +501,5 @@ task default: "bundler:audit"
     def heroku_adapter
       @heroku_adapter ||= Adapters::Heroku.new(self)
     end
-
-    def serve_static_files_line
-      "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
-    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -3,6 +3,8 @@ require 'rails/generators/rails/app/app_generator'
 
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
+    hide!
+
     class_option :database, type: :string, aliases: "-d", default: "postgresql",
       desc: "Configure for selected database (options: #{DATABASES.join("/")})"
 
@@ -24,6 +26,15 @@ module Suspenders
     class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
       desc: "Don't run bundle install"
 
+    class_option :version, type: :boolean, aliases: "-v", group: :suspenders,
+      desc: "Show Suspenders version number and quit"
+
+    class_option :help, type: :boolean, aliases: '-h', group: :suspenders,
+      desc: "Show this help message and quit"
+
+    class_option :path, type: :string, default: nil,
+      desc: "Path to the gem"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -45,21 +56,19 @@ module Suspenders
       invoke :setup_dotfiles
       invoke :setup_git
       invoke :setup_database
+      invoke :create_local_heroku_setup
       invoke :create_heroku_apps
       invoke :create_github_repo
       invoke :setup_spring
       invoke :create_binstubs
+      invoke :generate_default
       invoke :outro
     end
 
     def customize_gemfile
       build :create_ruby_gemset_file
+      build :replace_gemfile, options[:path]
       build :set_ruby_to_version_being_used
-
-      if options[:heroku]
-        build :set_up_heroku_specific_gems
-      end
-
       bundle_command 'install'
       build :configure_simple_form
     end
@@ -79,7 +88,6 @@ module Suspenders
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
       build :configure_letter_opener
-      build :set_test_delivery_method
       build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
@@ -138,8 +146,7 @@ module Suspenders
       build :configure_locales
       build :configure_active_job
       build :configure_slim
-      build :disable_xml_params
-      build :configure_available_locales
+      build :configure_time_formats
       build :setup_default_rake_task
       build :configure_puma
       build :set_up_forego
@@ -159,17 +166,23 @@ module Suspenders
       end
     end
 
+    def create_local_heroku_setup
+      say "Creating local Heroku setup"
+      build :create_review_apps_setup_script
+      build :create_deploy_script
+      build :create_heroku_application_manifest_file
+    end
+
     def create_heroku_apps
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
-        build :provide_review_apps_setup_script
         build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
-        build :create_heroku_pipelines_config_file
+        build :set_heroku_application_host
         build :create_heroku_pipeline
-        build :provide_deploy_script
+        build :configure_automatic_deployment
       end
     end
 
@@ -220,11 +233,24 @@ module Suspenders
       build :remove_routes_comment_lines
     end
 
+    def generate_default
+      run("spring stop")
+
+      generate("suspenders:static")
+      generate("suspenders:stylesheet_base")
+
+      bundle_command "install"
+    end
+
     def outro
       say "Congratulations! You just pulled our suspenders."
       say "Read README.md and configure Errbit."
     end
 
+    def self.banner
+      "suspenders #{arguments.map(&:usage).join(' ')} [options]"
+    end
+
     protected
 
     def get_builder_class

data/lib/suspenders/generators/static_generator.rb

@@ -0,0 +1,9 @@
+require "rails/generators"
+
+module Suspenders
+  class StaticGenerator < Rails::Generators::Base
+    def add_high_voltage
+      gem "high_voltage"
+    end
+  end
+end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -0,0 +1,25 @@
+require "rails/generators"
+
+module Suspenders
+  class StylesheetBaseGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__))
+
+    def add_stylesheet_gems
+      gem "bourbon", "5.0.0.beta.6"
+    end
+
+    def add_css_config
+      copy_file(
+        "application.sass",
+        "app/assets/stylesheets/application.sass",
+        force: true,
+      )
+    end
+
+    def remove_prior_config
+      remove_file "app/assets/stylesheets/application.css"
+    end
+  end
+end

data/lib/suspenders/version.rb

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

data/lib/welaika-suspenders.rb

@@ -0,0 +1 @@
+require 'suspenders'

data/spec/adapters/heroku_spec.rb

@@ -16,27 +16,32 @@ module Suspenders
           with(setup_file, /heroku join --app #{app_name.dasherize}-staging/)
       end
 
-      it "sets up the heroku specific gems" do
+      it "sets the heroku rails secrets" do
         app_builder = double(app_name: app_name)
-        allow(app_builder).to receive(:inject_into_file)
+        allow(app_builder).to receive(:run)
 
-        Heroku.new(app_builder).set_up_heroku_specific_gems
+        Heroku.new(app_builder).set_heroku_rails_secrets
 
-        expect(app_builder).to have_received(:inject_into_file).
-          with("Gemfile", /rails_stdout_logging/, anything)
+        expect(app_builder).to(
+          have_configured_var("staging", "SECRET_KEY_BASE"),
+        )
+        expect(app_builder).to(
+          have_configured_var("production", "SECRET_KEY_BASE"),
+        )
       end
 
-      it "sets the heroku rails secrets" do
+      it "sets the application host" do
         app_builder = double(app_name: app_name)
         allow(app_builder).to receive(:run)
 
-        Heroku.new(app_builder).set_heroku_rails_secrets
+        Heroku.new(app_builder).set_heroku_application_host
 
         expect(app_builder).to(
-          have_configured_var("staging", "SECRET_KEY_BASE"),
+          have_configured_var("staging", "APPLICATION_HOST"),
         )
+
         expect(app_builder).to(
-          have_configured_var("production", "SECRET_KEY_BASE"),
+          have_configured_var("production", "APPLICATION_HOST"),
         )
       end
 

data/spec/features/cli_help_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+RSpec.describe "Command line help output" do
+  let(:help_text) { suspenders_help_command }
+
+  it "does not contain the default rails usage statement" do
+    expect(help_text).not_to include("rails new APP_PATH [options]")
+  end
+
+  it "provides the correct usage statement for suspenders" do
+    expect(help_text).to include <<~EOH
+      Usage:
+        suspenders APP_PATH [options]
+    EOH
+  end
+
+  it "does not contain the default rails group" do
+    expect(help_text).not_to include("Rails options:")
+  end
+
+  it "provides help and version usage within the suspenders group" do
+    expect(help_text).to include <<~EOH
+Suspenders options:
+  -h, [--help], [--no-help]        # Show this help message and quit
+  -v, [--version], [--no-version]  # Show Suspenders version number and quit
+EOH
+  end
+
+  it "does not show the default extended rails help section" do
+    expect(help_text).not_to include("Create suspenders files for app generator.")
+  end
+
+  it "contains the usage statement from the suspenders gem" do
+    expect(help_text).to include IO.read(usage_file)
+  end
+end

data/spec/features/heroku_spec.rb

@@ -11,9 +11,6 @@ RSpec.describe "Heroku" do
     it "suspends a project for Heroku" do
       app_name = SuspendersTestHelpers::APP_NAME.dasherize
 
-      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")
@@ -21,6 +18,14 @@ RSpec.describe "Heroku" do
         "production",
         "SECRET_KEY_BASE",
       )
+      expect(FakeHeroku).to have_configured_vars(
+        "staging",
+        "APPLICATION_HOST",
+      )
+      expect(FakeHeroku).to have_configured_vars(
+        "production",
+        "APPLICATION_HOST",
+      )
       expect(FakeHeroku).to have_setup_pipeline_for(app_name)
 
       bin_setup_path = "#{project_path}/bin/setup"
@@ -31,36 +36,11 @@ RSpec.describe "Heroku" do
       expect(bin_setup).to include("git config heroku.remote staging")
       expect(File.stat(bin_setup_path)).to be_executable
 
-      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 --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
-
-      bin_deploy_path = "#{project_path}/bin/deploy"
-      bin_deploy = IO.read(bin_deploy_path)
-
-      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")
 
       expect(readme).to include("./bin/deploy staging")
       expect(readme).to include("./bin/deploy production")
     end
-
-    it "adds app.json file" do
-      expect(File).to exist("#{project_path}/app.json")
-    end
-
-    it "includes application name in app.json file" do
-      app_json_file = IO.read("#{project_path}/app.json")
-      app_name = SuspendersTestHelpers::APP_NAME.dasherize
-
-      expect(app_json_file).to match(/"name":"#{app_name}"/)
-    end
   end
 
   context "--heroku with region flag" do

data/spec/features/new_project_spec.rb

@@ -129,6 +129,13 @@ RSpec.describe "Suspend a new project with default configuration" do
     )
   end
 
+  it "configures static_cache_control in production" do
+    prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
+    expect(prod_env_file).to match(
+      /config.static_cache_control = "public, max-age=.+"/,
+    )
+  end
+
   it "raises on missing translations in development and test" do
     %w[development test].each do |environment|
       environment_file =
@@ -244,7 +251,60 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
+  it "creates review apps setup script" 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 --exit-code "\
+                                 "--app #{app_name.dasherize}-staging-pr-$1")
+    expect(bin_setup).to include("heroku ps:scale worker=1 "\
+                                 "--app #{app_name.dasherize}-staging-pr-$1")
+    expect(bin_setup).to include("heroku restart "\
+                                 "--app #{app_name.dasherize}-staging-pr-$1")
+    expect(File.stat(bin_setup_path)).to be_executable
+  end
+
+  it "creates deploy script" 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 --exit-code")
+    expect(File.stat(bin_deploy_path)).to be_executable
+  end
+
+  it "creates heroku application manifest file with application name in it" do
+    app_json_file = IO.read("#{project_path}/app.json")
+
+    expect(app_json_file).to match(/"name":"#{app_name.dasherize}"/)
+  end
+
+  it "sets up heroku specific gems" do
+    gemfile_file = IO.read("#{project_path}/Gemfile")
+
+    expect(gemfile_file).to include %{gem "rails_stdout_logging"}
+  end
+
   def app_name
     SuspendersTestHelpers::APP_NAME
   end
+
+  it "adds high_voltage" do
+    gemfile = IO.read("#{project_path}/Gemfile")
+    expect(gemfile).to match(/high_voltage/)
+  end
+
+  it "adds bourbon" do
+    gemfile = read_project_file("Gemfile")
+
+    expect(gemfile).to match(/bourbon/)
+  end
+
+  it "configures bourbon" do
+    app_css = read_project_file(%w(app assets stylesheets application.sass))
+    expect(app_css).to match(/normalize-rails.*bourbon/m)
+  end
+
+  def read_project_file(path)
+    IO.read(File.join(project_path, *path))
+  end
 end

data/spec/spec_helper.rb

@@ -18,4 +18,7 @@ RSpec.configure do |config|
   config.before(:each) do
     FakeGithub.clear!
   end
+
+  config.example_status_persistence_file_path = "tmp/rspec_examples.txt"
+  config.order = :random
 end

data/spec/support/fake_heroku.rb

@@ -6,8 +6,8 @@ class FakeHeroku
   end
 
   def run!
-    if @args.first == "plugins"
-      puts "heroku-pipelines@0.29.0"
+    if @args.first == "help"
+      puts "pipelines      #  manage collections of apps in pipelines"
     end
     File.open(RECORDER, 'a') do |file|
       file.puts @args.join(' ')

data/spec/support/suspenders.rb

@@ -10,6 +10,7 @@ module SuspendersTestHelpers
   end
 
   def run_suspenders(arguments = nil)
+    arguments = "--path=#{root_path} #{arguments}"
     Dir.chdir(tmp_path) do
       Bundler.with_clean_env do
         add_fakes_to_path
@@ -20,6 +21,16 @@ module SuspendersTestHelpers
     end
   end
 
+  def suspenders_help_command
+    Dir.chdir(tmp_path) do
+      Bundler.with_clean_env do
+        `
+          #{suspenders_bin} -h
+        `
+      end
+    end
+  end
+
   def setup_app_dependencies
     if File.exist?(project_path)
       Dir.chdir(project_path) do
@@ -48,6 +59,10 @@ module SuspendersTestHelpers
     @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
   end
 
+  def usage_file
+    @usage_path ||= File.join(root_path, "USAGE")
+  end
+
   private
 
   def tmp_path

data/suspenders.gemspec

@@ -25,13 +25,9 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bundler', '>= 1.8.4'
+  s.add_dependency 'bundler', '~> 1.3'
   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,15 +4,12 @@ ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "airbrake"
 gem "autoprefixer-rails"
-gem "bourbon", "5.0.0.beta.5"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "draper"
 gem "email_validator"
 gem "flutie"
-gem "high_voltage"
 gem "jquery-rails"
-gem "neat", "~> 1.7.0"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "puma"
@@ -22,12 +19,15 @@ gem "rails-i18n"
 gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "simple_form"
+gem "skylight"
 gem "slim-rails"
+gem "welaika-suspenders", ">= <%= Suspenders::VERSION %>"
 gem "title"
 gem "uglifier"
 
 group :development do
   gem "letter_opener"
+  gem "quiet_assets"
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"
@@ -44,7 +44,6 @@ group :development, :test do
   gem "priscilla"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "quiet_assets"
   gem "rspec-rails", "~> 3.4.0"
   gem "rubocop", require: false
 end
@@ -67,4 +66,5 @@ end
 
 group :staging, :production do
   gem "rack-timeout"
+  gem "rails_stdout_logging"
 end

data/templates/app.json.erb

@@ -31,9 +31,6 @@
     },
     "SMTP_USERNAME":{
       "required":true
-    },
-    "WEB_CONCURRENCY":{
-      "required":true
     }
   },
   "addons":[

data/templates/application.sass

@@ -2,4 +2,3 @@
 
 @import "normalize-rails"
 @import "bourbon"
-@import "neat"

data/templates/rubocop.yml

@@ -8,22 +8,26 @@ AllCops:
     - "config/**/*"
     - "bin/*"
 
+Lint/Debugger:
+  Exclude:
+    - "spec/support/capybara_webkit.rb"
+
+Metrics/AbcSize:
+  Max: 18
+
 Metrics/LineLength:
   Max: 100
 
-Style/StringLiterals:
-  Enabled: false
-  EnforcedStyle: double_quotes
-
 Style/Documentation:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Metrics/AbcSize:
-  Max: 18
+Style/StringLiterals:
+  Enabled: false
+  EnforcedStyle: double_quotes
 
-Lint/Debugger:
+Style/TrailingBlankLines:
   Exclude:
-    - "spec/support/capybara_webkit.rb"
+    - "Gemfile"

data/templates/suspenders_layout.html.slim

@@ -4,7 +4,7 @@ html lang="it"
     meta charset="utf-8"
     meta http-equiv="X-UA-Compatible" content="IE=edge"
     meta name="ROBOTS" content="NOODP"
-    meta name="viewport" content="width=device-width, initial-scale=1"
+    meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"
 
     / Configure default and controller-, and view-specific titles in
       config/locales/en.yml. For more see:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,62 +53,6 @@ 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
@@ -146,6 +90,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- USAGE
 - bin/rake
 - bin/rspec
 - bin/setup
@@ -155,10 +100,14 @@ files:
 - lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
+- lib/suspenders/generators/static_generator.rb
+- lib/suspenders/generators/stylesheet_base_generator.rb
 - lib/suspenders/version.rb
+- lib/welaika-suspenders.rb
 - spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
+- spec/features/cli_help_spec.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/new_project_spec.rb
@@ -186,7 +135,6 @@ files:
 - templates/config_locales_it.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
-- templates/disable_xml_params.rb
 - templates/dotfiles/.ctags
 - templates/dotfiles/.env
 - templates/errors.rb
@@ -224,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -232,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
@@ -240,6 +188,7 @@ test_files:
 - spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
+- spec/features/cli_help_spec.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/new_project_spec.rb

data/templates/disable_xml_params.rb

@@ -1 +0,0 @@
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)