fssm 0.0.9 → 0.1.0

data/.gitignore

@@ -1,7 +1,9 @@
 *.sw?
 .DS_Store
+.idea
+/*.gem
 coverage
-rdoc
-pkg
 nbproject
+pkg
+rdoc
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 0
-:patch: 9
+:minor: 1
+:patch: 0
 :build: 

data/example.rb

@@ -3,7 +3,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'fssm'
 
 FSSM.monitor('.', '**/*') do
-  update {|b,r| puts "Update in #{b} to #{r}"}
-  delete {|b,r| puts "Delete in #{b} to #{r}"}
-  create {|b,r| puts "Create in #{b} to #{r}"}
+  update {|b, r| puts "Update in #{b} to #{r}"}
+  delete {|b, r| puts "Delete in #{b} to #{r}"}
+  create {|b, r| puts "Create in #{b} to #{r}"}
 end

data/fssm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fssm}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Tilley"]
@@ -27,8 +27,9 @@ Gem::Specification.new do |s|
      "fssm.gemspec",
      "lib/fssm.rb",
      "lib/fssm/backends/fsevents.rb",
+     "lib/fssm/backends/inotify.rb",
      "lib/fssm/backends/polling.rb",
-     "lib/fssm/fsevents.rb",
+     "lib/fssm/backends/rubycocoa/fsevents.rb",
      "lib/fssm/monitor.rb",
      "lib/fssm/path.rb",
      "lib/fssm/pathname.rb",

data/lib/fssm.rb

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 module FSSM
   FileNotFoundError = Class.new(StandardError)
   CallbackError = Class.new(StandardError)
-  
+
   class << self
     def dbg(msg=nil)
       STDERR.puts(msg)
     end
 
-    def monitor(*args, &block)      
+    def monitor(*args, &block)
       monitor = FSSM::Monitor.new
       context = args.empty? ? monitor : monitor.path(*args)
 

data/lib/fssm/backends/fsevents.rb

@@ -1,4 +1,4 @@
-require 'fssm/fsevents'
+require File.join(File.dirname(__FILE__), 'rubycocoa/fsevents')
 
 module FSSM::Backends
   class FSEvents
@@ -6,23 +6,23 @@ module FSSM::Backends
       @handlers = {}
       @fsevents = []
     end
-    
+
     def add_path(path, preload=true)
       handler = FSSM::State.new(path)
       @handlers["#{path}"] = handler
-      
+
       fsevent = Rucola::FSEvents.new("#{path}", {:latency => 0.5}) do |events|
         events.each do |event|
           handler.refresh(event.path)
         end
       end
-      
+
       fsevent.create_stream
       handler.refresh(path.to_pathname, true) if preload
       fsevent.start
       @fsevents << fsevent
     end
-    
+
     def run
       begin
         OSX.CFRunLoopRun

data/lib/fssm/backends/inotify.rb

@@ -0,0 +1,25 @@
+module FSSM::Backends
+  class Inotify
+    def initialize
+      @notifier = INotify::Notifier.new
+    end
+
+    def add_path(path, preload=true)
+      handler = FSSM::State.new(path)
+
+      @notifier.watch(path.to_s, :all_events) do |event|
+        handler.refresh(event.name)
+      end
+
+      handler.refresh(path.to_pathname, true) if preload
+    end
+
+    def run
+      begin
+        @notifier.run
+      rescue Interrupt
+      end
+    end
+
+  end
+end

data/lib/fssm/backends/polling.rb

@@ -1,8 +1,8 @@
 module FSSM::Backends
   class Polling
     def initialize(options={})
-      @handlers  = []
-      @latency   = options[:latency]   || 1.5
+      @handlers = []
+      @latency = options[:latency] || 1.5
     end
 
     def add_path(path, preload=true)

data/lib/fssm/{fsevents.rb → backends/rubycocoa/fsevents.rb}

@@ -6,33 +6,35 @@ module Rucola
       attr_reader :fsevents_object
       attr_reader :id
       attr_reader :path
+
       def initialize(fsevents_object, id, path)
         @fsevents_object, @id, @path = fsevents_object, id, path
       end
-      
+
       # Returns an array of the files/dirs in the path that the event occurred in.
       # The files are sorted by the modification time, the first entry is the last modified file.
       def files
         Dir.glob("#{File.expand_path(path)}/*").sort_by {|f| File.mtime(f) }.reverse
       end
-      
+
       # Returns the last modified file in the path that the event occurred in.
       def last_modified_file
         files.first
       end
     end
