welaika-suspenders 2.34 → 2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca0442cb0adbdb8f07149baafe1841af1d44aa4c9028260ed332ffc6dac4c70
-  data.tar.gz: 402be3ceb068fdf2a08344050de8b5516f95cd45c63efab9bbda3c93785548d9
+  metadata.gz: 6dc5c70cb98579f63e22680ad0b1d522117eb65b1492d50bba5de23d7f0a662c
+  data.tar.gz: c97e53c5a59374b48b0331e470a1684e20dae53d3e70983a370c2a96211d3f29
 SHA512:
-  metadata.gz: ca5b9dff76fe3ecca545cd9c7ae09984b65df11895cb31fba42d7439fed0221e509596cbabcda45ecd0d3eecc11f62b16cd9e968313dbfd5434be513b44f6218
-  data.tar.gz: 79104448a207fd73e1a4ee60ae3261d787f9cc91dff76e847bf130a405cc0b7df2f3321b4f6d8bea1609b15c42ffd5ccebc787a9bd488a0d5abfaa8064c39837
+  metadata.gz: 7880528eeedca62eb57f65612351aa057e0cb0177932fc285547516c05253fe8c4c9986c0657b3cc2466863351901ca7c0234db492653fceb53ad6e9d9a4410f
+  data.tar.gz: 417d84ca0b5b64439a0b6fc8d089ab4a24b5f23e7bc056b645c370809929dcf10bde6cdc5225e8affef781e38793efbc609f46ce78481a238e1c75991f45d467

data/CHANGELOG_WELAIKA.md

@@ -1,3 +1,8 @@
+2.35 (October 20th, 2019)
+* Change: add more exclusion to rubocop (from the default configuration on github)
+* Change: configure autoprefixer browsers list
+* Feature: add sass sourcemaps (but they won't work if autoprefixer is present...)
+
 2.34 (October 19th, 2019)
 * Change: gitlab ci steps from prepare -> quality -> test to prepare -> test -> quality. We already run some quality checks with overcommit
 * Change: use :login instead of :plain as smtp authentication system

data/lib/suspenders/adapters/heroku.rb

@@ -94,7 +94,7 @@ module Suspenders
         end
       end
 
-      def set_buildpacks
+      def set_heroku_buildpacks
         %w(staging production).each do |environment|
           run_toolbelt_command(
             "buildpacks:add --index 1 heroku/nodejs",

data/lib/suspenders/app_builder.rb

@@ -16,7 +16,7 @@ module Suspenders
       :set_heroku_remotes,
       :set_heroku_sentry_configuration,
       :set_heroku_smtp_settings,
-      :set_buildpacks,
+      :set_heroku_buildpacks,
     )
 
     def readme
@@ -300,6 +300,19 @@ config.public_file_server.headers = {
       copy_file 'rakefile_template.rb', 'Rakefile', force: true
     end
 
+    def configure_sourcemaps_for_sass
+      config = [
+        "  config.sass.inline_source_maps = true\n",
+        "  config.sass.line_comments = true\n"
+      ].join
+
+      inject_into_file(
+        "config/environments/development.rb",
+        config,
+        after: "  config.assets.debug = true\n"
+      )
+    end
+
     private
 
     def raise_on_missing_translations_in(environment)

data/lib/suspenders/generators/app_generator.rb

@@ -103,6 +103,7 @@ module Suspenders
       build :configure_action_mailer
       build :configure_locales_and_time_zone
       build :configure_time_formats
+      build :configure_sourcemaps_for_sass
       build :setup_rakefile
       build :replace_default_puma_configuration
       build :set_up_forego
@@ -119,7 +120,7 @@ module Suspenders
         build :set_heroku_backup_schedule
         build :set_heroku_sentry_configuration
         build :set_heroku_smtp_settings
-        build :set_buildpacks
+        build :set_heroku_buildpacks
         build :create_heroku_pipeline
         build :configure_automatic_deployment
       end
@@ -180,6 +181,10 @@ module Suspenders
       generate("suspenders:views")
     end
 
+    def generate_autoprefixer
+      generate("suspenders:autoprefixer")
+    end
+
     def generate_outro
       build :run_rubocop_autocorrect
 

data/lib/suspenders/generators/autoprefixer_generator.rb

@@ -0,0 +1,31 @@
+require_relative "base"
+
+module Suspenders
+  class AutoprefixerGenerator < Generators::Base
+    def add_autoprefixer_rails
+      gem 'autoprefixer-rails'
+      Bundler.with_clean_env { run "bundle install" }
+    end
+
+    def copy_browserslistrc
+      if behavior == :invoke
+        list = <<~TEXT
+          last 1 version
+          > 5%
+          not IE 11
+        TEXT
+        in_root do
+          File.open('.browserslistrc', 'w') do |file|
+            file << list
+          end
+        end
+      else
+        in_root do
+          File.open('.browserslistrc', 'w') do |file|
+            file << 'defaults'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/suspenders/version.rb

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

data/lib/suspenders.rb

@@ -17,6 +17,7 @@ require "suspenders/generators/security_generator"
 require "suspenders/generators/import_dump_generator"
 require "suspenders/generators/jobs_generator"
 require "suspenders/generators/inline_svg_generator"
+require "suspenders/generators/autoprefixer_generator"
 require "suspenders/generators/production/force_tls_generator"
 require "suspenders/generators/production/email_generator"
 require "suspenders/generators/production/timeout_generator"

data/spec/adapters/heroku_spec.rb

@@ -55,6 +55,26 @@ module Suspenders
         )
       end
 
+      it "configures nodejs and ruby packs" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:run)
+
+        Heroku.new(app_builder).set_heroku_buildpacks
+
+        %w(staging production).each do |remote|
+          expect(app_builder).to(
+            have_configured_buildpack(
+              remote_name: remote, index: 1, packname: "heroku/nodejs"
+            )
+          )
+          expect(app_builder).to(
+            have_configured_buildpack(
+              remote_name: remote, index: 2, packname: "heroku/ruby"
+            )
+          )
+        end
+      end
+
       def app_name
         SuspendersTestHelpers::APP_NAME
       end
@@ -67,6 +87,12 @@ module Suspenders
       def have_configured_var(remote_name, var)
         have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
       end
+
+      def have_configured_buildpack(remote_name:, index:, packname:)
+        have_received(:run).with(
+          /buildpacks:add --index #{index} #{packname} --remote #{remote_name}/
+        )
+      end
     end
   end
 end

data/templates/Gemfile.erb

@@ -9,9 +9,6 @@ end
 
 ruby '<%= Suspenders::RUBY_VERSION %>'
 
-<% unless options[:api] %>
-gem 'autoprefixer-rails'
-<% end %>
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'coffee-rails', '~> 4.2'
 gem 'email_validator'

data/templates/rubocop.yml

@@ -9,8 +9,10 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   DisplayCopNames: true
   Exclude:
+    - '.git/**/*'
     - 'bin/*'
     - 'db/**/*'
+    - 'node_modules/**/*'
     - 'tmp/**/*'
     - 'vendor/**/*'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: '2.34'
+  version: '2.35'
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,6 +116,7 @@ files:
 - lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
+- lib/suspenders/generators/autoprefixer_generator.rb
 - lib/suspenders/generators/base.rb
 - lib/suspenders/generators/ci_generator.rb
 - lib/suspenders/generators/db_optimizations_generator.rb