voyage 1.44.0.3 → 1.44.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1680bf34e088ebf9522dc6095e18b1fbecfb3756
-  data.tar.gz: 7061b0471b756f48f0ebb784116e653066c88b04
+  metadata.gz: 7cb3e8bad0a9367df50559e0cca52b41498543b3
+  data.tar.gz: 566fcf34298cc07bb9c190aa706ca67ba79e5071
 SHA512:
-  metadata.gz: 20d2a728e0458ddc16850f6fac355b07598a325de8b4e7060dab8eeb41adf5de6dfac1b4e834ee318b839ff311bf94fbb51946eb7a09950257a0edc3164a865b
-  data.tar.gz: ef29a76964d6579783171aadea7c26c0cb1af0d04c2fba91d5450114f3b8344898c24f4a563b6592102fb642ccd36048ef1f72fdda74b079b96dd417390fe4a6
+  metadata.gz: c32afbce475a7abfb769b4f0820604d4dfe5337d2ec25e295f20373dea38aa798a8ff73462ee8d1ca9930a9592c7639c8f54ae626f924a347d5d2e42150d4995
+  data.tar.gz: 887d5adfc95ace7511265fd8096bebb2b5bbd554a6358380627048d86a38659d494ddbde1de50073c71419f774f0b64e921267186e170fd03b80ec2b83257be0

data/lib/voyage/app_builder.rb

@@ -218,23 +218,14 @@ module Suspenders
     end
 
     def authorize_devise_resource_for_index_action
-      generate "canard:ability user can:manage:user cannot:destroy:user"
-      generate "canard:ability admin can:destroy:user"
+      generate 'canard:ability user can:manage:user cannot:destroy:user'
+      generate 'canard:ability admin can:destroy:user'
 
       %w(admins users).each do |resource_name|
-        replace_in_file "spec/abilities/#{resource_name}_spec.rb", 'Factory.create', 'build_stubbed'
-        replace_in_file "spec/abilities/#{resource_name}_spec.rb", "require_relative '../spec_helper'", "require 'rails_helper'"
-        replace_in_file "spec/abilities/#{resource_name}_spec.rb", 'require "cancan/matchers"', "require_relative '../support/matchers/custom_cancan'"
-        # NOTE: (2016-02-09) jonk => this replaces both should and should_not and results in is_expected.to_not in the latter case
-        replace_in_file "spec/abilities/#{resource_name}_spec.rb", 'should', "is_expected.to"
+        replace_in_file "spec/abilities/#{resource_name}_spec.rb", "require 'cancan/matchers'", "require_relative '../support/matchers/custom_cancan'"
       end
 
-      replace_in_file 'spec/abilities/users_spec.rb', ':user_user', ':user'
-      replace_in_file 'spec/abilities/admins_spec.rb', ':admin_user', ':user, :admin'
-      replace_in_file 'spec/abilities/admins_spec.rb', '@user = build_stubbed(:user, :admin)', '@admin = build_stubbed(:user, :admin)'
-      replace_in_file 'spec/abilities/admins_spec.rb', 'subject { Ability.new(@user) }', 'subject { Ability.new(@admin) }'
-
-      generate "migration add_roles_mask_to_users roles_mask:integer"
+      generate 'migration add_roles_mask_to_users roles_mask:integer'
       template '../templates/custom_cancan_matchers.rb', 'spec/support/matchers/custom_cancan.rb'
     end
 
@@ -424,6 +415,10 @@ module Suspenders
       template "../templates/rails_helper.rb.erb", "spec/rails_helper.rb", force: true
     end
 
+    def add_rubocop_config
+      template '../templates/rubocop.yml', '.rubocop.yml', force: true
+    end
+
     # Do this last
     def rake_db_setup
       rake 'db:migrate'

data/lib/voyage/generators/app_generator.rb

@@ -35,6 +35,7 @@ module Suspenders
       invoke :generate_refills
       invoke :generate_test_environment
       invoke :update_test_environment
+      invoke :add_rubocop_config
 
 
       # Do these last
@@ -93,6 +94,10 @@ module Suspenders
       build :update_test_environment
     end
 
+    def add_rubocop_config
+      build :add_rubocop_config
+    end
+
     def rake_db_setup
       build :rake_db_setup
     end

data/lib/voyage/templates/Gemfile.erb

@@ -38,7 +38,7 @@ gem 'nprogress-rails' # Show request progress when a link is clicked
 gem 'gon' # pass variables betwween rails and javascript. Several examples in the application_controller.rb
 
 gem 'cancancan' # authorization library
-gem 'canard', git: 'https://github.com/james2m/canard.git' # ties into cancancan, adds roles for the user
+gem 'canard', git: 'https://github.com/jondkinney/canard.git', branch: 'feature/fixed-generators-and-rails-5' # ties into cancancan, adds roles for the user
 
 gem 'friendly_id' # slugs in the url auto-generated
 gem 'paper_trail'

data/lib/voyage/templates/rubocop.yml

@@ -0,0 +1,60 @@
+require: rubocop-rspec
+
+RSpec/NotToNot:
+   Description: 'Enforces the usage of the same method on all negative message expectations.'
+   EnforcedStyle: to_not
+   SupportedStyles:
+     - not_to
+     - to_not
+   Enabled: true
+
+RSpec/FilePath:
+  Exclude:
+    - spec/abilities/*_spec.rb
+
+RSpec/LeadingSubject:
+  Enabled: false
+
+Rails:
+ Enabled: true
+
+AllCops:
+  TargetRubyVersion: 2.4
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  RSpec:
+    Patterns:
+    - '.+'
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'bin/**/*'
+  Include:
+    - '**/*.pryrc'
+    - '.simplecov'
+    - 'config/initializers/*'
+
+Style/Documentation:
+  Description: 'Document classes and non-namespace modules.'
+  Enabled: false
+
+Style/DotPosition:
+  Description: 'Checks the position of the dot in multi-line method calls.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains'
+  EnforcedStyle: leading
+  Enabled: true
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 15
+
+Metrics/AbcSize:
+  Enabled: false

data/lib/voyage/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voyage
 version: !ruby/object:Gem::Version
-  version: 1.44.0.3
+  version: 1.44.0.4
 platform: ruby
 authors:
 - thoughtbot, headway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -113,6 +113,7 @@ files:
 - lib/voyage/templates/controller_helpers.rb
 - lib/voyage/templates/custom_cancan_matchers.rb
 - lib/voyage/templates/rails_helper.rb.erb
+- lib/voyage/templates/rubocop.yml
 - lib/voyage/templates/seeder.rb.erb
 - lib/voyage/templates/seeds.rb.erb
 - lib/voyage/templates/simplecov.rb