diff --git a/Gemfile b/Gemfile index 9e5dbc5..83eabce 100755 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,8 @@ source 'http://rubygems.org' gemspec ruby RUBY_VERSION +gem 'sqlite3' + group :development do gem 'appraisal', require: false gem 'gem-release', require: false @@ -22,11 +24,3 @@ group :test do gem 'rspec_junit_formatter', require: false gem 'simplecov', '~> 0.14', require: false end - -platforms :ruby do - gem 'sqlite3' -end - -platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter' -end diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 70ec7c5..c238ade 100755 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -5,6 +5,7 @@ source "http://rubygems.org" ruby RUBY_VERSION gem "activerecord", "~> 4.2.8", group: :test, require: false +gem 'sqlite3' group :development do gem 'appraisal', require: false @@ -27,12 +28,4 @@ group :test do gem "simplecov", "~> 0.14", require: false end -platforms :ruby do - gem "sqlite3" -end - -platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" -end - gemspec path: "../" diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock index d21c204..1326750 100644 --- a/gemfiles/rails_4.2.gemfile.lock +++ b/gemfiles/rails_4.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - machinist_redux (3.0.0) + machinist_redux (3.0.2) GEM remote: http://rubygems.org/ @@ -166,11 +166,11 @@ GEM ruby_dep (1.5.0) ruby_parser (3.9.0) sexp_processor (~> 4.1) - rubycritic (3.2.1) + rubycritic (3.2.2) flay (~> 2.8) flog (~> 4.4) launchy (= 2.4.3) - parser (= 2.4.0) + parser (~> 2.4.0) rainbow (~> 2.1) reek (~> 4.4) ruby_parser (~> 3.8) @@ -184,7 +184,7 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) slop (3.6.0) sqlite3 (1.3.13) term-ansicolor (1.6.0) @@ -206,7 +206,6 @@ PLATFORMS DEPENDENCIES activerecord (~> 4.2.8) - activerecord-jdbcsqlite3-adapter appraisal codeclimate-test-reporter coveralls diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index bda4439..d018122 100755 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -5,6 +5,7 @@ source "http://rubygems.org" ruby RUBY_VERSION gem "activerecord", "~> 5.0.3", group: :test, require: false +gem 'sqlite3' group :development do gem 'appraisal', require: false @@ -27,12 +28,4 @@ group :test do gem "simplecov", "~> 0.14", require: false end -platforms :ruby do - gem "sqlite3" -end - -platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" -end - gemspec path: "../" diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index a81bfc0..8683b34 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - machinist_redux (3.0.0) + machinist_redux (3.0.2) GEM remote: http://rubygems.org/ @@ -166,11 +166,11 @@ GEM ruby_dep (1.5.0) ruby_parser (3.9.0) sexp_processor (~> 4.1) - rubycritic (3.2.1) + rubycritic (3.2.2) flay (~> 2.8) flog (~> 4.4) launchy (= 2.4.3) - parser (= 2.4.0) + parser (~> 2.4.0) rainbow (~> 2.1) reek (~> 4.4) ruby_parser (~> 3.8) @@ -184,7 +184,7 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) slop (3.6.0) sqlite3 (1.3.13) term-ansicolor (1.6.0) @@ -206,7 +206,6 @@ PLATFORMS DEPENDENCIES activerecord (~> 5.0.3) - activerecord-jdbcsqlite3-adapter appraisal codeclimate-test-reporter coveralls diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 8326325..78e3f3a 100755 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -5,6 +5,7 @@ source "http://rubygems.org" ruby RUBY_VERSION gem "activerecord", "~> 5.1.1", group: :test, require: false +gem 'sqlite3' group :development do gem 'appraisal', require: false @@ -27,8 +28,4 @@ group :test do gem "simplecov", "~> 0.14", require: false end -platforms :ruby do - gem "sqlite3" -end - gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 498edf1..b0d3c7c 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - machinist_redux (3.0.0) + machinist_redux (3.0.2) GEM remote: http://rubygems.org/ @@ -166,11 +166,11 @@ GEM ruby_dep (1.5.0) ruby_parser (3.9.0) sexp_processor (~> 4.1) - rubycritic (3.2.1) + rubycritic (3.2.2) flay (~> 2.8) flog (~> 4.4) launchy (= 2.4.3) - parser (= 2.4.0) + parser (~> 2.4.0) rainbow (~> 2.1) reek (~> 4.4) ruby_parser (~> 3.8) @@ -184,7 +184,7 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) slop (3.6.0) sqlite3 (1.3.13) term-ansicolor (1.6.0) diff --git a/lib/machinist/version.rb b/lib/machinist/version.rb index 4eae91e..7e8d6c6 100755 --- a/lib/machinist/version.rb +++ b/lib/machinist/version.rb @@ -1,3 +1,3 @@ module Machinist - VERSION = '3.0.2'.freeze + VERSION = '3.0.3'.freeze end diff --git a/spec/machinist/active_record_spec.rb b/spec/machinist/active_record_spec.rb index 2ed4b39..2b5ec19 100755 --- a/spec/machinist/active_record_spec.rb +++ b/spec/machinist/active_record_spec.rb @@ -28,7 +28,7 @@ User.blueprint {} expect do User.make!(username: '') - end.to raise_error(ActiveRecord::RecordInvalid) + end.to raise_error(Machinist::BlueprintCantSaveError) end end