ruby-jmeter 2.11.1 → 2.11.2

data/lib/ruby-jmeter/dsl.rb

@@ -412,7 +412,14 @@ module RubyJmeter
       logger.warn "Test executing locally ..."
       properties = params.has_key?(:properties) ? params[:properties] : "#{File.dirname(__FILE__)}/helpers/jmeter.properties"
       properties = "-q #{properties}" if properties
-      cmd = "#{params[:path]}jmeter #{"-n" unless params[:gui] } -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' } #{properties}"
+
+      if params[:remote_hosts]
+        remote_hosts = params[:remote_hosts]
+        remote_hosts = remote_hosts.join(',') if remote_hosts.kind_of?(Array)
+        remote_hosts = "-R #{remote_hosts}"
+      end
+
+      cmd = "#{params[:path]}jmeter #{"-n" unless params[:gui] } -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' } #{properties} #{remote_hosts}"
       logger.debug cmd if params[:debug]
       Open3.popen2e("#{cmd}") do |stdin, stdout_err, wait_thr|
         while line = stdout_err.gets

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.11.1"
+  VERSION = "2.11.2"
 end

data/spec/dsl_spec.rb

@@ -726,7 +726,7 @@ describe "DSL" do
 
     it 'pass a properties file' do
       Open3.should_receive(:popen2e)
-           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -q my-jmeter.properties')
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -q my-jmeter.properties ')
 
       test do
       end.run(properties: 'my-jmeter.properties')
@@ -734,7 +734,7 @@ describe "DSL" do
 
     it 'do not pass a properties file' do
       Open3.should_receive(:popen2e)
-           .with("jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -q #{deflate_properties}")
+           .with("jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -q #{deflate_properties} ")
 
       test do
       end.run
@@ -742,11 +742,28 @@ describe "DSL" do
 
     it 'pass a nil properties file' do
       Open3.should_receive(:popen2e)
-           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl ')
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl  ')
 
       test do
       end.run(properties: nil)
     end
+
+    it 'pass remote hosts' do
+      Open3.should_receive(:popen2e)
+           .with("jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl  -R 192.168.1.1,192.168.1.2")
+
+      test do
+      end.run(properties: nil, remote_hosts: '192.168.1.1,192.168.1.2')
+    end
+
+    it 'pass remote hosts (Array)' do
+      Open3.should_receive(:popen2e)
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl  -R 192.168.1.1,192.168.1.2')
+
+      test do
+      end.run(properties: nil, remote_hosts: ['192.168.1.1', '192.168.1.2'])
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client