suspenders 1.39.0 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fa9283f4c4c9b3af17953372b07bce23918a61
-  data.tar.gz: 44a7c216b659711cc01faf8d3db39187d8e92c25
+  metadata.gz: f4bba79d54a04b9f85c062cf024f685e99826b40
+  data.tar.gz: e506439a76fcd20aa5f9dc010317efc20611f654
 SHA512:
-  metadata.gz: 81d78836d28a922cf77072c974de05fa6756ce219bfb6a4dceebd1b89431b407127e765f170ee5b50247614d30884167b33b7e0075f5349098c92807a1ed0080
-  data.tar.gz: d0c526b0a77295e7839f1c951f189cd759cee325b26c96ae549181fc3315b29bc0ba5d7a68c006d8bbcd17511659a42fd0628a592deeb5f6d0e2e6eb302eec79
+  metadata.gz: 1ea9a3b8f9fabdfda4f14b92f221c9f21715f6f97909dbd78b310fdd3da0bd12cf9cc909806adc6290bca5dd4e196ccc386d5998412524af76268b902c086287
+  data.tar.gz: 8f57f5ef1b22a882e620274638cf04b89f7115880a84405e54efc1dd1a0da0157aec23d1f87e0f95f0668dc5e26e19402b7b07a3d84b1df55d92169027466e6b

data/NEWS.md

@@ -1,5 +1,16 @@
 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

data/README.md

@@ -80,7 +80,7 @@ And development gems like:
 And testing gems like:
 
 * [Capybara](https://github.com/jnicklas/capybara) and
-  [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
+  [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
   integration testing
 * [Factory Girl](https://github.com/thoughtbot/factory_girl) for test data
 * [Formulaic](https://github.com/thoughtbot/formulaic) for integration testing
@@ -187,10 +187,10 @@ installed on your machine before generating an app with Suspenders.
 Use [OS X GCC Installer](https://github.com/kennethreitz/osx-gcc-installer/) for
 Snow Leopard (OS X 10.6).
 
-Use [Command Line Tools for XCode](https://developer.apple.com/downloads/index.action)
+Use [Command Line Tools for Xcode](https://developer.apple.com/downloads/index.action)
 for Lion (OS X 10.7) or Mountain Lion (OS X 10.8).
 
-We use [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
+We use [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
 full-stack JavaScript integration testing. It requires QT. Instructions for
 installing QT are
 [here](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).

data/lib/suspenders.rb

@@ -1,6 +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

@@ -51,9 +51,9 @@ module Suspenders
       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
 

data/lib/suspenders/app_builder.rb

@@ -142,14 +142,19 @@ module Suspenders
 
     def enable_rack_canonical_host
       config = <<-RUBY
-if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
     ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
   end
 
   config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
-      configure_environment "production", config
+      inject_into_file(
+        "config/environments/production.rb",
+        config,
+        after: "Rails.application.configure do",
+      )
     end
 
     def enable_rack_deflater
@@ -318,12 +323,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.scss",
-                "app/assets/stylesheets/application.scss"
-    end
-
     def install_refills
       generate "refills:import", "flashes"
       remove_dir "app/views/refills"

data/lib/suspenders/generators/app_generator.rb

@@ -249,6 +249,7 @@ module Suspenders
       run("spring stop")
 
       generate("suspenders:static")
+      generate("suspenders:stylesheet_base")
 
       bundle_command "install"
     end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -0,0 +1,27 @@
+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"
+      gem "neat", "~> 1.8.0"
+      gem "refills", group: [:development, :test]
+    end
+
+    def add_css_config
+      copy_file(
+        "application.scss",
+        "app/assets/stylesheets/application.scss",
+        force: true,
+      )
+    end
+
+    def remove_prior_config
+      remove_file "app/assets/stylesheets/application.css"
+    end
+  end
+end

data/lib/suspenders/version.rb

@@ -4,5 +4,5 @@ module Suspenders
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "1.39.0".freeze
+  VERSION = "1.40.0".freeze
 end

data/spec/features/new_project_spec.rb

@@ -264,7 +264,24 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(gemfile).to match(/high_voltage/)
   end
 
+  it "adds and configures bourbon, neat, and refills" do
+    gemfile = read_project_file("Gemfile")
+
+    expect(gemfile).to match(/bourbon/)
+    expect(gemfile).to match(/neat/)
+    expect(gemfile).to match(/refills/)
+  end
+
+  it "configures bourbon, neat, and refills" do
+    app_css = read_project_file(%w(app assets stylesheets application.scss))
+    expect(app_css).to match(/normalize-rails.*bourbon.*neat.*base.*refills/m)
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end
+
+  def read_project_file(path)
+    IO.read(File.join(project_path, *path))
+  end
 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/templates/Gemfile.erb

@@ -3,12 +3,10 @@ source "https://rubygems.org"
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
-gem "bourbon", "5.0.0.beta.5"
 gem "delayed_job_active_record"
 gem "flutie"
 gem "honeybadger"
 gem "jquery-rails"
-gem "neat", "~> 1.7.0"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "puma"
@@ -39,7 +37,6 @@ group :development, :test do
   gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "refills"
   gem "rspec-rails", "~> 3.4.0"
 end
 

data/templates/app.json.erb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.39.0
+  version: 1.40.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -99,6 +99,7 @@ files:
 - 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
 - spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku