computron 0.1.0 → 0.2.0

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Computron is like ab on steroids, implemented in Ruby using em-http-request. It was designed out of a need to simulate real users on a website. It also does a few smart things like decode JSON into a Ruby hash so you can use those responses in your next requests.
 
-= The DSL
+= The Simulation
 
 Computron is a simple DLS around HTTP em that makes more sense to write user tests. 
 

data/Rakefile

@@ -15,7 +15,6 @@ begin
     gem.add_dependency "colored", ">= 1.1"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/computron

@@ -1,15 +1,18 @@
 #!/usr/bin/env ruby
 
-computron_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+computron_dir = File.join(File.dirname(__FILE__), '..', 'lib')
 $LOAD_PATH.unshift(computron_dir) unless $LOAD_PATH.include?(computron_dir)
 
-require 'rubygems'
-require 'computron'
+$stdout.sync = true
 
-simulation = Computron::DSL.new(File.read(ARGV.last))
+require 'computron'
 
 Signal.trap('INT'){ 
   EM.stop 
 }
 
-simulation.run!
+file = File.open(ARGV.last)
+
+simulation = Computron::Simulation.new do
+  eval(file.read, binding, file.path)
+end.run!

data/computron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{computron}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Gessler"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-05-25}
   s.default_executable = %q{computron}
   s.description = %q{Computron was created to help Poll Everywhere peform load tests that simulate how real users work.}
   s.email = %q{brad@bradgessler.com}
@@ -31,12 +31,11 @@ Gem::Specification.new do |s|
      "computron.gemspec",
      "lib/computron.rb",
      "lib/computron/client.rb",
-     "lib/computron/dsl.rb",
      "lib/computron/report.rb",
+     "lib/computron/simulation.rb",
      "spec/computron_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "test.rb"
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/bradgessler/computron}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/computron/client.rb

@@ -161,7 +161,7 @@ module Computron
       end
       logger.info "#{status.ljust(3)} #{http.method.ljust(4)} #{http.uri}#{" (#{extra})".magenta if extra}\n  #{http.response}\n"
     end
-  
+
     # Simplifies em-http-client into something more suitable for tests. Interpets JSON, etc.
     def request(http_meth, url, opts={}, &block)
       response  = Response.new
@@ -174,7 +174,7 @@ module Computron
         log_request(http)
       }
       request.errback {|http|
-        log_request(http, "Network error or timeout.")
+        log_request(http, "Network error.")
       }
     end
 

data/lib/computron/{dsl.rb → simulation.rb}

@@ -1,11 +1,10 @@
 module Computron
-  class DSL
-
+  class Simulation
     attr_reader :client
 
-    def initialize(code=nil, &block)
+    def initialize(&block)
       @client     = Client.new
-      @simulation = Proc.new { code ? eval(code, self.send(:binding)) : instance_eval(&block) }
+      @simulation = Proc.new { instance_eval(&block) }
     end
 
     def run!
@@ -20,9 +19,9 @@ module Computron
       host ? @default_host = host : @default_host
     end
 
-    def every(seconds, opts={}, &block)
+    def every(interval, opts={}, &block)
       timer = EventMachine::PeriodicTimer.new(0) do
-        timer.interval = seconds
+        timer.interval = interval.respond_to?(:call) ? interval.call : interval
         block.call(timer)
       end
     end
@@ -42,6 +41,5 @@ module Computron
       url.concat path =~ /^\// ? path : "/#{path}" # Deal with leading /\
       url
     end
-
   end
 end

data/lib/computron.rb

@@ -1,5 +1,8 @@
-$stdout.sync = true
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
-require 'computron/client'
-require 'computron/dsl'
-require 'computron/report'
+module Computron
+  autoload :Client,     'computron/client'
+  autoload :Simulation, 'computron/simulation'
+  autoload :Report,     'computron/report'
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brad Gessler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-05-25 00:00:00 -07:00
 default_executable: computron
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,12 +106,11 @@ files:
 - computron.gemspec
 - lib/computron.rb
 - lib/computron/client.rb
-- lib/computron/dsl.rb
 - lib/computron/report.rb
+- lib/computron/simulation.rb
 - spec/computron_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- test.rb
 has_rdoc: true
 homepage: http://github.com/bradgessler/computron
 licenses: []

data/test.rb

@@ -1,34 +0,0 @@
-require '/Users/bgessler/Projects/imprezo/web/config/environment.rb'
-require 'lib/computron'
-
-clients_count = 2
-post_interval = 10
-
-clients = clients_count.times.map{ Computron::Client.new }
-
-default_host 'localhost:3000'
-
-get url('/events/1.json') do |response|
-  response.ok {|json|
-    event_id = json['event']['id']
-    ticks_url = url("/events/#{event_id}/ticks/stream.json")
-
-    clients.each do |client|
-      client.long_poll ticks_url do |response, repoll|
-        response.ok {|ticks|
-          if last_tick = ticks.last
-            repoll.url = "#{ticks_url}?since_id=#{last_tick['routing']['id']}"
-          end
-        }
-      end
-
-      every post_interval do
-        client.post url("/events/#{event_id}/comments"), :body => Comment.new(:response => 'Hey!').to_json, :head => {'Content-Type' => 'application/json'} do |response|
-          # response.ok             { p "Super fun" }
-          # response.found          { p "Redirected" }
-          # response.code(405)      { p "Method not supported jagoff" }
-        end
-      end
-    end
-  }
-end