From 7baf9f3a03639d183095ad1abf97b8c0027893e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Carric=CC=A7o?= Date: Thu, 1 Aug 2013 20:14:19 +0100 Subject: [PATCH] Update gems --- Gemfile | 14 +++++++------- Gemfile.lock | 52 +++++++++++++++++++++++++-------------------------- lib/pimon.rb | 1 - pimon.gemspec | 8 ++++---- 4 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Gemfile b/Gemfile index 7b58b8d..c522d6b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,20 +1,20 @@ source 'https://rubygems.org' -gem 'rake', '~> 10.0.3' -gem 'haml', '~> 4.0.0' -gem 'sinatra', '~> 1.4.1', :require => 'sinatra/base' +gem 'rake', '~> 10.1.0' +gem 'haml', '~> 4.0.3' +gem 'sinatra', '~> 1.4.3', :require => 'sinatra/base' gem 'em-websocket', '= 0.3.8' gem 'sinatra-websocket', '~> 0.2.1' gem 'sys-uptime', '~> 0.6.1' -gem 'thin', '~> 1.5.0' +gem 'thin', '~> 1.5.1' -gem 'pry', '~> 0.9.12' , :group => [:development, :test] +gem 'pry', '~> 0.9.12.2' , :group => [:development, :test] group :test do gem 'rack-test', '~> 0.6.2' - gem 'rspec', '~> 2.13.0' + gem 'rspec', '~> 2.14.1' gem 'simplecov', '~> 0.7.1', :require => false gem 'simplecov-rcov', '~> 0.2.3' gem 'timecop', '~> 0.6.1' - gem 'coveralls', require: false + gem 'coveralls', '~> 0.6.7', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 7c202c2..1d4c421 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,25 +4,25 @@ GEM addressable (2.3.3) coderay (1.0.9) colorize (0.5.8) - coveralls (0.6.3) + coveralls (0.6.7) colorize multi_json (~> 1.3) rest-client simplecov (>= 0.7) thor daemons (1.1.9) - diff-lcs (1.2.1) + diff-lcs (1.2.4) em-websocket (0.3.8) addressable (>= 2.1.1) eventmachine (>= 0.12.9) eventmachine (1.0.3) ffi (1.4.0) - haml (4.0.0) + haml (4.0.3) tilt method_source (0.8.1) - mime-types (1.21) + mime-types (1.23) multi_json (1.6.1) - pry (0.9.12) + pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) @@ -31,57 +31,57 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rake (10.0.3) + rake (10.1.0) rest-client (1.6.7) mime-types (>= 1.16) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) - rspec-core (2.13.1) - rspec-expectations (2.13.0) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.4) + rspec-expectations (2.14.0) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.13.0) + rspec-mocks (2.14.1) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sinatra (1.4.1) - rack (~> 1.5, >= 1.5.2) + sinatra (1.4.3) + rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) sinatra-websocket (0.2.1) em-websocket (~> 0.3.6) eventmachine thin (>= 1.3.1) - slop (3.4.4) + slop (3.4.5) sys-uptime (0.6.1) ffi (>= 1.0.0) - thin (1.5.0) + thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.17.0) - tilt (1.3.5) + thor (0.18.1) + tilt (1.4.1) timecop (0.6.1) PLATFORMS ruby DEPENDENCIES - coveralls + coveralls (~> 0.6.7) em-websocket (= 0.3.8) - haml (~> 4.0.0) - pry (~> 0.9.12) + haml (~> 4.0.3) + pry (~> 0.9.12.2) rack-test (~> 0.6.2) - rake (~> 10.0.3) - rspec (~> 2.13.0) + rake (~> 10.1.0) + rspec (~> 2.14.1) simplecov (~> 0.7.1) simplecov-rcov (~> 0.2.3) - sinatra (~> 1.4.1) + sinatra (~> 1.4.3) sinatra-websocket (~> 0.2.1) sys-uptime (~> 0.6.1) - thin (~> 1.5.0) + thin (~> 1.5.1) timecop (~> 0.6.1) diff --git a/lib/pimon.rb b/lib/pimon.rb index 90f6444..9078015 100644 --- a/lib/pimon.rb +++ b/lib/pimon.rb @@ -39,7 +39,6 @@ class Pimon < Sinatra::Base end configure :test do - config = PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test.yml") set :config, config diff --git a/pimon.gemspec b/pimon.gemspec index bf06095..7008e20 100644 --- a/pimon.gemspec +++ b/pimon.gemspec @@ -20,15 +20,15 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/pimon`.split("\n").map{ |f| File.basename(f) } s.require_paths = ['lib'] - s.add_runtime_dependency 'haml', '~> 4.0.0' - s.add_runtime_dependency 'sinatra', '~> 1.4.1' + s.add_runtime_dependency 'haml', '~> 4.0.3' + s.add_runtime_dependency 'sinatra', '~> 1.4.3' s.add_runtime_dependency 'em-websocket', '= 0.3.8' s.add_runtime_dependency 'sinatra-websocket', '~> 0.2.1' s.add_runtime_dependency 'sys-uptime', '~> 0.6.1' - s.add_runtime_dependency 'thin', '~> 1.5.0' + s.add_runtime_dependency 'thin', '~> 1.5.1' s.add_development_dependency 'rack-test', '~> 0.6.2' - s.add_development_dependency 'rspec', '~> 2.13.0' + s.add_development_dependency 'rspec', '~> 2.14.1' s.add_development_dependency 'simplecov', '~> 0.7.1' s.add_development_dependency 'simplecov-rcov', '~> 0.2.3' s.add_development_dependency 'timecop', '~> 0.6.1'