github-migration/master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass the group in the options hash instead of a new parameter in the Guard::Guard.initialize method!

Browse Source
This commit is contained in:
Rémy Coutable 2011-08-17 10:04:42 +02:00
parent 563b020d4f
commit dc2ab97d23
5 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/guard.rb
View File

@ -82,11 +82,11 @@ module Guard
listener.start
end
def add_guard(name, watchers = [], options = {}, group = nil)
def add_guard(name, watchers = [], options = {})
if name.to_sym == :ego
UI.deprecation("Guard::Ego is now part of Guard. You can remove it from your Guardfile.")
else
guard = get_guard_class(name).new(watchers, options, group)
guard = get_guard_class(name).new(watchers, options)
@guards << guard
end
end

3
lib/guard/dsl.rb
View File

@ -118,7 +118,8 @@ module Guard
def guard(name, options = {}, &watch_definition)
@watchers = []
watch_definition.call if watch_definition
::Guard.add_guard(name.to_s.downcase.to_sym, @watchers, options, @current_group || :default)
options.update(:group => (@current_group || :default))
::Guard.add_guard(name.to_s.downcase.to_sym, @watchers, options)
end
def watch(pattern, &action)

4
lib/guard/guard.rb
View File

@ -3,9 +3,9 @@ module Guard
attr_accessor :watchers, :options, :group
def initialize(watchers = [], options = {}, group = nil)
def initialize(watchers = [], options = {})
@group = options.delete(:group) || :default
@watchers, @options = watchers, options
@group ||= :default
end
# Guardfile template needed inside guard gem

42
spec/guard/dsl_spec.rb
View File

@ -201,41 +201,41 @@ describe Guard::Dsl do
describe "#group" do
it "evaluates only the specified string group" do
::Guard.should_receive(:add_guard).with(:pow, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], {}, :w)
::Guard.should_receive(:add_guard).with(:pow, [], { :group => :default })
::Guard.should_receive(:add_guard).with(:test, [], { :group => :w })
subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => ['w'])
end
it "evaluates only the specified symbol group" do
::Guard.should_receive(:add_guard).with(:pow, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], {}, :w)
::Guard.should_receive(:add_guard).with(:pow, [], { :group => :default })
::Guard.should_receive(:add_guard).with(:test, [], { :group => :w })
subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => [:w])
end
it "evaluates only the specified groups" do
::Guard.should_receive(:add_guard).with(:pow, [], {}, :default)
::Guard.should_receive(:add_guard).with(:rspec, [], {}, :x)
::Guard.should_receive(:add_guard).with(:ronn, [], {}, :x)
::Guard.should_receive(:add_guard).with(:less, [], {}, :y)
::Guard.should_receive(:add_guard).with(:pow, [], { :group => :default })
::Guard.should_receive(:add_guard).with(:rspec, [], { :group => :x })
::Guard.should_receive(:add_guard).with(:ronn, [], { :group => :x })
::Guard.should_receive(:add_guard).with(:less, [], { :group => :y })
subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => [:x, :y])
end
it "evaluates always guard outside any group (even when a group is given)" do
::Guard.should_receive(:add_guard).with(:pow, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], {}, :w)
::Guard.should_receive(:add_guard).with(:pow, [], { :group => :default })
::Guard.should_receive(:add_guard).with(:test, [], { :group => :w })
subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => [:w])
end
it "evaluates all groups when no group option is specified" do
::Guard.should_receive(:add_guard).with(:pow, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], {}, :w)
::Guard.should_receive(:add_guard).with(:rspec, [], {}, :x)
::Guard.should_receive(:add_guard).with(:ronn, [], {}, :x)
::Guard.should_receive(:add_guard).with(:less, [], {}, :y)
::Guard.should_receive(:add_guard).with(:pow, [], { :group => :default })
::Guard.should_receive(:add_guard).with(:test, [], { :group => :w })
::Guard.should_receive(:add_guard).with(:rspec, [], { :group => :x })
::Guard.should_receive(:add_guard).with(:ronn, [], { :group => :x })
::Guard.should_receive(:add_guard).with(:less, [], { :group => :y })
subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string)
end
@ -243,31 +243,31 @@ describe Guard::Dsl do
describe "#guard" do
it "loads a guard specified as a quoted string from the DSL" do
::Guard.should_receive(:add_guard).with(:test, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], { :group => :default })
subject.evaluate_guardfile(:guardfile_contents => "guard 'test'")
end
it "loads a guard specified as a double quoted string from the DSL" do
::Guard.should_receive(:add_guard).with(:test, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], { :group => :default })
subject.evaluate_guardfile(:guardfile_contents => 'guard "test"')
end
it "loads a guard specified as a symbol from the DSL" do
::Guard.should_receive(:add_guard).with(:test, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], { :group => :default })
subject.evaluate_guardfile(:guardfile_contents => "guard :test")
end
it "loads a guard specified as a symbol and called with parens from the DSL" do
::Guard.should_receive(:add_guard).with(:test, [], {}, :default)
::Guard.should_receive(:add_guard).with(:test, [], { :group => :default })
subject.evaluate_guardfile(:guardfile_contents => "guard(:test)")
end
it "receives options when specified, from normal arg" do
::Guard.should_receive(:add_guard).with(:test, [], { :opt_a => 1, :opt_b => 'fancy' }, :default)
::Guard.should_receive(:add_guard).with(:test, [], { :opt_a => 1, :opt_b => 'fancy', :group => :default })
subject.evaluate_guardfile(:guardfile_contents => "guard 'test', :opt_a => 1, :opt_b => 'fancy'")
end
@ -280,7 +280,7 @@ describe Guard::Dsl do
watch('c')
end"
::Guard.should_receive(:add_guard).with(:test, anything, {}, :default) do |name, watchers, options|
::Guard.should_receive(:add_guard).with(:test, anything, { :group => :default }) do |name, watchers, options|
watchers.size.should == 2
watchers[0].pattern.should == 'a'
watchers[0].action.call.should == proc { 'b' }.call

