grid 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/bin/grid

@@ -8,15 +8,16 @@ 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 "   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 "   status  - Update status of specified grid ID"
+  opts.separator "   token   - Generate new access token"
   opts.separator ""
   opts.separator "Options:"
   opts.on("-g", "--grid ID", String,
@@ -28,19 +29,24 @@ OptionParser.new do |opts|
     options[:token] = t || nil
   end
   opts.on("-e", "--email EMAIL", String,
-  "Specify the email to authenticate with, if not using token") do |e|
+  "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|
+  "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|
+  "Optional URI of the Gridinit API:
+                                     http://gridin.it/api/v0 (default)") do |u|
     options[:uri] = u || nil
   end
   opts.on("-a", "--api API", String,
-  "Specify the Watir API to use, default webdriver [watir, firewatir, webdriver_performance]}") do |a|
+  "Specify the API to use:
+                                     watir, firewatir, webdriver (default)
+                                     webdriver_performance") do |a|
     options[:api] = b || 'webdriver'
   end
 

data/examples/cucumber/step_definitions/example_steps.rb

@@ -6,7 +6,7 @@ require 'grid'
 
 Given /^(\d+) users open "([^"]*)"$/ do |quantity, browser|
   params={}
-  params[:controller_uri] = "druby://ec2-50-16-63-81.compute-1.amazonaws.com:11235"
+  params[:controller_uri] = "druby://ec2-184-73-37-176.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

data/grid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grid}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]

data/lib/grid.rb

@@ -106,7 +106,12 @@ class Grid
       @log  = Logger.new(logfile, 'daily')
       @log.level = Logger::DEBUG
       @log.datetime_format = "%Y-%m-%d %H:%M:%S "
-      @token = get_token(params)
+      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
 
@@ -114,7 +119,7 @@ class Grid
       ask(prompt) { |q| q.echo = mask }
     end
 
-    def get_token(params)
+    def get_token(params={})
       if params[:token]
         params[:token]
       else
@@ -128,6 +133,17 @@ class Grid
       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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tim Koopmans