rearrange furniture

bin/unison-watch

@@ -9,19 +9,165 @@ require 'daemons'
 
 ENV['PROFILE'] ||= 'default'
 
-TRANSFER_LOG = '~/unison.log'
-SYNC_CHECK_COUNT = 600
-SYNC_CHECK_TIME = 0.1
 
-@queue = Atomic.new([])
+class UnisonProfile
-@sync_now = false
+  def initialize(which = ENV['PROFILE'])
+    @which = which
+  end
 
-def <<(dirs)
+  def local_root
-  @queue.update { |q| q += [ dirs ].flatten ; q }
+    roots.find { |root| root[%r{^/}] }
+  end
+
+  def roots
+    @roots ||= lines.find_all { |line| line[%r{^root}] }.collect { |line| value_of(line) }
+  end
+
+  def lines
+    return @lines if @lines
+
+    @lines = File.readlines(File.expand_path("~/.unison/#{@which}.prf"))
+
+    includes = []
+
+    @lines.each do |line|
+      if file = line[%r{^include (.*)}, 1]
+        includes += File.readlines(File.expand_path("~/.unison/#{file}"))
+      end
+    end
+
+    @lines += includes
+  end
+
+  def paths
+    @paths ||= lines.find_all { |line| line[%r{^path}] }.collect { |line| value_of(line) }
+  end
+
+  def value_of(line)
+    line[%r{=(.*)$}, 1].strip
+  end
 end
-public :<<
 
