ruby-jmeter 2.0.1 → 2.0.2

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p448

data/examples/{basic_grid.rb → basic_flood.rb}

@@ -5,4 +5,8 @@ test do
   threads count: 1 do
     visit name: 'Home Page', url: 'http://google.com/'
   end
-end.grid('6CnGKgaTRU62LspdTFbr', {region: 'us-west-2', endpoint: '127.0.0.1:3000'})
+end.flood('qCL6dv7qzqeBB7LYSR2x', {
+  name: 'Demo using flood.io',
+  region: 'us-west-2', 
+  endpoint: 'dev.api.flood.io:3000'
+})

data/lib/ruby-jmeter/dsl.rb

@@ -346,12 +346,12 @@ module RubyJmeter
       logger.info "Local Results at: #{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}"
     end
 
-    def grid(token, params={})
+    def flood(token, params={})
       if params[:region] == 'local'
         logger.info "Starting test ..."
         params[:started] = Time.now
         run params
-        params[:completed] = Time.now
+        params[:stopped] = Time.now
         logger.info "Completed test ..."
         logger.debug "Uploading results ..." if params[:debug]
       end
@@ -360,21 +360,41 @@ module RubyJmeter
         file = Tempfile.new(['jmeter', '.jmx'])
         file.write(doc.to_xml(:indent => 2))
         file.rewind
-        response = RestClient.post "#{params[:endpoint] ? params[:endpoint] : 'https://flood.io'}/api?token=#{token}",
+
+        response = RestClient.post "#{params[:endpoint] ? params[:endpoint] : 'https://flood.io'}/floods?auth_token=#{token}",
         {
-          :attachment => File.new("#{file.path}", 'rb'),
+          :flood => {
+            :tool => 'jmeter',
+            :url => params[:url],
+            :plan => File.new("#{file.path}", 'rb'),
+            :plan_cache => '',
+            :name => params[:name],
+            :notes => params[:notes],
+            :tag_list => params[:tag_list],
+            :threads => params[:threads],
+            :rampup => params[:ramup],
+            :duration => params[:duration],
+            # specials for API
+            :started => params[:started],
+            :stopped => params[:stopped]
+          },
           :results => (File.new("#{params[:jtl] ? params[:jtl] : 'jmeter.jtl'}", 'rb') if params[:region] == 'local'),
+          :region => params[:region],
           :multipart => true,
-          :content_type => 'application/octet-stream',
-          :started => params[:started],
-          :completed => params[:completed]
+          :content_type => 'application/octet-stream'          
         }.merge(params)
-        logger.info "Flood results at: #{JSON.parse(response)["results"]}" if response.code == 200
+        if response.code == 200
+          logger.info "Flood results at: #{JSON.parse(response)["response"]["link"]}"
+        else
+          logger.fatal "Sorry there was an error: #{JSON.parse(response)["error_description"]}"
+        end
       rescue => e
-        logger.fatal "Sorry there was an error: #{e.message}"
+        logger.fatal "Sorry there was a fatal error: #{e.message}"
       end
     end
 
+    alias_method :grid, :flood
+
     private
 
     def hash_tree

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -54,6 +54,7 @@ files:
 - .gitattributes
 - .gitignore
 - .rspec
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -64,10 +65,10 @@ files:
 - examples/basic_cache.rb
 - examples/basic_cookies.rb
 - examples/basic_extract.rb
+- examples/basic_flood.rb
 - examples/basic_gc_dummy_sampler.rb
 - examples/basic_gc_results.rb
 - examples/basic_google.rb
-- examples/basic_grid.rb
 - examples/basic_header.rb
 - examples/basic_ldap_ext.rb
 - examples/basic_post.rb
@@ -243,7 +244,4 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This is a Ruby based DSL for writing JMeter test plans
-test_files:
-- spec/dsl_spec.rb
-- spec/spec_helper.rb
-- spec/stub.rb
+test_files: []