Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #119 from ches/guard

---

After all my talking in #118, I thought I should fix it :-)
  • Loading branch information...
commit fd405b313131ecb02b24458350f68085aa3c19e7 2 parents 2c81e5b + ca2a4fa
@netzpirat netzpirat authored
View
3  lib/guard/dsl.rb
@@ -104,7 +104,8 @@ def home_guardfile_path
end
def group(name, &guard_definition)
- guard_definition.call if guard_definition && (@@options[:group].empty? || @@options[:group].include?(name.to_s))
+ @groups = @@options[:group] || []
+ guard_definition.call if guard_definition && (@groups.empty? || @groups.include?(name.to_s))
end
def guard(name, options = {}, &watch_definition)
View
5 spec/guard/dsl_spec.rb
@@ -213,6 +213,11 @@
::Guard.should_receive(:add_guard).with('another', anything, {})
lambda { subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => ['x','y']) }.should_not raise_error
end
+ it "should evaluate all groups when no group option is specified" do
+ ::Guard.should_receive(:add_guard).with('test', anything, {}).twice
+ ::Guard.should_receive(:add_guard).with('another', anything, {}).twice
+ lambda { subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string) }.should_not raise_error
+ end
end
# TODO: not sure if each seperate quoting/call type needs its own test
View
4 spec/support/listener_helper.rb
@@ -8,9 +8,11 @@ def start
end
def record_results
+ noise = %r|\.sw.$| # don't fail specs due to editor swap files, etc.
+
@results = []
@listener.on_change do |files|
- @results += files
+ @results += files.reject { |f| f =~ noise }
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.