ruby-jmeter 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd3659e8b6c63f914431419f9eeacfa7e7df8d8
-  data.tar.gz: 1706ffed23bd94c9a6bfdb39c5895a8125fb385f
+  metadata.gz: 5f7e301f7230400fc1209e14de0cab9a9c598870
+  data.tar.gz: 2c2dd6207bc2ef9109b94dbaef2bc7dbedcaa10c
 SHA512:
-  metadata.gz: d4cdbda09d55d140d39a938f02abec9565ed94a004017ff34756009de8cda1b681f86028d5b1e958f13d934b3533e5daa2837aa183e3bea4e7cdb3925caa20c7
-  data.tar.gz: 03a415a86d46d38dc238c6410b59982159d66b46ba0631376ceb73967f0d9213599048e16777c33a2a9d3c8f6438bd172d038c9905841d84f47c8c819c4ed863
+  metadata.gz: 979db78c9a2b2dde3d6286f31f6af42b8bad9a29b219d9ec50007f25ebcb580fb653add14979edb2a13cf9f37649ecb4970c8c8f74a75fc2446501fe51e11f3a
+  data.tar.gz: 117c2a81ebb929b0ebb72e236d40091e8fdebf26090c6a281fae341a10c4341aac7d9cf7109d4b8ce0fc336d8d1eb5c9cb7906e1931572e76425441010c1a0bb

data/README.md

@@ -86,7 +86,7 @@ test do
 end.run
 ```
 
-This will launch JMeter in headless (non-GUI mode) and execute the test plan. This is useful for shaking out the script before you push it to the Grid. There are a few parameters that you can set such as the `path` to the JMeter binary, the `file` path/name for the JMX file, the `log` path/name to output JMeter logs and the `jtl` path/name for JMeter results like this.
+This will launch JMeter in headless (non-GUI mode) and execute the test plan. This is useful for shaking out the script before you push it to the Grid. There are a few parameters that you can set such as the `path` to the JMeter binary, the `file` path/name for the JMX file, the `log` path/name to output JMeter logs, the `jtl` path/name for JMeter results like this, and the `properties` path/name for the additional JMeter property file.
 
 ```ruby
 test do
@@ -97,7 +97,8 @@ end.run(
   path: '/usr/share/jmeter/bin/',
   file: 'jmeter.jmx',
   log: 'jmeter.log',
-  jtl: 'results.jtl')
+  jtl: 'results.jtl',
+  properties: 'jmeter.properties')
 ```
 
 ### Running a JMeter Test Plan on Flood IO

data/lib/ruby-jmeter/dsl.rb

@@ -38,7 +38,7 @@ module RubyJmeter
       file(params)
       logger.warn 'Test executing locally ...'
 
-      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' }"
+      cmd = "#{params[:path] ? File.join(params[:path], 'jmeter') : 'jmeter'} #{"-n" unless params[:gui] } -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' } #{build_properties(params[:properties]) if params[:properties]}"
       logger.debug cmd if params[:debug]
       Open3.popen2e("#{cmd}") do |stdin, stdout_err, wait_thr|
         while line = stdout_err.gets
@@ -81,6 +81,14 @@ module RubyJmeter
       Nokogiri::XML(@root.to_s, &:noblanks)
     end
 
+    def build_properties(properties)
+      if properties.kind_of?(String)
+        "-q #{properties}"
+      elsif properties.kind_of?(Hash)
+        properties.map{ |k,v| "-J#{k}=#{v}" }.join(" ")
+      end
+    end
+
     def logger
       @log ||= Logger.new(STDOUT)
       @log.level = Logger::DEBUG

data/lib/ruby-jmeter/dsl/constant_throughput_timer.rb

@@ -15,11 +15,7 @@ module RubyJmeter
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="#{testname}" enabled="true">
   <intProp name="calcMode">0</intProp>
-  <doubleProp>
-    <name>throughput</name>
-    <value>0.0</value>
-    <savedValue>0.0</savedValue>
-  </doubleProp>
+  <stringProp name="throughput">0.0</stringProp>
 </ConstantThroughputTimer>)
       EOS
       update params

data/lib/ruby-jmeter/extend/misc/flood.rb

@@ -43,7 +43,7 @@ module RubyJmeter
           logger.fatal "Sorry there was an error: #{JSON.parse(response)["error"]}"
         end
       rescue => e
-        logger.fatal "Sorry there was an error: #{JSON.parse(e.response)["error"]}"
+        logger.fatal "Sorry there was an error: #{e}"
       end
     end
   end

data/lib/ruby-jmeter/extend/timers/constant_throughput_timer.rb

@@ -4,8 +4,7 @@ module RubyJmeter
       params[:value] ||= params[:throughput] || 0.0
 
       node = RubyJmeter::ConstantThroughputTimer.new(params)
-      node.doc.xpath('.//value').first.content = params[:value].to_f
-
+      node.doc.xpath('//stringProp[@name="throughput"]').first.content = params[:value]
       attach_node(node, &block)
     end
   end

data/lib/ruby-jmeter/idl.xml

@@ -340,11 +340,7 @@
         <hashTree/>
         <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
           <intProp name="calcMode">0</intProp>
-          <doubleProp>
-            <name>throughput</name>
-            <value>0.0</value>
-            <savedValue>0.0</savedValue>
-          </doubleProp>
+          <stringProp name="throughput">0.0</stringProp>
         </ConstantThroughputTimer>
         <hashTree/>
         <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '3.0.7'
+  VERSION = '3.0.8'
 end

data/spec/constant_throughput_timer_spec.rb

@@ -10,13 +10,11 @@ describe 'constant_throughput_timer' do
     end.to_doc
   end
 
-  let(:fragment) { doc.search("//ConstantThroughputTimer").first }
-
   it 'should match on throughput using value' do
-    expect(fragment.search("//doubleProp/value").first.text).to eq '60.0'
+    expect(doc.search('//ConstantThroughputTimer[1]/stringProp[@name="throughput"]').first.content).to eq '60.0'
   end
-
+  
   it 'should match on throughput using throughput' do
-    expect(fragment.search("//doubleProp/value").last.text).to eq '70.0'
+    expect(doc.search('//ConstantThroughputTimer[2]/stringProp[@name="throughput"]').first.content).to eq '70.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client