voyage 1.44.0.4 → 1.44.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cb3e8bad0a9367df50559e0cca52b41498543b3
-  data.tar.gz: 566fcf34298cc07bb9c190aa706ca67ba79e5071
+  metadata.gz: 394ce85de666eddbe98828ebcced399f3c736d74
+  data.tar.gz: 39c3667979fba7d33f134d9e05f426f38bf53cb4
 SHA512:
-  metadata.gz: c32afbce475a7abfb769b4f0820604d4dfe5337d2ec25e295f20373dea38aa798a8ff73462ee8d1ca9930a9592c7639c8f54ae626f924a347d5d2e42150d4995
-  data.tar.gz: 887d5adfc95ace7511265fd8096bebb2b5bbd554a6358380627048d86a38659d494ddbde1de50073c71419f774f0b64e921267186e170fd03b80ec2b83257be0
+  metadata.gz: 68f4a19760d87f9e35370ed2f80f81b03d3bfc139c5fa57b1e8e618298a9f751f70b5acd12dd62e2869881e0cbdb01e3643f2fb0239d02a29f4a5918f241f71c
+  data.tar.gz: 115ab4812e477c7bd542d6e32b35a0bccfd79508b46ba98173b8f177d57254652c1008b600594a5187c3a9a53f7f2ec099576ffc721abe38a4d82035d409c6ce

data/lib/voyage/app_builder.rb

@@ -126,6 +126,7 @@ module Suspenders
         add_sign_in_and_sign_out_routes_for_devise
         customize_user_factory(adding_first_and_last_name)
         generate_seeder_templates(using_devise: true)
+        customize_user_spec
       else
         generate_seeder_templates(using_devise: false)
       end
@@ -152,12 +153,13 @@ module Suspenders
     end
 
     def customize_application_controller_for_devise(adding_first_and_last_name)
-      inject_into_file 'app/controllers/application_controller.rb', after: "  protect_from_forgery with: :exception" do <<-RUBY.gsub(/^ {6}/, '').gsub(/^ {8}\n/, '')
-        \n
+      inject_into_file 'app/controllers/application_controller.rb', after: "  protect_from_forgery with: :exception" do <<-RUBY.gsub(/^ {6}/, '')
+
         before_action :configure_permitted_parameters, if: :devise_controller?
 
         protected
 
+        # rubocop:disable Metrics/MethodLength
         def configure_permitted_parameters
           devise_parameter_sanitizer.permit(
             :sign_up,
@@ -168,14 +170,14 @@ module Suspenders
               :password,
               :password_confirmation,
               :remember_me,
-            ]
+            ],
           )
 
           devise_parameter_sanitizer.permit(
             :sign_in,
             keys: [
               :login, :email, :password, :remember_me
-            ]
+            ],
           )
 
           devise_parameter_sanitizer.permit(
@@ -187,15 +189,17 @@ module Suspenders
               :password,
               :password_confirmation,
               :current_password,
-            ]
+            ],
           )
         end
+        # rubocop:enable Metrics/MethodLength
         RUBY
       end
     end
 
     def customize_resource_controller_for_devise(adding_first_and_last_name)
-      bundle_command "exec rails generate controller users"
+      bundle_command 'exec rails generate controller users'
+      run 'rm spec/controllers/users_controller_spec.rb'
 
       inject_into_class "app/controllers/users_controller.rb", "UsersController" do <<-RUBY.gsub(/^ {6}/, '')
         # https://github.com/CanCanCommunity/cancancan/wiki/authorizing-controller-actions
@@ -231,7 +235,7 @@ module Suspenders
 
     def add_canard_roles_to_devise_resource
       inject_into_file 'app/models/user.rb', before: /^end/ do <<-RUBY.gsub(/^ {6}/, '')
-        \n
+
         # Permissions cascade/inherit through the roles listed below. The order of
         # this list is important, it should progress from least to most privelage
         ROLES = [:admin].freeze
@@ -294,6 +298,24 @@ module Suspenders
       template '../templates/seeds.rb.erb', 'db/seeds.rb', config
     end
 
+    def customize_user_spec
+      find = <<-RUBY.gsub(/^ {6}/, '')
+        pending "add some examples to (or delete) \#{__FILE__}"
+      RUBY
+
+      replace = <<-RUBY.gsub(/^ {6}/, '')
+        describe 'constants' do
+          context 'roles' do
+            it 'has the admin role' do
+              expect(User::ROLES).to eq([:admin])
+            end
+          end
+        end
+      RUBY
+
+      replace_in_file 'spec/models/user_spec.rb', find, replace
+    end
+
     def customize_application_js
       template '../templates/application.js', 'app/assets/javascripts/application.js', force: true
     end
