synchrotron 0.0.2 → 0.0.3

data/bin/synchrotron

@@ -24,7 +24,7 @@ BANNER
     opt :exclude,      "Pathname or pattern to exclude", :short => :none, :multi => true, :type => :string
     opt :exclude_from, "File containing pathnames and patterns to exclude", :short => :none, :multi => true, :type => :string
     opt :rsync_path,   "Path to the rsync binary", :short => :none, :default => '/usr/bin/rsync'
-    opt :verbosity,    "Output verbosity: debug, info, warn, error, or fatal", :short => '-V', :default => 'info'
+    opt :verbosity,    "Output verbosity: debug, verbose, info, warn, error, or fatal", :short => '-V', :default => 'info'
   end
 
   config[:remote_path] = ARGV.shift or abort("Error: Remote path not specified")

data/lib/synchrotron/ignore.rb

@@ -4,13 +4,13 @@ module Synchrotron; class Ignore
   REGEX_COMMENT = /#.*$/
   REGEX_REGEX   = /^\s*(%r(.).*\2[imxouesn]*)\s*$/i
 
-  def initialize(list = [])
+  def initialize(list = [], logger)
     @cache    = {}
     @globs    = []
     @regexes  = []
 
     @list     = list.to_a
-    @log      = Synchrotron.log
+    @log      = logger
 
     compile(@list)
   end
@@ -31,7 +31,7 @@ module Synchrotron; class Ignore
     @cache[_path] = match = @globs.any? {|glob| _path =~ glob } ||
         @regexes.any? {|regex| _path =~ regex }
 
-    @log.insane "Ignoring #{_path}" if match
+    @log.verbose "Ignoring #{_path}" if match
     match
   end
 
@@ -46,7 +46,7 @@ module Synchrotron; class Ignore
       lineno += 1
 
       # Strip comments.
-      line.sub!(REGEX_COMMENT, '')
+      line = line.sub(REGEX_COMMENT, '')
       line.strip!
 
       # Skip empty lines.
@@ -66,7 +66,7 @@ module Synchrotron; class Ignore
 
   def glob_to_regex(str)
     regex = str.gsub(/(.)/) {|c| GLOB_PATTERNS[$1] || Regexp.escape(c) }
-    Regexp.new("#{regex}$")
+    Regexp.new("#{regex}\\Z")
   end
 
 end; end

data/lib/synchrotron/logger.rb

@@ -4,12 +4,12 @@ class Logger
   attr_reader :level, :output
 
   LEVELS = {
-    :fatal  => 0,
-    :error  => 1,
-    :warn   => 2,
-    :info   => 3,
-    :debug  => 4,
-    :insane => 5
+    :fatal   => 0,
+    :error   => 1,
+    :warn    => 2,
+    :info    => 3,
+    :verbose => 4,
+    :debug   => 5
   }
 
   def initialize(level = :info, output = $stdout)

data/lib/synchrotron/version.rb

@@ -1,6 +1,6 @@
 module Synchrotron
   APP_NAME      = 'Synchrotron'
-  APP_VERSION   = '0.0.2'
+  APP_VERSION   = '0.0.3'
   APP_AUTHOR    = 'Ryan Grove'
   APP_EMAIL     = 'ryan@wonko.com'
   APP_URL       = 'http://github.com/rgrove/synchrotron/'

data/lib/synchrotron.rb

@@ -1,5 +1,6 @@
 require 'find'
 require 'pathname'
+require 'thread'
 
 require 'rb-fsevent'
 
@@ -21,19 +22,21 @@ module Synchrotron; class << self
 
       :rsync_options => [
         '--compress',
+        '--delete',
         '--human-readable',
         '--links',
+        '--out-format="--> [%o] %n %L"',
+        '--perms',
         '--recursive',
-        '--times',
-        '--verbose'
+        '--times'
       ],
 
       :rsync_path => '/usr/bin/rsync',
       :verbosity  => :info
     }.merge(config)
 
-    @ignore    = Ignore.new(@config[:exclude])
     @log       = Logger.new(@config[:verbosity])
+    @ignore    = Ignore.new(@config[:exclude], @log)
     @regex_rel = Regexp.new("^#{Regexp.escape(@config[:local_path].chomp('/'))}/?")
     @queue     = Queue.new
 
@@ -69,13 +72,15 @@ module Synchrotron; class << self
 
     @sync_thread = Thread.new do
       while changed = @queue.pop do
-        @log.info "Change detected"
+        @log.verbose "Change detected"
+
+        changed.each {|path| @log.verbose "--> #{path}" }
         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|
+    fsevent.watch(@config[:local_path], {:latency => 1}) do |paths|
       changed = coalesce_changes(paths.reject {|path| @ignore.match(path) })
       @queue << changed unless changed.empty?
     end
@@ -96,8 +101,11 @@ module Synchrotron; class << self
     @config[:exclude].each {|p| rsync_options << " --exclude #{escape_arg(p)}" }
     @config[:exclude_from].each {|f| rsync_options << " --exclude-from #{escape_arg(f)}"}
 
-    puts `#{@config[:rsync_path]} #{rsync_options} #{rsync_local} #{rsync_remote}`
-    puts
+    rsync_cmd = "#{@config[:rsync_path]} #{rsync_options} #{rsync_local} #{rsync_remote}"
+
+    @log.debug rsync_cmd
+
+    `#{rsync_cmd}`.each_line {|line| @log.info line }
   end
 
   private

metadata

@@ -1,58 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: synchrotron
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ryan Grove
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-07 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 13
-        version: "1.13"
+      - !ruby/object:Gem::Version
+        version: '1.13'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.13'
 description: 
 email: ryan@wonko.com
-executables: 
+executables:
 - synchrotron
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/synchrotron
 - lib/synchrotron/ignore.rb
 - lib/synchrotron/logger.rb
@@ -60,39 +57,29 @@ files:
 - lib/synchrotron/stream.rb
 - lib/synchrotron/version.rb
 - lib/synchrotron.rb
-has_rdoc: true
 homepage: http://github.com/rgrove/synchrotron/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
-      - 0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.2.0
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 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 using rsync.
+summary: Synchrotron monitors a local directory tree and performs nearly instantaneous
+  one-way synchronization of changes to a remote directory using rsync.
 test_files: []
-