gridinit-jmeter 0.0.2 → 0.0.3

data/Gemfile

@@ -6,6 +6,10 @@ gemspec
 gem 'nokogiri'
 gem 'rest-client'
 
+platforms :jruby do
+  gem 'json-jruby'
+end
+
 group :test do
   gem 'rake'
   gem 'rspec'

data/bin/grid

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'gridinit-jmeter'
+
+def usage(why = nil)
+  puts "failed for reason: #{why}" if why
+  puts "usage: grid [testplan.rb] "
+  puts "  The tesplan is optional, if you leave it off you'll get an interactive shell."
+  exit(1)
+end
+
+@testplan = ARGV.shift
+
+require 'irb'
+require 'irb/completion'
+
+if File.exists? ".irbrc"
+  ENV['IRBRC'] = ".irbrc"
+end
+
+ARGV.clear
+
+IRB.start
+exit!

data/examples/basic_proxy.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'gridinit-jmeter'
+
+test do
+  threads 10 do
+    visit 'Google Search', 'http://google.com'
+  end
+end.grid('4dy-zJLEIgpYkKe6p6JhSQ', {proxy: 'http://corporateproxy:8080'})

data/examples/basic_stdout.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'gridinit-jmeter'
+
+test do
+  threads 10 do
+    visit 'Google Search', 'http://google.com'
+  end
+end

data/gridinit-jmeter.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |gem|
   gem.description   = %q{This is a Ruby based DSL for writing JMeter test plans}
   gem.summary       = %q{This is a Ruby based DSL for writing JMeter test plans}
   gem.homepage      = ""
-  gem.add_dependency("rest-client", "~> 1.6.7")
-  gem.add_dependency("nokogiri",    "~> 1.5.5")
+  gem.add_dependency("rest-client")
+  gem.add_dependency("nokogiri")
+  gem.add_runtime_dependency('json-jruby') if RUBY_PLATFORM == 'java'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   << 'grid'
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 end

data/lib/gridinit-jmeter/dsl.rb

@@ -11,7 +11,7 @@ module Gridinit
     end
     dsl
   end
-  
+
   module_function :dsl_eval
 
   module Jmeter
@@ -112,9 +112,12 @@ module Gridinit
 
       alias_method :web_reg_find, :assert
 
+      def out(params={})
+        puts doc.to_xml(:indent => 2)
+      end
+
       def jmx(params={})
         file(params)
-        puts doc.to_xml(:indent => 2)
         logger.info "JMX saved to: #{params[:file]}"
       end
 
@@ -128,11 +131,15 @@ module Gridinit
       end
 
       def grid(token, params={})
-        file(params)
+        RestClient.proxy = params[:proxy] if params[:proxy]
         begin
-          response = RestClient.post "http://#{params[:endpoint] ? params[:endpoint] : 'gridinit.com'}/api?token=#{token}", {
+          file = Tempfile.new('jmeter')
+          file.write(doc.to_xml(:indent => 2))
+          file.rewind
+          response = RestClient.post "http://#{params[:endpoint] ? params[:endpoint] : 'gridinit.com'}/api?token=#{token}", 
+          {
             :name => 'attachment', 
-            :attachment => File.new("#{params[:file]}", 'rb'),
+            :attachment => File.new("#{file.path}", 'rb'),
             :multipart => true,
             :content_type => 'application/octet-stream'
           }
@@ -188,5 +195,7 @@ module Gridinit
 end
 
 def test(&block)
-  Gridinit.dsl_eval(Gridinit::Jmeter::DSL.new, &block)
+  t = Gridinit.dsl_eval(Gridinit::Jmeter::DSL.new, &block)
+  t.out
+  t
 end

data/lib/gridinit-jmeter/version.rb

@@ -1,5 +1,5 @@
 module Gridinit
   module Jmeter
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '0'
 description: This is a Ruby based DSL for writing JMeter test plans
 email:
 - support@gridinit.com
-executables: []
+executables:
+- grid
 extensions: []
 extra_rdoc_files: []
 files:
@@ -59,13 +60,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/grid
 - examples/basic_assertion.rb
 - examples/basic_auth.rb
 - examples/basic_cache.rb
 - examples/basic_cookies.rb
 - examples/basic_google.rb
 - examples/basic_grid.rb
+- examples/basic_proxy.rb
 - examples/basic_run.rb
+- examples/basic_stdout.rb
 - examples/basic_testplan.jmx
 - examples/basic_testplan.rb
 - examples/basic_think_time.rb