From 264513364f79899c43a262e0ead4e9337f7bcc1e Mon Sep 17 00:00:00 2001 From: EppO Date: Sun, 26 Jan 2014 21:54:28 -0500 Subject: [PATCH] clean up travis gemfiles with latest rails 3.2.x and 4.x releases clean up rolify gemfile to avoid duplicates with gemspec file removed a warning in resource spec regarding raise_error with expect now not loading activerecord and mongoid in the same time in config spec clean up spec helpers --- .travis.yml | 2 +- Gemfile | 22 +++++++------- gemfiles/Gemfile.rails-3.2 | 28 +++++++++-------- gemfiles/Gemfile.rails-4.0 | 30 +++++++++++-------- rolify.gemspec | 2 -- .../rolify_activerecord_generator_spec.rb | 1 - .../rolify/rolify_mongoid_generator_spec.rb | 2 -- spec/generators_helper.rb | 16 ++++++---- spec/rolify/config_spec.rb | 28 ++++++++--------- spec/rolify/resource_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 11 files changed, 70 insertions(+), 65 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2211993c..be3280da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ rvm: - 1.9.3 - 2.0.0 - 2.1.0 - - rbx-19mode + - rbx - jruby-19mode gemfile: diff --git a/Gemfile b/Gemfile index bd95c6b4..f9ee866c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,20 +1,18 @@ source "https://rubygems.org" -case ENV["ADAPTER"] -when nil, "active_record" - group :test do +group :test do + case ENV["ADAPTER"] + when nil, "active_record" gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby" gem "sqlite3", :platform => "ruby" + gem "activerecord", ">= 3.2.0", :require => "active_record" + when "mongoid" + gem "mongoid", ">= 3.1" + gem "bson_ext", :platform => "ruby" + else + raise "Unknown model adapter: #{ENV["ADAPTER"]}" end - gem "activerecord", ">= 3.2.0", :require => "active_record" -when "mongoid" - gem "mongoid", ">= 3.1" - gem "bson_ext", :platform => "ruby" -else - raise "Unknown model adapter: #{ENV["ADAPTER"]}" -end - -group :test do + gem 'coveralls', :require => false end diff --git a/gemfiles/Gemfile.rails-3.2 b/gemfiles/Gemfile.rails-3.2 index 08830dd6..a15810f5 100644 --- a/gemfiles/Gemfile.rails-3.2 +++ b/gemfiles/Gemfile.rails-3.2 @@ -1,20 +1,24 @@ source "https://rubygems.org" -case ENV["ADAPTER"] -when nil, "active_record" - group :test do - gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.5", :platform => "jruby" - gem "sqlite3", :platform => "ruby" - end - gem "activerecord", "~> 3.2.15", :require => "active_record" -when "mongoid" - gem "mongoid", "~> 3.1" - gem "bson_ext", :platform => "ruby" -else - raise "Unknown model adapter: #{ENV["ADAPTER"]}" +platforms :rbx do + gem 'racc' + gem 'rubysl', '~> 2.0' + gem 'psych' end group :test do + case ENV["ADAPTER"] + when nil, "active_record" + gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby" + gem "sqlite3", :platform => "ruby" + gem "activerecord", ">= 3.2.0", :require => "active_record" + when "mongoid" + gem "mongoid", ">= 3.1" + gem "bson_ext", :platform => "ruby" + else + raise "Unknown model adapter: #{ENV["ADAPTER"]}" + end + gem 'coveralls', :require => false end diff --git a/gemfiles/Gemfile.rails-4.0 b/gemfiles/Gemfile.rails-4.0 index 111e336a..cda7eec8 100644 --- a/gemfiles/Gemfile.rails-4.0 +++ b/gemfiles/Gemfile.rails-4.0 @@ -1,13 +1,9 @@ source "https://rubygems.org" -case ENV["ADAPTER"] -when nil, "active_record" - gem "activerecord", "~> 4.0.1", :require => "active_record" -when "mongoid" - gem "mongoid", :git => "git://github.com/mongoid/mongoid.git" - gem "bson_ext", :platform => "ruby" -else - raise "Unknown model adapter: #{ENV["ADAPTER"]}" +platforms :rbx do + gem 'racc' + gem 'rubysl', '~> 2.0' + gem 'psych' end group :test do @@ -18,10 +14,18 @@ group :test do gem "rspec-rails" gem "fuubar" gem "bundler" - - gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.5", :platform => "jruby" - gem "sqlite3", :platform => "ruby" - gem "activerecord", "~> 4.0.1", :require => "active_record" - gem "mongoid", :git => "git://github.com/mongoid/mongoid.git" + gem 'coveralls', :require => false + + case ENV["ADAPTER"] + when nil, "active_record" + gem "activerecord", "~> 4.0.1", :require => "active_record" + gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.5", :platform => "jruby" + gem "sqlite3", :platform => "ruby" + when "mongoid" + gem "mongoid" #, :git => "git://github.com/mongoid/mongoid.git" + gem "bson_ext", :platform => "ruby" + else + raise "Unknown model adapter: #{ENV["ADAPTER"]}" + end end diff --git a/rolify.gemspec b/rolify.gemspec index 4b80d175..4101ce7a 100644 --- a/rolify.gemspec +++ b/rolify.gemspec @@ -25,6 +25,4 @@ Gem::Specification.new do |s| s.add_development_dependency "rspec-rails", ">= 2.0" s.add_development_dependency "bundler" s.add_development_dependency "fuubar" - s.add_development_dependency "activerecord", ">= 3.2.0" - s.add_development_dependency "mongoid", ">= 3.1" end diff --git a/spec/generators/rolify/rolify_activerecord_generator_spec.rb b/spec/generators/rolify/rolify_activerecord_generator_spec.rb index c3483016..bfb1f663 100644 --- a/spec/generators/rolify/rolify_activerecord_generator_spec.rb +++ b/spec/generators/rolify/rolify_activerecord_generator_spec.rb @@ -1,6 +1,5 @@ require 'generators_helper' -require 'rails/all' # Generators are not automatically loaded by Rails require 'generators/rolify/rolify_generator' diff --git a/spec/generators/rolify/rolify_mongoid_generator_spec.rb b/spec/generators/rolify/rolify_mongoid_generator_spec.rb index 090635e6..c6c77856 100644 --- a/spec/generators/rolify/rolify_mongoid_generator_spec.rb +++ b/spec/generators/rolify/rolify_mongoid_generator_spec.rb @@ -1,7 +1,5 @@ require 'generators_helper' -require 'mongoid' - # Generators are not automatically loaded by Rails require 'generators/rolify/rolify_generator' diff --git a/spec/generators_helper.rb b/spec/generators_helper.rb index 8de266b7..5c4cd408 100644 --- a/spec/generators_helper.rb +++ b/spec/generators_helper.rb @@ -3,19 +3,23 @@ require 'rolify' require 'rolify/matchers' -require 'rails/all' +require 'rails' require 'coveralls' Coveralls.wear_merged! +ENV['ADAPTER'] ||= 'active_record' + +if ENV['ADAPTER'] == 'active_record' + require 'active_record/railtie' +else + require 'mongoid' +end + module TestApp class Application < ::Rails::Application config.root = File.dirname(__FILE__) end end -require 'ammeter/init' - -ENV['ADAPTER'] ||= 'active_record' - - +require 'ammeter/init' \ No newline at end of file diff --git a/spec/rolify/config_spec.rb b/spec/rolify/config_spec.rb index 5a5b80c1..ea088cde 100644 --- a/spec/rolify/config_spec.rb +++ b/spec/rolify/config_spec.rb @@ -1,14 +1,14 @@ require "spec_helper" -require "active_record" -require "mongoid" -class ARUser < ActiveRecord::Base - extend Rolify -end - -class MUser - include Mongoid::Document - extend Rolify +if ENV['ADAPTER'] == 'active_record' + class ARUser < ActiveRecord::Base + extend Rolify + end +else + class MUser + include Mongoid::Document + extend Rolify + end end describe Rolify do @@ -35,14 +35,14 @@ class MUser end describe :orm do - context "using defaults values" do + context "using defaults values", :if => ENV['ADAPTER'] == 'active_record' do subject { Rolify.orm } it { should eq("active_record") } context "on the User class" do before do - ARUser.rolify + subject.rolify end subject { ARUser } @@ -52,7 +52,7 @@ class MUser context "on the Forum class" do before do - Forum.resourcify + subject.resourcify end subject { Forum } @@ -61,7 +61,7 @@ class MUser end end - context "using custom values" do + context "using custom values", :if => ENV['ADAPTER'] == 'mongoid' do context "using :orm setter method" do before do Rolify.orm = "mongoid" @@ -165,7 +165,7 @@ class MUser its(:dynamic_shortcuts) { should be_true } its(:orm) { should eq("mongoid") } - context "on the User class" do + context "on the User class", :if => ENV['ADAPTER'] == 'mongoid' do before do MUser.rolify end diff --git a/spec/rolify/resource_spec.rb b/spec/rolify/resource_spec.rb index a6cbf309..accb20fc 100644 --- a/spec/rolify/resource_spec.rb +++ b/spec/rolify/resource_spec.rb @@ -46,7 +46,7 @@ it "should be able to modify the resource", :if => ENV['ADAPTER'] == 'active_record' do forum_resource = subject.with_role(:forum).first forum_resource.name = "modified name" - expect(forum_resource.save).not_to raise_error + expect { forum_resource.save }.not_to raise_error end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6f204df1..dba6dc01 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,7 @@ require 'rolify' require 'rolify/matchers' -require 'rails/all' +require 'rails' require 'coveralls' Coveralls.wear_merged!