voyage 1.44.0.7 → 1.44.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3069f490551d031bd77d95c0f11fafd36608a7c
-  data.tar.gz: 2cf4fe7cc391b8a195be17da2d72bf849d216cd1
+  metadata.gz: 1a7660253e2c6e4fc6f64ad2e6edcd40a1b8927b
+  data.tar.gz: 24ac8a58416d07799c43e391399e597a5707ef37
 SHA512:
-  metadata.gz: aa91712c84e2ef27758b693e36ef471788611f97c99454285a2662bd596fae2fa7f24142bcf622f05b74a46b1ac3c8d8e8519bb6ffb8ff99eea752a1c7229201
-  data.tar.gz: c4812939c3c07301063aaf17baaa4cfee6af9c38b052baad26334f283df7077478c1600978cbfe4f30f580b2cb767c9ff9d6178bf6abeb16853a79f1e03a362f
+  metadata.gz: 40ccda0ba49723dabca96ea51e0fea2d9a17884acbfefa5ae997d15d28292035b65bb93b76d4ca4fa8b7919a7499b36251047e650eaef6ea97f6357bfb96a1df
+  data.tar.gz: 292dfb3e8a16c2e15decc2f0a827116d82ec4761f4014689380e09bf04d191a4965f97d603c09679c5e2d96eb18188c18fce6f9f2544b4cdd8e1eebd6cdb8c2c

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2016 thoughtbot, inc.
+Copyright (c) 2008-2017 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -130,6 +130,7 @@ This:
 * Configures staging with `RACK_ENV` environment variable set
   to `staging`
 * Creates a [Heroku Pipeline] for review apps
+* Schedules automated backups for 10AM UTC for both `staging` and `production`
 
 [Heroku Pipeline]: https://devcenter.heroku.com/articles/pipelines
 
@@ -205,7 +206,7 @@ Thank you, [contributors]!
 
 ## License
 
-Suspenders is Copyright © 2008-2016 thoughtbot.
+Suspenders is Copyright © 2008-2017 thoughtbot.
 It is free software,
 and may be redistributed under the terms specified in the [LICENSE] file.
 
@@ -213,7 +214,7 @@ and may be redistributed under the terms specified in the [LICENSE] file.
 
 ## About thoughtbot
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+[![thoughtbot][thoughtbot-logo]][thoughtbot]
 
 Suspenders is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
@@ -222,5 +223,7 @@ We love open source software!
 See [our other projects][community].
 We are [available for hire][hire].
 
+[thoughtbot]: https://thoughtbot.com?utm_source=github
+[thoughtbot-logo]: http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com?utm_source=github

data/lib/suspenders/adapters/heroku.rb

@@ -37,6 +37,15 @@ module Suspenders
         end
       end
 
