Updated gitignore, travis build matrix and cleaned up gemspecs

2014-07-12 13:19:02 +10:00 · 2014-07-12 13:19:02 +10:00 · 7e62ee3e06
commit 7e62ee3e06
parent db0901e6f1
4 changed files with 1 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,6 @@
 .config
 .yardoc
 Gemfile.lock
-Mongoid4.gemfile.lock
 InstalledFiles
 _yardoc
 coverage
--- a/.travis.yml
+++ b/.travis.yml
@ -8,12 +8,5 @@ rvm:
  - 2.1.2
  - jruby-19mode

-gemfile:
-  - Gemfile
-  - Mongoid4.gemfile
 services:
  - mongodb
-branches:
-  only:
-    - master
-    - feature-mongoid4
--- a/Mongoid4.gemfile
+++ b/Mongoid4.gemfile
@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'mongoid', '~> 4.0.0', github: 'mongoid/mongoid'
-
-# Specify your gem's dependencies in mongoid-enum.gemspec
-gemspec
--- a/mongoid-enum.gemspec
+++ b/mongoid-enum.gemspec
@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
  spec.require_paths = ["lib"]

-  spec.add_runtime_dependency "mongoid", ["> 3.0", "< 4.1"]
+  spec.add_runtime_dependency "mongoid", "~> 4.0"

  spec.add_development_dependency "bundler", "~> 1.3"
  spec.add_development_dependency "rake"