moft 1.0.2.1 → 1.0.3

data/lib/moft/command.rb

@@ -1,12 +1,23 @@
 module Moft
   class Command
-    def self.globs(source, destination)
+    def self.globs(source, destination, static_includes)
+      dirs = []
       Dir.chdir(source) do
         dirs = Dir['*'].select { |x| File.directory?(x) }
         dirs -= [destination, File.expand_path(destination), File.basename(destination)]
         dirs = dirs.map { |x| "#{x}/**/*" }
         dirs += ['*']
       end
+      
+      static_includes.each do |dir|
+        if File.directory?(dir)
+          dir.gsub("\\","/")
+          dirs += ["%s/**/*" % [dir]]
+        end
+        
+        return dirs
+      end
+      
     end
 
     # Static: Run Site#process and catch errors

data/lib/moft/commands/build.rb

@@ -32,13 +32,19 @@ module Moft
       # Returns nothing.
       def self.watch(site, options)
         require 'directory_watcher'
-
+        
         source = options['source']
         destination = options['destination']
 
         Moft::Logger.info "Auto-regeneration:", "enabled"
 
-        dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true)
+        watchdirs = self.globs(source, destination, options['static_includes'])
+        
+        watchdirs.each do |dir|
+          Moft::Logger.info "Watching:", "%s" % dir
+        end
+        
+        dw = DirectoryWatcher.new(source, :glob => watchdirs, :pre_load => true)
         dw.interval = 1
 
         dw.add_observer do |*args|

data/lib/moft/convertible.rb

@@ -27,6 +27,7 @@ module Moft
     #
     # Returns nothing.
     def read_yaml(base, name)
+       
       begin
         self.content = File.read(File.join(base, name))
 
@@ -39,7 +40,6 @@ module Moft
       rescue Exception => e
         puts "Error reading file #{File.join(base, name)}: #{e.message}"
       end
-
       self.data ||= {}
     end
 

data/moft.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'moft'
-  s.version           = '1.0.2.1'
+  s.version           = '1.0.3'
   s.license           = 'MIT'
   s.date              = '2013-05-08'
   s.rubyforge_project = 'moft'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moft
 version: !ruby/object:Gem::Version
-  version: 1.0.2.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: