dominicsayers · dominicsayers · May 29, 2018 · May 29, 2018 · May 29, 2018 · May 29, 2018
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,5 +1,6 @@
 ---
-engines:
+version: 2
+plugins:
   duplication:
     enabled: true
     config:
@@ -9,9 +10,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
-ratings:
-  paths:
-  - '**.rb'
-exclude_paths:
+    channel: rubocop-0-54
+exclude_patterns:
 - script/
 - spec/
diff --git a/.gem_release.yml b/.gem_release.yml
@@ -0,0 +1,3 @@
+---
+bump:
+  file: ./lib/machinist/version.rb
diff --git a/.rubocop b/.rubocop
@@ -0,0 +1 @@
+--extra-details
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -6,44 +6,41 @@ AllCops:
   TargetRubyVersion: 2.2
   DisplayCopNames: true
   Exclude:
-    - 'tmp/**/*'
+    - gemfiles/**/*
+    - tmp/**/*
 
-Style/MixinGrouping:
-  Exclude:
-    - 'spec/**/*.rb'
+Layout/DotPosition:
+  EnforcedStyle: leading
+  Enabled: true
+
+Layout/ExtraSpacing:
+  Enabled: true
+
+Lint/LiteralInInterpolation:
+  AutoCorrect: true
 
 Metrics/BlockLength:
   CountComments: false  # count full line comments?
   Exclude:
     - '**/*_spec.rb'
 
-StringLiterals:
-  EnforcedStyle: single_quotes
+Metrics/LineLength:
+  Max: 120
   Enabled: true
 
-DotPosition:
-  EnforcedStyle: leading
+Naming/FileName:
   Enabled: true
 
-ClassAndModuleChildren:
+Style/ClassAndModuleChildren:
   EnforcedStyle: nested
   Enabled: true
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-FileName:
-  Enabled: true
-
-LineLength:
-  Max: 120
-  Enabled: true
-
-Style/ExtraSpacing:
-  Enabled: true
-
-Lint/LiteralInInterpolation:
-  AutoCorrect: true
+Style/MixinGrouping:
+  Exclude:
+    - spec/**/*.rb
 
 Style/ModuleFunction:
   EnforcedStyle: extend_self # Allows us to have private methods too
@@ -58,3 +55,7 @@ Style/PercentLiteralDelimiters:
     '%r': '{}'
     '%w': '[]'
     '%W': '[]'
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,27 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-05-16 15:42:20 +0100 using RuboCop version 0.48.1.
+# on 2018-05-29 13:23:58 +0100 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-Metrics/AbcSize:
-  Max: 17
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 13
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/machinist/blueprint.rb'
 
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 8
+# Offense count: 4
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/machinist/active_record_spec.rb'
 
 # Offense count: 1
 RSpec/DescribeMethod:
@@ -44,18 +45,26 @@ RSpec/IteratedExpectation:
     - 'spec/machinist/machinable_spec.rb'
 
 # Offense count: 21
+# Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 6
 
 # Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Style/FileName:
+# Cop supports --auto-correct.
+Style/Encoding:
+  Exclude:
+    - 'machinist.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
   Exclude:
-    - 'Appraisals'
+    - 'lib/generators/machinist/install/install_generator.rb'
+    - 'machinist.gemspec'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Exclude:
@@ -68,17 +77,14 @@ Style/GuardClause:
     - 'lib/generators/machinist/install/install_generator.rb'
     - 'lib/machinist/lathe.rb'
 
-# Offense count: 1
-Style/MethodMissing:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
   Exclude:
+    - 'lib/generators/machinist/install/install_generator.rb'
     - 'lib/machinist/lathe.rb'
 
 # Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
+Style/MethodMissing:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/machinist/blueprint.rb'
+    - 'lib/machinist/lathe.rb'
diff --git a/Appraisals b/Appraisals
@@ -1,11 +1,15 @@
 appraise 'rails-4.2' do
-  gem 'activerecord', '~> 4.2.8', group: :test, require: false
+  gem 'activerecord', '~> 4.2.10', group: :test, require: false
 end
 
 appraise 'rails-5.0' do
-  gem 'activerecord', '~> 5.0.3', group: :test, require: false
+  gem 'activerecord', '~> 5.0.7', group: :test, require: false
 end
 
 appraise 'rails-5.1' do
