grid 0.3.7 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.4.0

data/examples/basic/basic.rb

@@ -0,0 +1,67 @@
+require '../lib/grid'
+require 'watir-webdriver-performance' # only if using webdriver_performance
+
+##
+# Set some parameters before we begin
+params={}
+params[:controller_uri] = "druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235"
+params[:browser] = "chrome"
+params[:quantity] = 5
+
+##
+# Let's instantiate a grid object
+grid = Grid.new(params)
+
+##
+# How big is my grid?
+puts grid.size
+
+##
+# The setup method will prepare the browsers on the grid
+grid.setup
+
+##
+# Info about providers on the grid
+p grid.providers.first[:hostname]
+p grid.providers.first[:architecture]
+
+##
+# The iterate method can be passed a block of watir code,
+# and is yielded a browser object in return
+grid.iterate do |browser|
+  2.times do # because we want to iterate more than once for each browser
+    browser.goto "altentee.com"
+    puts browser.title
+    # if using webdriver_performance we can get performance metrics
+    puts browser.performance.summary[:response_time]
+  end
+end
+
+##
+# The teardown method will close browsers and release nodes back to the grid
+grid.teardown
+
+##
+# There's also a iterate_with_index method if you want to keep track
+# of individual browsers for further reporting and analysis
+grid = Grid.new(params)
+grid.setup
+
+grid.iterate_with_index do |browser, index|
+  puts "I am browser index #{index}"
+  browser.goto "watirgrid.com"
+  puts browser.performance.summary[:dom_processing]
+end
+
+grid.teardown
+
+##
+# Finally, here's a shorthand control method to do the setup, iteration and teardown
+# in one foul swoop!
+
+params[:rampup] = 10 #seconds, optional rampup period for all the browsers
+Grid.control(params) do |browser, index|
+  puts "I am browser index #{index}"
+  browser.goto "gridinit.com"
+  puts browser.performance.summary[:time_to_first_byte]
+end

data/examples/cucumber/example.feature

@@ -1,10 +1,10 @@
-@NFR001
+@NFR-001
 Feature: User logons
   In order to use the web applicaion users must be
   able to logon and access the portal in 3 seconds
 
-  Scenario: Logon with 50 users in 3 minutes
-    Given 200 users open "chrome"
+  Scenario: Logon with 50 users in 1 minute
+    Given 50 users open "chrome"
     And navigate to the portal
     When they enter their credentials
     Then they should see their account settings

data/examples/cucumber/step_definitions/example_steps.rb

@@ -1,29 +1,39 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
-require 'grid'
 require 'rspec/expectations';
+require 'watir-webdriver-performance'
+require 'grid'
 
-Grid.control(:controller_uri=>"druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235", :browser=>"chrome") do |browser, id|
-
-  Given /^(\d+) users open "([^"]*)"$/ do |arg1, arg2|
-    pending # express the regexp above with the code you wish you had
-  end
+Given /^(\d+) users open "([^"]*)"$/ do |quantity, browser|
+  params={}
+  params[:controller_uri] = "druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235"
+  params[:browser] = browser    # type of webdriver browser to spawn
+  params[:quantity] = quantity.to_i  # max number of browsers to use
+  params[:rampup] = 10          # seconds
+  @grid = Grid.new(params)
+  @grid.setup 
+end
 
-  Given /^navigate to the portal$/ do
-    pending # express the regexp above with the code you wish you had
-  end
+Given /^navigate to the portal$/ do
+  @grid.iterate {|browser| browser.goto "http://gridinit.com/examples/logon.html" }
+end
 
-  When /^they enter their credentials$/ do
-    pending # express the regexp above with the code you wish you had
+When /^they enter their credentials$/ do
+  @grid.iterate do |browser|
+    browser.text_field(:name => "email").set "tim@mahenterprize.com"
+    browser.text_field(:name => "password").set "mahsecretz"
+    browser.button(:type => "submit").click
   end
+end
 