@@ -362,6 +384,20 @@ module Suspenders
         run "erb2slim '../app/views/refills' '../app/views/refills'"
         run "erb2slim -d '../app/views/refills'"
       end
+
+      find = <<-RUBY.gsub(/^ {2}/, '')
+        |  <div class="flash-
+        = key
+        | ">
+        = value
+      RUBY
+
+      replace = <<-RUBY.gsub(/^ {2}/, '')
+        div class="flash-\#{key}"
+          = value
+      RUBY
+
+      replace_in_file 'app/views/application/_flashes.html.slim', find, replace
     end
 
     def add_refills_to_layout
@@ -419,6 +455,10 @@ module Suspenders
       template '../templates/rubocop.yml', '.rubocop.yml', force: true
     end
 
+    def add_auto_annotate_models_rake_task
+      template '../templates/auto_annotate_models.rake', 'lib/tasks/auto_annotate_models.rake', force: true
+    end
+
     # Do this last
     def rake_db_setup
       rake 'db:migrate'
@@ -442,6 +482,24 @@ module Suspenders
       run 'mkdir -p .git/safe'
     end
 
+    def run_rubocop_auto_correct
+      run 'rubocop --auto-correct'
+    end
+
+    def copy_env_to_example
+      run 'cp .env .env.example'
+    end
+
+    def add_to_gitignore
+      inject_into_file '.gitignore', after: '/tmp/*' do <<-RUBY.gsub(/^ {8}/, '')
+
+        .env
+        .zenflow-log
+        errors.err
+        RUBY
+      end
+    end
+
     ###############################
     # OVERRIDE SUSPENDERS METHODS #
     ###############################

data/lib/voyage/generators/app_generator.rb

@@ -36,11 +36,15 @@ module Suspenders
       invoke :generate_test_environment
       invoke :update_test_environment
       invoke :add_rubocop_config
+      invoke :add_auto_annotate_models_rake_task
 
 
       # Do these last
       invoke :rake_db_setup
       invoke :configure_rvm_prepend_bin_to_path
+      invoke :run_rubocop_auto_correct
+      invoke :copy_env_to_example
+      invoke :add_to_gitignore
       invoke :actually_setup_spring
       invoke :bon_voyage
       super
@@ -98,6 +102,10 @@ module Suspenders
       build :add_rubocop_config
     end
 
+    def add_auto_annotate_models_rake_task
+      build :add_auto_annotate_models_rake_task
+    end
+
     def rake_db_setup
       build :rake_db_setup
     end
@@ -110,6 +118,18 @@ module Suspenders
       # do nothing so we can run generators after suspenders_customization runs
     end
 
+    def run_rubocop_auto_correct
+      build :run_rubocop_auto_correct
+    end
+
+    def copy_env_to_example
+      build :copy_env_to_example
+    end
+
+    def add_to_gitignore
+      build :add_to_gitignore
+    end
+
     def actually_setup_spring
       say "Springifying binstubs"
       build :setup_spring

data/lib/voyage/templates/auto_annotate_models.rake

@@ -0,0 +1,46 @@
+# :nocov:
+if Rails.env.development?
+  task :set_annotation_options do
+    # Just some example settings from annotate 2.6.0.beta1
+    Annotate.set_defaults(
+      'position_in_routes'   => 'after',
+      'position_in_class'    => 'after',
+      'position_in_test'     => 'after',
+      'position_in_fixture'  => 'after',
+      'position_in_factory'  => 'after',
+      'show_indexes'         => 'true',
+      'simple_indexes'       => 'false',
+      'model_dir'            => 'app/models',
+      'include_version'      => 'false',
+      'require'              => '',
+      'exclude_tests'        => 'false',
+      'exclude_fixtures'     => 'false',
+      'exclude_factories'    => 'false',
+      'ignore_model_sub_dir' => 'false',
+      'skip_on_db_migrate'   => 'false',
+      'format_bare'          => 'true',
+      'format_rdoc'          => 'false',
+      'format_markdown'      => 'false',
+      'sort'                 => 'true',
+      'force'                => 'false',
+      'trace'                => 'false',
+    )
+  end
+
+  # Annotate models
+  task :annotate do
+    puts 'Annotating models...'
+    system 'bundle exec annotate -p after -i'
+  end
+
+  # Run annotate task after db:migrate and db:rollback tasks
+  Rake::Task['db:migrate'].enhance do
+    Rake::Task['annotate'].invoke
+    Rake::Task['db:test:prepare'].invoke
+  end
+
+  Rake::Task['db:rollback'].enhance do
+    Rake::Task['annotate'].invoke
+    Rake::Task['db:test:prepare'].invoke
+  end
+end

data/lib/voyage/templates/controller_helpers.rb

