loadaboy 0.1.0 → 0.1.1

data/.gitignore

@@ -19,4 +19,6 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-*.beam
+*.beam
+Loadafile.rb
+.rvmrc

data/README.rdoc

@@ -1,47 +1,54 @@
-= loadaboy
+= LoadaBoy
 
-= Simple Load Test service.
+== Synopsis
 
-= Installation
+A Load Tester that allows you to generate dynamic requests.
 
-= Synopsis
+== Requirements
 
-How it works
+LoadaBoy requires Erlang and RubyGems.
 
-* Write a custom generator in Loadafile.rb
-* run loadaboy domain workers requests-per-worker
+== Installation
 
-== Loadafile.rb:
+    gem install loadaboy
 
-    class Generator
-      AD_SIZES = [{width: 250, height:360}, {width: 300, height:250}, {width: 336, height:280}, {width: 480, height:280}]
+== How it works
 
-      def random_size
-        AD_SIZES[rand(AD_SIZES.length)]
-      end
+* Write a custom generator in Loadafile.rb:
 
-      def random_string(n = 10)
-        (1..n).map{ ('a'..'z').to_a[rand(26)] }.join
-      end
+  * The generator should return a hash with the requests names as keys and the urls as values.
 
-      def random_keywords(n = 20)
-        (1..n).map{random_string(5+rand(20))}.join("+")
-      end
+  * The generated request order is respected when the load test is running.
 
-      def generate
-        size = random_size
-        {
-          static: "/dynad/static.js",
-          ad:     "/dynad/ad/load_test_#{rand(3)}/#{size[:width]}/#{size[:height]}?div_id=#{random_string}&keywords=#{random_keywords}&track_url=http://www.zombo.com/"
-        }
-      end
-    end
+  * One set of requests returned by the generator represents one job.
+
+* run:
+    loadaboy domain-name number-of-workers number-of-jobs-per-worker
+
+== Example
 
+=== Loadafile.rb:
+    require 'loadaboy'
+    
+    def random_string(n = 10)
+      (1..n).map{ ('a'..'z').to_a[rand(26)] }.join
+    end
+    
+    def random_keywords(n = 20)
+      (1..n).map{random_string(5+rand(20))}.join("+")
+    end
+    
+    LoadaBoy.generator do
+      {
+        :first   => "/static",
+        :second  => "/dynamic/#{rand(3)}?random_string=#{random_string}&keywords=#{random_keywords}"
+      }
+    end
 
 
-== run:
 
-      loadaboy http://localhost:3000 10 10
+=== Run:
+    loadaboy http://localhost:3000 10 10
 
 == Note on Patches/Pull Requests
 

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.name = "loadaboy"
     gem.executables     = %W(loadaboy)
     gem.summary = %Q{LoadaBoy - Load Test Gem to the Rescue!}
-    gem.description = %Q{LoadaBoy - Load Test Gem to the Rescue!}
+    gem.description = %Q{LoadaBoy is a load testing gem.}
     gem.email = "jean-louis@icehouse.se"
     gem.homepage = "http://github.com/Jell/loadaboy"
     gem.authors = ["Jell"]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/elib/worker.erl

@@ -28,13 +28,13 @@ fetch_url(Url) ->
 		Time = time_to_ms(Tac) - time_to_ms(Tic),
 		case Result of
 			timeout ->
-				[timeout, Time];
+				[{"HTTP/1.1", 408, "Request Timeout"}, Time];
 			{Header, _Params, _Body} ->
 				[Header, Time]
 		end
 	catch
 		_:_ ->
-			['FAIL', 0]
+			[{"HTTP/1.1", 400, "Bad Request"}, 0]
 	end.
 
 time_to_ms({Mega, Sec, Micro})->
@@ -46,6 +46,6 @@ get_over_http(Url) ->
 		{http, {RequestId, Result}} ->
 			Result
 	after
-		3000 ->
+		10000 ->
 			timeout
 	end.

data/lib/erlang_interface.rb

@@ -1,11 +1,12 @@
-LOADABOY_EXEC_DIR = `echo $LOADABOY_EXEC_DIR`.chomp
-
 require 'rubygems'
 require 'erlectricity'
 require 'loadaboy'
 
 extend LoadaBoy
 
+LOADABOY_EXEC_DIR = `echo $LOADABOY_EXEC_DIR`.chomp
+require "#{LOADABOY_EXEC_DIR}/Loadafile" if File.exist? "#{LOADABOY_EXEC_DIR}/Loadafile.rb"
+
 receive do |f|
   f.when([:prepare, Array]) do |array|
     f.send!([:result, generate_requests(array[0], array[1])])

data/lib/loadaboy.rb

@@ -1,11 +1,31 @@
-require 'generator'
-require "#{LOADABOY_EXEC_DIR}/Loadafile" if File.exist? "#{LOADABOY_EXEC_DIR}/Loadafile.rb"
+require 'enumerator'
 
 module LoadaBoy
+
+  class << self
+    def generator(&block)
+      define_method :generate, &block
+    end
+  end
+
+  protected
+
+  def generate
+    { :default => "/" }
+  end
+
   def generate_requests(workers_count, jobs_count)
-    generator = Generator.new
     (1..workers_count).map do |i|
-      ["worker#{i}".to_sym, (1..jobs_count).map { generator.generate.to_a }.flatten(1)]
+      ["worker#{i}".to_sym, generate_urls(jobs_count)]
     end
   end
-end
+
+  def generate_urls(jobs_count)
+    urls = []
+    (1..jobs_count).map { generate.to_a }.flatten.each_slice(2) do |slice|
+      urls << slice
+    end
+    urls
+  end
+end
+

data/loadaboy.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loadaboy}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jell"]
-  s.date = %q{2010-10-19}
+  s.date = %q{2010-10-26}
   s.default_executable = %q{loadaboy}
-  s.description = %q{LoadaBoy - Load Test Gem to the Rescue!}
+  s.description = %q{LoadaBoy is a load testing gem.}
   s.email = %q{jean-louis@icehouse.se}
   s.executables = ["loadaboy"]
   s.extensions = ["ext/extconf.rb", "ext/extconf.rb"]
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
      "ext/Makefile",
      "ext/extconf.rb",
      "lib/erlang_interface.rb",
-     "lib/generator.rb",
      "lib/loadaboy.rb",
      "loadaboy.gemspec",
      "test/helper.rb",

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loadaboy
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jell
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-26 00:00:00 +02:00
 default_executable: loadaboy
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
@@ -45,7 +48,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   version_requirements: *id002
-description: LoadaBoy - Load Test Gem to the Rescue!
+description: LoadaBoy is a load testing gem.
 email: jean-louis@icehouse.se
 executables: 
 - loadaboy
@@ -69,7 +72,6 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/erlang_interface.rb
-- lib/generator.rb
 - lib/loadaboy.rb
 - loadaboy.gemspec
 - test/helper.rb
@@ -88,6 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -96,6 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/generator.rb

@@ -1,5 +0,0 @@
-class Generator
-  def generate
-    { default: "/" }
-  end
-end