xrefresh-server 0.1.0 → 0.1.6

data/VERSION

@@ -0,0 +1 @@
+0.1.6

data/bin/xrefresh-server

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -rubygems
+#!/usr/bin/env ruby
 
 # This script watches modifications on the given directories, using the new # FSEvents API in Leopard.
 # Depends on rubycocoa!
@@ -7,38 +7,27 @@
 # Based on code by Dave Dribin
 # http://www.dribin.org/dave/blog/archives/2008/01/04/fswatch/
 
+require "rubygems"
 require 'set'
 require 'optparse'
 require 'ostruct'
 require "yaml"
-begin
-    require 'xrefresh-server'
-rescue LoadError
-    require '../lib/xrefresh-server.rb'
-end
-begin
-    require 'json'
-rescue LoadError
-    die 'You must "sudo gem install json" to get xrefresh monitor running'
-end
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'xrefresh-server.rb') # this form is important for local development
 
 module XRefreshServer
 
     ################################################################################
     # command-line parsing
 
-    $COMMAND = File.basename($0)
-    $USAGE = "Usage: #{$COMMAND} [OPTIONS]"
-    $VERSION = XRefreshServer::VERSION
-    $AGENT = "OSX xrefresh-server"
-    CONFIG_FILE = ".xrefresh-server.yml"
+    COMMAND = File.basename($0)
+    USAGE = "Usage: #{COMMAND} [OPTIONS]"
 
     options = OpenStruct.new
     options.output = "-"
     options.config = nil
 
     opts = OptionParser.new do |o|
-        o.banner = $USAGE
+        o.banner = USAGE
         o.separator ""
         o.separator "Specific options:"
 
@@ -62,7 +51,7 @@ module XRefreshServer
         end
 
         o.on_tail("-v", "--version", "Show version") do
-            puts $VERSION
+            puts XRefreshServer::VERSION
             exit
         end
     end
@@ -75,9 +64,9 @@ module XRefreshServer
 
     # initialize output handle
     if options.output == "-"
-        $out = $stdout.clone
+        OUT = $stdout.clone
     else
-        $out = File.open(options.output, "w")
+        OUT = File.open(options.output, "w")
     end
 
     ################################################################################
@@ -125,7 +114,6 @@ module XRefreshServer
 
     ################################################################################
     # run server
-    $out.puts "Starting server on #{CONFIG["host"]}:#{CONFIG["port"]} (max #{CONFIG["max_connections"]} clients)"
     server = Server.new(CONFIG["port"], CONFIG["host"], CONFIG["max_connections"], $stderr, CONFIG["audit"], CONFIG["debug"])
     server.start
 
@@ -140,5 +128,4 @@ module XRefreshServer
     ################################################################################
     # leave in peace
     $out.flush
-    exit(0)
 end

data/lib/xrefresh-server.rb

@@ -1,8 +1,24 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'json'
+begin
+  require 'term/ansicolor'
+  include Term::ANSIColor
+rescue LoadError
+  raise 'Run "sudo gem install term-ansicolor"'
+end
+# http://kpumuk.info/ruby-on-rails/colorizing-console-ruby-script-output/
+if PLATFORM =~ /win32/ then
+  begin
+    require 'win32console'
+    include Win32::Console::ANSI
+  rescue LoadError
+    raise 'Run "sudo gem install win32console" to use terminal colors on Windows'
+  end
+end
 
 module XRefreshServer
-    VERSION = '0.1.0'
+    VERSION = File.read(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'VERSION'))
+    AGENT = "OSX xrefresh-server"
+    CONFIG_FILE = ".xrefresh-server.yml"
 
     def self.die(s)
         $stderr.puts s
@@ -27,7 +43,7 @@ paths:
 dir_include:
 dir_exclude: ^#{File.expand_path('~')}/Library|/\\.(svn|framework|app|pbproj|pbxproj|xcode(proj)?|bundle)/
 file_include:
-file_exclude: ^(CVS|SCCS|vssver.?.scc|\\.(cvsignore|svn|DS_Store)|_svn|Thumbs\\.db)$|~$|^(\\.(?!htaccess)[^/]*|\\.(tmproj|o|pyc)|svn-commit(\\.[2-9])?\\.tmp)$ # merged TextMate and Netbeans patterns
+file_exclude: ^(CVS|SCCS|vssver.?.scc|\\.(cvsignore|git|svn|DS_Store)|_svn|Thumbs\\.db)$|~$|^(\\.(?!htaccess)[^/]*|\\.(tmproj|o|pyc)|svn-commit(\\.[2-9])?\\.tmp)$ # merged TextMate and Netbeans patterns
 
 # xpert settings
 host: #{GServer::DEFAULT_HOST}
@@ -43,6 +59,7 @@ CONFIG
     
 end
 
-require 'client.rb'
-require 'server.rb'
-require 'monitor.rb'
+LIB_DIR = File.expand_path(File.dirname(__FILE__))
+require File.join(LIB_DIR, 'xrefresh-server/client.rb')
+require File.join(LIB_DIR, 'xrefresh-server/server.rb')
+require File.join(LIB_DIR, 'xrefresh-server/monitor.rb')

