fssm 0.2.5 → 0.2.6

data/README.markdown

@@ -1,3 +1,5 @@
+# FSSM ![project status](http://stillmaintained.com/ttilley/fssm.png) #
+
 Monitor API
 ===========
 
@@ -12,70 +14,70 @@ Monitor with path
 
 This form watches one path, and enters the run loop automatically. The first parameter is the path to watch, and the second parameter is an optional glob pattern or array of glob patterns that a file must match in order to trigger a callback. The default glob, if ommitted, is `'**/*'`.
 
-	FSSM.monitor('/some/directory/', '**/*') do
-	  update {|base, relative|}
-	  delete {|base, relative|}
-	  create {|base, relative|}
-	end
+    FSSM.monitor('/some/directory/', '**/*') do
+      update {|base, relative|}
+      delete {|base, relative|}
+      create {|base, relative|}
+    end
 
 Monitor with block
 ------------------
 
 This form watches one or more paths, and enters the run loop automatically. The glob configuration call can be ommitted, and defaults to `'**/*'`.
 
-	FSSM.monitor do
-	  path '/some/directory/' do
-	    glob '**/*.yml'
-   
-	    update {|base, relative|}
-	    delete {|base, relative|}
-	    create {|base, relative|}
-	  end
- 
-	  path '/some/other/directory/' do
-	    update {|base, relative|}
-	    delete {|base, relative|}
-	    create {|base, relative|}
-	  end
-	end
+    FSSM.monitor do
+      path '/some/directory/' do
+        glob '**/*.yml'
+
+        update {|base, relative|}
+        delete {|base, relative|}
+        create {|base, relative|}
+      end
+
+      path '/some/other/directory/' do
+        update {|base, relative|}
+        delete {|base, relative|}
+        create {|base, relative|}
+      end
+    end
 
 Monitor object
 --------------
 
 This form doesn't enter the run loop automatically.
 
-	monitor = FSSM::Monitor.new
+    monitor = FSSM::Monitor.new
 
-	monitor.path '/some/directory/' do
-	  update {|base, relative|}
-	  delete {|base, relative|}
-	  create {|base, relative|}
-	end
+    monitor.path '/some/directory/' do
+      update {|base, relative|}
+      delete {|base, relative|}
+      create {|base, relative|}
+    end
 
-	monitor.run
+    monitor.run
 
 Monitoring directories
 ----------------------
 
-By default, FSSM monitors changes in files only. To enable monitoring of files and directories, pass option `directories => true` in a hash to the monitor. For example:
+By default, FSSM monitors changes in files only. To enable monitoring of files and directories, pass option `directories => true` in a hash to the monitor. Please note that this may not work as expected in all backends. For example:
 
-	FSSM::Monitor.new(:directories => true)
-	FSSM.monitor(dir, file_glob, :directories => true)
+    FSSM::Monitor.new(:directories => true)
+    FSSM.monitor(dir, file_glob, :directories => true)
 
 When directories are monitored, there's an additional third argument to the callbacks. Instead of
 
-	FSSM.monitor('/some/directory/', '**/*') do
-	  update {|base, relative|}
-	  delete {|base, relative|}
-	  create {|base, relative|}
-	end
+    FSSM.monitor('/some/directory/', '**/*') do
+      update {|base, relative|}
+      delete {|base, relative|}
+      create {|base, relative|}
+    end
 
 you get this:
 
-	FSSM.monitor('/some/directory/', '**/*', :directories => true) do
-	  update {|base, relative, type|}
-	  delete {|base, relative, type|}
-	  create {|base, relative, type|}
-	end
+    FSSM.monitor('/some/directory/', '**/*', :directories => true) do
+      update {|base, relative, type|}
+      delete {|base, relative, type|}
+      create {|base, relative, type|}
+    end
 
 The value of `type` argument is either `:file` or `:directory`.

data/Rakefile

@@ -1,11 +1,11 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--format', 'specdoc']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ["--color", "--backtrace", "--format", "documentation"]
+  spec.verbose = true
 end
 
 task :default => :spec

data/example.rb

@@ -6,7 +6,7 @@ require 'rubygems'
 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

@@ -3,22 +3,22 @@ $:.push File.expand_path("../lib", __FILE__)
 require "fssm/version"
 
 Gem::Specification.new do |s|
