grid 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/examples/bacon/bacon.rb

@@ -0,0 +1,27 @@
+require 'grid'
+require 'bacon'
+
+describe 'A simple specification' do
+
+  before do
+    options = {}
+    options[:controller_uri] = "druby://10.0.1.3:11235"
+    options[:browser_type]   = 'webdriver'
+    options[:browser]        = 'chrome'
+    options[:loglevel]       = Logger::DEBUG
+    @grid = Grid.new(options)
+    @grid.setup
+  end
+
+  after do
+    @grid.teardown
+  end
+
+  it "should do a search on Google" do
+    @grid.iterate do |browser|
+      browser.goto "altentee.com"
+      browser.title.should =~ /Automation Company/
+    end
+  end
+
+end

data/examples/basic/basic.rb

@@ -1,16 +1,16 @@
-require '../lib/grid'
+require '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
+options={}
+options[:controller_uri] = "druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235"
+options[:browser] = "chrome"
+options[:quantity] = 5
 
 ##
 # Let's instantiate a grid object
-grid = Grid.new(params)
+grid = Grid.new(options)
 
 ##
 # How big is my grid?
@@ -44,7 +44,7 @@ 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 = Grid.new(options)
 grid.setup
 
 grid.iterate_with_index do |browser, index|

data/examples/basic/selenium/selenium.rb

@@ -0,0 +1,14 @@
+require 'grid'
+
+params={}
+params[:controller_uri] = 'druby://10.0.1.3:11235'
+params[:browser]        = 'firefox'
+
+Grid.control(params) do |driver, index|
+  driver.navigate.to 'http://google.com'
+  element = driver.find_element(:name, 'q')
+  element.send_keys 'gridinit'
+  element.submit
+  puts driver.title
+  driver.quit
+end

data/examples/capybara/testunit/example_test.rb

@@ -0,0 +1,36 @@
+require 'grid'
+require 'test/unit'
+require 'grid/extensions/capybara'
+
+#require 'capybara'
+#require 'capybara/dsl'
+#require 'selenium-webdriver'
+
+#module Capybara
+  #module Grid
+    #autoload :Node,    'lib/grid/extensions/capybara/node.rb'
+    #autoload :Driver,  'lib/grid/extensions/capybara/driver.rb'
+  #end
+#end
+
+Capybara.register_driver :grid do |app|
+  options = {}
+  options[:controller_uri] = 'druby://10.0.1.3:11235'
+  options[:loglevel]       = Logger::DEBUG
+  Capybara::Grid::Driver.new(app, options)
+end
+
+class HelloWorldTest < Test::Unit::TestCase
+  include Capybara
+
+  Capybara.app_host = 'http://www.google.com'
+  Capybara.default_driver = :grid
+  Capybara.run_server = false
+
+  def test_google
+    visit '/'
+    fill_in 'q', :with => 'gridinit'
+    assert page.has_content?('results')
+  end
+
+end

data/examples/cucumber/step_definitions/example_steps.rb

@@ -6,12 +6,12 @@ require 'grid'
 
 Given /^(\d+) users open "([^"]*)"$/ do |quantity, browser|
   params={}
-  params[:controller_uri] = "druby://ec2-184-73-37-176.compute-1.amazonaws.com:11235"
+  params[:controller_uri] = "druby://ec2-50-17-154-31.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 
+  @grid.setup
 end
 
 Given /^navigate to the portal$/ do

data/examples/rspec/basic_spec.rb

@@ -0,0 +1,26 @@
+require 'grid'
+
+describe 'A simple specification' do
+
+  before(:all) do
+    options = {}
+    options[:controller_uri] = "druby://10.0.1.3:11235"
+    options[:browser_type]   = 'webdriver'
+    options[:browser]        = 'chrome'
+    options[:loglevel]       = Logger::DEBUG
+    @grid = Grid.new(options)
+    @grid.setup
+  end
+
+  after(:all) do
+    @grid.teardown
+  end
+
+  it "should do a search on Google" do
+    @grid.iterate do |browser|
+      browser.goto "altentee.com"
+      browser.title.should =~ /Automation Company/
+    end
+  end
+
+end

data/examples/testunit/basic_test.rb

