vagrant-gatling-rsync 0.0.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f7e90735d5b30fc728ce9def9abc606eba65a780
-  data.tar.gz: 97ffd1da36b10c33132168c0cacf6f68219f9520
+SHA256:
+  metadata.gz: 2c450f1e3f93ee70f51a9a7d6e690bedfeb9c3d2747643a62293e05738201439
+  data.tar.gz: e31847e72bb85082c301639890f6c108e902320a9309abdabb0770479912a1e9
 SHA512:
-  metadata.gz: 88804ec3406328978c34cb02e33ec8e62d7ab7c0459b099d60d13c38357675edad2f2442690902d100d827d836752109b23e66b67327dd0563018d45bdbfdabd
-  data.tar.gz: d46d7d7848cf6aecff2f7470c597f0b10d4e5d71adb70c281088a0a6f4c3ef5d063fb0fbe88f51d2602418e5500b6f16e91ab7577809868e9011f52136a5a1b9
+  metadata.gz: 68dcf265bc0e451852768cda9d1007f9155707c4a1839d6a90cc15b4c66438c14bfd3baa80085607ee8fd01bf1413c55afe331d481b49b5565de310214982f51
+  data.tar.gz: bf9290204b050458c14d44950fc6022ff91ae363e55e11ebbbe404dea0ae867a6196f76ae0454c1827494bb981cf2f3a11dacf7344d7ec46210905bb94fba701

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.6.2

data/CHANGELOG.md

@@ -1,8 +1,40 @@
+## 1.0 (June 02, 2020)
+
+This release adds compatibility with Vagrant 2.2.5+.
+
+Small parts of the example Vagrantfile and the Gemfile and Gemspec have also been cleaned up.
+
+FEATURES:
+
+- Add compatibility with Vagrant 2.2.5+. Thanks to @leejo for the PR. [GH-37]
+
+## 0.9.0 (June 28, 2015)
+
+This release adds two big features: Windows support and automatic sync on startup.
+
+It also adds the `config.gatling.rsync_on_startup` configuration option to turn automatic rsync on startup off if you
+do not want it.
+
+It also updates the Gemfile to use Vagrant 1.7.2 for development. The gem should still work with Vagrant 1.5.1+.
+
+FEATURES:
+
+- Add support for Windows. Thanks to @mfradcourt for wiring it up. [GH-21]
+- Add automatic sync startup on `vagrant up` or `vagrant reload` if rsync folders are present. [GH-14]
+
+## 0.1.0 (January 04, 2015)
+
+This release adds feature parity with Vagrant core rsync-auto by doing a sync when gatling-rsync is started.
+
+FEATURES:
+
+- Perform an initial rsync when the watcher starts. [GH-13]
+
 ## 0.0.4 (August 24, 2014)
 
 This release adds notification of time and duration of rsyncs.
 
-It also adds the config.gatling.time_format configuration option to allow customization of the time format string when
+It also adds the `config.gatling.time_format` configuration option to allow customization of the time format string when
 time information is printed to the console.
 
 It also updates the Gemfile to use Vagrant 1.6.4 so that I can test on Linux using the Docker provider. This should not

data/Gemfile

@@ -4,10 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v1.6.3'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v2.2.16'
 end
 
 group :plugins do
-  gem "vagrant-gatling-rsync", path: "."
+  gemspec
 end
 

data/README.md

@@ -5,8 +5,8 @@ potential cost of more rsync actions.
 
 ## Getting started
 
-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.
+To get started, you need to have Vagrant 1.5.1 installed on your Linux, Mac, or
+Windows host machine. To install the plugin, use the following command.
 
 ```bash
 vagrant plugin install vagrant-gatling-rsync
@@ -39,6 +39,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.gatling.latency = 2.5
     config.gatling.time_format = "%H:%M:%S"
   end
+
+  # Automatically sync when machines with rsync folders come up.
+  config.gatling.rsync_on_startup = true
 end
 ```
 
@@ -49,6 +52,11 @@ command to sync files.
 vagrant gatling-rsync-auto
 ```
 
+As of version 0.9.0, vagrant-gatling-rsync will automatically start the sync
+engine on `vagrant up` or `vagrant reload` when the machines that you bring up
+have one or more rsync folders defined.  You can disable this behavior by
+setting `config.gatling.rsync_on_startup` to false.
+
 ## Why "gatling"?
 
 The gatling gun was the first gun capable of firing continuously.

data/example/vagrant/Vagrantfile

@@ -5,7 +5,7 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "hashicorp/precise64"
+  config.vm.box = "centos/7"
 
   config.vm.provider "docker" do |d, override|
     d.image = "smerrill/vagrant-centos"
@@ -13,22 +13,34 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
     # This is needed if you have non-Docker provisioners in the Vagrantfile.
     override.vm.box = nil
+  end
 
-    # Ensure Vagrant knows the SSH port. See
-    # https://github.com/mitchellh/vagrant/issues/3772.
-    override.ssh.port = 22
+  config.vm.provider "lxc" do |d, override|
+    override.vm.box = "smerrill/centos-7"
   end
 
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  config.vm.synced_folder "../files", "/opt/vagrant/rsynced_folder", type: "rsync",
-    rsync__exclude: [".git/", ".idea/"]
+  # When using gatling rsync in your projects, you should wrap these configs in
+  # an 'if Vagrant.has_plugin?("vagrant-gatling-rsync")' test.
 
-  # Configure the window for gatling to coalesce writes. Note that when using
-  # outside of a development environment like this one, you should wrap these
-  # statements in an 'if Vagrant.has_plugin?("vagrant-gatling-rsync")' test.
+  # Configure the window for gatling to coalesce writes.
   config.gatling.latency = 0.4
   config.gatling.time_format = "%H:%M:%S"
+
+  # Gatling rsync will run `vagrant gatling-rsync-auto` after the machines in
+  # your Vagrant environment start unles you set this to false.
+  config.gatling.rsync_on_startup = true
+
+  # Add a multi-box setup.
+  config.vm.define "rsync", primary: true do |m|
+    m.vm.synced_folder "../files", "/opt/vagrant/rsynced_folder", type: "rsync",
+      rsync__exclude: [".git/", ".idea/"]
+  end
+
+  config.vm.define "rsync2", primary: true do |m|
+    m.vm.synced_folder "../files", "/opt/vagrant/rsynced_folder", type: "rsync",
+      rsync__exclude: [".git/", ".idea/"]
+  end
+
+  config.vm.define "norsync" do |m|
+  end
 end

data/lib/vagrant-gatling-rsync.rb

@@ -14,6 +14,7 @@ module VagrantPlugins
     autoload :Errors, lib_path.join("errors")
     autoload :ListenOSX, lib_path.join("listen/listenosx")
     autoload :ListenLinux, lib_path.join("listen/listenlinux")
+    autoload :ListenWindows, lib_path.join("listen/listenwindows")
 
     # This returns the path to the source of this plugin.
     #

data/lib/vagrant-gatling-rsync/action/startup_rsync.rb

@@ -0,0 +1,48 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GatlingRsync
+    class StartupRsync
+      include Vagrant::Action::Builtin::MixinSyncedFolders
+
+      def initialize(app, env)
+        @app = app
+        @gatling_startup_registered = false
+        @rsync_folder_count = 0
+      end
+
+      def call(env)
+        folders = synced_folders(env[:machine])
+        @rsync_folder_count += folders[:rsync].size if folders.key?(:rsync)
+
+        @app.call(env)
+
+        # Ensure only one at_exit block is registered.
+        return unless @gatling_startup_registered == false
+
+        return unless env[:machine].config.gatling.rsync_on_startup == true
+
+        at_exit do
+          unless $!.is_a?(SystemExit)
+            env[:ui].warn "Vagrant's startup was interrupted by an exception."
+            exit 1
+          end
+
+          exit_status = $!.status
+          if exit_status != 0
+            env[:ui].warn "The previous process exited with exit code #{exit_status}."
+            exit exit_status
+          end
+
+          # Don't run if there are no rsynced folders.
+          unless @rsync_folder_count == 0 then
+            env[:ui].info I18n.t("vagrant_gatling_rsync.startup_sync")
+            env[:machine].env.cli("gatling-rsync-auto")
+          end
+        end
+
+        @gatling_startup_registered = true
+      end
+    end
+  end
+end

data/lib/vagrant-gatling-rsync/command/rsync_auto.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
     class GatlingRsyncAuto < Vagrant.plugin(2, :command)
       # 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.1"
+      if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new("1.5.1")
         raise Errors::Vagrant15RequiredError
       end
 
@@ -41,6 +41,16 @@ module VagrantPlugins
           folders = synced_folders(machine)[:rsync]
           next if !folders || folders.empty?
 
+          # Get the SSH info for this machine so we can do an initial
+          # sync to the VM, just as core `vagrant rsync-auto` does.
+          ssh_info = machine.ssh_info
+          if ssh_info
+            machine.ui.info(I18n.t("vagrant.rsync_auto_initial"))
+            folders.each do |id, folder_opts|
+              VagrantPlugins::SyncedFolderRSync::RsyncHelper.rsync_single(machine, ssh_info, folder_opts)
+            end
+          end
+
           folders.each do |id, folder_opts|
             # If we marked this folder to not auto sync, then
             # don't do it.
@@ -57,7 +67,11 @@ module VagrantPlugins
 
             if folder_opts[:exclude]
               Array(folder_opts[:exclude]).each do |pattern|
-                ignores << VagrantPlugins::SyncedFolderRSync::RsyncHelper.exclude_to_regexp(hostpath, pattern.to_s)
+               if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new("2.2.5")
+                 ignores << VagrantPlugins::SyncedFolderRSync::RsyncHelper.exclude_to_regexp(hostpath, pattern.to_s)
+               else
+                 ignores << VagrantPlugins::SyncedFolderRSync::RsyncHelper.exclude_to_regexp(pattern.to_s)
+                end
               end
             end
           end
@@ -84,9 +98,11 @@ module VagrantPlugins
           ListenOSX.new(paths, ignores, latency, @logger, self.method(:callback)).run
         when /linux/
           ListenLinux.new(paths, ignores, latency, @logger, self.method(:callback)).run
+        when /cygwin|mswin|mingw|bccwin|wince|emx/
+          ListenWindows.new(paths, ignores, latency, @logger, self.method(:callback)).run
         else
           # @TODO: Raise this earlier?
-          raise Errors::OnlyOSXLinuxSupportError
+          raise Errors::OSNotSupportedError
         end
 
         0

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

@@ -5,15 +5,22 @@ module VagrantPlugins
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :latency
       attr_accessor :time_format
+      attr_accessor :rsync_on_startup
 
       def initialize
         @latency = UNSET_VALUE
         @time_format = UNSET_VALUE
+        @rsync_on_startup = UNSET_VALUE
       end
 
       def finalize!
         @latency = 1.5 if @latency == UNSET_VALUE
         @time_format = "%I:%M:%S %p" if @time_format == UNSET_VALUE
+        if @rsync_on_startup == UNSET_VALUE
+          @rsync_on_startup = true
+        else
+          @rsync_on_startup = !!@rsync_on_startup
+        end
       end
 
       # @TODO: This does not appear to be called.

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

@@ -7,8 +7,8 @@ module VagrantPlugins
         error_namespace("vagrant_gatling_rsync.errors")
       end
 
-      class OnlyOSXLinuxSupportError < VagrantGatlingRsyncError
-        error_key(:only_osx_linux_support)
+      class OSNotSupportedError < VagrantGatlingRsyncError
+        error_key(:os_not_supported)
       end
 
       class Vagrant15RequiredError < VagrantGatlingRsyncError

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

@@ -18,7 +18,7 @@ module VagrantPlugins
         monitor = WDM::Monitor.new
         changes = Queue.new
         @paths.keys.each do |path|
-          monitor.watch_recursively(path) { |change| changes << change }
+          monitor.watch_recursively(path.dup) { |change| changes << change }
         end
         Thread.new { monitor.run! }
 

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

@@ -18,6 +18,12 @@ module VagrantPlugins
         I18n.reload!
       end
 
+      action_hook "startup-rsync" do |hook|
+        setup_i18n
+        require_relative "action/startup_rsync"
+        hook.after Vagrant::Action::Builtin::SyncedFolders, StartupRsync
+      end
+
       command "gatling-rsync-auto" do
         setup_i18n
 

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GatlingRsync
-    VERSION = "0.0.4"
+    VERSION = "1.0.1"
   end
 end

data/locales/en.yml

@@ -2,9 +2,11 @@ en:
   vagrant_gatling_rsync:
     gatling_ran: |-
       %{date}: The rsync operation completed in %{milliseconds} milliseconds.
+    startup_sync: |-
+      vagrant-gatling-rsync is starting the sync engine because you have at least one rsync folder. To disable this behavior, set `config.gatling.rsync_on_startup = false` in your Vagrantfile.
     errors:
-      only_osx_linux_support: |-
-        The vagrant-gatling-rsync plugin currently only supports Max OS X and Linux hosts.
+      os_not_supported: |-
+        The vagrant-gatling-rsync plugin does not support your OS.
       vagrant_15_required: |-
         The vagrant-gatling-rsync plugin requires Vagrant 1.5.1 or newer to function.
 

data/vagrant-gatling-rsync.gemspec

@@ -18,9 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
-  # Make Vagrant work on Linux for development.
-  spec.add_development_dependency "json", "~> 1.8.1"
 end

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-gatling-rsync
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Steven Merrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.1
 description: The gatling-rsync plugin runs on Mac and Linux and is far less CPU-intensive
   than the built-in rsync-auto.
 email:
@@ -74,8 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -83,6 +55,7 @@ files:
 - Rakefile
 - example/vagrant/Vagrantfile
 - lib/vagrant-gatling-rsync.rb
+- lib/vagrant-gatling-rsync/action/startup_rsync.rb
 - lib/vagrant-gatling-rsync/command/rsync_auto.rb
 - lib/vagrant-gatling-rsync/config.rb
 - lib/vagrant-gatling-rsync/errors.rb
@@ -103,17 +76,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A lighter-weight Vagrant plugin for watching and rsyncing directories.