grid 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/bin/grid

@@ -5,25 +5,20 @@ require 'optparse'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: grid [options] command"
+  opts.banner = "Usage: grid [options] command [grid_id]"
   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 "   token   - Generate new access token"
+  opts.separator "   credits - List available credits"
   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
@@ -43,12 +38,6 @@ OptionParser.new do |opts|
                                      http://gridin.it/api/v0 (default)") do |u|
     options[:uri] = u || nil
   end
-  opts.on("-a", "--api API", String,
-  "Specify the API to use:
-                                     watir, firewatir, webdriver (default)
-                                     webdriver_performance") do |a|
-    options[:api] = b || 'webdriver'
-  end
 
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
@@ -57,12 +46,10 @@ OptionParser.new do |opts|
   end.parse!
 
 helper = Grid::Helper.new(
-  :grid_id    => options[:grid_id],
   :token      => options[:token],
   :email      => options[:email],
   :password   => options[:password],
   :uri        => options[:uri],
-  :api        => options[:api],
   :args       => ARGV
 )
-helper.send(ARGV[0])
+helper.send ARGV[0], ARGV[1]

data/examples/testunit/basic_test.rb

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

data/grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grid}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-05-05}
   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}

data/lib/grid/grid.rb

@@ -93,14 +93,12 @@ class Grid
     if params[:rampup]
       params[:rampup] / @grid.size
     else
-      0.5
+      0.25
     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')
@@ -138,16 +136,16 @@ class Grid
       homes.detect {|h| ENV[h] != nil}
     end
 
-    def token
+    def token(args=nil)
       @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 ...")
+    def credits(args=nil)
+      @log.debug("Listing credits available ...")
       begin
-        response = RestClient.get "#{@uri}/grid.json" , {
+        response = RestClient.get "#{@uri}/credit.json" , {
           :token => @token
         }
         ap JSON.parse(response)
@@ -156,11 +154,10 @@ class Grid
       end
     end
 
-    def show
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      @log.debug("Listing grid ...")
+    def list(args=nil)
+      @log.debug("Listing grids ...")
       begin
-        response = RestClient.get "#{@uri}/grid/#{@grid_id}.json" , {
+        response = RestClient.get "#{@uri}/grid.json" , {
           :token => @token
         }
         ap JSON.parse(response)
@@ -169,114 +166,104 @@ class Grid
       end
     end
 
-    def create_grid(name, description)
+    def show(grid_id=nil)
+      @grid_id = ( grid_id ? grid_id : ask("Grid ID: ") )
+      @log.debug("Listing grid ...")
       begin
-        @log.debug("Creating grid ...")
-        response = RestClient.post "#{@uri}/grid.json" , {
-          :token => @token,
-          :name  => name,
-          :description => description
+        response = RestClient.get "#{@uri}/grid/#{@grid_id}.json" , {
+          :token => @token
         }
-        (JSON.parse(response)).first[1]["id"]
+        ap JSON.parse(response)
       rescue => e
         @log.error("#{e}")
       end
     end
 
-    def create_intranode(grid_id, browser_type, location, nodes)
+    def create_grid(name, description, driver, location, total_nodes)
       begin
-        @log.debug("Creating intranode ...")
-        response = RestClient.post "#{@uri}/grid/#{grid_id.to_s}/intranode.json", {
+        @log.debug("Creating grid ...")
+        response = RestClient.post "#{@uri}/grid.json" , {
           :token => @token,
-          :browser_type => browser_type,
+          :name  => name,
+          :description => description,
+          :driver => driver,
           :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
+          :total_nodes => total_nodes
         }
+        (JSON.parse(response)).first[1]["id"]
       rescue => e
         @log.error("#{e}")
       end
     end
 
-    def create
+    def create(args=nil)
       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 }
+      total_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
+      driver = ask("Driver: ") { |q| q.default = "webdriver" } unless @api
+      @grid_id = create_grid(name, description, driver, location, total_nodes)
+      show(@grid_id)
     end
 
-    def add
-      @grid_id = ask("Grid ID: ") unless @grid_id
-      nodes = ask("Number of nodes: ") { |q| q.default = 5 }
+    def launch(args=nil)
+      name = ask("Grid name: ") { |q| q.default = "Grid" }
+      description = ask("Grid description: ") { |q| q.default = "Grid created #{Time.now}" }
+      total_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
+      driver = ask("Driver: ") { |q| q.default = "webdriver" } unless @api
+      @grid_id = create_grid(name, description, driver, location, total_nodes)
+      @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(@grid_id)
     end
 
-    def start
-      @grid_id = ask("Grid ID: ") unless @grid_id
+    def start(grid_id=nil)
+      @grid_id = ( grid_id ? grid_id : ask("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
+      show(@grid_id)
     end
 
-    def stop
-      @grid_id = ask("Grid ID: ") unless @grid_id
+    def stop(grid_id=nil)
+      @grid_id = ( grid_id ? grid_id : ask("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
+      show(@grid_id)
     end
 
-    def restart
-      @grid_id = ask("Grid ID: ") unless @grid_id
+    def restart(grid_id=nil)
+      @grid_id = ( grid_id ? grid_id : ask("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
+      show(@grid_id)
     end
 
-    def status
-      @grid_id = ask("Grid ID: ") unless @grid_id
+    def status(grid_id=nil)
+      @grid_id = ( grid_id ? grid_id : ask("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
+      show(@grid_id)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +10:00
+date: 2011-05-05 00:00:00 +10:00
 default_executable: grid
 dependencies: 
 - !ruby/object:Gem::Dependency