-def check
+class UnisonWatcher < Qt::Application
+  TRANSFER_LOG = '~/unison.log'
+  SYNC_CHECK_COUNT = 600
+  SYNC_CHECK_TIME = 0.1
+
+  def initialize(*args)
+    super(*args)
+
+    @queue = Atomic.new([])
+    @sync_now = false
+    @exiting = false
+    @active = true
+  end
+
+  def <<(dirs)
+    @queue.update { |q| q += [ dirs ].flatten ; q }
+  end
+
+  def profile
+    @profile ||= UnisonProfile.new
+  end
+
+  def watch
+    require 'rbconfig'
+
+    watcher = Thread.new do
+      while !Thread.current[:app]; sleep 0.1; end
+
+      begin
+        @watch = nil
+
+        case RbConfig::CONFIG['host_os']
+        when /darwin/
+          require 'rb-fsevent'
+          @watch = FSEvent.new
+          @watch.watch Thread.current[:paths], :latency => 0.1 do |directories|
+            Thread.current[:app] << directories
+          end
+        when /linux/
+          require 'rb-inotify'
+          @watch = INotify::Notifier.new
+          Thread.current[:paths].each do |path|
+            @watch.watch path, :recursive, :modify, :create, :delete do |event|
+              Thread.current[:app] << event.absolute_name
+            end
+          end
+        end
+
+        @watch.run
+      rescue => e
+        puts e.message
+        puts e.backtrace.join("\n")
+        exit
+      end
+    end
+
+    watcher[:paths] = profile.paths.collect { |path| File.join(profile.local_root, path) }
+    watcher[:app] = self
+  end
+
+  def menu
+    menu = Qt::Menu.new
+
+    @status = Qt::Action.new("Unison watch idle.", menu)
+    @status.enabled = false
+
+    sync_now = Qt::Action.new("Sync now", menu)
+    sync_now.connect(SIGNAL :triggered) { @sync_now = true }
+
+    @active_status = Qt::Action.new("Pause syncing", menu)
+    @active_status.connect(SIGNAL :triggered) { toggle_status }
+
+    @log = Qt::Action.new("View transfer log", menu)
+    @log.connect(SIGNAL :triggered) { system %{open #{TRANSFER_LOG}} }
+
+    quit = Qt::Action.new("Quit", menu)
+    quit.connect(SIGNAL :triggered) { @exiting = true }
+
+    menu.addAction @status
+    menu.addAction @active_status
+    menu.addAction sync_now
+    menu.addSeparator
+    menu.addAction @log
+    menu.addAction quit
+
+    menu
+  end
+
+  def ui
+    icon = Qt::SystemTrayIcon.new
+    icon.contextMenu = menu
+
+    toggle_status true
+    @prior_icon = nil
+
+    while !@exiting
+      @log.enabled = File.file?(File.expand_path(TRANSFER_LOG))
+
+      if @current_icon != @prior_icon
+        icon.icon = Qt::Icon.new(File.expand_path("../../assets/#{@current_icon}.png", __FILE__))
+
+        if !@prior_icon
+          icon.show
+        end
+
+        @prior_icon = @current_icon
+      end
+
+      processEvents
+      sleep 0.1
+    end
+  end
+
+  def start
+    watch
+    check
+    ui
+  end
+
+  def check
     remote_sync_check = SYNC_CHECK_COUNT
 
     Thread.new do
@@ -73,142 +219,15 @@ def check
         end
       end
     end
-end
-
-class UnisonProfile
-  def initialize(which = ENV['PROFILE'])
-    @which = which
   end
 
-  def local_root
+  def toggle_status(set = nil)
-    roots.find { |root| root[%r{^/}] }
-  end
-
-  def roots
-    @roots ||= lines.find_all { |line| line[%r{^root}] }.collect { |line| value_of(line) }
-  end
-
-  def lines
-    return @lines if @lines
-
-    @lines = File.readlines(File.expand_path("~/.unison/#{@which}.prf"))
-
-    includes = []
-
-    @lines.each do |line|
-      if file = line[%r{^include (.*)}, 1]
-        includes += File.readlines(File.expand_path("~/.unison/#{file}"))
-      end
-    end
-
-    @lines += includes
-  end
-
-  def paths
-    @paths ||= lines.find_all { |line| line[%r{^path}] }.collect { |line| value_of(line) }
-  end
-
-  def value_of(line)
-    line[%r{=(.*)$}, 1].strip
-  end
-end
-
-profile = UnisonProfile.new
-require 'rbconfig'
-
-watcher = Thread.new do
-  while !Thread.current[:app]; sleep 0.1; end
-
-  begin
-    @watch = nil
-
-    case RbConfig::CONFIG['host_os']
-    when /darwin/
-      require 'rb-fsevent'
-      @watch = FSEvent.new
-      @watch.watch Thread.current[:paths], :latency => 0.1 do |directories|
-        Thread.current[:app] << directories
-      end
-    when /linux/
-      require 'rb-inotify'
-      @watch = INotify::Notifier.new
-      Thread.current[:paths].each do |path|
-        @watch.watch path, :recursive, :modify, :create, :delete do |event|
-          Thread.current[:app] << event.absolute_name
-        end
-      end
-    end
-
-    @watch.run
-  rescue => e
-    puts e.message
-    puts e.backtrace.join("\n")
-    exit
-  end
-end
-
-app = Qt::Application.new(ARGV)
-
-watcher[:paths] = profile.paths.collect { |path| File.join(profile.local_root, path) }
-watcher[:app] = self
-
-menu = Qt::Menu.new
-
-@status = Qt::Action.new("Unison watch idle.", menu)
-@status.enabled = false
-
-sync_now = Qt::Action.new("Sync now", menu)
-sync_now.connect(SIGNAL :triggered) { @sync_now = true }
-
-@active = true
-
-def toggle_status(set = nil)
     @active = set || !@active
 
     @active_status.text = @active ? "Pause syncing" : "Resume syncing"
     @current_icon = @active ? 'idle' : 'paused'
+  end
 end
 
-@active_status = Qt::Action.new("Pause syncing", menu)
+UnisonWatcher.new(ARGV).start
-@active_status.connect(SIGNAL :triggered) { toggle_status }
-
-log = Qt::Action.new("View transfer log", menu)
-log.connect(SIGNAL :triggered) { system %{open #{TRANSFER_LOG}} }
-
-exiting = false
-
-quit = Qt::Action.new("Quit", menu)
-quit.connect(SIGNAL :triggered) { exiting = true }
-
-menu.addAction @status
-menu.addAction @active_status
-menu.addAction sync_now
-menu.addSeparator
-menu.addAction log
-menu.addAction quit
-
-icon = Qt::SystemTrayIcon.new
-icon.contextMenu = menu
-
-toggle_status true
-@prior_icon = nil
-
-check
-
-while !exiting
-  log.enabled = File.file?(File.expand_path(TRANSFER_LOG))
-
-  if @current_icon != @prior_icon
-    icon.icon = Qt::Icon.new(File.expand_path("../../assets/#{@current_icon}.png", __FILE__))
-
-    if !@prior_icon
-      icon.show
-    end
-
-    @prior_icon = @current_icon
-  end
-
-  app.processEvents
-  sleep 0.1
-end