+      def set_heroku_backup_schedule
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "pg:backups:schedule DATABASE_URL --at '10:00 UTC'",
+            environment,
+          )
+        end
+      end
+
       def create_review_apps_setup_script
         app_builder.template(
           "bin_setup_review_app.erb",

data/lib/suspenders/app_builder.rb

@@ -12,6 +12,7 @@ module Suspenders
                    :create_staging_heroku_app,
                    :create_review_apps_setup_script,
                    :set_heroku_rails_secrets,
+                   :set_heroku_backup_schedule,
                    :set_heroku_remotes,
                    :set_heroku_application_host
 
@@ -370,8 +371,8 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 If you have previously run the `./bin/setup` script,
 you can deploy to staging and production with:
 
-    $ ./bin/deploy staging
-    $ ./bin/deploy production
+    % ./bin/deploy staging
+    % ./bin/deploy production
       MARKDOWN
 
       append_file "README.md", instructions
@@ -401,7 +402,7 @@ you can deploy to staging and production with:
 
     def setup_bundler_audit
       copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
-      append_file "Rakefile", %{\ntask default: "bundler:audit"\n}
+      append_file "Rakefile", %{\ntask default: "bundle:audit"\n}
     end
 
     def setup_spring

data/lib/suspenders/generators/app_generator.rb

@@ -164,6 +164,7 @@ module Suspenders
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_heroku_application_host
+        build :set_heroku_backup_schedule
         build :create_heroku_pipeline
         build :configure_automatic_deployment
       end

data/lib/voyage/app_builder.rb

@@ -198,7 +198,7 @@ module Suspenders
         protected
 
         def devise_or_pages_controller?
-          devise_controller? || is_a?(HighVoltage::PagesController)
+          devise_controller? == true || is_a?(HighVoltage::PagesController)
         end
 
         def sanitize_hash_javascript(hash)
@@ -539,6 +539,9 @@ module Suspenders
     def generate_data_migrations
       generate 'data_migrations:install'
 
+      file = Dir['db/migrate/*_create_data_migrations.rb'].first
+      replace_in_file file, 'class CreateDataMigrations < ActiveRecord::Migration', "class CreateDataMigrations < ActiveRecord::Migration[4.2]"
+
       empty_directory_with_keep_file 'db/data_migrate'
     end
 
@@ -567,7 +570,7 @@ module Suspenders
     # --------
     def downgrade_neat_1_8_so_refills_media_mixin_works
       replace_in_file 'Gemfile', "gem 'neat', '~> 2.0.0.beta.1'", "gem 'neat', '~> 1.8.0'"
-      run 'gem uninstall -x neat -v2.0.0.beta.2'
+      run 'gem uninstall -x neat -v2.0.0'
       run 'bundle'
     end
     # ------------
@@ -593,6 +596,18 @@ module Suspenders
       end
     end
 
+    def add_app_css_file
+      create_file "app/assets/stylesheets/#{app_name}.sass" do <<-RUBY.gsub(/^ {8}/, '')
+        .main-content
+          padding: 18px
+        RUBY
+      end
+    end
+
+    def update_flashes_css_file
+      replace_in_file 'app/assets/stylesheets/refills/_flashes.scss', "margin-bottom: $base-spacing / 2;", "// margin-bottom: $base-spacing / 2;"
+    end
+
     def add_admin_links_to_navigation
       return unless @@use_devise
       inject_into_file 'app/views/refills/_navigation.html.erb', after: '        <li class="nav-link"><a href="javascript:void(0)">Contact</a></li>'  do <<-RUBY
@@ -604,6 +619,12 @@ module Suspenders
             <li class="nav-link"><a href="/admin/users">Admin</a></li>
           <% end %>
         <% end %>
+
+        <% if current_user %>
+          <li class='nav-link'><%= link_to 'Sign Out', sign_out_path %></li>
+        <% else %>
+          <li class='nav-link'><%= link_to 'Sign In', sign_in_path %></li>
+        <% end %>
         RUBY
       end
     end
@@ -612,6 +633,8 @@ module Suspenders
       inject_into_file 'app/assets/stylesheets/application.scss', after: '@import "refills/flashes";'  do <<-RUBY.gsub(/^ {8}/, '')
         \n@import "refills/navigation";
         @import "refills/footer";
+
+        @import "#{app_name}";
         RUBY
       end
     end
@@ -655,6 +678,15 @@ module Suspenders
       template '../templates/auto_annotate_models.rake', 'lib/tasks/auto_annotate_models.rake', force: true
     end
 
+    def update_delayed_job_migration_rails_5_1_specify_4_2
+      file = Dir['db/migrate/*_create_delayed_jobs.rb'].first
+      replace_in_file file, 'class CreateDelayedJobs < ActiveRecord::Migration', "class CreateDelayedJobs < ActiveRecord::Migration[4.2]"
+    end
+
+    def add_favicon
+      template '../templates/favicon.ico', 'app/assets/images/favicon.ico', force: true
+    end
+
     # Do this last
     def rake_db_setup
       rake 'db:migrate'
@@ -729,6 +761,11 @@ module Suspenders
       template '../templates/analytics_identify.html.erb.erb', 'app/views/application/_analytics_identify.html.erb', force: true
     end
 
+    def create_database
+      # Suspenders version also migrates, we don't want that yet... we migrate in the rake_db_setup method
+      bundle_command 'exec rake db:create'
+    end
+
     # --------------------------------
     # setup_test_environment overrides
     # --------------------------------
@@ -741,6 +778,8 @@ module Suspenders
     end
 
     def configure_background_jobs_for_rspec
+      # template '../templates/config_dj_rails5_patches.rb', 'config/dj_rails5_patches.rb', force: true
+
       run 'rails g delayed_job:active_record'
     end
 

data/lib/voyage/generators/app_generator.rb

@@ -33,11 +33,15 @@ module Suspenders
       invoke :add_high_voltage_static_pages
       invoke :downgrade_neat_1_8_so_refills_media_mixin_works # this should be temporary until they get refills re-written to take advantage of Neat 2.0
       invoke :generate_refills
+      invoke :add_app_css_file
+      invoke :update_flashes_css_file
       invoke :overwrite_application_layout
       invoke :generate_test_environment
       invoke :update_test_environment
       invoke :add_rubocop_config
       invoke :add_auto_annotate_models_rake_task
+      invoke :update_delayed_job_migration_rails_5_1_specify_4_2
+      invoke :add_favicon
 
 
       # Do these last
@@ -91,6 +95,14 @@ module Suspenders
       build :generate_refills
     end
 
+    def add_app_css_file
+      build :add_app_css_file
+    end
+
+    def update_flashes_css_file
+      build :update_flashes_css_file
+    end
+
     def overwrite_application_layout
       build :overwrite_application_layout
     end
@@ -111,6 +123,14 @@ module Suspenders
       build :add_auto_annotate_models_rake_task
     end
 
+    def update_delayed_job_migration_rails_5_1_specify_4_2
+      build :update_delayed_job_migration_rails_5_1_specify_4_2
+    end
+
+    def add_favicon
+      build :add_favicon
+    end
+
     def rake_db_setup
       build :rake_db_setup
     end

data/lib/voyage/templates/Gemfile.erb

@@ -13,14 +13,13 @@ gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "puma"
 gem "rack-canonical-host"
-# gem "rails", "<%= Voyage::RAILS_VERSION %>"
-gem 'rails', git: 'https://github.com/rails/rails.git', branch: '5-0-stable' # OMG Fix deprecation warnings...
+gem "rails", "<%= Voyage::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "skylight"
 gem "sprockets", ">= 3.0.0"
-gem 'suspenders'
+gem 'voyage'
 gem "title"
 gem "uglifier"
 
@@ -77,6 +76,7 @@ group :development do
   gem 'better_errors' # A better error page for rails when a local 500 (or similar) is thrown
   gem 'binding_of_caller' # REPL in better_errors to debug in the browser at the point at which it failed
   gem 'bitters', '~> 1.3'
+  gem 'fix-db-schema-conflicts' # when working with multiple developers schema order of columns is standardized.
   gem 'meta_request' # for chrome rails console plugin found here: https://chrome.google.com/webstore/detail/railspanel/gjpfobpafnhjhbajcjgccbbdofdckggg?hl=en-US
   gem 'rails-erd' # auto gen ERD Diagram of models in the app on rake db:migrate
   gem 'redcarpet' # used to render the readme inside a static welcome page from the high_voltage gem

data/lib/voyage/templates/config_dj_rails5_patches.rb

@@ -0,0 +1,20 @@
+# RAILS 5 patches for delayed_job
+# TODO: REMOVE WHEN upstream is updated
+
+module DelayedWorkerPatches
+  def reload!
+    return unless self.class.reload_app?
+    if defined?(ActiveSupport::Reloader)
+      Rails.application.reloader.reload!
+    else
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+    end
+  end
+end
+
+module Delayed
+  class Worker
+    prepend DelayedWorkerPatches
+  end
+end

data/lib/voyage/templates/rails_helper.rb.erb

@@ -1,4 +1,4 @@
-# rubocop:disable Metrics/BlockLength, Metrics/LineLength, Rails/FilePath
+# rubocop:disable Metrics/BlockLength, Metrics/LineLength, Rails/FilePath, Style/MixinGrouping
 require 'simplecov'
 SimpleCov.command_name 'Rspec'
 

data/lib/voyage/templates/rubocop.yml

@@ -38,6 +38,7 @@ AllCops:
     - 'config/initializers/rack_mini_profiler.rb'
     - 'config/initializers/wrap_parameters.rb'
     - 'bin/**/*'
+    - 'Rakefile'
   Include:
     - 'Gemfile'
     - '.simplecov'

data/lib/voyage/templates/voyage_layout.html.erb.erb

@@ -26,12 +26,17 @@
     <%%= render 'flashes' -%>
     <%% if devise_controller? %>
       <% if config[:add_refills] %><%%= render 'refills/navigation' %><% end %>
-      <%%= yield %>
+      <div class='main-content'>
+        <%%= yield %>
+      </div>
     <%% else %>
       <div class='grid-offset'>
         <div class='work-area'>
           <% if config[:add_refills] %><%%= render 'refills/navigation' %><% end %>
-          <%%= yield %>
+
+          <div class='main-content'>
+            <%%= yield %>
+          </div>
         </div>
       </div>
     <%% end %>

data/lib/voyage/version.rb

@@ -1,9 +1,9 @@
 module Voyage
-  RAILS_VERSION = '~> 5.0.1'.freeze
+  RAILS_VERSION = '~> 5.1.0.rc1'.freeze
   RUBY_VERSION =
     IO
       .read("#{File.dirname(__FILE__)}/../../.ruby-version")
       .strip
       .freeze
-  VERSION = '1.44.0.7'.freeze
+  VERSION = '1.44.0.8'.freeze
 end

data/spec/adapters/heroku_spec.rb

@@ -30,6 +30,16 @@ module Suspenders
         )
       end
 