data/lib/xrefresh-server/client.rb

@@ -0,0 +1,52 @@
+require 'json'
+
+module XRefreshServer
+
+    # client representation on server side
+    class Client
+        attr_accessor :id, :dead, :type, :agent
+
+        def initialize(id, socket)
+            @id = id
+            @socket = socket
+            @dead = false
+            @type = '?'
+            @agent = '?'
+        end
+        
+        def name
+            green("#{@type}(#{@id})")
+        end
+    
+        def send(data)
+            return if @dead
+            begin
+                @socket << data.to_json
+            rescue
+                OUT.puts "Client #{name} #{red("is dead")}"
+                @dead = true
+            end
+        end
+
+        def send_about(version, agent)
+            send({
+              "command" => "AboutMe", 
+              "version" => version, 
+              "agent" => agent
+            })
+        end
+
+        def send_do_refresh(root, name, type, date, time, files)
+            send({
+              "command" => "DoRefresh", 
+              "root" => root, 
+              "name" => name, 
+              "date" => date, 
+              "time" => time, 
+              "type" => type, 
+              "files" => files
+            })
+        end
+    end
+
+end

data/lib/{monitor.rb → xrefresh-server/monitor.rb}

@@ -20,13 +20,13 @@ module XRefreshServer
                 root = FSEventStreamCopyPathsBeingWatched(stream).first
                 paths.regard_as('*')
                 numEvents.times do |n|
-                    $out.puts "Event: #{paths[n]}" if @config["debug"]
+                    OUT.puts "Event: #{paths[n]}" if @config["debug"]
                     @modified_dirs.add({:root=>root, :dir=>paths[n]})
                 end
             end
 
             @config["paths"].each do |path|
