From 18e8b076c7e19772427ee3e22adc1e961b6c33f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Wed, 3 Oct 2012 15:52:40 +0200
Subject: [PATCH] bump guard
---
Gemfile | 7 ++++---
Gemfile.lock | 41 +++++++++++++++++++++++++----------------
Guardfile | 2 +-
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/Gemfile b/Gemfile
index 235eecc06e..7d8be57ed0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -146,9 +146,10 @@ group :test do
gem 'webmock', '1.8.11', :require => false
gem 'spork', '1.0.0rc3'
- gem 'guard-rspec', '0.7.3'
- gem 'guard-spork', '0.8.0'
- gem 'guard-cucumber', '1.0.0'
+ gem 'guard-rspec', '2.1.1'
+ gem 'guard-spork', '1.2.3'
+ gem 'guard-cucumber', '1.2.2'
+ gem 'rb-inotify', '0.8.8'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 6600fbb405..1d612dbe80 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,6 +90,7 @@ GEM
childprocess (0.3.5)
ffi (~> 1.0, >= 1.0.6)
client_side_validations (3.2.1)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -164,17 +165,22 @@ GEM
gon (4.0.0)
actionpack (>= 2.3.0)
json
- guard (1.1.1)
+ guard (1.5.4)
listen (>= 0.4.2)
+ lumberjack (>= 1.0.2)
+ pry (>= 0.9.10)
thor (>= 0.14.6)
- guard-cucumber (1.0.0)
+ guard-cucumber (1.2.2)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
- guard-rspec (0.7.3)
- guard (>= 0.10.0)
- guard-spork (0.8.0)
- guard (>= 0.10.0)
+ guard-rspec (2.1.1)
+ guard (>= 1.1)
+ rspec (~> 2.11)
+ guard-spork (1.2.3)
+ childprocess (>= 0.2.3)
+ guard (>= 1.1)
spork (>= 0.8.4)
+ sys-proctable
haml (3.1.7)
handlebars_assets (0.6.6)
execjs (>= 1.2.9)
@@ -214,15 +220,14 @@ GEM
activesupport (>= 3.0.0)
kgio (2.7.4)
libwebsocket (0.1.5)
- listen (0.4.2)
- rb-fchange (~> 0.0.5)
- rb-fsevent (~> 0.9.1)
- rb-inotify (~> 0.8.8)
+ listen (0.5.3)
+ lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
messagebus_ruby_api (1.0.3)
+ method_source (0.8.1)
mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
@@ -267,6 +272,10 @@ GEM
omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
polyglot (0.3.3)
+ pry (0.9.10)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.3.1)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -318,9 +327,6 @@ GEM
thor (>= 0.14.6, < 2.0)
raindrops (0.9.0)
rake (0.9.2.2)
- rb-fchange (0.0.5)
- ffi
- rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
@@ -370,12 +376,14 @@ GEM
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
+ slop (3.3.3)
spork (1.0.0rc3)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
subexec (0.2.2)
+ sys-proctable (0.9.2)
thor (0.16.0)
tilt (1.3.3)
timecop (0.5.3)
@@ -437,9 +445,9 @@ DEPENDENCIES
foreman (= 0.60.2)
fuubar (= 1.1.0)
gon (= 4.0.0)
- guard-cucumber (= 1.0.0)
- guard-rspec (= 0.7.3)
- guard-spork (= 0.8.0)
+ guard-cucumber (= 1.2.2)
+ guard-rspec (= 2.1.1)
+ guard-spork (= 1.2.3)
haml (= 3.1.7)
handlebars_assets (= 0.6.6)
http_accept_language (= 1.0.2)
@@ -466,6 +474,7 @@ DEPENDENCIES
rails-i18n!
rails_admin (= 0.1.1)
rails_autolink (= 1.0.9)
+ rb-inotify (= 0.8.8)
redcarpet (= 2.1.1)
remotipart (= 1.0.2)
resque (= 1.23.0)
diff --git a/Guardfile b/Guardfile
index 9175e155f1..6428dfdd77 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,7 +1,7 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme
# also, http://asciicasts.com/episodes/264-guard
-guard 'rspec', :version => 2, :all_on_start => false do
+guard 'rspec', :all_on_start => false do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
--
GitLab