@@ -0,0 +1,25 @@
+require 'grid'
+require 'test/unit'
+
+class SimpleTest < Test::Unit::TestCase
+  def setup
+    options = {}
+    options[:controller_uri] = "druby://10.0.1.3:11235"
+    options[:browser_type]   = 'webdriver'
+    options[:browser]        = 'chrome'
+    options[:loglevel]       = Logger::DEBUG
+    @grid = Grid.new(options)
+    @grid.setup
+  end
+
+  def teardown
+    @grid.teardown
+  end
+
+  def test_google
+    @grid.iterate do |browser|
+      browser.goto "altentee.com"
+      assert_match /Automation Company/, browser.title
+    end
+  end
+end

data/grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grid}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-04-26}
   s.default_executable = %q{grid}
   s.description = %q{Gridinit command line utilities to help you use the Gridinit API}
   s.email = %q{tim.koops@gmail.com}
@@ -28,12 +28,21 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/grid",
+    "examples/bacon/bacon.rb",
     "examples/basic/basic.rb",
+    "examples/basic/selenium/selenium.rb",
+    "examples/capybara/testunit/example_test.rb",
     "examples/cucumber/example.feature",
     "examples/cucumber/step_definitions/.DS_Store",
     "examples/cucumber/step_definitions/example_steps.rb",
+    "examples/rspec/basic_spec.rb",
+    "examples/testunit/basic_test.rb",
     "grid.gemspec",
     "lib/grid.rb",
