CI fixes backported from master

3 files changed, 3 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 3775c3dda7..3152075b0a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,7 +41,7 @@ namespace :spec do
       deps.delete("rdiscount")
     end
 
-    deps.each do |name, version|
+    deps.sort_by{|name, _| name }.each do |name, version|
       sh "#{Gem.ruby} -S gem list -i '^#{name}$' -v '#{version}' || " \
          "#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
     end
diff --git a/bundler.gemspec b/bundler.gemspec
index dc8fbc8d45..8320547dd7 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version     = '>= 1.8.7'
   spec.required_rubygems_version = '>= 1.3.6'
 
+  spec.add_development_dependency 'mustache', '0.99.6'
   spec.add_development_dependency 'rdiscount', '~> 1.6'
   spec.add_development_dependency 'ronn', '~> 0.7.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
diff --git a/spec/realworld/parallel_spec.rb b/spec/realworld/parallel_spec.rb
index 457139b882..2ebe4307e2 100644
--- a/spec/realworld/parallel_spec.rb
+++ b/spec/realworld/parallel_spec.rb
@@ -58,7 +58,7 @@ describe "parallel", :realworld => true do
      expect(out).to match(/[1-3]: /)
 
     bundle "show activesupport"
-    expect(out).to match(/activesupport-3\.2\.1[3-9]/)
+    expect(out).to match(/activesupport-3\.2\.\d+/)
 
     bundle "show faker"
     expect(out).to match(/faker/)