vagrant-listen-server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a4ce449ded50fcc6e74eee8185c87f505f52c6
-  data.tar.gz: ccdb1dc74ba61cf0b73020934b795988a936ced6
+  metadata.gz: a30b9bb31559cff8314063a36ebbe2b42f041504
+  data.tar.gz: f19e8fe12f1e3700841cb95a4caf7ecbfe0334cc
 SHA512:
-  metadata.gz: d34b120570d800c0ef54f7ff55dafcf55321e83ab16ab991a36d6e8b0e54aeb7f6724f0e7dd6109684d065055ccb8ac8958fa3961d92395005f0fe72e13bd34d
-  data.tar.gz: d82c5bee25552a3c5f5d7285a035966c47bc41bbd3a02d767f35735842e1f18545369e7f78a7bf3df9bfead96d990ab3105e98f075d21d96652692380c25f0da
+  metadata.gz: c1b0dda84cc0a2a0951f4f3b6810bdf8dc7ead5d5ab2b1c55939190c41a710198757d63e14550ebae86e612e640974c390d3ee8c0bb61719a2f7a5298f54ba86
+  data.tar.gz: 0c19dc5641435505ebfae14329a5dc0d30ebf20f8dd0e47b4e8edc82aa72b750f0af16a271af4cfa8b8bf2c2689db81b89126927aa42a24ccb96ea09b9e5eb77

data/README.md

@@ -32,6 +32,10 @@ You can also write a simple server that touches all files on the guest, however
 you'll have to be aware of loops created if filesystem notifications are passed
 back from the guest to the host.
 
+See the [examples](/examples) section for some implementations. Currently there
+is solely my node based client, but if you're using this in any other
+languages, please add your client and submit a pull request!
+
 
 ## Usage
 

data/examples/node-client.js

@@ -0,0 +1,48 @@
+var net = require('net');
+
+
+// Assuming the existence of some `build` method that returns a promise.
+var sequence = build();
+
+
+// gathers rapid changes as one build
+var timeout = null;
+var scheduleBuild = function() {
+  if (timeout) { return; }
+
+  // we want the timeout to start now before we wait for the current build
+  var timeoutPromise = new Promise(function(resolve) {
+    timeout = setTimeout(resolve, 100);
+  });
+
+  var timeoutThenBuild = function() {
+    timeoutPromise.then(function() {
+      timeout = null
+      return build();
+    });
+  };
+
+  // we want the current promise to be waiting for the current build
+  // regardless if it fails or not.
+  sequence = sequence.then(timeoutThenBuild, timeoutThenBuild);
+};
+
+
+var port = 4000;
+var host = '172.16.172.1';
+var client = new net.Socket();
+
+client.connect(port, host, function() {
+  console.log('Connected to listen server: ', host, port);
+});
+
+client.on('data', function(data) {
+  // message is [modified, added, removed]
+  console.log('Data received', data)
+  var message = JSON.parse(data.toString().trim())
+  scheduleBuild();
+});
+
+client.on('close', function() {
+  console.log('Connection closed');
+});

data/lib/vagrant-listen-server/action.rb

@@ -1,5 +1,6 @@
-require 'celluloid'
 require 'listen'
+require 'socket'
+require 'json'
 
 # No ActiveSupport in vagrant
 def array_wrap object
@@ -28,9 +29,8 @@ module VagrantPlugins
 
           config = @machine.config.listen_server
           folders = array_wrap config.folders
-          host = "#{config.ip}:#{config.port}"
 
-          @ui.info "Starting listen server - #{host}"
+          @ui.info "Starting listen server - #{config.ip}:#{config.port}"
 
           # Check whether the daemon is already running.
           if File.exists? config.pid_file
@@ -52,18 +52,51 @@ module VagrantPlugins
           # machine to test it out on...
           pid = fork do
             $0 = "vagrant-listen-server - #{@machine.name}"
-            listener = Listen.to *folders, forward_to: host do |modified, added, removed|
-              File.open('/tmp/listen.txt', 'a+') do |f|
-                f.puts 'listen fired', modified, added, removed
+
+            clients = []
+            server = TCPServer.new config.ip, config.port
+
+            callback = Proc.new do |modified, added, removed|
+              bad_clients = []
+              # @ui.info "Listen fired - #{clients.count} clients.\n  #{modified}\n  #{added}\n  #{removed}"
+              clients.each do |client|
+                begin
+                  client.puts [modified, added, removed].to_json
+                rescue Errno::EPIPE
+                  @ui.info "Connection broke! #{client}"
+                  # Don't want to change the list of threads as we iterate.
+                  bad_clients.push client
+                end
               end
-            end
 
-            begin
-              listener.start
-            rescue Errno::EADDRNOTAVAIL
-              @ui.info "Can't start server - Port in use"
-              exit
+              bad_clients.each do |client|
+                clients.delete client
+              end
             end
+            listener = Listen.to(*folders, &callback)
+            listener.start
+
+            # server.accept blocks - we need it in its own thread so we can
+            # continue to have listener callbacks fired, and so we can sleep
+            # and catch any interrupts from vagrant.
+            Thread.new do
+              loop do
+                Thread.fork(server.accept) do |client|
+                  @ui.info "New connection - #{client}"
+                  clients.push client
+                end
+              end
+            end
+
+            # TODO: this error won't happen on the listen anymore - it will
+            # happen somewhere on the tcp call. Not sure where.
+            #
+            # begin
+            #   listener.start
+            # rescue Errno::EADDRNOTAVAIL
+            #   @ui.info "Can't start server - Port in use"
+            #   exit
+            # end
 
             # Uhh... this needs work. Vagrant steals the interrupt from us and
             # there's no way to get it back

data/lib/vagrant-listen-server/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ListenServer
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/vagrant-listen-server.gemspec

@@ -17,9 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'celluloid', '~> 0.16'
-  spec.add_dependency 'celluloid-io', '~> 0.16', '>= 0.16.2'
-
   spec.add_dependency 'rb-inotify', '~> 0.9', '>= 0.9.5'
   spec.add_dependency 'rb-fsevent', '~> 0.9', '>= 0.9.4'
   spec.add_dependency 'rb-kqueue', '~> 0.2', '>= 0.2.3'

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-listen-server
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David Kelso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +110,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/node-client.js
 - lib/vagrant-listen-server.rb
 - lib/vagrant-listen-server/action.rb
 - lib/vagrant-listen-server/config.rb