-    
-    class StreamError < StandardError; end
-    
+
+    class StreamError < StandardError;
+    end
+
     attr_reader :paths
     attr_reader :stream
-    
+
     attr_accessor :allocator
     attr_accessor :context
     attr_accessor :since
     attr_accessor :latency
     attr_accessor :flags
-    
+
     # Initializes a new FSEvents `watchdog` object and starts watching the directories you specify for events. The
     # block is used as a handler for events, which are passed as the block's argument. This method is the easiest
     # way to start watching some directories if you don't care about the details of setting up the event stream.
@@ -57,7 +59,7 @@ module Rucola
       fsevents.start
       fsevents
     end
-    
+
     # Creates a new FSEvents `watchdog` object. You can specify a list of paths to watch and options to control the
     # behaviour of the watchdog. The block you pass serves as a callback when an event is generated on one of the
     # specified paths.
@@ -84,19 +86,19 @@ module Rucola
     # Please refer to the Cocoa documentation for the rest of the options.
     def initialize(*params, &block)
       raise ArgumentError, 'No callback block was specified.' unless block_given?
-      
+
       options = params.last.kind_of?(Hash) ? params.pop : {}
       @paths = params.flatten
-      
+
       paths.each { |path| raise ArgumentError, "The specified path (#{path}) does not exist." unless File.exist?(path) }
-      
+
       @allocator = options[:allocator] || OSX::KCFAllocatorDefault
-      @context   = options[:context]   || nil
-      @since     = options[:since]     || OSX::KFSEventStreamEventIdSinceNow
-      @latency   = options[:latency]   || 0.0
-      @flags     = options[:flags]     || 0
-      @stream    = options[:stream]    || nil
-      
+      @context = options[:context] || nil
+      @since = options[:since] || OSX::KFSEventStreamEventIdSinceNow
+      @latency = options[:latency] || 0.0
+      @flags = options[:flags] || 0
+      @stream = options[:stream] || nil
+
       @user_callback = block
       @callback = Proc.new do |stream, client_callback_info, number_of_events, paths_pointer, event_flags, event_ids|
         paths_pointer.regard_as('*')
@@ -105,7 +107,7 @@ module Rucola
         @user_callback.call(events)
       end
     end
-    
+
     # Create the stream.
     # Raises a Rucola::FSEvents::StreamError if the stream could not be created.
     def create_stream
@@ -113,13 +115,13 @@ module Rucola
       raise(StreamError, 'Unable to create FSEvents stream.') unless @stream
       OSX.FSEventStreamScheduleWithRunLoop(@stream, OSX.CFRunLoopGetCurrent, OSX::KCFRunLoopDefaultMode)
     end
-    
+
     # Start the stream.
     # Raises a Rucola::FSEvents::StreamError if the stream could not be started.
     def start
       raise(StreamError, 'Unable to start FSEvents stream.') unless OSX.FSEventStreamStart(@stream)
     end
-    
+
     # Stop the stream.
     # You can resume it by calling `start` again.
     def stop

data/lib/fssm/pathname.rb

@@ -3,16 +3,16 @@
 
 module FSSM
   class Pathname < String
-    
+
     SEPARATOR = Regexp.quote(File::SEPARATOR)
-    
+
     if File::ALT_SEPARATOR
       ALT_SEPARATOR = Regexp.quote(File::ALT_SEPARATOR)
       SEPARATOR_PAT = Regexp.compile("[#{SEPARATOR}#{ALT_SEPARATOR}]")
     else
       SEPARATOR_PAT = Regexp.compile(SEPARATOR)
     end
-    
+
     if RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/
       PREFIX_PAT = Regexp.compile("^([A-Za-z]:#{SEPARATOR_PAT})")
     else
@@ -26,27 +26,28 @@ module FSSM
         path
       end
     end
-    
+
     def initialize(path)
       if path =~ %r{\0}
         raise ArgumentError, "path cannot contain ASCII NULLs"
       end
-      
+
       dememo
-      
+
       super(path)
     end
-    
+
     def to_path
       self
     end
-    
+
     def to_s
       "#{self}"
     end
+
     alias to_str to_s
-    
-    def to_a      
+
+    def to_a
       return @segments if @segments
       set_prefix_and_names
       @segments = @names.dup
@@ -54,136 +55,142 @@ module FSSM
       @segments.unshift(@prefix) unless @prefix.empty?
       @segments
     end
+
     alias segments to_a