24
spec/guard_spec.rb
View File

@ -98,7 +98,7 @@ describe Guard do
context "with no watchers given" do
it "gives an empty array of watchers" do
@guard_rspec_class.should_receive(:new).with([], {}, nil).and_return(@guard_rspec)
@guard_rspec_class.should_receive(:new).with([], {}).and_return(@guard_rspec)
Guard.add_guard(:rspec, [])
end
@ -106,7 +106,7 @@ describe Guard do
context "with watchers given" do
it "give the watchers array" do
@guard_rspec_class.should_receive(:new).with([:foo], {}, nil).and_return(@guard_rspec)
@guard_rspec_class.should_receive(:new).with([:foo], {}).and_return(@guard_rspec)
Guard.add_guard(:rspec, [:foo])
end
@ -114,7 +114,7 @@ describe Guard do
context "with no options given" do
it "gives an empty hash of options" do
@guard_rspec_class.should_receive(:new).with([], {}, nil).and_return(@guard_rspec)
@guard_rspec_class.should_receive(:new).with([], {}).and_return(@guard_rspec)
Guard.add_guard(:rspec, [], {})
end
@ -122,17 +122,9 @@ describe Guard do
context "with options given" do
it "give the options hash" do
@guard_rspec_class.should_receive(:new).with([], { :foo => true }, nil).and_return(@guard_rspec)
@guard_rspec_class.should_receive(:new).with([], { :foo => true, :group => :backend }).and_return(@guard_rspec)
Guard.add_guard(:rspec, [], { :foo => true })
end
end
context "with the group :backend given" do
it "initialize the guard and pass it its group" do
@guard_rspec_class.should_receive(:new).with([], {}, :backend).and_return(@guard_rspec)
Guard.add_guard(:rspec, [], {}, :backend)
Guard.add_guard(:rspec, [], { :foo => true, :group => :backend })
end
end
end
@ -145,17 +137,17 @@ describe Guard do
it "accepts group name as string" do
Guard.add_group('backend')
Guard.groups.should eql [:default, :backend]
end
it "accepts group name as symbol" do
Guard.add_group(:backend)
Guard.groups.should eql [:default, :backend]
end
end
describe ".get_guard_class" do
after do
[:Classname, :DashedClassName, :Inline].each do |const|