ruby-jmeter 2.13.4 → 2.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dda9f4e86561144164191340739f1ec3e28905a
-  data.tar.gz: 82074b1073ebbeedb1dd18efede806ab49cf0f03
+  metadata.gz: 2bc45180e9ae9b2911cbe73279e54fe7a367b33b
+  data.tar.gz: 9e1d2afeb4dcaf99274a2b3804717fdcfa2134ed
 SHA512:
-  metadata.gz: a656d71dd7996db38de4d913a737c322996c47fd87c331b67c1d1d5316238e6a55c9b2ff87d373c50791ec3da945d8fa199bbce5f8e0a9087993655a457e1169
-  data.tar.gz: 30aa94e631a5c7e23c3baa60e336af53e4c7c13f0dde6befac1a59a96cbd96985e05ccfc5e3f52c24ec16449dbd95971682d94e4726f12237f358e7692ad77bc
+  metadata.gz: 5c7322a18414e08695dbd0eb280af2423580c65cf801e7b5d89345f171016ad2a80f1f42a60a74a7705216cf33c755813b91ffb19930cd35cede75a26f9ee7d1
+  data.tar.gz: 6db79206bc45f66291c0f58ea3d84ede37e67d4e733ee307bf176fc4d4f2a110d7b03ff2798440d56bd993c2a6c9061a728fc5bbc7457a4ed85bc1bea662ca94

data/examples/basic_os_process_sampler.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+build_args = ->(args) do
+  args.collect do |arg|
+    {
+      xpath: "//collectionProp[@name='Arguments.arguments']",
+      value: Nokogiri::XML(<<-EOF.strip_heredoc).children
+              <elementProp name="" elementType="Argument">
+                <stringProp name="Argument.name"></stringProp>
+                <stringProp name="Argument.value">#{arg}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            EOF
+    }
+  end
+end
+
+
+test do
+  os_process_sampler 'SystemSampler.command' => 'git',
+                      update_at_xpath: build_args.call(['push', 'origin', 'master'])
+
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/lib/ruby-jmeter/dsl.rb

@@ -94,6 +94,20 @@ module RubyJmeter
 
     alias_method :threads, :thread_group
 
+    def setup_thread_group(*args, &block)
+      params = args.shift || {}
+      params = { count: params }.merge(args.shift || {}) if params.class == Fixnum
+      params[:num_threads] = params[:count] || 1
+      params[:ramp_time] = params[:rampup] || (params[:num_threads]/2.0).ceil
+      params[:start_time] = params[:start_time] || Time.now.to_i * 1000
+      params[:end_time] = params[:end_time] || Time.now.to_i * 1000
+      params[:duration] ||= 60
+      params[:continue_forever] ||= false
+      params[:loops] = -1 if params[:continue_forever]
+      node = RubyJmeter::SetupThreadGroup.new(params)
+      attach_node(node, &block)
+    end
+
     ##
     # HTTP Samplers
 

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

@@ -0,0 +1,36 @@
+module RubyJmeter
+  class DSL
+    def setup_thread_group(params={}, &block)
+      node = RubyJmeter::SetupThreadGroup.new(params)
+      attach_node(node, &block)
+    end
+  end
+
+  class SetupThreadGroup
+    attr_accessor :doc
+    include Helper
+
+    def initialize(params={})
+      testname = params.kind_of?(Array) ? 'SetupThreadGroup' : (params[:name] || 'SetupThreadGroup')
+      @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
+<SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="#{testname}" enabled="true">
+  <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+  <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="#{testname}" enabled="true">
+    <boolProp name="LoopController.continue_forever">false</boolProp>
+    <stringProp name="LoopController.loops">-1</stringProp>
+  </elementProp>
+  <stringProp name="ThreadGroup.num_threads">1</stringProp>
+  <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+  <longProp name="ThreadGroup.start_time">1442954623000</longProp>
+  <longProp name="ThreadGroup.end_time">1442954623000</longProp>
+  <boolProp name="ThreadGroup.scheduler">true</boolProp>
+  <stringProp name="ThreadGroup.duration"></stringProp>
+  <stringProp name="ThreadGroup.delay"></stringProp>
+</SetupThreadGroup>)
+      EOS
+      update params
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
+    end
+  end
+
+end

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '2.13.4'
+  VERSION = '2.13.5'
 end

data/spec/dsl_spec.rb

@@ -186,6 +186,36 @@ describe 'DSL' do
     end
   end
 
+  describe 'setup thread groups' do
+    let(:doc) do
+      test do
+        setup_thread_group count: 101, continue_forever: true, duration: 69
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//SetupThreadGroup").first }
+
+    it 'should match on num_threads' do
+      fragment.search(".//stringProp[@name='ThreadGroup.num_threads']").text.should == '101'
+    end
+
+    it 'should match on scheduler' do
+      fragment.search(".//boolProp[@name='ThreadGroup.scheduler']").text.should == 'true'
+    end
+
+    it 'should match on continue_forever' do
+      fragment.search(".//boolProp[@name='LoopController.continue_forever']").text.should == 'true'
+    end
+
+    it 'should match on loops' do
+      fragment.search(".//stringProp[@name='LoopController.loops']").text.should == '-1'
+    end
+
+    it 'should match on duration' do
+      fragment.search(".//stringProp[@name='ThreadGroup.duration']").text.should == '69'
+    end
+  end
+
   describe 'thread groups old syntax' do
     let(:doc) do
       test do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.13.4
+  version: 2.13.5
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -84,6 +84,7 @@ files:
 - examples/basic_loadosophia.rb
 - examples/basic_loops.rb
 - examples/basic_meta_fu.rb
+- examples/basic_os_process_sampler.rb
 - examples/basic_perfmon.rb
 - examples/basic_post.rb
 - examples/basic_preprocessor_user_parameters.rb
@@ -198,6 +199,7 @@ files:
 - lib/ruby-jmeter/dsl/result_status_action_handler.rb
 - lib/ruby-jmeter/dsl/runtime_controller.rb
 - lib/ruby-jmeter/dsl/save_responses_to_a_file.rb
+- lib/ruby-jmeter/dsl/setup_thread_group.rb
 - lib/ruby-jmeter/dsl/simple_config_element.rb
 - lib/ruby-jmeter/dsl/simple_controller.rb
 - lib/ruby-jmeter/dsl/simple_data_writer.rb