deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update to latest Guard and Guard Livereload to avoid gem dependency issues

Browse source
This commit is contained in:
Thomas Reynolds 2012-06-23 12:40:23 -07:00
parent 4706c3ad00
commit 541c5710f7
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,3 +1,7 @@
2.0.16
====
Update Guard to v1.1
2.0.15.4
====
Lock Padrino version to 0.10.6

10
lib/middleman/guard.rb
View file

@ -2,7 +2,7 @@ require "guard"
require "guard/guard"
require "rbconfig"
if Config::CONFIG['host_os'].downcase =~ %r{mingw}
if RbConfig::CONFIG['host_os'].downcase =~ %r{mingw}
require "win32/process"
end
@ -31,7 +31,11 @@ module Middleman
guardfile_contents << result unless result.nil?
end
::Guard.start({ :guardfile_contents => guardfile_contents })
begin
::Guard.start({ :guardfile_contents => guardfile_contents })
rescue Interrupt
::Guard.stop
end
end
end
end
@ -47,7 +51,7 @@ module Guard
server_start
end
def run_on_change(paths)
def run_on_changes(paths)
server_stop
server_start
end

2
lib/middleman/version.rb
View file

@ -1,3 +1,3 @@
module Middleman
VERSION = "2.0.15.4"
VERSION = "2.0.16"
end

4
middleman-x86-mingw32.gemspec
View file

@ -58,8 +58,8 @@ eos
s.add_dependency("win32-process", ["~> 0.6.5"])
s.add_dependency("rb-fchange")
s.add_dependency("guard", ["~> 0.6.2"])
s.add_dependency("middleman-livereload", ["~> 0.2.0"])
s.add_dependency("guard", ["~> 1.1.0"])
s.add_dependency("middleman-livereload", ["~> 0.2.2"])
# Development and test
# s.add_development_dependency("jquery-rails")

4
middleman.gemspec
View file

@ -56,8 +56,8 @@ eos
s.add_dependency("padrino-core", ["0.10.6"])
s.add_dependency("padrino-helpers", ["0.10.6"])
s.add_dependency("guard", ["~> 0.6.2"])
s.add_dependency("middleman-livereload", ["~> 0.2.0"])
s.add_dependency("guard", ["~> 1.1.0"])
s.add_dependency("middleman-livereload", ["~> 0.2.2"])
# Development and test
s.add_development_dependency("coffee-filter", ["~> 0.1.1"])