vagrant-gatling-rsync 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874e00d6caf6487664c49d27f97208fcea7f015c
-  data.tar.gz: 26c34bedc9e1936f71a22dcd9950c175e5d3ac54
+  metadata.gz: f7e90735d5b30fc728ce9def9abc606eba65a780
+  data.tar.gz: 97ffd1da36b10c33132168c0cacf6f68219f9520
 SHA512:
-  metadata.gz: 9f57f6c8a0c5d559302a44afa669995e821212f1842dd2d550531bd34d92eb670f35e4c3c5828a19ee3c3cfbcd5f2fc3aeeeb44c64e862e36edcc34b585c7249
-  data.tar.gz: cf8b9867b09ef3de6eb8b0b32be938a56e2b59b2fa6f6e36e81b45de12885fe23ca48cfe44275108a9105282d9b28c1f9a69a5654216095ae5fa87369e75de12
+  metadata.gz: 88804ec3406328978c34cb02e33ec8e62d7ab7c0459b099d60d13c38357675edad2f2442690902d100d827d836752109b23e66b67327dd0563018d45bdbfdabd
+  data.tar.gz: d46d7d7848cf6aecff2f7470c597f0b10d4e5d71adb70c281088a0a6f4c3ef5d063fb0fbe88f51d2602418e5500b6f16e91ab7577809868e9011f52136a5a1b9

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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
+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
+have any impact on using the gem with 1.5.1+ versions of Vagrant, however.
+
+FEATURES:
+
+- Add output to note when an rsync finishes and how long it took. [GH-7, GH-10]
+
+BUG FIXES:
+
+- The plugin now correctly outputs an error instead of failing to load on Vagrant versions < 1.5.1. [GH-11]
+
 ## 0.0.3 (May 02, 2014)
 
 Bugfix release.

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v1.5.1'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v1.6.3'
 end
 
 group :plugins do

data/README.md

@@ -17,6 +17,11 @@ vagrant plugin install vagrant-gatling-rsync
 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 may also specify what
+[Time.strftime](http://www.ruby-doc.org/core-2.0.0/Time.html#method-i-strftime)
+options the plugin will use when it reports on completed rsyncs. The default is
+"%I:%M:%S %p".
+
 You will also need to have at least one synced folder set to type "rsync"
 to use the plugin.
 
@@ -32,6 +37,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Configure the window for gatling to coalesce writes.
   if Vagrant.has_plugin?("vagrant-gatling-rsync")
     config.gatling.latency = 2.5
+    config.gatling.time_format = "%H:%M:%S"
   end
 end
 ```

data/example/vagrant/Vagrantfile

@@ -7,6 +7,18 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "hashicorp/precise64"
 
+  config.vm.provider "docker" do |d, override|
+    d.image = "smerrill/vagrant-centos"
+    d.has_ssh = true
+
+    # This is needed if you have non-Docker provisioners in the Vagrantfile.
+    override.vm.box = nil
+
+    # Ensure Vagrant knows the SSH port. See
+    # https://github.com/mitchellh/vagrant/issues/3772.
+    override.ssh.port = 22
+  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
@@ -14,8 +26,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   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
+  # 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.
+  config.gatling.latency = 0.4
+  config.gatling.time_format = "%H:%M:%S"
 end

data/lib/vagrant-gatling-rsync.rb

@@ -1,5 +1,5 @@
 # This file is required because Vagrant's plugin system expects
-# a eponymous ruby file matching the rubygem.
+# an eponymous ruby file matching the rubygem.
 #
 # So this gem is called 'vagrant-gatling-rsync' and thus vagrant tries
 # to require "vagrant-gatling-rsync"

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

@@ -6,6 +6,12 @@ require "vagrant"
 module VagrantPlugins
   module GatlingRsync
     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"
+        raise Errors::Vagrant15RequiredError
+      end
+
       include Vagrant::Action::Builtin::MixinSyncedFolders
 
       def self.synopsis
@@ -121,12 +127,20 @@ module VagrantPlugins
         tosync.each do |folders|
           folders.each do |opts|
             ssh_info = opts[:machine].ssh_info
-            if ssh_info
-              VagrantPlugins::SyncedFolderRSync::RsyncHelper.rsync_single(opts[:machine], ssh_info, opts[:opts])
-            end
+            do_rsync(opts[:machine], ssh_info, opts[:opts]) if ssh_info
           end
         end
       end
+
+      def do_rsync(machine, ssh_info, opts)
+        start_time = Time.new
+        VagrantPlugins::SyncedFolderRSync::RsyncHelper.rsync_single(machine, ssh_info, opts)
+        end_time = Time.new
+        machine.ui.info(I18n.t(
+          "vagrant_gatling_rsync.gatling_ran",
+          date: end_time.strftime(machine.config.gatling.time_format),
+          milliseconds: (end_time - start_time) * 1000))
+      end
     end
   end
 end

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

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

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

@@ -4,15 +4,9 @@ rescue LoadError
   raise "The Vagrant gatling rsync plugin must be run within Vagrant."
 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.1"
-  raise Errors::Vagrant15RequiredError
-end
-
 module VagrantPlugins
   module GatlingRsync
-    class Plugin < Vagrant.plugin("2")
+    class Plugin < Vagrant.plugin(2)
       name "Gatling Rsync"
       description <<-DESC
       Rsync large project directories to your Vagrant VM without using many resources on the host.

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

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

data/locales/en.yml

@@ -1,8 +1,10 @@
 en:
   vagrant_gatling_rsync:
+    gatling_ran: |-
+      %{date}: The rsync operation completed in %{milliseconds} milliseconds.
     errors:
       only_osx_linux_support: |-
-        This plugin currently only supports Max OS X and Linux hosts.
+        The vagrant-gatling-rsync plugin currently only supports Max OS X and Linux hosts.
       vagrant_15_required: |-
-        This plugin requires Vagrant 1.5.1 or newer to function.
+        The vagrant-gatling-rsync plugin requires Vagrant 1.5.1 or newer to function.
 

data/vagrant-gatling-rsync.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  # @TODO: Remove example files from the built gem.
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.start_with?('example/files')}
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -22,4 +21,6 @@ Gem::Specification.new do |spec|
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-gatling-rsync
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Steven Merrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !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:
@@ -67,7 +81,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- example/files/.gitkeep
 - example/vagrant/Vagrantfile
 - lib/vagrant-gatling-rsync.rb
 - lib/vagrant-gatling-rsync/command/rsync_auto.rb
@@ -100,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A lighter-weight Vagrant plugin for watching and rsyncing directories.