Guardfile in riak-client-2.1.0 vs Guardfile in riak-client-2.2.0.pre1

@@ -1,14 +1,20 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-gemset = ENV['RVM_GEMSET'] || 'ripple'
-gemset = "@#{gemset}" unless gemset.to_s == ''
 
-rvms = %w[ 1.8.7 1.9.2 1.9.3 ].map do |version|
-  "#{version}@#{gemset}"
-end
-
-guard 'rspec', :cli => '--profile --tag "~slow"', :rvm => rvms do
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec', all_after_pass: true, all_on_start: true do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec/riak" }
+  watch(%r{^lib/riak/(.+)\.rb$})     { |m| "spec/riak/#{m[1]}_spec.rb" }
+  watch(%r{^lib/riak/client/}) { 'spec/riak/beefcake_protobuffs_backend' }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  watch(/^spec\/integration/) { 'spec:integration' }
 end
+