Merge pull request #1 from petergoldstein/feature/add_2_1_0

Feature/add 2 1 0

.travis.yml

@@ -3,8 +3,6 @@ script: bundle exec rake spec
 matrix:
   allow_failures:
     - rvm: jruby
-    - rvm: rbx
-    - rvm: ree
 
 notifications:
   email: false
@@ -19,4 +17,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby

Gemfile

@@ -18,6 +18,8 @@ group :development do
   gem 'rr',     '~> 1.0.2'
   gem 'rspec',  '~> 2.0'
   gem "simplecov", :require => false
-  gem 'timecop'
+  gem 'timecop', '0.6.1'
   gem 'yard'
+  gem 'mime-types', '~> 1.25.1'
+  gem 'rdiscount', '~> 1.6.8'
 end

Gemfile.lock

@@ -8,44 +8,46 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    aws-s3 (0.6.2)
+    aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
-    builder (3.0.0)
+    builder (3.2.2)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
-    dotenv (0.7.0)
+    docile (1.1.2)
+    dotenv (0.9.0)
     fakefs (0.3.2)
     hpricot (0.8.6)
     hpricot (0.8.6-java)
-    mime-types (1.16)
+    mime-types (1.25.1)
-    multi_json (1.0.4)
+    multi_json (1.8.4)
-    mustache (0.11.2)
+    mustache (0.99.5)
-    posix-spawn (0.3.6)
+    posix-spawn (0.3.8)
-    rake (0.9.2.2)
+    rake (10.1.1)
-    rdiscount (1.6.5)
+    rdiscount (1.6.8)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rr (1.0.2)
+    rr (1.0.5)
-    rspec (2.8.0)
+    rspec (2.14.1)
-      rspec-core (~> 2.8.0)
+      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.8.0)
+      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.8.0)
+      rspec-mocks (~> 2.14.0)
-    rspec-core (2.8.0)
+    rspec-core (2.14.7)
-    rspec-expectations (2.8.0)
+    rspec-expectations (2.14.4)
-      diff-lcs (~> 1.1.2)
+      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.8.0)
+    rspec-mocks (2.14.4)
-    simplecov (0.5.4)
+    simplecov (0.8.2)
-      multi_json (~> 1.0.3)
+      docile (~> 1.1.0)
-      simplecov-html (~> 0.5.3)
+      multi_json
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.8.0)
-    thor (0.16.0)
+    simplecov-html (0.8.0)
-    timecop (0.3.5)
+    thor (0.18.1)
-    win32console (1.3.0-x86-mingw32)
+    timecop (0.6.1)
-    xml-simple (1.0.15)
+    win32console (1.3.2-x86-mingw32)
-    yard (0.8.2)
+    xml-simple (1.1.3)
+    yard (0.8.7.3)
 
 PLATFORMS
   java
@@ -56,12 +58,14 @@ DEPENDENCIES
   aws-s3
   fakefs (~> 0.3.2)
   foreman!
+  mime-types (~> 1.25.1)
   posix-spawn (~> 0.3.6)
   rake
+  rdiscount (~> 1.6.8)
   ronn
   rr (~> 1.0.2)
   rspec (~> 2.0)
   simplecov
-  timecop
+  timecop (= 0.6.1)
   win32console (~> 1.3.0)
   yard

spec/foreman/export/runit_spec.rb

@@ -31,6 +31,6 @@ describe Foreman::Export::Runit, :fakefs do
   end
 
   it "creates a full path to the export directory" do
-    expect { runit.export }.to_not raise_error(Errno::ENOENT)
+    expect { runit.export }.to_not raise_error
   end
 end

spec/spec_helper.rb

@@ -177,5 +177,5 @@ RSpec.configure do |config|
   config.order = 'rand'
   config.include FakeFS::SpecHelpers, :fakefs
   config.mock_with :rr
-  config.backtrace_clean_patterns = []
+  config.backtrace_exclusion_patterns = []
 end