-  Then /^they should see their account settings$/ do
-    pending # express the regexp above with the code you wish you had
+Then /^they should see their account settings$/ do
+  @grid.iterate do |browser|
+    browser.text.should =~ /Maybe I should get a real Gridinit account/
   end
+end
 
-  Then /^the response time should be less than (\d+) seconds$/ do |arg1|
-    pending # express the regexp above with the code you wish you had
+Then /^the response time should be less than (\d+) seconds$/ do |response_time|
+  @grid.iterate do |browser|
+    browser.performance.summary[:response_time].should < response_time.to_i * 1000
   end
-
 end
-

data/grid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grid}
-  s.version = "0.3.7"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/grid",
+    "examples/basic/basic.rb",
     "examples/cucumber/example.feature",
     "examples/cucumber/step_definitions/.DS_Store",
     "examples/cucumber/step_definitions/example_steps.rb",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Gridinit command line utilities}
   s.test_files = [
+    "examples/basic/basic.rb",
     "examples/cucumber/step_definitions/example_steps.rb",
     "spec/grid_spec.rb",
     "spec/spec_helper.rb"

data/lib/grid.rb

@@ -10,56 +10,88 @@ require 'highline/import'
 
 class Grid
 
-  ##
-  # This is a helper method to control a grid based on watir.
-  # It involves some general block thuggery and could
-  # honestly benefit from some brutal refactoring...
-  def self.control(params = {}, &block)
-    $stdout.flush
-    log  = Logger.new(STDOUT, 'daily')
-    log.level = params[:loglevel] || Logger::DEBUG
-    grid = Watir::Grid.new(params)
-    grid.start(:take_all => true)
-    log.debug("Grid size                         : #{grid.size}")
-    log.debug("Grid rampup                       : #{rampup(grid.size, params)} secs")
+  def initialize(params = {})
+    @log = Logger.new(STDOUT, 'daily')
+    @log.level = params[:loglevel] || Logger::INFO
+    @exclusive = params[:exclusive]
+    @exclusive ? params[:take_all] = true : params[:read_all] = true
+    @webdriver_browser_type = params[:browser].to_sym if params[:browser]
+    @grid = Watir::Grid.new(params)
+    @grid.start(params)
+    @providers = @grid.browsers
+    @browsers = []
+  end
+
+  def size
+    @grid.size
+  end
+
+  def browsers
+    @browsers
+  end
+
+  def providers
+    @providers
+  end
+
+  def setup
+    @grid.browsers.each_with_index do |browser, index|
+      sleep 0.15
+      @browsers[index] ||= browser[:object].new_browser(@webdriver_browser_type)
+    end
+  end
+
+  def teardown
+    @browsers.each do |browser|
+      browser.close
+    end
+    @grid.release_tuples if @exclusive
+  end
+
+  def iterate &block
+    threads = []
+    @browsers.each do |browser|
+      threads << Thread.new do
+        yield browser
+      end
+    end
+    threads.each {|thread| thread.join}
+  end
+
+  def iterate_with_index &block
     threads = []
-    grid.browsers.each_with_index do |browser, index|
-      sleep rampup(grid.size, params)
-      threads << Thread.new(params[:browser]) do |webdriver_browser_type|
-        $stdout.flush
-        start = ::Time.now
-        log.debug("Browser #{index+1}##{Thread.current.object_id} start         : #{::Time.now}")
-        log.debug("Browser #{index+1}##{Thread.current.object_id} architecture  : #{browser[:architecture]}")
-        log.debug("Browser #{index+1}##{Thread.current.object_id} type          : #{browser[:browser_type]}")
-        log.debug("Browser #{index+1}##{Thread.current.object_id} hostname      : #{browser[:hostname]}")
-        if browser[:browser_type] =~ /webdriver/
-          webdriver_browser_type = "firefox" unless webdriver_browser_type
-          @browser = browser[:object].new_browser(webdriver_browser_type.to_sym)
-        else
-           @browser = browser[:object].new_browser
-        end
-        yield @browser, "#{index+1}##{Thread.current.object_id}"
-        log.debug("Browser #{index+1}##{Thread.current.object_id} stop          : #{::Time.now}")
-        log.debug("Browser #{index+1}##{Thread.current.object_id} elapsed       : #{(::Time.now - start).to_i} secs")
+    @browsers.each_with_index do |browser, index|
+      threads << Thread.new do
+        yield browser, index
       end
     end
-    begin
-      threads.each {|thread| thread.join}
-    rescue => e
-      puts e.inspect
-      puts e.backtrace
-      grid.release_tuples
+    threads.each {|thread| thread.join}
+  end
+
+  def self.control(params = {}, &block)
+    @exclusive = params[:exclusive]
+    @exclusive ? params[:take_all] = true : params[:read_all] = true
+    @webdriver_browser_type = params[:browser].to_sym if params[:browser]
+    @grid = Watir::Grid.new(params)
+    @grid.start(params)
+    @browsers = []
+    threads = []
+    @grid.browsers.each_with_index do |browser, index|
+      sleep rampup(params)
+      threads << Thread.new(@webdriver_browser_type) do |webdriver_browser_type|
+        @browser = browser[:object].new_browser(webdriver_browser_type)
+        yield @browser, index
+      end
     end
-    grid.release_tuples
+    threads.each {|thread| thread.join}
+    @grid.release_tuples if @exclusive
   end
 
   private
 
-  ##
-  # Calculate rampup in seconds
-  def self.rampup(total_threads, params = {})
+  def self.rampup(params = {})
     if params[:rampup]
-      params[:rampup] / total_threads
+      params[:rampup] / @grid.size
     else
       0.5
     end

data/spec/grid_spec.rb

@@ -1,7 +1,61 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Grid" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+
+  let!(:grid) do
+    params={}
+    params[:controller_uri] = "druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235"
+    params[:browser] = "chrome"
+    params[:quantity] = 5
+    grid = Grid.new(params)
+  end
+
+  it "should be able to check the size of a grid" do
+    grid.size.should == 5
+  end
+
+  it "should be able setup browsers on the grid" do
+    grid.setup
+    grid.browsers.first.should be_an_instance_of(DRb::DRbObject)
+    grid.teardown
+  end
+
+  it "should be able to get information about individual providers on the grid" do
+    grid.providers.first[:hostname].should_not be_empty
+    grid.providers.first[:architecture].should_not be_empty
+  end
+
+  it "should be able to iterate over the grid" do
+    grid.setup
+    grid.iterate do |browser|
+      2.times do # because we want to iterate more than once for each browser
+        browser.goto "altentee.com"
+        browser.title.should =~ /The Automation Company/
+        # if using webdriver_performance we can get performance metrics
+        browser.performance.summary[:response_time].should > 0
+      end
+    end
+    grid.teardown
+  end
+
+  it "should be able to iterate over the grid with an index" do
+    grid.setup
+    grid.iterate_with_index do |browser, index|
+      browser.goto "watirgrid.com"
+      browser.performance.summary[:dom_processing].should > 0
+    end
+    grid.teardown
+  end
+
+  it "should be able to control the grid using shorthand method" do
+    params={}
+    params[:controller_uri] = "druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235"
+    params[:browser] = "chrome" # type of webdriver browser to spawn
+    params[:quantity] = 5 # max number of browsers to use
+    params[:rampup] = 10 # seconds
+    Grid.control(params) do |browser, index|
+      browser.goto "gridinit.com"
+      browser.performance.summary[:time_to_first_byte].should > 0
+    end
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'grid'
+require 'watir-webdriver-performance'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -253,6 +253,7 @@ files:
 - Rakefile
 - VERSION
 - bin/grid
+- examples/basic/basic.rb
 - examples/cucumber/example.feature
 - examples/cucumber/step_definitions/.DS_Store
 - examples/cucumber/step_definitions/example_steps.rb
@@ -295,6 +296,7 @@ signing_key:
 specification_version: 3
 summary: Gridinit command line utilities
 test_files: 
+- examples/basic/basic.rb
 - examples/cucumber/step_definitions/example_steps.rb
 - spec/grid_spec.rb
 - spec/spec_helper.rb