@@ -1,9 +1,9 @@
 module ControllerHelpers
-  def sign_in(user = double('user'))
+  def sign_in(user = instance_double('user'))
     if user.nil?
       allow(request.env['warden'])
         .to receive(:authenticate!)
-        .and_throw(:warden, { scope: :user })
+        .and_throw(:warden, scope: :user)
 
       allow(controller).to receive(:current_user).and_return(nil)
     else

data/lib/voyage/templates/custom_cancan_matchers.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/BlockLength
 rspec_module = defined?(RSpec::Core) ? 'RSpec' : 'Spec' # RSpec 1 compatability
 
 if rspec_module == 'RSpec'
@@ -24,8 +25,8 @@ Kernel.const_get(rspec_module)::Matchers.define :be_able_to do |*args|
 
   # Check that RSpec is < 2.99
   if !respond_to?(:failure_message) && respond_to?(:failure_message_for_should)
-    alias :failure_message :failure_message_for_should
-    alias :failure_message_when_negated :failure_message_for_should_not
+    alias_method :failure_message, :failure_message_for_should
+    alias_method :failure_message_when_negated, :failure_message_for_should_not
   end
 
   failure_message do

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

@@ -1,13 +1,14 @@
+# rubocop:disable Metrics/BlockLength, Metrics/LineLength, Rails/FilePath
 require 'simplecov'
 SimpleCov.command_name 'Rspec'
 
-ENV["RACK_ENV"] = "test"
+ENV['RACK_ENV'] = 'test'
 
-require File.expand_path("../../config/environment", __FILE__)
-abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]
+require File.expand_path('../../config/environment', __FILE__)
+abort('DATABASE_URL environment variable is set') if ENV['DATABASE_URL']
 
 require 'spec_helper'
-require "rspec/rails"
+require 'rspec/rails'
 require 'factory_girl'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
@@ -23,7 +24,7 @@ ActiveRecord::Migration.maintain_test_schema!
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |file| require file }
+Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |file| require file }
 
 module Features
   # Extend this module in spec/support/features/*.rb

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

@@ -1,6 +1,8 @@
+# rubocop:disable Rails/Output
 module Seeder
-  extend self
-<% if config[:using_devise] %>
+  module_function
+
+<% if config[:using_devise] -%>
   def admin_user
     puts '-----> Creating Admin User'
 
@@ -21,7 +23,7 @@ module Seeder
       create(:user, name.to_sym)
     end
   end
-<% else %>
+<% else -%>
   # Change 'resource' to something real
   def seed_resource
     puts '-----> Creating Resource'
@@ -31,9 +33,10 @@ module Seeder
 
     create(:resource)
   end
-<% end %>
+<% end -%>
 end
 
+# rubocop:disable Metrics/LineLength
 if Rails.env == 'production'
   unless ENV['FORCE_SEED']
     puts
@@ -41,6 +44,7 @@ if Rails.env == 'production'
     puts 'WARNING: You are trying to run db:seed on production. This is a DESTRUCTIVE task.'
     puts 'If you know what you are doing, you can override by setting environment variable '
     puts 'FORCE_SEED=1'
-    exit 1
+    abort('Exiting now...')
   end
 end
+# rubocop:enable Rails/Output, Metrics/LineLength

data/lib/voyage/templates/simplecov.rb

@@ -1,4 +1,4 @@
-if ENV['COVERAGE'] =~ /\Atrue\z/i
+if ENV['COVERAGE'].match?(/\Atrue\z/i)
   require 'cadre/simplecov'
 
   SimpleCov.start do
@@ -23,7 +23,7 @@ if ENV['COVERAGE'] =~ /\Atrue\z/i
 
   SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
-    Cadre::SimpleCov::VimFormatter
+    Cadre::SimpleCov::VimFormatter,
   ]
 
   SimpleCov.minimum_coverage 95

data/lib/voyage/version.rb

@@ -5,5 +5,5 @@ module Voyage
       .read("#{File.dirname(__FILE__)}/../../.ruby-version")
       .strip
       .freeze
-  VERSION = '1.44.0.4'.freeze
+  VERSION = '1.44.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voyage
 version: !ruby/object:Gem::Version
-  version: 1.44.0.4
+  version: 1.44.0.5
 platform: ruby
 authors:
 - thoughtbot, headway
@@ -109,6 +109,7 @@ files:
 - lib/voyage/templates/README.md.erb
 - lib/voyage/templates/about.html.erb
 - lib/voyage/templates/application.js
+- lib/voyage/templates/auto_annotate_models.rake
 - lib/voyage/templates/config_locales_en.yml.erb
 - lib/voyage/templates/controller_helpers.rb
 - lib/voyage/templates/custom_cancan_matchers.rb