-  gem 'activerecord', '~> 5.1.1', group: :test, require: false
+  gem 'activerecord', '~> 5.1.6', group: :test, require: false
+end
+
+appraise 'rails-5.2' do
+  gem 'activerecord', '~> 5.2.0', group: :test, require: false
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,57 @@
+# Change Log
+
+## [Unreleased](https://github.com/dominicsayers/machinist/tree/HEAD)
+
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.3...HEAD)
+
+**Merged pull requests:**
+
+- add rails 5.2 tests [\#5](https://github.com/dominicsayers/machinist/pull/5) ([thomasdziedzic-pd](https://github.com/thomasdziedzic-pd))
+
+## [v3.0.3](https://github.com/dominicsayers/machinist/tree/v3.0.3) (2017-05-19)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.2...v3.0.3)
+
+## [v3.0.2](https://github.com/dominicsayers/machinist/tree/v3.0.2) (2017-05-19)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.1...v3.0.2)
+
+**Closed issues:**
+
+- Better diagnostics when ActiveRecord model can't be instantiated [\#4](https://github.com/dominicsayers/machinist/issues/4)
+
+**Merged pull requests:**
+
+- Machinist v3 [\#3](https://github.com/dominicsayers/machinist/pull/3) ([dominicsayers](https://github.com/dominicsayers))
+
+## [v3.0.1](https://github.com/dominicsayers/machinist/tree/v3.0.1) (2017-05-17)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.0...v3.0.1)
+
+## [v3.0.0](https://github.com/dominicsayers/machinist/tree/v3.0.0) (2017-05-17)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v2.0...v3.0.0)
+
+**Merged pull requests:**
+
+- Development environment [\#2](https://github.com/dominicsayers/machinist/pull/2) ([dominicsayers](https://github.com/dominicsayers))
+- Rails 4.2 [\#1](https://github.com/dominicsayers/machinist/pull/1) ([dominicsayers](https://github.com/dominicsayers))
+
+## [v2.0](https://github.com/dominicsayers/machinist/tree/v2.0) (2012-01-13)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v2.0.0.beta2...v2.0)
+
+## [v2.0.0.beta2](https://github.com/dominicsayers/machinist/tree/v2.0.0.beta2) (2010-07-06)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v2.0.0.beta1...v2.0.0.beta2)
+
+## [v2.0.0.beta1](https://github.com/dominicsayers/machinist/tree/v2.0.0.beta1) (2010-07-06)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v1.0.6...v2.0.0.beta1)
+
+## [v1.0.6](https://github.com/dominicsayers/machinist/tree/v1.0.6) (2009-11-29)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/1.0.5...v1.0.6)
+
+## [1.0.5](https://github.com/dominicsayers/machinist/tree/1.0.5) (2009-10-20)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/1.0.4...1.0.5)
+
+## [1.0.4](https://github.com/dominicsayers/machinist/tree/1.0.4) (2009-10-08)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/1.0.0...1.0.4)
+
+## [1.0.0](https://github.com/dominicsayers/machinist/tree/1.0.0) (2009-06-02)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/Gemfile b/Gemfile
@@ -6,13 +6,14 @@ gem 'sqlite3'
 
 group :development do
   gem 'appraisal', require: false
-  gem 'gem-release', require: false
+  gem 'gem-release', '> 1', require: false
   gem 'github_changelog_generator', require: false
   gem 'guard', require: false
   gem 'guard-rspec', require: false
   gem 'guard-rubocop', require: false
   gem 'guard-rubycritic', require: false
   gem 'rdoc', require: false
+  gem 'rubocop', '= 0.54', require: false
   gem 'rubocop-rspec', require: false
 end
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ If you want support for Rails 3 or Rubies prior to 2.2, [go here](https://github
 
 This is a fork of [Pete Yandell's Machinist](http://github.com/notahat/machinist). The original gem was abandoned for the reasons given below, as are most of its forks. The purpose of this fork is to keep Machinist under maintenance for legacy projects that have upgraded to Ruby 2.2 or later and Rails 4.2 or later, but still have Machinist factories in the test environment.
 
-I'm pleased to say that Pete's code runs fine under Ruby 2.2, 2.3 & 2.4 and Rails 4.2, 5.0 and 5.1. I have allowed [RuboCop](https://github.com/bbatsov/rubocop) and [RuboCop RSpec](https://github.com/backus/rubocop-rspec) to suggest some changes, and I have converted to the more up-to-date RSpec syntax using [Transpec](https://github.com/yujinakayama/transpec). Few if any manual changes were needed.
+I'm pleased to say that Pete's code runs fine under Ruby 2.2, 2.3, 2.4 & 2.5 and Rails 4.2, 5.0, 5.1 and 5.2. I have allowed [RuboCop](https://github.com/bbatsov/rubocop) and [RuboCop RSpec](https://github.com/backus/rubocop-rspec) to suggest some changes, and I have converted to the more up-to-date RSpec syntax using [Transpec](https://github.com/yujinakayama/transpec). Few if any manual changes were needed.
 
 Pete Yandell's reason for abandoning Machinist is that he found himself with less and less need for factories in tests. He recommends Bo Jeanes' [excellent article on the topic](http://bjeanes.com/2012/02/factories-breed-complexity).
 

diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -4,19 +4,19 @@ source "http://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "activerecord", "~> 4.2.8", group: :test, require: false
-gem 'sqlite3'
+gem "sqlite3"
+gem "activerecord", "~> 4.2.10", group: :test, require: false
 
 group :development do
-  gem 'appraisal', require: false
-  gem 'gem-release', require: false
-  gem 'github_changelog_generator', require: false
-  gem 'guard', require: false
-  gem 'guard-rspec', require: false
-  gem 'guard-rubocop', require: false
-  gem 'guard-rubycritic', require: false
-  gem 'rdoc', require: false
-  gem 'rubocop-rspec', require: false
+  gem "appraisal", require: false
+  gem "gem-release", "> 1", require: false
+  gem "github_changelog_generator", require: false
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+  gem "guard-rubycritic", require: false
+  gem "rdoc", require: false
+  gem "rubocop-rspec", require: false
 end
 
 group :test do