-    
+
     def each_filename(&block)
       to_a.each(&block)
     end
-    
+
     def ascend
       parts = to_a
       parts.length.downto(1) do |i|
         yield self.class.join(parts[0, i])
       end
     end
-    
+
     def descend
       parts = to_a
       1.upto(parts.length) do |i|
         yield self.class.join(parts[0, i])
       end
     end
-    
+
     def root?
       set_prefix_and_names
       @names.empty? && !@prefix.empty?
     end
-    
+
     def parent
       self + '..'
     end
-    
+
     def relative?
       set_prefix_and_names
       @prefix.empty?
     end
-    
+
     def absolute?
       !relative?
     end
-    
+
     def +(path)
       dup << path
     end
-    
+
     def <<(path)
       replace(join(path).cleanpath!)
     end
-    
+
     def cleanpath!
       parts = to_a
       final = []
 
       parts.each do |part|
         case part
-          when '.'          then next
-          when '..'         then
+          when '.' then
+            next
+          when '..' then
             case final.last
-              when '..'     then final.push('..')
-              when nil      then final.push('..')
-              else          final.pop
+              when '..' then
+                final.push('..')
+              when nil then
+                final.push('..')
+              else
+                final.pop
             end
-          else final.push(part)
+          else
+            final.push(part)
         end
       end
 
       replace(final.empty? ? Dir.pwd : File.join(*final))
     end
-    
+
     def cleanpath
       dup.cleanpath!
     end
-    
+
     def realpath
-       raise unless self.exist?
+      raise unless self.exist?
 
-       if File.symlink?(self)
-          file = self.dup
+      if File.symlink?(self)
+        file = self.dup
 
-          while true
-             file = File.join(File.dirname(file), File.readlink(file))
-             break unless File.symlink?(file)
-          end
+        while true
+          file = File.join(File.dirname(file), File.readlink(file))
+          break unless File.symlink?(file)
+        end
 
-          self.class.new(file).clean
-       else
-          self.class.new(Dir.pwd) + self
-       end
+        self.class.new(file).clean
+      else
+        self.class.new(Dir.pwd) + self
+      end
     end
-    
+
     def relative_path_from(base)
       base = self.class.for(base)
-      
+
       if self.absolute? != base.absolute?
         raise ArgumentError, 'no relative path between a relative and absolute'
       end
-      
+
       if self.prefix != base.prefix
         raise ArgumentError, "different prefix: #{@prefix.inspect} and #{base.prefix.inspect}"
       end
-      
+
       base = base.cleanpath!.segments
       dest = dup.cleanpath!.segments
-      
+
       while !dest.empty? && !base.empty? && dest[0] == base[0]
         base.shift
         dest.shift
       end
-      
+
       base.shift if base[0] == '.'
       dest.shift if dest[0] == '.'
-      
+
       if base.include?('..')
         raise ArgumentError, "base directory may not contain '..'"
       end
-      
+
       path = base.fill('..') + dest
       path = self.class.join(*path)
       path = self.class.new('.') if path.empty?
-      
+
       path
     end
-    
-    def replace(path)      
+
+    def replace(path)
       if path =~ %r{\0}
         raise ArgumentError, "path cannot contain ASCII NULLs"
       end
-      
+
       dememo
-      
+
       super(path)
     end
-    
+
     def unlink
       Dir.unlink(self)
       true
@@ -191,31 +198,31 @@ module FSSM
       File.unlink(self)
       true
     end
-    
+
     def prefix
       set_prefix_and_names
       @prefix
     end
-    
+
     def names
       set_prefix_and_names
       @names
     end
-    
+
     def dememo
-      @set        = nil
-      @segments   = nil
-      @prefix     = nil
-      @names      = nil
+      @set = nil
+      @segments = nil
+      @prefix = nil
+      @names = nil
     end
-    
+
     private
-    
+
     def set_prefix_and_names
       return if @set
-      
+
       @names = []
-      
+
       if (match = PREFIX_PAT.match(self))
         @prefix = match[0].to_s
         @names += match.post_match.split(SEPARATOR_PAT)
@@ -223,10 +230,10 @@ module FSSM
         @prefix = ''
         @names += self.split(SEPARATOR_PAT)
       end
-      
+
       @names.compact!
       @names.delete('')
-      
+
       @set = true
     end
 
@@ -237,7 +244,7 @@ module FSSM
       def glob(pattern, flags=0)
         dirs = Dir.glob(pattern, flags)
         dirs.map! {|path| new(path)}
