vagrant-gatling-rsync 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d981cfb603768c87a0a307b415b32acf4fdacc27
-  data.tar.gz: 7517d55a2e0be0a9d6fc04c7ae60c15262ebc82d
+  metadata.gz: 7354f9501fc4cbac38522002f0187aadb11875dc
+  data.tar.gz: 5f071e14f37ff5cb463da802c82159cf576a73ca
 SHA512:
-  metadata.gz: 6e0938d9cc6f4e67da39c1865c004b348a7ef03451ed8b93086af4dff9706101dee20a5313c4006153803588edd4def025b538a2c0fb9e1779404ad880dfb992
-  data.tar.gz: 176593bea18b5cc114ebd0f9ce944ccfe7c7438beb128ea738e770056ee38cc0301ede1641bfcacbcf339ea599008cc8d159f26396dda8a55cdac798692fdce6
+  metadata.gz: e814d5190b5e3b2c678798b147c314ffd775aacc4b7d53301ba02de95679e8fdf1de7ccd247433bc87679176e91751b3c8cf1db6643e3400c01ac7d7349f9d72
+  data.tar.gz: 908e73d45901906eda295fbf26dcad64852e7468670c1819e3f8075472e171631c8da533f81645dc878d1271673a711e57f3061bc04e9c4dab7b6237c1b9531e

data/{CHANGELOG.txt → CHANGELOG.md}

@@ -1,3 +1,12 @@
+## 0.0.2 (April 27, 2014)
+
+Bugfix release.
+
+BUG FIXES:
+
+- Catch ThreadErrors (this sometimes happens in practice on OS X.)
+- Reflect that this plugin requires Vagrant 1.5.1+.
+
 ## 0.0.1 (March 23, 2014)
 
 Initial release.

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 
 group :development do
   gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v1.5.1'
-  gem "pry"
 end
 
 group :plugins do

data/README.md

@@ -1,16 +1,47 @@
 # vagrant-gatling-rsync
 
-An rsync watcher for Vagrant 1.5+ that uses fewer host resources at the
+An rsync watcher for Vagrant 1.5.1+ that uses fewer host resources at the
 potential cost of more rsync actions.
 
-## Authors
+## Getting started
 
-Steven Merrill (@stevenmerrill) originally had the idea to tap into rb-fsevent
-and rb-inotify to more efficiently rsync files.
+To get started, you need to have Vagrant 1.5.1 installed on your Linux or
+Mac OS X host machine. To install the plugin, use the following command.
 
-Doug Marcey (@dougmarcey) provided considerable guidance in the implementation
-of the coalescing functionality and wrote the initial sketch of the Linux and
-Windows adapters.
+```bash
+vagrant plugin install vagrant-gatling-rsync
+```
+
+## Working with this plugin
+
+Add the following information to the Vagrantfile to set the coalescing
+threshold in seconds. If you do not set it, it will default to 1.5.
+
+You will also need to have at least one synced folder set to type "rsync"
+to use the plugin.
+
+```ruby
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "hashicorp/precise64"
+
+  config.vm.synced_folder "../files", "/opt/vagrant/rsynced_folder", type: "rsync",
+    rsync__exclude: [".git/", ".idea/"]
+
+  # Configure the window for gatling to coalesce writes.
+  if Vagrant.has_plugin?("vagrant-gatling-rsync")
+    config.gatling.latency = 2.5
+  end
+end
+```
+
+With the Vagrantfile configured in this fashion, you can run the following
+command to sync files.
+
+```bash
+vagrant gatling-rsync-auto
+```
 
 ## Why "gatling"?
 
@@ -37,37 +68,18 @@ APIs, which allows for higher performance.
 ## Event coalescing
 
 This plugin also coalesces events for you. The default latency is 1.5 seconds.
-(This will be a configurable option in future versions.) If you specify a
-latency of two seconds, this plugin will not fire a `vagrant rsync` until two
-contiguous seconds without file events have passed. This will delay rsyncs from
-happening if many writes are happening on the host (during a `make` or a
-`git clone`, for example) until the activity has leveled off.
-
-## Working with this plugin
-
-Add the following information to the Vagrantfile to set the coalescing
-threshold in seconds. If you do not set it, it will default to 1.5.
-
-You will also need to have at least one synced folder set to type "rsync"
-to use the plugin.
-
-```ruby
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "hashicorp/precise64"
+It is configurable through the `config.gatling.latency` parameter.
+If you specify a latency of two seconds, this plugin will not fire a
+`vagrant rsync` until two contiguous seconds without file events have passed.
+This will delay rsyncs from happening if many writes are happening on the host
+(during a `make` or a `git clone`, for example) until the activity has leveled off.
 
-  config.vm.synced_folder "../files", "/opt/vagrant/rsynced_folder", type: "rsync",
-    rsync__exclude: [".git/", ".idea/"]
+## Authors
 
-  # Configure the window for gatling to coalesce writes.
-  config.gatling.latency = 2.5
-end
-```
+Steven Merrill (@stevenmerrill) originally had the idea to tap into rb-fsevent
+and rb-inotify to more efficiently rsync files.
 
-With the Vagrantfile configured in this fashion, you can run the following
-command to sync files.
+Doug Marcey (@dougmarcey) provided considerable guidance in the implementation
+of the coalescing functionality and wrote the initial sketch of the Linux and
+Windows adapters.
 
