synchrotron 0.0.1 → 0.0.2

data/lib/synchrotron.rb

@@ -1,13 +1,7 @@
-# Prepend this file's directory to the include path if it's not there already.
-$:.unshift(File.dirname(File.expand_path(__FILE__)))
-$:.uniq!
-
 require 'find'
 require 'pathname'
-require 'set'
-require 'osx/foundation'
 
-OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
+require 'rb-fsevent'
 
 require 'synchrotron/ignore'
 require 'synchrotron/logger'
@@ -38,9 +32,10 @@ module Synchrotron; class << self
       :verbosity  => :info
     }.merge(config)
 
-    @log       = Logger.new(@config[:verbosity])
     @ignore    = Ignore.new(@config[:exclude])
+    @log       = Logger.new(@config[:verbosity])
     @regex_rel = Regexp.new("^#{Regexp.escape(@config[:local_path].chomp('/'))}/?")
+    @queue     = Queue.new
 
     @config[:rsync_options] << '--dry-run' if @config[:dry_run]
 
@@ -48,20 +43,6 @@ module Synchrotron; class << self
     @config[:exclude_from] << local_exclude_file if File.exist?(local_exclude_file)
     @config[:exclude_from].each {|filename| @ignore.add_file(filename) }
 
-    @callback = proc do |stream, context, event_count, paths, marks, event_ids|
-      changed = Set.new
-      paths.regard_as('*')
-      event_count.times {|i| changed.add(paths[i]) unless @ignore.match(paths[i]) }
-
-      changed = coalesce_changes(changed)
-      return if changed.empty?
-
-      @log.info "Change detected"
-      changed.each {|path| sync(path) }
-    end
-
-    @stream  = Stream.new(config[:local_path], @callback)
-
     @log.info "Local path : #{@config[:local_path]}"
     @log.info "Remote path: #{@config[:remote_path]}"
   end
@@ -85,13 +66,21 @@ module Synchrotron; class << self
 
   def monitor
     @log.info "Watching for changes"
-    @stream.start
 
-    begin
-      OSX.CFRunLoopRun()
-    rescue Interrupt
-      @stream.release
+    @sync_thread = Thread.new do
+      while changed = @queue.pop do
+        @log.info "Change detected"
+        changed.each {|path| sync(path) if File.exist?(path) }
+      end
+    end
+
+    fsevent = FSEvent.new
+    fsevent.watch(@config[:local_path], {:latency => 5, :no_defer => true}) do |paths|
+      changed = coalesce_changes(paths.reject {|path| @ignore.match(path) })
+      @queue << changed unless changed.empty?
     end
+
+    fsevent.run
   end
 
   def relative_path(path)

data/lib/synchrotron/version.rb

@@ -1,9 +1,9 @@
 module Synchrotron
   APP_NAME      = 'Synchrotron'
-  APP_VERSION   = '0.0.1'
+  APP_VERSION   = '0.0.2'
   APP_AUTHOR    = 'Ryan Grove'
   APP_EMAIL     = 'ryan@wonko.com'
   APP_URL       = 'http://github.com/rgrove/synchrotron/'
-  APP_COPYRIGHT = 'Copyright (c) 2009 Ryan Grove <ryan@wonko.com>. All ' <<
+  APP_COPYRIGHT = 'Copyright (c) 2012 Ryan Grove <ryan@wonko.com>. All ' <<
                   'rights reserved.'
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: synchrotron
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,19 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -08:00
+date: 2012-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: rb-fsevent
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
+        version: 0.9.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 13
         version: "1.13"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: ryan@wonko.com
 executables: 
@@ -32,12 +54,12 @@ extra_rdoc_files: []
 
 files: 
 - bin/synchrotron
-- lib/synchrotron.rb
 - lib/synchrotron/ignore.rb
 - lib/synchrotron/logger.rb
 - lib/synchrotron/scanner.rb
 - lib/synchrotron/stream.rb
 - lib/synchrotron/version.rb
+- lib/synchrotron.rb
 has_rdoc: true
 homepage: http://github.com/rgrove/synchrotron/
 licenses: []
@@ -51,20 +73,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
-  version: 
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 2
+      - 0
+      version: 1.2.0
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Synchrotron monitors a local directory tree and performs nearly instantaneous one-way synchronization of changes to a remote directory.
+summary: Synchrotron monitors a local directory tree and performs nearly instantaneous one-way synchronization of changes to a remote directory using rsync.
 test_files: []