gridinit-jmeter 0.2.0 → 0.2.1

data/lib/gridinit-jmeter/dsl.rb

@@ -282,6 +282,14 @@ module Gridinit
         self.instance_exec(&block) if block
       end
 
+      def gc_console_status_logger(name="jp@gc - Console Status Logger", params={}, &block)
+        node = Gridinit::Jmeter::GCConsoleStatusLogger.new(name, params)
+        attach_to_last(node, caller)
+        self.instance_exec(&block) if block
+      end
+
+      alias_method :console, :gc_console_status_logger
+
       def throughput_shaper(name="jp@gc - Throughput Shaping Timer", steps=[], params={}, &block)
         node = Gridinit::Jmeter::ThroughputShapingTimer.new(name, steps)
         attach_to_last(node, caller)
@@ -296,19 +304,36 @@ module Gridinit
 
       def jmx(params={})
         file(params)
-        logger.info "JMX saved to: #{params[:file]}"
+        logger.info "Test plan saved to: #{params[:file]}"
       end
 
       def run(params={})
         file(params)
         logger.warn "Test executing locally ..."
         cmd = "#{params[:path]}jmeter -n -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' }"
-        logger.info cmd
-        `#{cmd}`
-        logger.info "Results at: #{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}"
+        logger.debug cmd
+        Open3.popen2e("#{cmd} -q #{File.dirname(__FILE__)}/helpers/jmeter.properties") do |stdin, stdout_err, wait_thr|
+          while line = stdout_err.gets
+            logger.debug line.chomp if params[:debug]
+          end
+
+          exit_status = wait_thr.value
+          unless exit_status.success?
+            abort "FAILED !!! #{cmd}"
+          end
+        end
+        logger.info "Local Results at: #{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}"
       end
 
       def grid(token, params={})
+        if params[:region] == 'local'
+          logger.info "Starting test ..."
+          params[:started] = Time.now
+          run params 
+          params[:completed] = Time.now
+          logger.info "Completed test ..."
+          logger.debug "Uploading results ..." if params[:debug]
+        end
         RestClient.proxy = params[:proxy] if params[:proxy]
         begin
           file = Tempfile.new('jmeter')
@@ -318,10 +343,13 @@ module Gridinit
           {
             :name => 'attachment', 
             :attachment => File.new("#{file.path}", 'rb'),
+            :results => (File.new("#{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}", 'rb') if params[:region] == 'local'),
             :multipart => true,
-            :content_type => 'application/octet-stream'
+            :content_type => 'application/octet-stream',
+            :started => params[:started],
+            :completed => params[:completed]
           }
-          logger.info "Results at: #{JSON.parse(response)["results"]}" if response.code == 200
+          logger.info "Grid Results at: #{JSON.parse(response)["results"]}" if response.code == 200
         rescue => e
           logger.fatal "There was an error: #{e.message}"
         end

data/lib/gridinit-jmeter/helpers/jmeter.properties

@@ -0,0 +1,28 @@
+jmeter.save.saveservice.output_format=csv
+jmeter.save.saveservice.data_type=false
+jmeter.save.saveservice.label=true
+jmeter.save.saveservice.response_code=true
+jmeter.save.saveservice.response_data=false
+jmeter.save.saveservice.response_data.on_error=false
+jmeter.save.saveservice.response_message=false
+jmeter.save.saveservice.successful=true
+jmeter.save.saveservice.thread_name=true
+jmeter.save.saveservice.time=true
+jmeter.save.saveservice.subresults=false
+jmeter.save.saveservice.assertions=false
+jmeter.save.saveservice.latency=true
+jmeter.save.saveservice.samplerData=false
+jmeter.save.saveservice.responseHeaders=false
+jmeter.save.saveservice.requestHeaders=false
+jmeter.save.saveservice.encoding=false
+jmeter.save.saveservice.bytes=true
+jmeter.save.saveservice.url=false
+jmeter.save.saveservice.filename=false
+jmeter.save.saveservice.hostname=false
+jmeter.save.saveservice.thread_counts=true
+jmeter.save.saveservice.sample_count=true
+jmeter.save.saveservice.idle_time=false
+jmeter.save.saveservice.timestamp_format=ms
+jmeter.save.saveservice.default_delimiter=|
+jmeter.save.saveservice.print_field_names=false
+sample_variables=testguid

data/lib/gridinit-jmeter/listeners/gc_console_status_logger.rb

@@ -0,0 +1,16 @@
+module Gridinit
+  module Jmeter
+
+    class GCConsoleStatusLogger
+      attr_accessor :doc
+      include Helper
+      def initialize(name, params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <kg.apc.jmeter.reporters.ConsoleStatusLogger guiclass="kg.apc.jmeter.reporters.ConsoleStatusLoggerGui" testclass="kg.apc.jmeter.reporters.ConsoleStatusLogger" testname="#{name}" enabled="true"/>
+        EOF
+        update params
+      end
+    end  
+
+  end
+end

data/lib/gridinit-jmeter/version.rb

@@ -1,5 +1,5 @@
 module Gridinit
   module Jmeter
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/gridinit-jmeter.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'rest_client'
 require 'json'
 require 'cgi'
+require 'open3'
 
 # DSL
 require 'gridinit-jmeter/dsl'
@@ -95,6 +96,7 @@ require 'gridinit-jmeter/helpers/user-agents'
   require 'gridinit-jmeter/listeners/gc_response_times_over_time'
   require 'gridinit-jmeter/listeners/gc_response_times_percentiles'
   require 'gridinit-jmeter/listeners/gc_transactions_per_second'
+  require 'gridinit-jmeter/listeners/gc_console_status_logger'
 
 # LOGIC CONTROLLERS
   require 'gridinit-jmeter/controllers/transaction'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -103,9 +103,11 @@ files:
 - lib/gridinit-jmeter/dsl.rb
 - lib/gridinit-jmeter/helpers/dsl_helper.rb
 - lib/gridinit-jmeter/helpers/fallback_content_proxy.rb
+- lib/gridinit-jmeter/helpers/jmeter.properties
 - lib/gridinit-jmeter/helpers/logger-colors.rb
 - lib/gridinit-jmeter/helpers/strip-heredoc.rb
 - lib/gridinit-jmeter/helpers/user-agents.rb
+- lib/gridinit-jmeter/listeners/gc_console_status_logger.rb
 - lib/gridinit-jmeter/listeners/gc_latencies_over_time.rb
 - lib/gridinit-jmeter/listeners/gc_response_codes_per_second.rb
 - lib/gridinit-jmeter/listeners/gc_response_times_distribution.rb