-        
+
         if block_given?
           dirs.each {|dir| yield dir}
           nil
@@ -245,62 +252,158 @@ module FSSM
           dirs
         end
       end
-      
+
       def [](pattern)
         Dir[pattern].map! {|path| new(path)}
       end
-      
+
       def pwd
         new(Dir.pwd)
       end
     end
-    
-    def entries; Dir.entries(self).map! {|e| FSSM::Pathname.new(e) }; end
-    def mkdir(mode = 0777); Dir.mkdir(self, mode); end
-    def opendir(&blk); Dir.open(self, &blk); end
-    def rmdir; Dir.rmdir(self); end
 
-    def chdir 
+    def entries
+      Dir.entries(self).map! {|e| FSSM::Pathname.new(e) }
+    end
+
+    def mkdir(mode = 0777)
+      Dir.mkdir(self, mode)
+    end
+
+    def opendir(&blk)
+      Dir.open(self, &blk)
+    end
+
+    def rmdir
+      Dir.rmdir(self)
+    end
+
+    def chdir
       blk = lambda { yield self } if block_given?
       Dir.chdir(self, &blk)
     end
   end
 
   class Pathname
-    def blockdev?; FileTest.blockdev?(self); end
-    def chardev?; FileTest.chardev?(self); end
-    def directory?; FileTest.directory?(self); end
-    def executable?; FileTest.executable?(self); end
-    def executable_real?; FileTest.executable_real?(self); end
-    def exists?; FileTest.exists?(self); end
-    def file?; FileTest.file?(self); end
-    def grpowned?; FileTest.grpowned?(self); end
-    def owned?; FileTest.owned?(self); end
-    def pipe?; FileTest.pipe?(self); end
-    def readable?; FileTest.readable?(self); end
-    def readable_real?; FileTest.readable_real?(self); end
-    def setgid?; FileTest.setgit?(self); end
-    def setuid?; FileTest.setuid?(self); end
-    def socket?; FileTest.socket?(self); end
-    def sticky?; FileTest.sticky?(self); end
-    def symlink?; FileTest.symlink?(self); end
-    def world_readable?; FileTest.world_readable?(self); end
-    def world_writable?; FileTest.world_writable?(self); end
-    def writable?; FileTest.writable?(self); end
-    def writable_real?; FileTest.writable_real?(self); end
-    def zero?; FileTest.zero?(self); end
-    
+    def blockdev?
+      FileTest.blockdev?(self)
+    end
+
+    def chardev?
+      FileTest.chardev?(self)
+    end
+
+    def directory?
+      FileTest.directory?(self)
+    end
+
+    def executable?
+      FileTest.executable?(self)
+    end
+
+    def executable_real?
+      FileTest.executable_real?(self)
+    end
+
+    def exists?
+      FileTest.exists?(self)
+    end
+
+    def file?
+      FileTest.file?(self)
+    end
+
+    def grpowned?
+      FileTest.grpowned?(self)
+    end
+
+    def owned?
+      FileTest.owned?(self)
+    end
+
+    def pipe?
+      FileTest.pipe?(self)
+    end
+
+    def readable?
+      FileTest.readable?(self)
+    end
+
+    def readable_real?
+      FileTest.readable_real?(self)
+    end
+
+    def setgid?
+      FileTest.setgit?(self)
+    end
+
+    def setuid?
+      FileTest.setuid?(self)
+    end
+
+    def socket?
+      FileTest.socket?(self)
+    end
+
+    def sticky?
+      FileTest.sticky?(self)
+    end
+
+    def symlink?
+      FileTest.symlink?(self)
+    end
+
+    def world_readable?
+      FileTest.world_readable?(self)
+    end
+
+    def world_writable?
+      FileTest.world_writable?(self)
+    end
+
+    def writable?
+      FileTest.writable?(self)
+    end
+
+    def writable_real?
+      FileTest.writable_real?(self)
+    end
+
+    def zero?
+      FileTest.zero?(self)
+    end
+
     alias exist? exists?
   end
 
   class Pathname
-    def atime; File.atime(self); end
-    def ctime; File.ctime(self); end
-    def ftype; File.ftype(self); end
-    def lstat; File.lstat(self); end
-    def mtime; File.mtime(self); end
-    def stat; File.stat(self); end
-    def utime(atime, mtime); File.utime(self, atime, mtime); end
+    def atime
+      File.atime(self)
+    end
+
+    def ctime
+      File.ctime(self)
+    end
+
+    def ftype
+      File.ftype(self)
+    end
+
+    def lstat
+      File.lstat(self)
+    end
+
+    def mtime
+      File.mtime(self)
+    end
+
+    def stat
+      File.stat(self)
+    end
+
+    def utime(atime, mtime)
+      File.utime(self, atime, mtime)
+    end
   end
 
   class Pathname