-```bash
-vagrant gatling-rsync-auto
-```

data/example/vagrant/Vagrantfile

@@ -15,5 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     rsync__exclude: [".git/", ".idea/"]
 
   # Configure the window for gatling to coalesce writes.
-  config.gatling.latency = 2.5
+  if Vagrant.has_plugin?("vagrant-gatling-rsync")
+    config.gatling.latency = 2.5
+  end
 end

data/lib/vagrant-gatling-rsync/listen/listenlinux.rb

@@ -19,10 +19,10 @@ module VagrantPlugins
           notifier.watch(path, :modify, :create, :delete, :recursive) {}
         end
 
-        while true do
+        loop do
           directories = Set.new
           begin
-            while true do
+            loop do
               events = []
               events = Timeout::timeout(@latency) {
                 notifier.read_events

data/lib/vagrant-gatling-rsync/listen/listenosx.rb

@@ -28,17 +28,17 @@ module VagrantPlugins
         end
         Thread.new { fsevent.run }
 
-        while true do
+        loop do
           directories = Set.new
           begin
-            while true do
+            loop do
               @logger.info("Starting the timeout at #{Time.now.to_s}.")
               change = Timeout::timeout(@latency) {
                 changes.pop
               }
               directories << change unless change.nil?
             end
-          rescue Timeout::Error
+          rescue Timeout::Error, ThreadError
             @logger.info("Breaking out of the loop at #{Time.now.to_s}.")
           end
 

data/lib/vagrant-gatling-rsync/listen/listenwindows.rb

@@ -1,33 +1,46 @@
 # @TODO: Note that this is entirely untested and not yet implemented.
 
-require "timeout"
-require "thread"
+require "wdm"
 
-paths = {"/path/to/a/directory" => {}}
-latency = 2
+module VagrantPlugins
+  module GatlingRsync
+    class ListenWindows
+      def initialize(paths, ignores, latency, logger, callback)
+        @paths = paths
+        @ignores = ignores
+        @latency = latency
+        @logger = logger
+        @callback = callback
+      end
 
-monitor = WDM::Monitor.new
-changes = Queue.new
-paths.keys.each do |path|
-  monitor.watch_recursively(path) { |change| changes << change }
-end
-Thread.new { monitor.run! }
+      def run
+        @logger.info("Listening via: WDM on Windows.")
+        monitor = WDM::Monitor.new
+        changes = Queue.new
+        @paths.keys.each do |path|
+          monitor.watch_recursively(path) { |change| changes << change }
+        end
+        Thread.new { monitor.run! }
 
-while true do
-  directories = Set.new
-  begin
-    while true do
-      change = Timeout::timeout(latency) {
-        changes.pop
-      }
-      directories << change.path
-    end
-  rescue Timeout::Error
-    @logger.info("Breaking out of the loop at #{Time.now.to_s}.")
-  end
+        loop do
+          directories = Set.new
+          begin
+            loop do
+              change = Timeout::timeout(@latency) {
+                changes.pop
+              }
+              directories << change.path
+            end
+          rescue Timeout::Error
+            @logger.info("Breaking out of the loop at #{Time.now.to_s}.")
+          end
 
-  @logger.info(directories.inspect) unless directories.empty?
+          @logger.info(directories.inspect) unless directories.empty?
 
-  #@callback.call(paths, ignores, directories) unless directories.empty?
+          @callback.call(@paths, @ignores, directories) unless directories.empty?
+        end
+      end
+    end
+  end
 end
 

data/lib/vagrant-gatling-rsync/plugin.rb

@@ -6,7 +6,7 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.5.0"
+if Vagrant::VERSION < "1.5.1"
   raise Errors::Vagrant15RequiredError
 end
 

data/lib/vagrant-gatling-rsync/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GatlingRsync
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/locales/en.yml

@@ -4,5 +4,5 @@ en:
       only_osx_linux_support: |-
         This plugin currently only supports Max OS X and Linux hosts.
       vagrant_15_required: |-
-        This plugin requires Vagrant 1.5 or newer to function.
+        This plugin requires Vagrant 1.5.1 or newer to function.
 

data/vagrant-gatling-rsync.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Steven Merrill"]
   spec.email         = ["steven.merrill@gmail.com"]
   spec.summary       = %q{A lighter-weight Vagrant plugin for watching and rsyncing directories.}
-  spec.description   = %q{The gatling-rsync plugin run on Mac (and soon on Linux) and is far less CPU-intensive than the built-in 'vagrant rsync-auto' plugin, at the cost of possibly rsyncing more often.}
+  spec.description   = %q{The gatling-rsync plugin runs on Mac and Linux and is far less CPU-intensive than the built-in rsync-auto.}
   spec.homepage      = ""
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-gatling-rsync
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Steven Merrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,9 +52,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: The gatling-rsync plugin run on Mac (and soon on Linux) and is far less
-  CPU-intensive than the built-in 'vagrant rsync-auto' plugin, at the cost of possibly
-  rsyncing more often.
+description: The gatling-rsync plugin runs on Mac and Linux and is far less CPU-intensive
+  than the built-in rsync-auto.
 email:
 - steven.merrill@gmail.com
 executables: []
@@ -63,7 +62,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-version
-- CHANGELOG.txt
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md