middleman-core 3.0.0.alpha.7 → 3.0.0.alpha.8

data/lib/middleman-core/{guard.rb → watcher.rb}

@@ -1,61 +1,67 @@
-# Guard watches the filesystem for changes
-require "guard"
-require "guard/guard"
+# Inspect Ruby env
+require "rbconfig"
+
+# Watcher Library
+require "fssm"
 
 # File changes are forwarded to the currently running app via HTTP
 require "net/http"
 
-# Support forking on Windows
-require "win32/process" if Middleman::WINDOWS
-
-# The Guard namespace
-module Middleman::Guard
-  
-  # Start guard
-  # @param [Hash] options
-  # @return [void]
-  def self.start(options={})
-    # Forward CLI options to Guard
-    options_hash = options.map { |k,v| ", :#{k} => '#{v}'" }.join
-  
-    # Watch all files in project, even hidden ones.
-    ::Guard.start({
-      :guardfile_contents      => %Q{
-        guard 'middleman'#{options_hash} do 
-          watch(%r{(.*)})
-        end
-      },
-      :watch_all_modifications => true,
-      :no_interactions => true
-    })
-  end
-end
-
-# @private
-module Guard
-  
-  # Monkeypatch Guard into being quiet
-  module UI
+module Middleman
+  class Watcher
     class << self
-      def info(message, options = { }); end
+      attr_accessor :singleton
+      
+      def start(options)
+        self.singleton = new(options)
+        self.singleton.watch!
+      end
+      
+      # What command is sent to kill instances
+      # @return [Symbol, Fixnum]
+      def kill_command
+        ::Middleman::WINDOWS ? 1 : :INT
+      end
+      
+      def ignore_list
+        [
+          /\.sass-cache/,
+          /\.git/,
+          /\.DS_Store/
+        ]
+      end
     end
-  end
-  
-  # Guards must be in the Guard module to be picked up
-  class Middleman < Guard
     
-    # Save the options for later
-    def initialize(watchers = [], options = {})
-      super
-      
-      # Save options
+    def initialize(options)
       @options = options
+
+      if RbConfig::CONFIG['target_os'] =~ /darwin/i
+        $LOAD_PATH << File.expand_path('../../middleman-core/vendor/rb-fsevent-0.4.3.1/lib', __FILE__)
+        require 'rb-fsevent'
+      elsif RbConfig::CONFIG['target_os'] =~ /linux/i
+        $LOAD_PATH << File.expand_path('../../middleman-core/vendor/rb-inotify-0.8.8/lib', __FILE__)
+        require 'rb-inotify'
+      end
+      
+      start
+    end
+    
+    def watch!
+      local = self
+      FSSM.monitor(Dir.pwd) do
+        create { |base, relative| local.run_on_change([relative]) }
+        update { |base, relative| local.run_on_change([relative]) }
+        delete { |base, relative| local.run_on_deletion([relative]) }
+      end
     end
     
     # Start Middleman in a fork
     # @return [void]
     def start
-      @server_job = fork { bootup }
+      @server_job = fork {
+        Signal.trap(::Middleman::WINDOWS ? :KILL : :TERM) { exit! }
+        bootup
+      }
     end
     
     # Start an instance of Middleman::Base
@@ -92,7 +98,7 @@ module Guard
       stop
       start
     end
-  
+    
     # What to do on file change
     # @param [Array<String>] paths Array of paths that changed
     # @return [void]
@@ -101,7 +107,9 @@ module Guard
       return reload if needs_to_reload?(paths)
       
       # Otherwise forward to Middleman
-      paths.each { |path| tell_server(:change => path) }
+      paths.each do |path|
+        tell_server(:change => path) unless self.class.ignore_list.any? { |r| path.match(r) }
+      end
     end
 
     # What to do on file deletion
@@ -112,13 +120,9 @@ module Guard
       return reload if needs_to_reload?(paths)
       
       # Otherwise forward to Middleman
-      paths.each { |path| tell_server(:delete => path) }
-    end
-    
-    # What command is sent to kill instances
-    # @return [Symbol, Fixnum]
-    def self.kill_command
-      ::Middleman::WINDOWS ? 1 : :INT
+      paths.each do |path|
+        tell_server(:delete => path) unless self.class.ignore_list.any? { |r| path.match(r) }
+      end
     end
     
   private
@@ -141,8 +145,8 @@ module Guard
   end
 end
 
-# Trap the interupt signal and shut down Guard (and thus the server) smoothly
-trap(::Guard::Middleman.kill_command) do 
-  ::Guard.stop
-  exit!(0)
+# Trap the interupt signal and shut down FSSM (and thus the server) smoothly
+trap(::Middleman::Watcher.kill_command) do
+  ::Middleman::Watcher.singleton.stop
+  exit(0)
 end

data/lib/middleman-core.rb

@@ -27,7 +27,7 @@ module Middleman
   autoload :Base,           "middleman-core/base"
   autoload :Cache,          "middleman-core/cache"
   autoload :Templates,      "middleman-core/templates"
-  autoload :Guard,          "middleman-core/guard"
+  autoload :Watcher,        "middleman-core/watcher"
   
   module Cli
     autoload :Base,         "middleman-core/cli"

data/middleman-core.gemspec

@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.1.0"])
   
   # Watcher
-  s.add_dependency("guard", ["~> 0.9.4"])
+  s.add_dependency("fssm", ["~> 0.2.7"])
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman-core
 version: !ruby/object:Gem::Version 
-  hash: -3702664398
+  hash: -3702664404
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 7
-  version: 3.0.0.alpha.7
+  - 8
+  version: 3.0.0.alpha.8
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 -08:00
+date: 2012-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,13 +108,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 25
         segments: 
         - 0
-        - 9
-        - 4
-        version: 0.9.4
-  name: guard
+        - 2
+        - 7
+        version: 0.2.7
+  name: fssm
   version_requirements: *id006
 description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
@@ -390,7 +390,6 @@ files:
 - lib/middleman-core/extensions/automatic_image_sizes/fastimage.rb
 - lib/middleman-core/extensions/directory_indexes.rb
 - lib/middleman-core/extensions/lorem.rb
-- lib/middleman-core/guard.rb
 - lib/middleman-core/renderers/erb.rb
 - lib/middleman-core/sitemap/page.rb
 - lib/middleman-core/sitemap/store.rb
@@ -694,7 +693,27 @@ files:
 - lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_output_helpers.rb
 - lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb
 - lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/LICENSE
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/README.rdoc
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/ext/extconf.rb
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/ext/fsevent/fsevent_watch.c
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/lib/rb-fsevent.rb
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/lib/rb-fsevent/fsevent.rb
+- lib/middleman-core/vendor/rb-fsevent-0.4.3.1/lib/rb-fsevent/version.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/.yardopts
+- lib/middleman-core/vendor/rb-inotify-0.8.8/MIT-LICENSE
+- lib/middleman-core/vendor/rb-inotify-0.8.8/README.md
+- lib/middleman-core/vendor/rb-inotify-0.8.8/Rakefile
+- lib/middleman-core/vendor/rb-inotify-0.8.8/VERSION
+- lib/middleman-core/vendor/rb-inotify-0.8.8/lib/rb-inotify.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/lib/rb-inotify/event.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/lib/rb-inotify/native.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/lib/rb-inotify/native/flags.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/lib/rb-inotify/notifier.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/lib/rb-inotify/watcher.rb
+- lib/middleman-core/vendor/rb-inotify-0.8.8/rb-inotify.gemspec
 - lib/middleman-core/version.rb
+- lib/middleman-core/watcher.rb
 - middleman-core.gemspec
 has_rdoc: true
 homepage: http://middlemanapp.com