middleman 2.0.5 → 2.0.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.0.6
+=====
+- Pulled out livereload feature into its own extension, still installed by default.
+
 2.0.5
 =====
 - Vendored Padrino 0.10.0

data/lib/middleman/guard.rb

@@ -1,6 +1,5 @@
 require "guard"
 require "guard/guard"
-require "guard/livereload"
 require "rbconfig"
 
 if Config::CONFIG['host_os'].downcase =~ %r{mswin|mingw}
@@ -8,34 +7,34 @@ if Config::CONFIG['host_os'].downcase =~ %r{mswin|mingw}
   require 'win32console'
 end
   
-module Middleman::Guard
-  def self.start(options={}, livereload={})
-    options_hash = ""
-    options.each do |k,v|
-      options_hash << ", :#{k} => '#{v}'"
+module Middleman
+  module Guard
+    def self.add_guard(&block)
+      @additional_guards ||= []
+      @additional_guards << block
     end
-    
-    guardfile_contents = %Q{
-      guard 'middleman'#{options_hash} do 
-        watch("config.rb")
-        watch(%r{^lib/^[^\.](.*)\.rb$})
+  
+    def self.start(options={}, livereload={})
+      options_hash = ""
+      options.each do |k,v|
+        options_hash << ", :#{k} => '#{v}'"
       end
-    }
     
-    if livereload
-      livereload_options_hash = ""
-      livereload.each do |k,v|
-        livereload_options_hash << ", :#{k} => '#{v}'"
-      end
-      
-      guardfile_contents << %Q{
-        guard 'livereload'#{livereload_options_hash} do 
-          watch(%r{^source/([^\.].*)$})
+      guardfile_contents = %Q{
+        guard 'middleman'#{options_hash} do 
+          watch("config.rb")
+          watch(%r{^lib/^[^\.](.*)\.rb$})
         end
       }
-    end
     
-    ::Guard.start({ :guardfile_contents => guardfile_contents })
+      (@additional_guards || []).each do |block|
+        result = block.call(options, livereload)
+        guardfile_contents << result unless result.nil?
+      end
+    
+      $stderr.puts guardfile_contents
+      ::Guard.start({ :guardfile_contents => guardfile_contents })
+    end
   end
 end
 

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/middleman.gemspec

@@ -69,7 +69,7 @@ eos
   end
   
   s.add_runtime_dependency("guard", ["~> 0.6.2"])
-  s.add_runtime_dependency("guard-livereload", ["~> 0.3.0"])
+  s.add_runtime_dependency("middleman-livereload", ["~> 0.2.0"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["0.8.7"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -308,19 +308,19 @@ dependencies:
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: guard-livereload
+  name: middleman-livereload
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 0
-        - 3
+        - 2
         - 0
-        version: 0.3.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency