grid 0.1.0 → 0.2.0

data/Gemfile

@@ -1,10 +1,12 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+   gem "watirgrid"
+   gem "json"
+   gem "rest-client"
+   gem "awesome_print"
+   gem "highline"
 
 # Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -0,0 +1,40 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    awesome_print (0.3.2)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    highline (1.6.1)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.5.1)
+    mime-types (1.16)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    watirgrid (1.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  bundler (~> 1.0.0)
+  highline
+  jeweler (~> 1.5.2)
+  json
+  rcov
+  rest-client
+  rspec (~> 2.3.0)
+  watirgrid

data/LICENSE.txt

@@ -1,20 +1,25 @@
-Copyright (c) 2011 Tim Koopmans
+Copyright (c) 2009-2011 Altentee. All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those of the
+authors and should not be interpreted as representing official policies, either expressed
+or implied, of Altentee.

data/README.rdoc

@@ -1,9 +1,195 @@
-= grid
+= Grid
 
-Description goes here.
+This is a utility gem for use with Gridinit.com.
+
+== About
+Gridinit.com is a RESTful API for distributed testing. It currently supports Watir test cases with plans to also support Selenium in the near future. Gridinit allows for the simple command and control of grid resources. You can control the grid using the included RESTful API, or you can use this gem which is another abstraction of the API from the command line.
+
+A Grid consists of loosely coupled, distributed "nodes". Nodes are an alias for remote browsers. Nodes can be grouped into "intranodes", which is a collection of similar nodes defined by their browser type, quantity and location.
+
+One Grid can have many Intranodes, with each Intranode consisting of many Nodes!
+
+== Getting Started
+To install Grid:
+  gem install grid
+
+You will need an account on Gridinit.com before you proceed. You can also purchase credits on Gridinit, which are necessary to consume resources on the cloud. After you have created an account and purchased credits (note: first 50 credits are free) you can run the following from any command line / terminal.
+
+=== The Grid Command Line
+  Usage: grid [options] command
+
+  Commands:
+   list - List all grids
+   show - Show specified grids
+   create - Create a new grid
+   add - Add intranode to specified grid ID
+   delete - Delete intranode from specified grid ID
+   start - Start specified grid ID
+   stop - Stop specified grid ID
+   restart - Restart specified grid ID
+   status - Update status of specified grid ID
+
+  Options:
+    -g, --grid ID                    Specify the Grid ID to use
+    -t, --token TOKEN                Specify the token to authenticate with
+    -e, --email EMAIL                Specify the email to authenticate with, if not using token
+    -p, --password PASSWORD          Specify the password to authenticate with, if not using token
+    -u, --uri URI                    Optional URI of the Gridinit API, default http://gridin.it/api/v0
+    -h, --help                       Show this message
+
+=== Step 1. Create a new Grid
+*Create* a new grid with the create command. Following is an example using your email address and password as parameters. You will then be prompted for the name, description, number, type and location of nodes which are the remote providers (browsers).
+
+  grid -e your@email.com -p yourpassword create
+
+  D, [2011-04-17 11:49:06 #43304] DEBUG -- : Current token: yKan0JEfPSEbwsgeSRIYSg
+  Grid name: |Grid|
+  Grid description: |Grid created Sun Apr 17 11:49:07 +1000 2011| 
+  Number of nodes: |5|
+  Location of nodes: |us-east|
+  Node type: |webdriver|
+  D, [2011-04-17 11:49:10 #43304] DEBUG -- : Creating grid ...
+  D, [2011-04-17 11:49:10 #43304] DEBUG -- : Creating intranode ...
+  D, [2011-04-17 11:49:10 #43304] DEBUG -- : Listing grid ...
+  {
+    "grid" => {
+                "name" => "Grid",
+          "created_at" => "2011-04-17T11:49:10+10:00",
+          "updated_at" => "2011-04-17T11:49:10+10:00",
+                  "id" => 1,
+             "user_id" => 1,
+        "credits_used" => 0,
+               "nodes" => 5,
+         "description" => "Grid created Sun Apr 17 11:49:07 +1000 2011",
+          "intranodes" => [
+            [0] {
+                "intranode" => {
+                           "grid_id" => 1,
+                        "created_at" => "2011-04-17T11:49:10+10:00",
+                          "location" => "us-east",
+                        "updated_at" => "2011-04-17T11:49:10+10:00",
+                                "id" => 1,
+                      "credits_used" => 0,
+                           "user_id" => 1,
+                             "nodes" => 5,
+                    "controller_uri" => nil,
+                            "status" => "stopped",
+                            "active" => true,
+                      "browser_type" => "webdriver"
+                }
+            }
+        ],
+              "active" => true
+    }
+  }
+
+=== Step 2. Start the Grid
+Once you have created a grid, you can use the start command to start up the remote browsers.
+  grid -e your@email.com -p yourpassword start
+
+  D, [2011-04-17 11:49:21 #43313] DEBUG -- : Current token: dm3uw4yKY6jqknCvzGKBHQ
+  Grid ID: 1
+  D, [2011-04-17 11:49:22 #43313] DEBUG -- : Starting grid ...
+  D, [2011-04-17 11:49:31 #43313] DEBUG -- : Listing grid ...
+  {
+    "grid" => {
+                "name" => "Grid",
+          "created_at" => "2011-04-17T11:49:10+10:00",
+          "updated_at" => "2011-04-17T11:49:10+10:00",
+                  "id" => 1,
+             "user_id" => 1,
+        "credits_used" => 0,
+               "nodes" => 5,
+         "description" => "Grid created Sun Apr 17 11:49:07 +1000 2011",
+          "intranodes" => [
+            [0] {
+                "intranode" => {
+                           "grid_id" => 1,
+                        "created_at" => "2011-04-17T11:49:10+10:00",
+                          "location" => "us-east",
+                        "updated_at" => "2011-04-17T11:49:31+10:00",
+                                "id" => 1,
+                      "credits_used" => 0,
+                           "user_id" => 1,
+                             "nodes" => 5,
+                    "controller_uri" => nil,
+                            "status" => "starting",
+                            "active" => true,
+                      "browser_type" => "webdriver"
+                }
+            }
+        ],
+              "active" => true
+    }
+  }
+=== Step 3. Refresh the status of the Grid
+After starting the grid, you can refresh its status to confirm all grid => intranodes have a "running" status. Typically it takes between 30 - 60s to start up all the remote browsers on the grid. You can refresh the status with the status command.
+
+  grid -e your@email.com -p yourpassword start
+
+  D, [2011-04-17 11:49:44 #43339] DEBUG -- : Current token: xTbnoM6LVSjjLjQSB4GLtA
+  Grid ID: 1
+  D, [2011-04-17 11:49:45 #43339] DEBUG -- : Updating status of grid ...
+  D, [2011-04-17 11:49:49 #43339] DEBUG -- : Listing grid ...
+  {
+    "grid" => {
+                "name" => "Grid",
+          "created_at" => "2011-04-17T11:49:10+10:00",
+          "updated_at" => "2011-04-17T11:49:47+10:00",
+                  "id" => 1,
+             "user_id" => 1,
+        "credits_used" => 5,
+               "nodes" => 5,
+         "description" => "Grid created Sun Apr 17 11:49:07 +1000 2011",
+          "intranodes" => [
+            [0] {
+                "intranode" => {
+                           "grid_id" => 1,
+                        "created_at" => "2011-04-17T11:49:10+10:00",
+                          "location" => "us-east",
+                        "updated_at" => "2011-04-17T11:49:49+10:00",
+                                "id" => 1,
+                      "credits_used" => 5,
+                           "user_id" => 1,
+                             "nodes" => 5,
+                    "controller_uri" => "druby://ec2-50-17-120-217.compute-1.amazonaws.com:11235",
+                            "status" => "{\"running\":5}",
+                            "active" => true,
+                      "browser_type" => "webdriver"
+                }
+            }
+        ],
+              "active" => true
+    }
+  }
+
+Take note of the intranode *status* which in this examples indicates that there are 5 nodes "running" on the first intranode in your grid.
+Also take note of the *controller_uri* as this will be what you connect to when you distribute your tests. In this example the *controller_uri* is "druby://ec2-50-17-120-217.compute-1.amazonaws.com:11235"
+
+=== Step 4. Distribute your tests on the Grid
+Very little modification is needed to your existing test scripts. Essentially you will "top and tail" your test scripts with a Grid.control method as follows
+
+*Old Code*
+  require 'watir-webdriver'
+  browser = Watir::Browser.new :firefox
+  browser.goto("http://www.google.com")
+  browser.text_field(:name, 'q').set("watirgrid")
+  browser.button(:name, "btnI").click
+
+*New Code*
+  require 'grid'
+  Grid.control(
+  :controller_uri => 'druby://ec2-50-17-120-217.compute-1.amazonaws.com:11235') do |browser, id|
+    puts "My remote browser id is #{id}"
+    browser.goto("http://www.google.com")
+    browser.text_field(:name, 'q').set("watirgrid")
+    browser.button(:name, "btnI").click
+  end
+
+In this example, we required the 'grid' gem and controlled a Grid object with the "control" method. This method requires the *:controller_uri* parameter obtained from step 3 and is passed a block of your existing watir code. The same method will yield an individual browser object (same as a Watir browser object) as well as a thread ID which you can use to help identify which node your code is executed on.
+
+== Contributing to the Grid
 
-== Contributing to grid
- 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -14,6 +200,4 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2011 Tim Koopmans. See LICENSE.txt for
-further details.
-
+Copyright (c) 2011 Tim Koopmans. See LICENSE.txt for details.

data/Rakefile

@@ -19,8 +19,11 @@ Jeweler::Tasks.new do |gem|
   gem.email = "tim.koops@gmail.com"
   gem.authors = ["Tim Koopmans"]
   gem.add_runtime_dependency 'watirgrid'
-  gem.add_runtime_dependency 'rest_client'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_runtime_dependency 'rest-client'
+  gem.add_runtime_dependency 'json'
+  gem.add_runtime_dependency 'highline'
+  gem.add_runtime_dependency 'awesome_print'
+  gem.add_development_dependency 'rspec'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

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

data/bin/grid

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'grid'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: grid [options] command"
+  opts.separator ""
+  opts.separator "Commands:"
+  opts.separator "   list - List all grids"
+  opts.separator "   show - Show specified grids"
+  opts.separator "   create - Create a new grid"
+  opts.separator "   add - Add intranode to specified grid ID"
+  opts.separator "   delete - Delete intranode from specified grid ID"
+  opts.separator "   start - Start specified grid ID"
+  opts.separator "   stop - Stop specified grid ID"
+  opts.separator "   restart - Restart specified grid ID"
+  opts.separator "   status - Update status of specified grid ID"
+  opts.separator ""
+  opts.separator "Options:"
+  opts.on("-g", "--grid ID", String,
+  "Specify the Grid ID to use") do |g|
+    options[:grid_id] = g || nil
+  end
+  opts.on("-t", "--token TOKEN", String,
+  "Specify the token to authenticate with") do |t|
+    options[:token] = t || nil
+  end
+  opts.on("-e", "--email EMAIL", String,
+  "Specify the email to authenticate with, if not using token") do |e|
+    options[:email] = e || nil
+  end
+  opts.on("-p", "--password PASSWORD", String,
+  "Specify the password to authenticate with, if not using token") do |p|
+    options[:password] = p || nil
+  end
+  opts.on("-u", "--uri URI", String,
+  "Optional URI of the Gridinit API, default http://gridin.it/api/v0") do |u|
+    options[:uri] = u || nil
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+  end.parse!
+
+helper = Grid::Helper.new(
+  :grid_id    => options[:grid_id],
+  :token      => options[:token],
+  :email      => options[:email],
+  :password   => options[:password],
+  :uri        => options[:uri],
+  :args       => ARGV
+)
+helper.send(ARGV[0])

data/grid.gemspec

@@ -0,0 +1,100 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{grid}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tim Koopmans"]
+  s.date = %q{2011-04-17}
+  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}
+  s.executables = ["grid"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/grid",
+    "grid.gemspec",
+    "lib/grid.rb",
+    "spec/grid_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/90kts/grid}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Gridinit command line utilities}
+  s.test_files = [
+    "spec/grid_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<watirgrid>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<watirgrid>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<watirgrid>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<watirgrid>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<watirgrid>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<watirgrid>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end
+

data/lib/grid.rb

@@ -0,0 +1,209 @@
+#!/usr/bin/env ruby
+# grid.rb
+# Grid Helper
+
+require 'ap'
+require 'watirgrid'
+require 'json'
+require 'rest_client'
+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)
+    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")
+    threads = []
+    grid.browsers.each_with_index do |browser, index|
+      sleep rampup(grid.size, params)
+      threads << Thread.new do
+        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]}")
+        @browser = browser[:object].new_browser
+        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")
+      end
+    end
+    threads.each {|thread| thread.join}
+    grid.release_tuples
+  end
+
+  class Helper
+    def initialize(params = {})
+      @grid_id  = params[:grid_id]
+      @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 "
+      @token = get_token(params)
+      @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 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" }
+      @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" }
+      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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,11 +15,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +10:00
-default_executable: 
+date: 2011-04-17 00:00:00 +10:00
+default_executable: grid
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id001
+  type: :runtime
+  name: watirgrid
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id002
+  type: :runtime
+  name: json
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id003
+  type: :runtime
+  name: rest-client
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id004
+  type: :runtime
+  name: awesome_print
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id005
+  type: :runtime
+  name: highline
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,11 +101,11 @@ dependencies:
         - 0
         version: 2.3.0
   prerelease: false
-  requirement: *id001
+  requirement: *id006
   type: :development
   name: rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +117,11 @@ dependencies:
         - 0
         version: 1.0.0
   prerelease: false
-  requirement: *id002
+  requirement: *id007
   type: :development
   name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +133,11 @@ dependencies:
         - 2
         version: 1.5.2
   prerelease: false
-  requirement: *id003
+  requirement: *id008
   type: :development
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +147,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id004
+  requirement: *id009
   type: :development
   name: rcov
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,11 +161,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id005
+  requirement: *id010
   type: :runtime
   name: watirgrid
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,13 +175,69 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id006
+  requirement: *id011
+  type: :runtime
+  name: rest-client
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id012
+  type: :runtime
+  name: json
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id013
   type: :runtime
-  name: rest_client
+  name: highline
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id014
+  type: :runtime
+  name: awesome_print
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id015
+  type: :development
+  name: rspec
 description: Gridinit command line utilities to help you use the Gridinit API
 email: tim.koops@gmail.com
-executables: []
-
+executables: 
+- grid
 extensions: []
 
 extra_rdoc_files: 
@@ -121,10 +247,13 @@ files:
 - .document
 - .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/grid
+- grid.gemspec
 - lib/grid.rb
 - spec/grid_spec.rb
 - spec/spec_helper.rb