-  s.name        = "fssm"
-  s.version     = FSSM::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Travis Tilley", "Nathan Weizenbaum", "Chris Eppstein",
-                    "Jonathan Castello", "Tuomas Kareinen"]
-  s.email       = ["ttilley@gmail.com"]
-  s.homepage    = "https://github.com/ttilley/fssm"
-  s.summary     = %q{File System State Monitor}
-  s.description = %q{The File System State Monitor keeps track of the state of any number of paths and will fire events when said state changes (create/update/delete). FSSM supports using FSEvents on MacOS, Inotify on GNU/Linux, and polling anywhere else.}
+  s.name              = "fssm"
+  s.version           = FSSM::VERSION
+  s.platform          = Gem::Platform::RUBY
+  s.authors           = ["Travis Tilley", "Nathan Weizenbaum", "Chris Eppstein",
+                         "Jonathan Castello", "Tuomas Kareinen"]
+  s.email             = ["ttilley@gmail.com"]
+  s.homepage          = "https://github.com/ttilley/fssm"
+  s.summary           = %q{File System State Monitor}
+  s.description       = %q{The File System State Monitor keeps track of the state of any number of paths and will fire events when said state changes (create/update/delete). FSSM supports using FSEvents on MacOS, Inotify on GNU/Linux, and polling anywhere else.}
 
   s.rubyforge_project = "fssm"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths     = ["lib"]
 
-  s.add_development_dependency "rspec", "1.3.0"
+  s.add_development_dependency "rspec", ">= 2.4.0"
 end

data/lib/fssm.rb

@@ -1,6 +1,7 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
+#noinspection ALL
 module FSSM
   FileNotFoundError = Class.new(StandardError)
   FileNotRealError  = Class.new(StandardError)
@@ -8,7 +9,7 @@ module FSSM
 
   class << self
     def dbg(msg=nil)
-      STDERR.puts(msg)
+      STDERR.puts("FSSM -> #{msg}")
     end
 
     def monitor(*args, &block)

data/lib/fssm/backends/inotify.rb

@@ -5,7 +5,7 @@ module FSSM::Backends
     end
 
     def add_handler(handler, preload=true)