-                $out.puts "  monitoring #{path}"
+                OUT.puts "  monitoring #{yellow(path)}"
                 # need to create new stream for every supplied path
                 # because we want to report registered sources of the changes
                 stream = FSEventStreamCreate(
@@ -54,14 +54,14 @@ module XRefreshServer
         # blocking call
         def run_loop(start_time)
             
-            activities = {"changed" => '*', "deleted" => '-', "created" => '+', "renamed" => '>'}
+            activities = {"changed" => blue('*'), "deleted" => red('-'), "created" => green('+'), "renamed" => magenta('>')}
             
             # main loop
-            $out.puts "Waiting for file system events ..."
+            OUT.puts "Waiting for file system events ..."
             not_first_time = false
             loop do
                 if @server.stopped?
-                    $out.puts "Server stopped"
+                    OUT.puts "Server stopped"
                     break
                 end
                 @streams.each do |stream|
@@ -74,23 +74,23 @@ module XRefreshServer
                             dir = dir_info[:dir]
                             root = dir_info[:root]
                             unless dir=~@config["dir_include"]
-                                $out.puts "debug: #{dir} rejected because dir_include" if @config["debug"]
+                                OUT.puts "debug: #{dir} rejected because dir_include" if @config["debug"]
                                 next
                             end
                             if dir=~@config["dir_exclude"]
-                                $out.puts "debug: #{dir} rejected because dir_exclude" if @config["debug"]
+                                OUT.puts "debug: #{dir} rejected because dir_exclude" if @config["debug"]
                                 next
                             end
 
                             if File.exists?(dir)
-                                $out.puts "debug: checking dir #{dir}" if @config["debug"]
+                                OUT.puts "debug: checking dir #{dir}" if @config["debug"]
                                 Dir.foreach(dir) do |file|
                                     unless file=~@config["file_include"]
-                                        $out.puts "debug: #{file} rejected because file_include" if @config["debug"]
+                                        OUT.puts "debug: #{file} rejected because file_include" if @config["debug"]
                                         next
                                     end
                                     if file=~@config["file_exclude"]
-                                        $out.puts "debug: #{file} rejected because file_exclude" if @config["debug"]
+                                        OUT.puts "debug: #{file} rejected because file_exclude" if @config["debug"]
                                         next
                                     end
 
@@ -98,17 +98,17 @@ module XRefreshServer
                                     next if File.directory?(full_path)
                                     begin
                                         stat = File.stat(full_path)
-                                        $out.puts "debug: stat #{full_path}" if @config["debug"]
+                                        OUT.puts "debug: stat #{full_path}" if @config["debug"]
                                     rescue
                                         # file may not exist
-                                        $out.puts "debug: stat failed #{full_path}" if @config["debug"]
+                                        OUT.puts "debug: stat failed #{full_path}" if @config["debug"]
                                         next # keep silence
                                     end
                                     current_time = stat.mtime.to_i
                                     original_time = @paths_info[full_path] || start_time
 
                                     if (current_time > original_time)
-                                        $out.puts "debug: reported #{full_path}" if @config["debug"]
+                                        OUT.puts "debug: reported #{full_path}" if @config["debug"]
                                         relative_path = full_path[root.size+1..-1]
                                         buckets[root]||=[]
                                         buckets[root]<< {
@@ -129,7 +129,7 @@ module XRefreshServer
                                 }
                             end
                         rescue
-                            $out.puts "debug: exception! #{dir}" if @config["debug"]
+                            OUT.puts "debug: exception! #{dir}" if @config["debug"]
                             raise if @config["debug"]
                             next #keep silence
                         end
@@ -140,9 +140,9 @@ module XRefreshServer
 
                 if buckets.size
                     buckets.each do |root, files|
-                        $out.puts "  activity in #{root}:"
+                        OUT.puts "  activity in #{yellow(root)}:"
                         files.each do |file|
-                            $out.puts "    #{activities[file["action"]]} #{file["path1"]}"
+                            OUT.puts "    #{activities[file["action"]]} #{blue(file["path1"])}"
                         end
                         date = nil
                         time = nil

data/lib/{server.rb → xrefresh-server/server.rb}

@@ -5,12 +5,13 @@ module XRefreshServer
 
     # server
     class Server < GServer
-        attr :clients
+        attr_accessor :clients
 
-        def initialize(*args)
-            super(*args)
+        def initialize(port, host, max_connections, *args)
+            super
             @clients = Set.new
             @last_client_id = 0
+            OUT.puts "#{green('Started server')} on #{blue("#{host}:#{port}")} (max #{max_connections} clients)"
         end
 
         def serve(socket)
@@ -41,19 +42,19 @@ module XRefreshServer
         end
 
         def process(client, msg)
-            # see windows implementation in src/winmonitor/Server.cs#ProcessMessage
+            # see windows implementation in http://github.com/darwin/xrefresh/tree/master/src/winmonitor/Server.cs#ProcessMessage
             case msg["command"]
-            when "Hello"
-                type = msg["type"] || '?'
-                agent = msg["agent"] || '?'
-                $out.puts "Client ##{client.id} connected:  #{type} (#{agent})"
-                client.send_about($VERSION, $AGENT)
-            when "Bye"
-                @clients.delete(client)
-                $out.puts "Client ##{client.id} disconnected"
-            when "SetPage"
-                url = msg["url"] || '?'
-                $out.puts "Client ##{client.id} changed page to #{url}"
+                when "Hello"
+                    client.type = msg["type"] || '?'
+                    client.agent = msg["agent"] || '?'
+                    OUT.puts "Client #{client.name} [#{magenta(client.agent)}] has connected"
+                    client.send_about(VERSION, AGENT)
+                when "Bye"
+                    @clients.delete(client)
+                    OUT.puts "Client #{client.name} has disconnected"
+                when "SetPage"
+                    url = msg["url"] || '?'
+                    OUT.puts "Client #{client.name} changed page to #{blue(url)}"
             end
         end
     end

data/{License.txt → license.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Antonin Hildebrand
+Copyright (c) 2008-2009 Antonin Hildebrand
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -11,10 +11,10 @@ the following conditions:
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+THE SOFTWARE IS PROVIDED "AS IS", WITHout WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, out OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/readme.md

@@ -0,0 +1,5 @@
+# XRefresh Server for OSX
+
+XRefresh is refresh automation for web developers. This is OSX filesystem monitor.
+
+## Visit [xrefresh.binaryage.com](http://xrefresh.binaryage.com)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xrefresh-server
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.6
 platform: ruby
 authors: 
 - Antonin Hildebrand
@@ -9,63 +9,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-19 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
-description: XRefresh filesystem monitor - browser refresh automation tool for web developers
-email: 
-- antonin@hildebrand.cz
+date: 2009-05-26 00:00:00 +02:00
+default_executable: xrefresh-server
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: XRefresh is browser refresh automation for web developers
+email: antonin@hildebrand.cz
 executables: 
 - xrefresh-server
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- website/index.txt
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- Rakefile
+- VERSION
 - bin/xrefresh-server
-- config/hoe.rb
-- config/requirements.rb
-- lib/client.rb
-- lib/monitor.rb
-- lib/server.rb
 - lib/xrefresh-server.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.html.erb
+- lib/xrefresh-server/client.rb
+- lib/xrefresh-server/monitor.rb
+- lib/xrefresh-server/server.rb
+- license.txt
+- readme.md
 has_rdoc: true
-homepage: http://xrefresh-server.rubyforge.org
-post_install_message: |-
-  ---
-  To run monitoring server launch:
-  xrefresh-server
-  (when first launched, you will be asked to setup config file)
-  For more information see http://xrefresh-server.rubyforge.org
-  ---
+homepage: http://github.com/darwin/xrefresh-server
+licenses: []
+
+post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -83,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: xrefresh-server
-rubygems_version: 1.1.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
-summary: XRefresh filesystem monitor - browser refresh automation tool for web developers
+specification_version: 3
+summary: XRefresh filesystem monitor for OSX
 test_files: []