loadaboy 0.2.2 → 0.3.0

data/README.rdoc

@@ -16,14 +16,12 @@ LoadaBoy requires Erlang and RubyGems.
 
 * Write a custom generator in Loadafile.rb:
 
-  * The generator should return a hash with the requests names as keys and the urls as values.
+Write a generator containing each request a worker needs to perform per job.
+The request order is respected.
+You can optionally give a name to the generator if you want to test different load profiles.
 
-  * The generated request order is respected when the load test is running.
-
-  * One set of requests returned by the generator represents one job.
-
-* run:
-    loadaboy domain-name number-of-workers number-of-jobs-per-worker
+* In the same folder as your Loadafile.rb, run:
+    loadaboy domain-name number-of-workers number-of-jobs-per-worker (generator-name)
 
 == Example
 
@@ -39,17 +37,24 @@ LoadaBoy requires Erlang and RubyGems.
     end
     
     LoadaBoy.generator do
-      {
-        :first   => "/static",
-        :second  => "/dynamic/#{rand(3)}?random_string=#{random_string}&keywords=#{random_keywords}"
-      }
+      request :static,  "/static"
+      request :dynamic, "/dynamic/#{rand(3)}?random_string=#{random_string}&keywords=#{random_keywords}"
+    end
+    
+    LoadaBoy.generator :only_dynamic do
+      request :dynamic, "/dynamic/#{rand(3)}?random_string=#{random_string}&keywords=#{random_keywords}"
     end
-
-
 
 === Run:
     loadaboy http://localhost:3000 10 10
 
+or
+    loadaboy http://localhost:3000 10 10 only_dynamic
+
+== TODO
+
+* Add options to request to customize timeout, disable keepalive etc...
+
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/loadaboy.rb

@@ -4,15 +4,25 @@ module LoadaBoy
 
   class << self
     def generator(service = 'default', &block)
-      define_method "generate_#{service}", &block
+      define_method "generate_#{service}" do
+        @urls = {}
+        block.call
+        @urls
+      end
     end
     def set_generator(name)
       alias_method(:generate, "generate_#{name}")
     end
   end
 
+  def request(name, url, options={})
+    @urls[name] = url
+  end
+
   def generate_default
-    { :default => "/" }
+    @urls = {}
+    request :default, "/"
+    @urls
   end
 
   alias_method :generate, :generate_default

data/loadaboy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loadaboy}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jell"]
-  s.date = %q{2010-11-17}
+  s.date = %q{2011-02-27}
   s.default_executable = %q{loadaboy}
   s.description = %q{LoadaBoy is a load testing gem.}
   s.email = %q{jean-louis@icehouse.se}

data/test/test_loadaboy.rb

@@ -6,15 +6,17 @@ class TestLoadaboy < Test::Unit::TestCase
   context ".generator" do
     should "define a generate function running the given block" do
       LoadaBoy.generator do
-        "custom generator"
+        raise "block ran"
       end
-      assert_equal "custom generator", generate_default
+      exception = assert_raise(RuntimeError){ generate_test }
+      assert_match /block ran/, exception.message
     end
     should "define a generate function running the given block with proper name" do
       LoadaBoy.generator :test do
-        "custom generator"
+        raise "block ran"
       end
-      assert_equal "custom generator", generate_test
+      exception = assert_raise(RuntimeError){ generate_test }
+      assert_match /block ran/, exception.message
     end
   end
 
@@ -31,10 +33,10 @@ class TestLoadaboy < Test::Unit::TestCase
     end
     should "set proper generator" do
       LoadaBoy.generator :test do
-        "custom generator"
+        request :request, "custom request"
       end
-      generate_requests(2, 1, :test)
-      assert_equal "custom generator", generate
+      generate_requests(1, 1, :test)
+      assert_equal "custom request", @urls[:request]
     end
   end
 
@@ -45,4 +47,12 @@ class TestLoadaboy < Test::Unit::TestCase
     end
   end
 
+  context "#request" do
+    should "add request to url list" do
+      @urls = {}
+      request :test, "test"
+      assert_equal "test", @urls[:test]
+    end
+  end
+
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-02-27 00:00:00 +01:00
 default_executable: loadaboy
 dependencies: 
 - !ruby/object:Gem::Dependency