vagrant-listen-server 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6bc4b1dc74d14a2265d218cfd30d1a65a6d21c3
-  data.tar.gz: 5c2910bca19794cb808df5ba3ec21be5ced9efad
+  metadata.gz: 54a4ce449ded50fcc6e74eee8185c87f505f52c6
+  data.tar.gz: ccdb1dc74ba61cf0b73020934b795988a936ced6
 SHA512:
-  metadata.gz: 66746b24cd27bf4d4a003f6dab284e777266c0714738e9ae3a33ec17ff28cbe8f6c97610b36bdcdca517c52aa8b9cbae0af905e249f62ea8bc219cb9a6988740
-  data.tar.gz: 54fb1ba72bba130fce0c253e15e47a78f903d3bc38b0fbde36a92f5e1b231c7e02b8fae7c792bc4f6e625d9ebdd8e8f082a1702f0a6056b1cfba5122b4f4921e
+  metadata.gz: d34b120570d800c0ef54f7ff55dafcf55321e83ab16ab991a36d6e8b0e54aeb7f6724f0e7dd6109684d065055ccb8ac8958fa3961d92395005f0fe72e13bd34d
+  data.tar.gz: d82c5bee25552a3c5f5d7285a035966c47bc41bbd3a02d767f35735842e1f18545369e7f78a7bf3df9bfead96d990ab3105e98f075d21d96652692380c25f0da

data/Gemfile

@@ -6,7 +6,4 @@ end
 
 group :plugins do
   gem 'vagrant-listen-server', path: '.'
-  gem 'listen'
-  gem 'celluloid'
-  gem 'celluloid-io'
 end

data/README.md

@@ -64,7 +64,7 @@ Then in your Vagrantfile:
 
 Filesystem is shared using rsync-auto protocol instead of vboxsf
 
- * [rsync-mirror](https://github.com/ingenerator/vagrant-mirror/)
+ * [vagrant-mirror](https://github.com/ingenerator/vagrant-mirror/)
 
 Hasn't been updated to work with vagrant's new plugin system.
 
@@ -90,3 +90,19 @@ Listen maybe is a bit of a resource hog:
 
 There might be some better, native implementations that make this faster. e.g.
  * https://fsnotify.org/
+
+Gemspecs don't allow platform specific requirements, so we have to include all
+the gems for filesystem events. It looks like the only great solution to this
+is to switch to a separate gem for each platform...
+ * http://stackoverflow.com/questions/8940271/build-a-ruby-gem-and-conditionally-specify-dependencies
+
+You can automate the install pretty easily though:
+ * http://stackoverflow.com/questions/4596606/rubygems-how-do-i-add-platform-specific-dependency/10249133#10249133
+ * http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems#How_to_install_different_versions_of_gems_depending_on_which_version_of_ruby_the_installee_is_using
+
+Fork in a way that will work with windows. Childprocess gem is included with
+vagrant by default - see if it will fit the bill.
+ * https://github.com/jarib/childprocess
+
+There's also a "subprocess" module under vagrant util
+ * https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/util/subprocess.rb

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

@@ -1,6 +1,18 @@
 require 'celluloid'
 require 'listen'
 
+# No ActiveSupport in vagrant
+def array_wrap object
+  if object.nil?
+    []
+  elsif object.respond_to?(:to_ary)
+    object.to_ary || [object]
+  else
+    [object]
+  end
+end
+
+
 module VagrantPlugins
   module ListenServer
     module Action
@@ -15,7 +27,7 @@ module VagrantPlugins
           @machine = env[:machine]
 
           config = @machine.config.listen_server
-          folders = config.folders
+          folders = array_wrap config.folders
           host = "#{config.ip}:#{config.port}"
 
           @ui.info "Starting listen server - #{host}"
@@ -28,7 +40,7 @@ module VagrantPlugins
               @ui.info 'Warning - listen server already running'
               return @app.call(env)
             rescue Errno::ESRCH
-              @ui.info 'Warning - stale PID file'
+              @ui.info "Warning - stale PID: #{pid}"
             end
           end
 
@@ -40,7 +52,7 @@ 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|
+            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
               end
@@ -52,7 +64,16 @@ module VagrantPlugins
               @ui.info "Can't start server - Port in use"
               exit
             end
-            sleep
+
+            # Uhh... this needs work. Vagrant steals the interrupt from us and
+            # there's no way to get it back
+            #  * https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/runner.rb#L49
+            # Is there a way to register more callbacks to the busy block?
+            #  * https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/util/busy.rb
+            while not env[:interrupted]
+              sleep 1
+            end
+            @ui.info "Listen sleep finished"
           end
 
           Process.detach pid

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

@@ -1,5 +1,14 @@
 require_relative 'action'
 
+require 'rbconfig'
+os = RbConfig::CONFIG['target_os']
+
+require 'rb-fsevent' if os =~ /darwin/i
+require 'rb-kqueue' if os =~ /bsd|dragonfly/i
+require 'rb-inotify' if os =~ /linux/i
+require 'wdm' if Gem.win_platform?
+
+
 module VagrantPlugins
   module ListenServer
     class Plugin < Vagrant.plugin('2')

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

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

data/vagrant-listen-server.gemspec

@@ -17,8 +17,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'celluloid', '~> 0.16'
-  spec.add_runtime_dependency 'celluloid-io', '~> 0.16', '>= 0.16.2'
+  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'
+  # wdm is already included in the vagrant gem spec.
+  # spec.add_runtime_dependency 'wdm', '~> 0.10', '>= 0.10.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-listen-server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Kelso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -44,6 +44,66 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.2
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: rb-kqueue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement