celluloid-benchmark 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 8a93b7e2da94de515289b206900f7e8672a3ed2e
-  data.tar.gz: 13c898934494aa9365d6a2c5fd445b39d42c20b0
+  metadata.gz: 9b4f96a47f1a9d4c90006868c81711b9b6bdfc52
+  data.tar.gz: ed693552569f5428d0d080f433ee698dd5957968
 SHA512: 
-  metadata.gz: df661160938f2506686e0876c61fcb444a93327cee17c42c47326e38dad43278f35426b7fcfd748c4d1e21e630b20c217e8df0ae6e307b57e4b91b8bf172e54f
-  data.tar.gz: cf3cd1bbbda270cd1e2d77c178bc41f3bf1ff9f9b4e5cbc054a7ff844e73b71db56226552d88638be9c1b0afb4a71338e162c401e353a53ece419bb7d9bc06d8
+  metadata.gz: 45acfeefe059bb4bb16f65f814790c5311c93f015ba2f92a738608822f9bb4dffda0e11a1fbdab2e584ec76e85b1185b643bb418fb332280f3c1bbf05e080805
+  data.tar.gz: 2629ee0d3f1583eb1a33e12375f5d28b4e17744be9e648fa7cf33a54341c03b9ca25e1b5590f91325fa45baa0e55438227de7be4efb07b3af934fc2f1e2eb5d3

data/README.md

@@ -16,8 +16,10 @@ For your own tests, create a session file and pass its path to celluloid-benchma
 
 Simple scenario
 ---------------
-    benchmark :home_page, 1
-    get "https://github.com/scottwillson/celluloid-benchmark"
+    CelluloidBenchmark::Session.define do
+      benchmark :home_page, 1
+      get "https://github.com/scottwillson/celluloid-benchmark"
+    end
 
 `benchmark :label, duration` means "measure the following requests and group them under 'label'".
 Duration is optional and defaults to 0.3 seconds.
@@ -50,6 +52,18 @@ Simulate AJAX
       }
     end
 
+JSON requests (e.g., a mobile app API)
+--------------------------------------
+  get "/mobile-api/v2/offers.json", [], nil, {
+          "Accept" => "application/json, text/javascript, */*; q=0.01"
+        }
+
+  post(
+    "/mobile-api/v2/signup.json",
+    MultiJson.dump({ email: email }),
+    { "Content-Type" => "application/json" }
+  )
+
 Test data
 ---------
 Because test scenarios are plain Ruby, you can drive tests in many different ways. The
@@ -72,12 +86,27 @@ Celluloid Benchmark can also pull random test data from CSV files. For example:
 
 `random_data(:post_zone)` pulls a random line from tmp/data/post_zones.csv
 