-      @notifier.watch(handler.path.to_s, :recursive, :attrib, :modify, :create,
+      @notifier.watch(handler.path.to_s, :recursive, :attrib, :close_write, :create,
                       :delete, :delete_self, :moved_from, :moved_to, :move_self) do |event|
         path = FSSM::Pathname.for(event.absolute_name)
         path = path.dirname unless event.name == "" # Event on root directory

data/lib/fssm/backends/rbfsevent.rb

@@ -1,26 +1,42 @@
 module FSSM::Backends
   class RBFSEvent
     def initialize
-      @fsevent = FSEvent.new
+      @handlers = []
     end
 
     def add_handler(handler, preload=true)
-      @fsevent.watch handler.path.to_s do |paths|
-        paths.each do |path|
-          handler.refresh(path)
-        end
-      end
-
+      @handlers << handler
       handler.refresh(nil, true) if preload
     end
 
     def run
       begin
+        @fsevent = FSEvent.new
+        @fsevent.watch(temporary_multipath_hack) do |paths|
+          paths.each do |path|
+            temporary_multipath_handler(path)
+          end
+        end
         @fsevent.run
       rescue Interrupt
         @fsevent.stop
       end
     end
 
+    def temporary_multipath_handler(path)
+      @handlers.each do |handler|
+        handler_path = File.join(handler.path.to_s, "")
+        if handler_path.start_with?(path)
+          handler.refresh(path)
+          break
+        end
+      end
+    end
+
+    def temporary_multipath_hack
+      @handlers = @handlers.sort {|x,y| y.path.to_pathname.segments.length <=> x.path.to_pathname.segments.length}
+      return @handlers.map {|handler| handler.path.to_s}
+    end
+
   end
 end

data/lib/fssm/monitor.rb

@@ -8,12 +8,18 @@ class FSSM::Monitor
     path = create_path(path, glob, &block)
     @backend.add_handler(FSSM::State::Directory.new(path, @options))
     path
+  rescue FSSM::FileNotRealError => e
+    FSSM.dbg("#{e}")
+    nil
   end
 
   def file(path=nil, glob=nil, &block)
     path = create_path(path, glob, &block)
     @backend.add_handler(FSSM::State::File.new(path))
     path
+  rescue FSSM::FileNotRealError => e
+    FSSM.dbg("#{e}")
+    nil
   end
 
   def run

data/lib/fssm/path.rb

@@ -85,6 +85,7 @@ class FSSM::Path
     @path = FSSM::Pathname.for(path).expand_path
     raise FSSM::FileNotFoundError, "No such file or directory - #{@path}" unless @path.exist?
     raise FSSM::FileNotRealError, "Path is virtual - #{@path}" if @path.is_virtual?
+    @path = @path.realpath
   end
 
   def set_glob(glob)

data/lib/fssm/support.rb

@@ -4,7 +4,7 @@ module FSSM::Support
   class << self
     def usable_backend
       choice = case
-                 when mac? && !jruby? && carbon_core?
+                 when mac? && !lion? && !jruby? && carbon_core?
                    'FSEvents'
                  when mac? && rb_fsevent?
                    'RBFSEvent'
@@ -21,8 +21,8 @@ module FSSM::Support
                     when linux?
                       'rb-inotify'
                   end
-        STDERR.puts("FSSM: An optimized backend is available for this platform!")
-        STDERR.puts("    gem install #{optimal}")
+        FSSM.dbg("An optimized backend is available for this platform!")
+        FSSM.dbg("    gem install #{optimal}")
       end
 
       choice
@@ -40,6 +40,10 @@ module FSSM::Support
       Config::CONFIG['target_os'] =~ /darwin/i
     end
 
+    def lion?
+      Config::CONFIG['target_os'] =~ /darwin11/i
+    end
+
     def linux?
       Config::CONFIG['target_os'] =~ /linux/i
     end
@@ -57,6 +61,9 @@ module FSSM::Support
     def rb_fsevent?
       begin
         require 'rb-fsevent'
+        if defined?(FSEvent::VERSION)
+          FSEvent::VERSION.to_f >= 0.4
+        end
         true
       rescue LoadError
         false

data/lib/fssm/version.rb

@@ -1,3 +1,3 @@
 module FSSM
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/profile/prof-cache.rb

@@ -5,7 +5,7 @@ require 'fssm'
 require 'rubygems'
 require 'ruby-prof'
 
-$test_path = FSSM::Pathname.new('..').expand_path
+$test_path  = FSSM::Pathname.new('..').expand_path
 $test_files = FSSM::Pathname.glob(File.join($test_path, '**', '*'))
 
 RubyProf.start
@@ -33,8 +33,8 @@ cache = FSSM::Tree::Cache.new
   print "\n\n"
 end
 
-result = RubyProf.stop
-output = File.new('prof.html', 'w+')
+result  = RubyProf.stop
+output  = File.new('prof.html', 'w+')
 
 printer = RubyProf::GraphHtmlPrinter.new(result)
 printer.print(output, :min_percent => 1)

data/profile/prof-pathname-rubinius.rb

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'pathname'
 
-$test_path = "#{Pathname.new('..').expand_path}"
+$test_path  = "#{Pathname.new('..').expand_path}"
 $iterations = 900000
 
 if ARGV.first == 'native'
@@ -20,7 +20,7 @@ if ARGV.first == 'native'
   end
 
   $iterations.times do |num|
-    p = ::Pathname.new($test_path)
+    p        = ::Pathname.new($test_path)
     segments = p.segments
   end
 else
@@ -29,7 +29,7 @@ else
   require 'fssm'
 
   $iterations.times do |num|
-    p = FSSM::Pathname.new($test_path)
+    p        = FSSM::Pathname.new($test_path)
     segments = p.segments
   end
 end

data/profile/prof-pathname.rb

@@ -6,7 +6,7 @@ require 'pathname'
 require 'rubygems'
 require 'ruby-prof'
 
-$test_path = "#{Pathname.new('..').expand_path}"
+$test_path  = "#{Pathname.new('..').expand_path}"
 $iterations = 90000
 
 class Pathname
@@ -32,15 +32,15 @@ $iterations.times do |num|
   puts "FSSM::Pathname iteration #{iteration}"
 
   RubyProf.resume
-  p = FSSM::Pathname.new($test_path)
+  p        = FSSM::Pathname.new($test_path)
   segments = p.segments
   RubyProf.pause
 end
 
 puts "\nFSSM Pathname profile finished\n\n"
 
-result = RubyProf.stop
-output = File.new('prof-fssm-pathname.html', 'w+')
+result  = RubyProf.stop
+output  = File.new('prof-fssm-pathname.html', 'w+')
 
 printer = RubyProf::GraphHtmlPrinter.new(result)
 printer.print(output, :min_percent => 1)
@@ -54,15 +54,15 @@ $iterations.times do |num|
   puts "::Pathname iteration #{iteration}"
 
   RubyProf.resume
-  p = ::Pathname.new($test_path)
+  p        = ::Pathname.new($test_path)
   segments = p.segments
   RubyProf.pause
 end
 
 puts "\nruby Pathname profile finished\n\n"
 
-result = RubyProf.stop
-output = File.new('prof-plain-pathname.html', 'w+')
+result  = RubyProf.stop
+output  = File.new('prof-plain-pathname.html', 'w+')
 
 printer = RubyProf::GraphHtmlPrinter.new(result)
 printer.print(output, :min_percent => 1)

data/spec/count_down_latch.rb

@@ -9,7 +9,7 @@ class CountDownLatch
   def initialize(to)
     @count = to.to_i
     raise ArgumentError, "cannot count down from negative integer" unless @count >= 0
-    @lock = Mutex.new
+    @lock      = Mutex.new
     @condition = ConditionVariable.new
   end
 
@@ -37,7 +37,7 @@ if $0 == __FILE__
 
     def test_basic_latch_usage
       latch = CountDownLatch.new(1)
-      name = "foo"
+      name  = "foo"
       Thread.new do
         name = "bar"
         latch.count_down
@@ -49,7 +49,7 @@ if $0 == __FILE__
 
     def test_basic_latch_usage_inverted
       latch = CountDownLatch.new(1)
-      name = "foo"
+      name  = "foo"
       Thread.new do
         latch.wait
         assert_equal(0, latch.count)
@@ -67,7 +67,7 @@ if $0 == __FILE__
 
     def test_count_down_twice_with_thread
       latch = CountDownLatch.new(2)
-      name = "foo"
+      name  = "foo"
       Thread.new do
         latch.count_down
         name = "bar"
@@ -80,7 +80,7 @@ if $0 == __FILE__
 
     def test_count_down_twice_with_two_parallel_threads
       latch = CountDownLatch.new(2)
-      name = "foo"
+      name  = "foo"
       Thread.new { latch.count_down }
       Thread.new do
         name = "bar"
@@ -93,7 +93,7 @@ if $0 == __FILE__
 
     def test_count_down_twice_with_two_chained_threads
       latch = CountDownLatch.new(2)
-      name = "foo"
+      name  = "foo"
       Thread.new do
         latch.count_down
         Thread.new do
@@ -108,8 +108,8 @@ if $0 == __FILE__
 
     def test_count_down_with_multiple_waiters
       proceed_latch = CountDownLatch.new(2)
-      check_latch = CountDownLatch.new(2)
-      results = {}
+      check_latch   = CountDownLatch.new(2)
+      results       = {}
       Thread.new do
         proceed_latch.wait
         results[:first] = 1
@@ -131,9 +131,9 @@ if $0 == __FILE__
 
     def test_interleaved_latches
       change_1_latch = CountDownLatch.new(1)
-      check_latch = CountDownLatch.new(1)
+      check_latch    = CountDownLatch.new(1)
       change_2_latch = CountDownLatch.new(1)
-      name = "foo"
+      name           = "foo"
       Thread.new do
         name = "bar"
         change_1_latch.count_down

data/spec/monitor_spec.rb

@@ -25,9 +25,9 @@ module FSSM::MonitorSpecHelpers
   end
 
   def run_monitor(num_events_to_expect=0, options={})
-    event_latch = CountDownLatch.new(num_events_to_expect)
-    @handler_results = Hash.new {|hash, key| hash[key] = []}
-    thread = Thread.new do
+    event_latch      = CountDownLatch.new(num_events_to_expect)
+    @handler_results = Hash.new { |hash, key| hash[key] = [] }
+    thread           = Thread.new do
       monitor = FSSM::Monitor.new(options)
       monitor.path(@tmp_dir) do |p|
         p.create(&create_handler(:create, event_latch))
@@ -36,7 +36,7 @@ module FSSM::MonitorSpecHelpers
       end
       monitor.run
     end
-    sleep 1   # give time for monitor to start up
+    sleep 1 # give time for monitor to start up
     yield if block_given?
     event_latch.wait
     thread.kill
@@ -126,18 +126,18 @@ describe "The File System State Monitor" do
         run_monitor(3, :directories => true) do
           FileUtils.mv @tmp_dir + "/root/yawn", @tmp_dir + "/root/old_yawn"
         end
-        @handler_results[:create].should include([@tmp_dir, 'root/old_yawn',  :directory])
-        @handler_results[:delete].should include([@tmp_dir, 'root/yawn',      :directory])
-        @handler_results[:update].should include([@tmp_dir, 'root',           :directory])
+        @handler_results[:create].should include([@tmp_dir, 'root/old_yawn', :directory])
+        @handler_results[:delete].should include([@tmp_dir, 'root/yawn', :directory])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
       end
 
       it "should call create, update, and delete callbacks upon directory moving to another directory" do
         run_monitor(3, :directories => true) do
           FileUtils.mv @tmp_dir + "/root/yawn", @tmp_dir + "/old_yawn"
         end
-        @handler_results[:create].should include([@tmp_dir, 'old_yawn',   :directory])
-        @handler_results[:delete].should include([@tmp_dir, 'root/yawn',  :directory])
-        @handler_results[:update].should include([@tmp_dir, 'root',       :directory])
+        @handler_results[:create].should include([@tmp_dir, 'old_yawn', :directory])
+        @handler_results[:delete].should include([@tmp_dir, 'root/yawn', :directory])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
       end
 
       it "should call create, update, and delete callbacks upon file renaming in the same directory" do
@@ -145,55 +145,55 @@ describe "The File System State Monitor" do
           FileUtils.mv @tmp_dir + "/root/file.rb", @tmp_dir + "/root/old_file.rb"
         end
         @handler_results[:create].should include([@tmp_dir, 'root/old_file.rb', :file])
-        @handler_results[:delete].should include([@tmp_dir, 'root/file.rb',     :file])
-        @handler_results[:update].should include([@tmp_dir, 'root',             :directory])
+        @handler_results[:delete].should include([@tmp_dir, 'root/file.rb', :file])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
       end
 
       it "should call create, update, and delete callbacks upon file moving to another directory" do
         run_monitor(3, :directories => true) do
           FileUtils.mv @tmp_dir + "/root/file.rb", @tmp_dir + "/old_file.rb"
         end
-        @handler_results[:create].should include([@tmp_dir, 'old_file.rb',  :file])
+        @handler_results[:create].should include([@tmp_dir, 'old_file.rb', :file])
         @handler_results[:delete].should include([@tmp_dir, 'root/file.rb', :file])
-        @handler_results[:update].should include([@tmp_dir, 'root',         :directory])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
       end
 
       it "should call delete callbacks upon directory structure deletion, in reverse order" do
         expected_delete_events = [
-          ['root/yawn',           :directory],
-          ['root/moo/cow.txt',    :file],
-          ['root/moo',            :directory],
-          ['root/file.yml',       :file],
-          ['root/file.rb',        :file],
-          ['root/file.css',       :file],
-          ['root/duck/quack.txt', :file],
-          ['root/duck',           :directory],
-          ['root',                :directory]
+            ['root/yawn', :directory],
+            ['root/moo/cow.txt', :file],
+            ['root/moo', :directory],
+            ['root/file.yml', :file],
+            ['root/file.rb', :file],
+            ['root/file.css', :file],
+            ['root/duck/quack.txt', :file],
+            ['root/duck', :directory],
+            ['root', :directory]
         ]
         run_monitor(expected_delete_events.size, :directories => true) do
           FileUtils.rm_rf @tmp_dir + '/.'
         end
         @handler_results[:create].should == []
-        @handler_results[:delete].should == expected_delete_events.map {|(file, type)| [@tmp_dir, file, type]}
+        @handler_results[:delete].should == expected_delete_events.map { |(file, type)| [@tmp_dir, file, type] }
         @handler_results[:update].should == []
       end
 
       it "should call create callbacks upon directory structure creation, in order" do
         expected_create_events = [
-          ['new_root',                :directory],
-          ['new_root/duck',           :directory],
-          ['new_root/duck/quack.txt', :file],
-          ['new_root/file.css',       :file],
-          ['new_root/file.rb',        :file],
-          ['new_root/file.yml',       :file],
-          ['new_root/moo',            :directory],
-          ['new_root/moo/cow.txt',    :file],
-          ['new_root/yawn',           :directory]
+            ['new_root', :directory],
+            ['new_root/duck', :directory],
+            ['new_root/duck/quack.txt', :file],
+            ['new_root/file.css', :file],
+            ['new_root/file.rb', :file],
+            ['new_root/file.yml', :file],
+            ['new_root/moo', :directory],
+            ['new_root/moo/cow.txt', :file],
+            ['new_root/yawn', :directory]
         ]
         run_monitor(expected_create_events.size, :directories => true) do
           FileUtils.cp_r @tmp_dir + '/root/.', @tmp_dir + '/new_root'
         end
-        @handler_results[:create].should == expected_create_events.map {|(file, type)| [@tmp_dir, file, type]}
+        @handler_results[:create].should == expected_create_events.map { |(file, type)| [@tmp_dir, file, type] }
         @handler_results[:delete].should == []
         @handler_results[:update].should == []
       end

data/spec/path_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe "The File System State Monitor" do
   describe "paths" do
     it "should accept a valid filesystem directory" do
-      lambda {FSSM::Path.new("#{@watch_root}")}.should_not raise_error
+      lambda { FSSM::Path.new("#{@watch_root}") }.should_not raise_error
     end
 
     it "should not accept an invalid filesystem directory" do
-      lambda {FSSM::Path.new('/does/not/exist/kthxbye')}.should raise_error
+      lambda { FSSM::Path.new('/does/not/exist/kthxbye') }.should raise_error
     end
 
     it "should default the path to the current directory" do
@@ -28,7 +28,7 @@ describe "The File System State Monitor" do
     end
 
     it "should accept an optional option parameter" do
-      lambda {FSSM::Path.new('.', '**/*.yml', :foo => :bar)}.should_not raise_error
+      lambda { FSSM::Path.new('.', '**/*.yml', :foo => :bar) }.should_not raise_error
     end
 
     it "should default the glob to ['**/*']" do
@@ -37,22 +37,22 @@ describe "The File System State Monitor" do
     end
 
     it "should accept a callback for update events" do
-      path = FSSM::Path.new
-      callback = lambda {|base, relative| return true}
+      path     = FSSM::Path.new
+      callback = lambda { |base, relative| return true }
       path.update(&callback)
       (path.update).should == callback
     end
 
     it "should accept a callback for delete events" do
-      path = FSSM::Path.new
-      callback = lambda {|base, relative| return true}
+      path     = FSSM::Path.new
+      callback = lambda { |base, relative| return true }
       path.delete(&callback)
       (path.delete).should == callback
     end
 
     it "should accept a callback for create events" do
-      path = FSSM::Path.new
-      callback = lambda {|base, relative| return true}
+      path     = FSSM::Path.new
+      callback = lambda { |base, relative| return true }
       path.create(&callback)
       (path.create).should == callback
     end
@@ -60,9 +60,9 @@ describe "The File System State Monitor" do
     it "should accept a configuration block" do
       path = FSSM::Path.new "#{@watch_root}" do
         glob '**/*.yml'
-        update {|base, relative| 'success'}
-        delete {|base, relative| 'success'}
-        create {|base, relative| 'success'}
+        update { |base, relative| 'success' }
+        delete { |base, relative| 'success' }
+        create { |base, relative| 'success' }
       end
 
       "#{path}".should == "#{@watch_root}"
@@ -78,9 +78,9 @@ describe "The File System State Monitor" do
     it "should pass file type to callbacks as the third argument if :directories option is used" do
       path = FSSM::Path.new "#{@watch_root}", nil, :directories => true do
         glob '**/*.yml'
-        update {|base, relative, type| [base, relative, type]}
-        delete {|base, relative, type| [base, relative, type]}
-        create {|base, relative, type| [base, relative, type]}
+        update { |base, relative, type| [base, relative, type] }
+        delete { |base, relative, type| [base, relative, type] }
+        create { |base, relative, type| [base, relative, type] }
       end
 
       "#{path}".should == "#{@watch_root}"

data/spec/spec_helper.rb

@@ -1,15 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
-require 'pathname'
 require 'rubygems'
+require 'bundler/setup'
 require 'fssm'
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before :all do
-    @watch_root = Pathname.new(__FILE__).dirname.join('root').expand_path
+    @watch_root = FSSM::Pathname.new(__FILE__).dirname.join('root').expand_path
   end
 end

metadata

@@ -1,36 +1,43 @@
 --- !ruby/object:Gem::Specification 
 name: fssm
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.5
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
-  - Travis Tilley
-  - Nathan Weizenbaum
-  - Chris Eppstein
-  - Jonathan Castello
-  - Tuomas Kareinen
+- Travis Tilley
+- Nathan Weizenbaum
+- Chris Eppstein
+- Jonathan Castello
+- Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -05:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.3.0
-    type: :development
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :development
+  version_requirements: *id001
 description: The File System State Monitor keeps track of the state of any number of paths and will fire events when said state changes (create/update/delete). FSSM supports using FSEvents on MacOS, Inotify on GNU/Linux, and polling anywhere else.
 email: 
-  - ttilley@gmail.com
+- ttilley@gmail.com
 executables: []
 
 extensions: []
@@ -38,42 +45,42 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - Gemfile
-  - LICENSE
-  - README.markdown
-  - Rakefile
-  - example.rb
-  - fssm.gemspec
-  - lib/fssm.rb
-  - lib/fssm/backends/fsevents.rb
-  - lib/fssm/backends/inotify.rb
-  - lib/fssm/backends/polling.rb
-  - lib/fssm/backends/rbfsevent.rb
-  - lib/fssm/backends/rubycocoa/fsevents.rb
-  - lib/fssm/monitor.rb
-  - lib/fssm/path.rb
-  - lib/fssm/pathname.rb
-  - lib/fssm/state/directory.rb
-  - lib/fssm/state/file.rb
-  - lib/fssm/support.rb
-  - lib/fssm/tree.rb
-  - lib/fssm/version.rb
-  - profile/prof-cache.rb
-  - profile/prof-fssm-pathname.html
-  - profile/prof-pathname-rubinius.rb
-  - profile/prof-pathname.rb
-  - profile/prof-plain-pathname.html
-  - profile/prof.html
-  - spec/count_down_latch.rb
-  - spec/monitor_spec.rb
-  - spec/path_spec.rb
-  - spec/root/duck/quack.txt
-  - spec/root/file.css
-  - spec/root/file.rb
-  - spec/root/file.yml
-  - spec/root/moo/cow.txt
-  - spec/spec_helper.rb
+- .gitignore
+- Gemfile
+- LICENSE
+- README.markdown
+- Rakefile
+- example.rb
+- fssm.gemspec
+- lib/fssm.rb
+- lib/fssm/backends/fsevents.rb
+- lib/fssm/backends/inotify.rb
+- lib/fssm/backends/polling.rb
+- lib/fssm/backends/rbfsevent.rb
+- lib/fssm/backends/rubycocoa/fsevents.rb
+- lib/fssm/monitor.rb
+- lib/fssm/path.rb
+- lib/fssm/pathname.rb
+- lib/fssm/state/directory.rb
+- lib/fssm/state/file.rb
+- lib/fssm/support.rb
+- lib/fssm/tree.rb
+- lib/fssm/version.rb
+- profile/prof-cache.rb
+- profile/prof-fssm-pathname.html
+- profile/prof-pathname-rubinius.rb
+- profile/prof-pathname.rb
+- profile/prof-plain-pathname.html
+- profile/prof.html
+- spec/count_down_latch.rb
+- spec/monitor_spec.rb
+- spec/path_spec.rb
+- spec/root/duck/quack.txt
+- spec/root/file.css
+- spec/root/file.rb
+- spec/root/file.yml
+- spec/root/moo/cow.txt
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/ttilley/fssm
 licenses: []
@@ -82,33 +89,35 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: fssm
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: File System State Monitor
 test_files: 
-  - spec/count_down_latch.rb
-  - spec/monitor_spec.rb
-  - spec/path_spec.rb
-  - spec/root/duck/quack.txt
-  - spec/root/file.css
-  - spec/root/file.rb
-  - spec/root/file.yml
-  - spec/root/moo/cow.txt
-  - spec/spec_helper.rb
+- spec/count_down_latch.rb
+- spec/monitor_spec.rb
+- spec/path_spec.rb
+- spec/root/duck/quack.txt
+- spec/root/file.css
+- spec/root/file.rb
+- spec/root/file.yml
+- spec/root/moo/cow.txt
+- spec/spec_helper.rb