+      it "sets the heroku backup schedule" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:run)
+
+        Heroku.new(app_builder).set_heroku_backup_schedule
+
+        expect(app_builder).to have_backup_schedule("staging")
+        expect(app_builder).to have_backup_schedule("production")
+      end
+
       it "sets the application host" do
         app_builder = double(app_name: app_name)
         allow(app_builder).to receive(:run)
@@ -49,6 +59,11 @@ module Suspenders
         SuspendersTestHelpers::APP_NAME
       end
 
+      def have_backup_schedule(remote_name)
+        have_received(:run).
+          with(/pg:backups:schedule DATABASE_URL --at '10:00 UTC' --remote #{remote_name}/)
+      end
+
       def have_configured_var(remote_name, var)
         have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
       end

data/spec/features/new_project_spec.rb

@@ -29,6 +29,14 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
+  it "includes the bundle:audit task" do
+    Dir.chdir(project_path) do
+      Bundler.with_clean_env do
+        expect(`rake -T`).to include('rake bundle:audit')
+      end
+    end
+  end
+
   it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
@@ -101,7 +109,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(analytics_partial).
       to include(%{<% if ENV["SEGMENT_KEY"] %>})
     expect(analytics_partial).
-      to include(%{window.analytics.load("<%= ENV["SEGMENT_KEY"] %>");})
+      to include(%{analytics.load("<%= ENV["SEGMENT_KEY"] %>");})
   end
 
   it "raises on unpermitted parameters in all environments" do

data/templates/_analytics.html.erb

@@ -1,7 +1,8 @@
 <% if ENV["SEGMENT_KEY"] %>
   <script type="text/javascript">
-    window.analytics=window.analytics||[],window.analytics.methods=["identify","group","track","page","pageview","alias","ready","on","once","off","trackLink","trackForm","trackClick","trackSubmit"],window.analytics.factory=function(t){return function(){var a=Array.prototype.slice.call(arguments);return a.unshift(t),window.analytics.push(a),window.analytics}};for(var i=0;i<window.analytics.methods.length;i++){var key=window.analytics.methods[i];window.analytics[key]=window.analytics.factory(key)}window.analytics.load=function(t){if(!document.getElementById("analytics-js")){var a=document.createElement("script");a.type="text/javascript",a.id="analytics-js",a.async=!0,a.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n)}},window.analytics.SNIPPET_VERSION="2.0.9",
-    window.analytics.load("<%= ENV["SEGMENT_KEY"] %>");
-    window.analytics.page();
+    !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="4.0.0";
+    analytics.load("<%= ENV["SEGMENT_KEY"] %>");
+    analytics.page();
+    }}();
   </script>
 <% end %>

