Merge pull request #31 from osulyanov/master

Remove rspec duplicate dependency, remove Ruby 1.8.7, add 2.0.0 and 2.1.1 to Travis build matrix

.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
   - jruby
 notifications:
   recipients:

Rakefile

@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
-  gem.add_development_dependency "rspec", "~> 2"
+  # gem.add_development_dependency "rspec", "~> 2"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

role_model.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: role_model 0.8.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "role_model"
   s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Martin Rehfeld"]
-  s.date = "2012-10-29"
+  s.date = "2014-04-07"
   s.description = "Ever needed to assign roles to a model, say a User, and build conditional behaviour on top of that? Enter RoleModel -- roles have never been easier! Just declare your roles and you are done. Assigned roles will be stored as a bitmask."
   s.email = "martin.rehfeld@glnetworks.de"
   s.extra_rdoc_files = [
@@ -38,32 +40,28 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/martinrehfeld/role_model"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   s.summary = "Declare, assign and query roles with ease"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2"])
       s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2"])
     else
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rspec>, ["~> 2"])
       s.add_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_dependency(%q<autotest>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2"])
     end
   else
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rspec>, ["~> 2"])
     s.add_dependency(%q<rdoc>, [">= 2.4.2"])
     s.add_dependency(%q<autotest>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2"])
   end
 end