+    "lib/grid/extensions/capybara.rb",
+    "lib/grid/extensions/capybara/driver.rb",
+    "lib/grid/extensions/capybara/node.rb",
+    "lib/grid/grid.rb",
     "spec/grid_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -43,8 +52,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Gridinit command line utilities}
   s.test_files = [
+    "examples/bacon/bacon.rb",
     "examples/basic/basic.rb",
+    "examples/basic/selenium/selenium.rb",
+    "examples/capybara/testunit/example_test.rb",
     "examples/cucumber/step_definitions/example_steps.rb",
+    "examples/rspec/basic_spec.rb",
+    "examples/testunit/basic_test.rb",
     "spec/grid_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/grid/extensions/capybara/driver.rb

@@ -0,0 +1,155 @@
+class Capybara::Grid::Driver < Capybara::Driver::Base
+  DEFAULT_OPTIONS = {
+    :resynchronize => false,
+    :resynchronization_timeout => 10,
+    :browser => :firefox
+  }
+  SPECIAL_OPTIONS = [:browser, :resynchronize, :resynchronization_timeout]
+
+  attr_reader :app, :rack_server, :options
+
+  def browser
+    unless @browsers
+      @options[:browser]        = 'firefox'
+      @grid = Grid.new(@options)
+      @browsers = []
+      @grid.providers.each_with_index do |provider, index|
+        @browsers[index] = provider[:object].new_browser :firefox
+      end
+      at_exit do
+        @browsers.each do |browser|
+          browser.quit
+        end
+      end
+    end
+    @browsers.first
+  end
+
+  def initialize(app, options={})
+    @app = app
+    @options = DEFAULT_OPTIONS.merge(options)
+    @rack_server = Capybara::Server.new(@app)
+    @rack_server.boot if Capybara.run_server
+  end
+
+  def visit(path)
+    browser.navigate.to(url(path))
+  end
+
+  def source
+    browser.page_source
+  end
+
+  def body
+    browser.page_source
+  end
+
+  def current_url
+    browser.current_url
+  end
+
+  def find(selector)
+    browser.find_elements(:xpath, selector).map do |node|
+      Capybara::Grid::Node.new(self, node)
+    end
+  end
+
+  def wait?; true; end
+
+  def resynchronize
+    if options[:resynchronize]
+      load_wait_for_ajax_support
+      yield
+      Capybara.timeout(options[:resynchronization_timeout], self, "failed to resynchronize, ajax request timed out") do
+        evaluate_script("!window.capybaraRequestsOutstanding")
+      end
+    else
+      yield
+    end
+  end
+
+  def execute_script(script)
+    browser.execute_script script
+  end
+
+  def evaluate_script(script)
+    browser.execute_script "return #{script}"
+  end
+
+  def reset!
+    # Use instance variable directly so we avoid starting the browser just to reset the session
+    if @browser
+      begin
+        @browser.manage.delete_all_cookies
+      rescue Selenium::WebDriver::Error::UnhandledError => e
+        # delete_all_cookies fails when we've previously gone
+        # to about:blank, so we rescue this error and do nothing
+        # instead.
+      end
+      @browser.navigate.to('about:blank')
+    end
+  end
+
+  def within_frame(frame_id)
+    old_window = browser.window_handle
+    browser.switch_to.frame(frame_id)
+    yield
+    browser.switch_to.window old_window
+  end
+
+  def find_window( selector )
+    original_handle = browser.window_handle
+    browser.window_handles.each do |handle|
+      browser.switch_to.window handle
+      if( selector == browser.execute_script("return window.name") ||
+          browser.title.include?(selector) ||
+          browser.current_url.include?(selector) ||
+          (selector == handle) )
+        browser.switch_to.window original_handle
+        return handle
+      end
+    end
+    raise Capybara::ElementNotFound, "Could not find a window identified by #{selector}"
+  end
+
+  def within_window(selector, &blk)
+    handle = find_window( selector )
+    browser.switch_to.window(handle, &blk)
+  end
+
+private
+
+  def load_wait_for_ajax_support
+    browser.execute_script <<-JS
+      window.capybaraRequestsOutstanding = 0;
+      (function() { // Overriding XMLHttpRequest
+          var oldXHR = window.XMLHttpRequest;
+
+          function newXHR() {
+              var realXHR = new oldXHR();
+
+              window.capybaraRequestsOutstanding++;
+              realXHR.addEventListener("readystatechange", function() {
+                  if( realXHR.readyState == 4 ) {
+                    setTimeout( function() {
+                      window.capybaraRequestsOutstanding--;
+                      if(window.capybaraRequestsOutstanding < 0) {
+                        window.capybaraRequestsOutstanding = 0;
+                      }
+                    }, 500 );
+                  }
+              }, false);
+
+              return realXHR;
+          }
+
+          window.XMLHttpRequest = newXHR;
+      })();
+    JS
+  end
+
+  def url(path)
+    rack_server.url(path)
+  end
+
+end

data/lib/grid/extensions/capybara/node.rb

@@ -0,0 +1,92 @@
+class Capybara::Grid::Node < Capybara::Driver::Node
+  def text
+    native.text
+  end
+
+  def [](name)
+    if name == :value
+      value
+    else
+      native.attribute(name.to_s)
+    end
+  rescue Selenium::WebDriver::Error::WebDriverError
+    nil
+  end
+
+  def value
+    if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
+      native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n.value || n.text }
+    else
+      native.value
+    end
+  end
+
+  def set(value)
+    if tag_name == 'input' and type == 'radio'
+      click
+    elsif tag_name == 'input' and type == 'checkbox'
+      click if value ^ native.attribute('checked').to_s.eql?("true")
+    elsif tag_name == 'textarea' or tag_name == 'input'
+      resynchronize do
+        native.clear
+        native.send_keys(value.to_s)
+      end
+    end
+  end
+
+  def select_option
+    resynchronize { native.select }
+  end
+
+  def unselect_option
+    if select_node['multiple'] != 'multiple' and select_node['multiple'] != 'true'
+      raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
+    end
+    resynchronize { native.toggle } if selected?
+  end
+
+  def click
+    resynchronize { native.click }
+  end
+
+  def drag_to(element)
+    resynchronize { native.drag_and_drop_on(element.native) }
+  end
+
+  def tag_name
+    native.tag_name
+  end
+
+  def visible?
+    displayed = native.displayed?
+    displayed and displayed != "false"
+  end
+
+  def selected?
+    selected = native.selected?
+    selected and selected != "false"
+  end
+
+  alias :checked? :selected?
+
+  def find(locator)
+    native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
+  end
+
+private
+
+  def resynchronize
+    driver.resynchronize { yield }
+  end
+
+  # a reference to the select node if this is an option node
+  def select_node
+    find('./ancestor::select').first
+  end
+
+  def type
+    self[:type]
+  end
+
+end
+

data/lib/grid/extensions/capybara.rb

@@ -0,0 +1,10 @@
+require 'capybara'
+require 'capybara/dsl'
+require 'selenium-webdriver'
+
+module Capybara
+  module Grid
+    autoload :Node,    'grid/extensions/capybara/node'
+    autoload :Driver,  'grid/extensions/capybara/driver'
+  end
+end

data/lib/grid/grid.rb