data/templates/bin_setup_review_app.erb

@@ -11,7 +11,10 @@ fi
 
 PARENT_APP_NAME=<%= app_name.dasherize %>-staging
 APP_NAME=<%= app_name.dasherize %>-staging-pr-$1
-URL=`heroku pg:backups public-url -a $PARENT_APP_NAME`
+
+heroku pg:backups:capture --app $PARENT_APP_NAME
+
+URL=`heroku pg:backups public-url --app $PARENT_APP_NAME`
 
 heroku pg:backups restore $URL DATABASE_URL --confirm $APP_NAME --app $APP_NAME
 heroku run rake db:migrate --exit-code --app $APP_NAME

data/templates/bundler_audit.rake

@@ -1,12 +1,4 @@
 if Rails.env.development? || Rails.env.test?
-  require "bundler/audit/cli"
-
-  namespace :bundler do
-    desc "Updates the ruby-advisory-db and runs audit"
-    task :audit do
-      %w(update check).each do |command|
-        Bundler::Audit::CLI.start [command]
-      end
-    end
-  end
+  require "bundler/audit/task"
+  Bundler::Audit::Task.new
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voyage
 version: !ruby/object:Gem::Version
-  version: 1.44.0.7
+  version: 1.44.0.8
 platform: ruby
 authors:
 - thoughtbot, headway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,10 +115,12 @@ files:
 - lib/voyage/templates/analytics_ruby_initializer.rb
 - lib/voyage/templates/application.js
 - lib/voyage/templates/auto_annotate_models.rake
+- lib/voyage/templates/config_dj_rails5_patches.rb
 - lib/voyage/templates/config_locales_en.yml.erb
 - lib/voyage/templates/controller_helpers.rb
 - lib/voyage/templates/custom_cancan_matchers.rb
 - lib/voyage/templates/devise_registrations_controller.rb
+- lib/voyage/templates/favicon.ico
 - lib/voyage/templates/rails_helper.rb.erb
 - lib/voyage/templates/rubocop.yml
 - lib/voyage/templates/seeder.rb.erb
@@ -200,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using headway's best practices.