+Extending session DSL
+---------------------
+The DSL is simple and will change in early releases. To add custom DSL methods, add methods to Visitor
+    module CelluloidBenchmark
+      class Visitor
+        def visit_from_homepage(target)
+          ...
+        end
+      end
+    end
+
 Celluloid Benchmark agents delegate calls to Mechanize. If you need something more complicated
 than the examples, check out the [Mechanize API](http://mechanize.rubyforge.org/HTTP/Agent.html) and call it directly with `browser.` in your test scenario.
 
 For a longer test, pass in a second duration argument (seconds):
     celluloid-benchmark my_test_session.rb 180
 
+Sessions are defined as Procs, which means that you can't call `return` in a session definition. If you do need to
+short-circuit a session (for example, to simulate an early visitor exit), encapsulate that part of the session in a
+method. You can call return from the method. See "Extending session DSL" above.
+
 Why
 ===
 I need to simulate a lot of realistic traffic against preproduction code.

data/bin/celluloid-benchmark

@@ -1,12 +1,14 @@
 #! /usr/bin/env ruby
 
 require_relative "../lib/celluloid_benchmark"
+require "os"
 
-benchmark_run = CelluloidBenchmark::Runner.run ARGV[0], (ARGV[1] || 20).to_i, (ARGV[2] || OS.cpu_count * 1.5).to_i
+session_path = File.expand_path(ARGV[0])
+benchmark_run = CelluloidBenchmark::Runner.run session_path, (ARGV[1] || 20).to_i, (ARGV[2] || OS.cpu_count * 1.5).to_i
 
 p benchmark_run
 puts
-p "#{benchmark_run.requests / benchmark_run.elapsed_time} requests per second. #{benchmark_run.requests} requests in #{benchmark_run.elapsed_time} seconds by #{Celluloid::Actor[:visitor_pool].size} visitors."
+p "#{benchmark_run.requests / benchmark_run.elapsed_time} requests per second. #{benchmark_run.requests} requests in #{benchmark_run.elapsed_time} seconds by #{CelluloidBenchmark::Visitor.pool.size} visitors."
 
 puts
 benchmark_run.benchmarks.each do |trans|

data/lib/celluloid_benchmark/runner.rb

@@ -1,4 +1,5 @@
 require "celluloid"
+require_relative "session"
 require_relative "visitor_group"
 
 Celluloid.logger = nil
@@ -10,24 +11,25 @@ module CelluloidBenchmark
       raise("session_path is required") unless session_path
       raise("'#{session_path}' does not exist") unless File.exists?(session_path)
 
-      visitor_group = VisitorGroup.run!
+      require session_path
+
+      VisitorGroup.run!
       set_visitors_pool_size visitors
       benchmark_run = Celluloid::Actor[:benchmark_run]
 
       benchmark_run.mark_start
-      futures = run_sessions(session_path, benchmark_run, duration)
+      futures = run_sessions(benchmark_run, duration)
       futures.map(&:value)
       benchmark_run.mark_end
 
       benchmark_run
     end
 
-    def self.run_sessions(session_path, benchmark_run, duration)
-      session = File.read(session_path)
+    def self.run_sessions(benchmark_run, duration)
       visitors = Celluloid::Actor[:visitor_pool]
       futures = []
       (visitors.size - 2).times do
-        futures << visitors.future.run_session(session, benchmark_run, duration)
+        futures << visitors.future.run_session(benchmark_run, duration)
       end
       futures
     end

data/lib/celluloid_benchmark/session.rb

@@ -0,0 +1,13 @@
+module CelluloidBenchmark
+  module Session
+    @session_block = nil
+
+    def self.define(&block)
+      @session_block = block
+    end
+
+    def self.run(visitor)
+      visitor.instance_eval(&@session_block)
+    end
+  end
+end

data/lib/celluloid_benchmark/version.rb

@@ -1,3 +1,3 @@
 module CelluloidBenchmark
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

data/lib/celluloid_benchmark/visitor.rb

@@ -25,14 +25,14 @@ module CelluloidBenchmark
       browser.user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/537.75.14"
     end
 
-    def run_session(session, benchmark_run, duration)
+    def run_session(benchmark_run, duration)
       @benchmark_run = benchmark_run
 
       elapsed_time = 0
       started_at = Time.now
       until elapsed_time >= duration
         begin
-          instance_eval session
+          Session.run self
         rescue Mechanize::ResponseCodeError => e
           log_response_code_error e
         end
@@ -51,6 +51,10 @@ module CelluloidBenchmark
       case value
       when :iphone
         browser.user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25"
+      when :android
+        browser.user_agent = "Mozilla/5.0 (Linux; Android 4.4; Nexus 5 Build/BuildID) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36"
+      when :ipad
+        browser.user_agent = "Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25"
       else
         browser.user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/537.75.14"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celluloid-benchmark
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Scott Willson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-16 00:00:00 Z
+date: 2014-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: celluloid
@@ -81,6 +81,7 @@ files:
 - lib/celluloid_benchmark/benchmark_run.rb
 - lib/celluloid_benchmark/data_sources.rb
 - lib/celluloid_benchmark/runner.rb
+- lib/celluloid_benchmark/session.rb
 - lib/celluloid_benchmark/version.rb
 - lib/celluloid_benchmark/visitor.rb
 - lib/celluloid_benchmark/visitor_group.rb