Bump deps

.travis.yml

@@ -1,28 +1,12 @@
 language: ruby
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install redis-server
-  - sudo service redis-server start
 script:
   - bundle exec rake spec:coveralls
-
 rvm:
-  - 2.2.2
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
-  - jruby-head
+  - 2.2
+  - 2.3
+  - 2.4
 env:
   - CONN=hiredis
   - CONN=ruby
-
-matrix:
-  exclude:
-    - rvm: jruby-head
-      env: CONN=hiredis
-    - rvm: jruby-19mode
-      env: CONN=hiredis
-  allow_failures:
-    - rvm: jruby-head
-      env: CONN=ruby
+services:
+  - redis-server

Gemfile.lock

@@ -7,87 +7,69 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    coveralls (0.8.2)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    factory_girl (4.5.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    hiredis (0.6.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    json (1.8.3-java)
-    machinist (2.0)
-    mime-types (2.6.2)
-    minitest (5.8.1)
-    netrc (0.10.3)
-    rake (10.4.2)
-    redis (3.2.1)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    hiredis (0.6.1)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    minitest (5.10.3)
+    rake (12.3.0)
+    redis (4.0.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.10.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tins (1.6.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.16.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf (0.1.4-java)
-    unf_ext (0.0.7.1)
-    yard (0.8.7.6)
+    yard (0.9.12)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   bundler
   coveralls
-  factory_girl
+  factory_bot
   hiredis
-  machinist
   rake
   redpear!
   rspec
@@ -96,4 +78,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.10.6
+   1.16.0

lib/redpear/model/factory_girl.rb → lib/redpear/model/factory_bot.rb

@@ -1,28 +1,28 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'redpear/model'
 
 class Redpear::Model
 
-  # FactoryGirl module for your tests/specs. Example:
+  # FactoryBot module for your tests/specs. Example:
   #
-  #   require 'redpear/model/factory_girl'
+  #   require 'redpear/model/factory_bot'
   #
-  #   FactoryGirl.define do
+  #   FactoryBot.define do
   #     factory :post do
   #       title      { "A Title" }
   #       created_at { Time.at(1313131313) }
   #     end
   #   end
   #
-  module FactoryGirl
+  module FactoryBot
 
-    # @return [Boolean] always true. FactoryGirl requires it.
+    # @return [Boolean] always true. FactoryBot requires it.
     def save!
       after_save({}) # call after_save again
       true
     end
 
   end
-  include FactoryGirl
+  include FactoryBot
 
 end

redpear.gemspec

@@ -3,8 +3,7 @@ require File.expand_path('../lib/redpear/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 1.9.0'
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version = '>= 2.2.0'
 
   s.name        = "redpear"
   s.summary     = "Redpear, a Redis ORM"
@@ -24,8 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "shoulda-matchers"
-  s.add_development_dependency "machinist"
-  s.add_development_dependency "factory_girl"
+  s.add_development_dependency "factory_bot"
   s.add_development_dependency "yard"
   s.add_development_dependency "coveralls"
 end

spec/redpear/model/factory_girl_spec.rb → spec/redpear/model/factory_bot_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-describe Redpear::Model::FactoryGirl do
+describe Redpear::Model::FactoryBot do
 
   let :klass do
     Redpear::Model
   end
 
   it 'should persist records on create' do
-    created = FactoryGirl.create(:post)
+    created = FactoryBot.create(:post)
     expect(created).to eq({ 'id' => created.id })
     expect(created.attributes).to eq({ "title" => "A Title", "created_at" => "1313131313" })
   end
 
   it 'should persist records on build' do
-    built = FactoryGirl.build(:post)
+    built = FactoryBot.build(:post)
     expect(built).to eq({ 'id' => built.id })
     expect(built.attributes).to eq({ "title" => "A Title", "created_at" => "1313131313" })
   end

spec/spec_helper.rb

@@ -14,7 +14,6 @@
 require 'redpear'
 require 'redpear/model'
 require 'support/models'
-require 'support/blueprints'
 require 'support/factories'
 
 count = Redis.current.dbsize

spec/support/factories.rb

@@ -1,6 +1,6 @@
-require 'redpear/model/factory_girl'
+require 'redpear/model/factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :post do
     title      { "A Title" }