@@ -0,0 +1,283 @@
+#!/usr/bin/env ruby
+# grid.rb
+# Grid Helper
+
+require 'ap'
+require 'watirgrid'
+require 'json'
+require 'rest_client'
+require 'highline/import'
+
+class Grid
+
+  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 = []
+    @browsers.each_with_index do |browser, index|
+      threads << Thread.new do
+        yield browser, index
+      end
+    end
+    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
+    threads.each {|thread| thread.join}
+    @grid.release_tuples if @exclusive
+  end
+
+  private
+
+  def self.rampup(params = {})
+    if params[:rampup]
+      params[:rampup] / @grid.size
+    else
+      0.5
+    end
+  end
+
+  class Helper
+    def initialize(params = {})
+      @grid_id  = params[:grid_id]
+      @api      = params[:api]
+      @uri = params[:uri] || "http://gridin.it/api/v0"
+      logfile = STDOUT
+      @log  = Logger.new(logfile, 'daily')
+      @log.level = Logger::DEBUG
+      @log.datetime_format = "%Y-%m-%d %H:%M:%S "
+      if home
+        if File.file? ENV[home]+'/.gridrc'
+          @token = open(ENV[home]+'/.gridrc') { |f| f.read }.split(':')[1]
+        end
+      end
+      @token = get_token(params) unless @token
+      @log.debug("Current token: #{@token}")
+    end
+
+    def get_password(prompt='Password: ', mask='*')
+      ask(prompt) { |q| q.echo = mask }
+    end
+
+    def get_token(params={})
+      if params[:token]
+        params[:token]
+      else
+        HighLine.track_eof = false
+        @email    = params[:email] || ask('Email: ')
+        @password = params[:password] ||  get_password
+        response = RestClient.post "#{@uri}/token.json" , {
+          :email => @email, :password => @password
+        }
+        (JSON.parse(response))["token"]
+      end
+    end
+
+    def home
+      homes = ["HOME", "HOMEPATH"]
+      homes.detect {|h| ENV[h] != nil}
+    end
+
+    def token
+      @token = get_token
+      open(ENV[home]+'/.gridrc', 'w') { |f| f << "TOKEN:#{@token}" } if home and @token
+      @log.debug("New token    : #{@token}")
+    end
+
+    def list
+      @log.debug("Listing grids ...")
+      begin
+        response = RestClient.get "#{@uri}/grid.json" , {
+          :token => @token
+        }
+        ap JSON.parse(response)
+      rescue => e
+        @log.error("#{e}")
+      end
+    end
+
+    def show
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      @log.debug("Listing grid ...")
+      begin
+        response = RestClient.get "#{@uri}/grid/#{@grid_id}.json" , {
+          :token => @token
+        }
+        ap JSON.parse(response)
+      rescue => e
+        @log.error("#{e}")
+      end
+    end
+
+    def create_grid(name, description)
+      begin
+        @log.debug("Creating grid ...")
+        response = RestClient.post "#{@uri}/grid.json" , {
+          :token => @token,
+          :name  => name,
+          :description => description
+        }
+        (JSON.parse(response)).first[1]["id"]
+      rescue => e
+        @log.error("#{e}")
+      end
+    end
+
+    def create_intranode(grid_id, browser_type, location, nodes)
+      begin
+        @log.debug("Creating intranode ...")
+        response = RestClient.post "#{@uri}/grid/#{grid_id.to_s}/intranode.json", {
+          :token => @token,
+          :browser_type => browser_type,
+          :location => location,
+          :nodes => nodes
+        }
+      rescue => e
+        @log.error("#{e}")
+      end
+    end
+
+    def delete_intranode
+      begin
+        @log.debug("Deleting intranode ...")
+        response = RestClient.delete "#{@uri}/grid/intranode/#{@intranode_id}.json", {
+          :token => @token
+        }
+      rescue => e
+        @log.error("#{e}")
+      end
+    end
+
+    def create
+      name = ask("Grid name: ") { |q| q.default = "Grid" }
+      description = ask("Grid description: ") { |q| q.default = "Grid created #{Time.now}" }
+      nodes = ask("Number of nodes: ") { |q| q.default = 5 }
+      location = ask("Location of nodes: ") { |q| q.default = "us-east" }
+      browser_type = ask("Node type: ") { |q| q.default = "webdriver" } unless @api
+      @grid_id = create_grid(name, description)
+      create_intranode(@grid_id, browser_type, location, nodes)
+      show
+    end
+
+    def add
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      nodes = ask("Number of nodes: ") { |q| q.default = 5 }
+      location = ask("Location of nodes: ") { |q| q.default = "us-east" }
+      browser_type = ask("Node type: ") { |q| q.default = "webdriver" } unless @api
+      create_intranode(@grid_id, browser_type, location, nodes)
+      show
+    end
+
+    def delete
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      @intranode_id= ask("Intranode ID: ") unless @intranode_id
+      delete_intranode
+      show
+    end
+
+    def start
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      @log.debug("Starting grid ...")
+      begin
+        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/start.json", {:token => @token}
+      rescue => e
+        @log.error("#{e}")
+      end
+      show
+    end
+
+    def stop
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      @log.debug("Stopping grid ...")
+      begin
+        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/stop.json", {:token => @token}
+      rescue => e
+        @log.error("#{e}")
+      end
+      show
+    end
+
+    def restart
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      @log.debug("Restarting grid ...")
+      begin
+        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/restart.json", {:token => @token}
+      rescue => e
+        @log.error("#{e}")
+      end
+      show
+    end
+
+    def status
+      @grid_id = ask("Grid ID: ") unless @grid_id
+      @log.debug("Updating status of grid ...")
+      begin
+        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/status.json", {:token => @token}
+      rescue => e
+        @log.error("#{e}")
+      end
+      show
+    end
+
+  end
+end