@@ -309,42 +412,117 @@ module FSSM
         new(File.join(*parts.reject {|p| p.empty? }))
       end
     end
-    
-    def basename; self.class.new(File.basename(self)); end
-    def chmod(mode); File.chmod(mode, self); end
-    def chown(owner, group); File.chown(owner, group, self); end
-    def dirname; self.class.new(File.dirname(self)); end
-    def expand_path(from = nil); self.class.new(File.expand_path(self, from)); end
-    def extname; File.extname(self); end
-    def fnmatch?(pat, flags = 0); File.fnmatch(pat, self, flags); end
-    def join(*parts); self.class.join(self, *parts); end
-    def lchmod(mode); File.lchmod(mode, self); end
-    def lchown(owner, group); File.lchown(owner, group, self); end
-    def link(to); File.link(self, to); end
-    def open(mode = 'r', perm = nil, &blk); File.open(self, mode, perm, &blk); end
-    def readlink; self.class.new(File.readlink(self)); end
-    def rename(to); File.rename(self, to); replace(to); end
-    def size; File.size(self); end
-    def size?; File.size?(self); end
-    def symlink(to); File.symlink(self, to); end
-    def truncate; File.truncate(self); end
+
+    def basename
+      self.class.new(File.basename(self))
+    end
+
+    def chmod(mode)
+      File.chmod(mode, self)
+    end
+
+    def chown(owner, group)
+      File.chown(owner, group, self)
+    end
+
+    def dirname
+      self.class.new(File.dirname(self))
+    end
+
+    def expand_path(from = nil)
+      self.class.new(File.expand_path(self, from))
+    end
+
+    def extname
+      File.extname(self)
+    end
+
+    def fnmatch?(pat, flags = 0)
+      File.fnmatch(pat, self, flags)
+    end
+
+    def join(*parts)
+      self.class.join(self, *parts)
+    end
+
+    def lchmod(mode)
+      File.lchmod(mode, self)
+    end
+
+    def lchown(owner, group)
+      File.lchown(owner, group, self)
+    end
+
+    def link(to)
+      File.link(self, to)
+    end
+
+    def open(mode = 'r', perm = nil, &blk)
+      File.open(self, mode, perm, &blk)
+    end
+
+    def readlink
+      self.class.new(File.readlink(self))
+    end
+
+    def rename(to)
+      File.rename(self, to)
+      replace(to)
+    end
+
+    def size
+      File.size(self)
+    end
+
+    def size?
+      File.size?(self)
+    end
+
+    def symlink(to)
+      File.symlink(self, to)
+    end
+
+    def truncate
+      File.truncate(self)
+    end
   end
 
   class Pathname
-    def mkpath; self.class.new(FileUtils.mkpath(self)); end
-    def rmtree; self.class.new(FileUtils.rmtree(self).first); end
-    def touch; self.class.new(FileUtils.touch(self).first); end
+    def mkpath
+      self.class.new(FileUtils.mkpath(self))
+    end
+
+    def rmtree
+      self.class.new(FileUtils.rmtree(self).first)
+    end
+
+    def touch
+      self.class.new(FileUtils.touch(self).first)
+    end
   end
 
   class Pathname
-    def each_line(sep = $/, &blk); IO.foreach(self, sep, &blk); end
-    def read(len = nil, off = 0); IO.read(self, len, off); end
-    def readlines(sep = $/); IO.readlines(self, sep); end
-    def sysopen(mode = 'r', perm = nil); IO.sysopen(self, mode, perm); end
+    def each_line(sep = $/, &blk)
+      IO.foreach(self, sep, &blk)
+    end
+
+    def read(len = nil, off = 0)
+      IO.read(self, len, off)
+    end
+
+    def readlines(sep = $/)
+      IO.readlines(self, sep)
+    end
+
+    def sysopen(mode = 'r', perm = nil)
+      IO.sysopen(self, mode, perm)
+    end
   end
 
   class Pathname
-    def find; Find.find(self) {|path| yield FSSM::Pathname.new(path) }; end
+    def find
+      Find.find(self) {|path| yield FSSM::Pathname.new(path) }
+    end
   end
 
 end