Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
tdreyno committed Nov 8, 2011
2 parents fea3b88 + 6edd284 commit 3d31543
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -4,3 +4,4 @@ Gemfile.lock
pkg/*
.rvmrc
.DS_Store
.rbenv-version
5 changes: 4 additions & 1 deletion lib/middleman-livereload.rb
Expand Up @@ -102,13 +102,16 @@ def start_threaded_reactor(options)
Middleman::Guard.add_guard do |options, livereload|
if livereload
livereload_options_hash = ""

livereload.each do |k,v|
livereload_options_hash << ", :#{k} => '#{v}'"
livereload_options_hash << ", :#{k} => "
livereload_options_hash << ((v.kind_of?(String)) ? "'#{v}'" : "#{v.to_s}")
end

%Q{
guard 'livereload'#{livereload_options_hash} do
watch(%r{^source/([^\.].*)$})
watch(%r{^data/([^\.].*)$})
end
}
else
Expand Down
1 change: 1 addition & 0 deletions middleman-livereload.gemspec
Expand Up @@ -22,4 +22,5 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("middleman", ["~> 2.1.0"])
s.add_runtime_dependency('em-websocket', ['>= 0.2.0'])
s.add_runtime_dependency('multi_json', ['~> 1.0.3'])
s.add_development_dependency("rake")
end

0 comments on commit 3d31543

Please sign in to comment.