Guardfile in message-driver-0.1.0 vs Guardfile in message-driver-0.2.0.rc1

@@ -6,12 +6,13 @@
 guard 'bundler' do
   watch('Gemfile')
   watch(/^.+\.gemspec/)
 end
 
-unit_spec_opts = {spec_paths: ["spec/units"], cli: '-f doc', run_all: {cli: ''}}
-acceptance_spec_opts = {spec_paths: ["spec/integration"], cli: '-f doc -t all_adapters', run_all: {cli: '-t all_adapters'}}
+common_rspec_opts = {keep_failed: true, all_after_pass: true}
+unit_spec_opts = common_rspec_opts.merge({spec_paths: ["spec/units"], cli: '-f doc', run_all: {cli: ''}})
+integration_spec_opts = common_rspec_opts.merge({spec_paths: ["spec/integration/#{BrokerConfig.current_adapter}"], cli: '-f doc -t all_adapters', run_all: {cli: '-t all_adapters'}})
 
 group 'specs' do
   guard 'rspec', unit_spec_opts do
     watch(%r{^spec/units/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})          { |m| "spec/units/#{m[1]}_spec.rb" }
@@ -19,18 +20,21 @@
     watch('spec/spec_helper.rb')       { "spec" }
   end
 end
 
 group 'integration' do
-  guard 'rspec', acceptance_spec_opts do
+  guard 'rspec', integration_spec_opts do
     watch(%r{^spec/integration/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})          { |m| "spec/integration/#{m[1]}_spec.rb" }
     watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
     watch('spec/spec_helper.rb')       { "spec" }
   end
+end
 
+group 'features' do
   cucumber_cli = "--no-profile --color --format progress --strict --tag @all_adapters,@#{BrokerConfig.current_adapter} --tag ~@wip"
-  guard 'cucumber', change_format: 'pretty', cli: cucumber_cli do
+  cucumber_run_all_cli = "#{cucumber_cli} --tag ~@slow"
+  guard 'cucumber', change_format: 'pretty', all_on_start: false, cli: cucumber_cli, run_all: { cli: cucumber_run_all_cli } do
     watch(%r{^features/.+\.feature$})
     watch(%r{^features/support/.+$})          { 'features' }
     watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
   end
 end