data/lib/grid.rb

@@ -1,283 +1 @@
-#!/usr/bin/env ruby
-# grid.rb
-# Grid Helper
-
-require 'ap'
-require 'watirgrid'
-require 'json'
-require 'rest_client'
-require 'highline/import'
-
-class Grid
-
-  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 = []
-    @browsers.each_with_index do |browser, index|
-      threads << Thread.new do
-        yield browser, index
-      end
-    end
-    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
-    threads.each {|thread| thread.join}
-    @grid.release_tuples if @exclusive
-  end
-
-  private
-
-  def self.rampup(params = {})
-    if params[:rampup]
-      params[:rampup] / @grid.size
-    else
-      0.5
-    end
-  end
-
-  class Helper
-    def initialize(params = {})
-      @grid_id  = params[:grid_id]
-      @api      = params[:api]
-      @uri = params[:uri] || "http://gridin.it/api/v0"
-      logfile = STDOUT
-      @log  = Logger.new(logfile, 'daily')
-      @log.level = Logger::DEBUG
-      @log.datetime_format = "%Y-%m-%d %H:%M:%S "
-      if home
-        if File.file? ENV[home]+'/.gridrc'
-          @token = open(ENV[home]+'/.gridrc') { |f| f.read }.split(':')[1]
-        end
-      end
-      @token = get_token(params) unless @token
-      @log.debug("Current token: #{@token}")
-    end
-
-    def get_password(prompt='Password: ', mask='*')
-      ask(prompt) { |q| q.echo = mask }
-    end
-
-    def get_token(params={})
-      if params[:token]
-        params[:token]
-      else
-        HighLine.track_eof = false
-        @email    = params[:email] || ask('Email: ')
-        @password = params[:password] ||  get_password
-        response = RestClient.post "#{@uri}/token.json" , {
-          :email => @email, :password => @password
-        }
-        (JSON.parse(response))["token"]
-      end
-    end
-
-    def home
-      homes = ["HOME", "HOMEPATH"]
-      homes.detect {|h| ENV[h] != nil}
-    end
-
-    def token
-      @token = get_token
-      open(ENV[home]+'/.gridrc', 'w') { |f| f << "TOKEN:#{@token}" } if home and @token
-      @log.debug("New token    : #{@token}")
-    end
-
-    def list
-      @log.debug("Listing grids ...")
-      begin
-        response = RestClient.get "#{@uri}/grid.json" , {
-          :token => @token
-        }
-        ap JSON.parse(response)
-      rescue => e
-        @log.error("#{e}")
-      end
-    end
-
-    def show
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @log.debug("Listing grid ...")
-      begin
-        response = RestClient.get "#{@uri}/grid/#{@grid_id}.json" , {
-          :token => @token
-        }
-        ap JSON.parse(response)
-      rescue => e
-        @log.error("#{e}")
-      end
-    end
-
-    def create_grid(name, description)
-      begin
-        @log.debug("Creating grid ...")
-        response = RestClient.post "#{@uri}/grid.json" , {
-          :token => @token,
-          :name  => name,
-          :description => description
-        }
-        (JSON.parse(response)).first[1]["id"]
-      rescue => e
-        @log.error("#{e}")
-      end
-    end
-
-    def create_intranode(grid_id, browser_type, location, nodes)
-      begin
-        @log.debug("Creating intranode ...")
-        response = RestClient.post "#{@uri}/grid/#{grid_id.to_s}/intranode.json", {
-          :token => @token,
-          :browser_type => browser_type,
-          :location => location,
-          :nodes => nodes
-        }
-      rescue => e
-        @log.error("#{e}")
-      end
-    end
-
-    def delete_intranode
-      begin
-        @log.debug("Deleting intranode ...")
-        response = RestClient.delete "#{@uri}/grid/intranode/#{@intranode_id}.json", {
-          :token => @token
-        }
-      rescue => e
-        @log.error("#{e}")
-      end
-    end
-
-    def create
-      name = ask("Grid name: ") { |q| q.default = "Grid" }
-      description = ask("Grid description: ") { |q| q.default = "Grid created #{Time.now}" }
-      nodes = ask("Number of nodes: ") { |q| q.default = 5 }
-      location = ask("Location of nodes: ") { |q| q.default = "us-east" }
-      browser_type = ask("Node type: ") { |q| q.default = "webdriver" } unless @api
-      @grid_id = create_grid(name, description)
-      create_intranode(@grid_id, browser_type, location, nodes)
-      show
-    end
-
-    def add
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      nodes = ask("Number of nodes: ") { |q| q.default = 5 }
-      location = ask("Location of nodes: ") { |q| q.default = "us-east" }
-      browser_type = ask("Node type: ") { |q| q.default = "webdriver" } unless @api
-      create_intranode(@grid_id, browser_type, location, nodes)
-      show
-    end
-
-    def delete
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @intranode_id= ask("Intranode ID: ") unless @intranode_id
-      delete_intranode
-      show
-    end
-
-    def start
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @log.debug("Starting grid ...")
-      begin
-        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/start.json", {:token => @token}
-      rescue => e
-        @log.error("#{e}")
-      end
-      show
-    end
-
-    def stop
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @log.debug("Stopping grid ...")
-      begin
-        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/stop.json", {:token => @token}
-      rescue => e
-        @log.error("#{e}")
-      end
-      show
-    end
-
-    def restart
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @log.debug("Restarting grid ...")
-      begin
-        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/restart.json", {:token => @token}
-      rescue => e
-        @log.error("#{e}")
-      end
-      show
-    end
-
-    def status
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @log.debug("Updating status of grid ...")
-      begin
-        response = RestClient.put "#{@uri}/grid/#{@grid_id.to_s}/status.json", {:token => @token}
-      rescue => e
-        @log.error("#{e}")
-      end
-      show
-    end
-
-  end
-end
+require 'grid/grid'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +10:00
+date: 2011-04-26 00:00:00 +10:00
 default_executable: grid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -253,12 +253,21 @@ files:
 - Rakefile
 - VERSION
 - bin/grid
+- examples/bacon/bacon.rb
 - examples/basic/basic.rb
+- examples/basic/selenium/selenium.rb
+- examples/capybara/testunit/example_test.rb
 - examples/cucumber/example.feature
 - examples/cucumber/step_definitions/.DS_Store
 - examples/cucumber/step_definitions/example_steps.rb
+- examples/rspec/basic_spec.rb
+- examples/testunit/basic_test.rb
 - grid.gemspec
 - lib/grid.rb
+- lib/grid/extensions/capybara.rb
+- lib/grid/extensions/capybara/driver.rb
+- lib/grid/extensions/capybara/node.rb
+- lib/grid/grid.rb
 - spec/grid_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -296,7 +305,12 @@ signing_key:
 specification_version: 3
 summary: Gridinit command line utilities
 test_files: 
+- examples/bacon/bacon.rb
 - examples/basic/basic.rb
+- examples/basic/selenium/selenium.rb
+- examples/capybara/testunit/example_test.rb
 - examples/cucumber/step_definitions/example_steps.rb
+- examples/rspec/basic_spec.rb
+- examples/testunit/basic_test.rb
 - spec/grid_spec.rb
 - spec/spec_helper.rb