gondola 1.3.0 → 1.3.1

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "sauce", ">= 0.19.0"
 gem "parallel", "~> 0.5.2"
+gem "rainbow"
 
 group :development do
   gem "shoulda", ">= 0"

data/Gemfile.lock

@@ -20,6 +20,7 @@ GEM
     net-ssh-gateway (1.0.1)
       net-ssh (>= 1.99.1)
     parallel (0.5.3)
+    rainbow (1.1.1)
     rake (0.8.7)
     rest-client (1.6.1)
       mime-types (>= 1.16)
@@ -49,6 +50,7 @@ DEPENDENCIES
   fakeweb (~> 1.3.0)
   jeweler (~> 1.5.2)
   parallel (~> 0.5.2)
+  rainbow
   sauce (>= 0.19.0)
   shoulda
   vcr (>= 1.7.1)

data/bin/gondola

@@ -88,7 +88,25 @@ class ProjectCommand < CmdParse::Command
       exit 1
     end
 
-    args.each { |p| Dir.mkdir p }
+    args.each do |dir| 
+      begin
+        Dir.mkdir dir
+      rescue Errno::EEXIST
+        puts "This project already exists"
+        exit 1
+      end
+      puts "Creating new project #{dir.inspect}"
+      print "Base Url: "
+      base_url = $stdin.gets.chomp
+      File.open(File.join(dir, "config.yml"), "w") do |f|
+        yaml = Gondola::DEFAULT_CONFIG.merge({
+          :project_name => dir,
+          :base_url => base_url
+        })
+        YAML.dump(yaml, f)
+      end
+      puts "Project created"
+    end
   end
 end
 

data/gondola.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]
-  s.date = %q{2011-05-02}
+  s.date = %q{2011-06-09}
   s.description = %q{
     Gondola is Ruby command line utility and as well as a library  which helps
     for integrate the Selenium IDE more tightly with Sauce Labs' Ondemand services and
@@ -77,6 +77,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sauce>, [">= 0.19.0"])
       s.add_runtime_dependency(%q<parallel>, ["~> 0.5.2"])
+      s.add_runtime_dependency(%q<rainbow>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -85,6 +86,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sauce>, [">= 0.19.0"])
       s.add_dependency(%q<parallel>, ["~> 0.5.2"])
+      s.add_dependency(%q<rainbow>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -94,6 +96,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sauce>, [">= 0.19.0"])
     s.add_dependency(%q<parallel>, ["~> 0.5.2"])
+    s.add_dependency(%q<rainbow>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/gondola/results/console.rb

@@ -1,23 +1,26 @@
 # Gondola - console.rb
 #   Definitions of functions for printing
 #   results to the console in a readable format
+require 'rainbow'
 
 class Gondola
   module Results
     class Console
       def self.change(result)
         browser_string = result[:browser].values.join(" ")
-        print "#{result[:id]}: \"#{result[:name]}\" "
+        print "#{result[:id]}: \"#{result[:name]}\" ".foreground(:magenta)
 
         case result[:status]
         when :in_progress
-          puts "started with #{browser_string}"
+          puts "started with #{browser_string}".foreground(:cyan)
         when :not_started
-          puts "failed to start on #{browser_string}"
-        when :passed, :failed
-          puts "has completed with #{result[:errors].size} error(s) on #{browser_string}"
+          puts "failed to start on #{browser_string}".foreground(:red)
+        when :passed
+          puts "has completed with 0 errors on #{browser_string}".foreground(:green)
+        when :failed
+          puts "has completed with #{result[:errors].size} error(s) on #{browser_string}".foreground(:red)
         else
-          puts "Unknown status code"
+          puts "Unknown status code".foreground(:blue)
         end
       end
 
@@ -25,19 +28,23 @@ class Gondola
         puts
         results.each do |result|
           puts "Sauce Labs ID : #{result[:id]}"
-          puts "Test Name     : #{result[:name]}"
+          puts "Test Name     : #{result[:name]}".foreground(:magenta)
           puts "Browser       : #{result[:browser].values.join(" ")}"
-          puts "Status        : Test #{result[:status].to_s.capitalize} - #{result[:errors].size} error(s)"
-          if result[:status] == :failed
+          if result[:status] == :passed
+            puts "Status        : Test #{result[:status].to_s.capitalize}".foreground(:green)
+
+          elsif result[:status] == :failed
+            puts "Status        : Test #{result[:status].to_s.capitalize} - #{result[:errors].size} error(s)".foreground(:red)
+
             result[:errors].each_with_index do |error,i|
-              puts "- Error #{i+1}, Command number #{error[:cmd_num]}:"
+              puts "- Error #{i+1}, Command number #{error[:cmd_num]}:".foreground(:red)
 
               max_key = -1 * (error[:command].keys.map { |k| k.to_s.size }.max + 8)
               error[:command].each_pair do |k,v| 
                 puts "    %1$*2$s : #{v}" % [ "#{k.to_s.capitalize} command", max_key ]
               end
 
-              puts "    #{error[:error]}"
+              puts "    #{error[:error]}".foreground(:red)
             end
           else
             puts

data/lib/gondola/tester.rb

@@ -27,7 +27,17 @@ class Gondola
         @status = :in_progress
       rescue ::Selenium::Client::CommandError => e
         @status = :not_started
-        add_error e.message, e.backtrace
+        @errors << {
+          :cmd_num => 0,
+          :command => "#{SELENIUM_OBJECT}.start",
+          :error => e.message
+        }
+      rescue Timeout::Error => e
+        @errors << {
+          :cmd_num => 0,
+          :command => "#{SELENIUM_OBJECT}.start",
+          :error => "ERROR: Command timed out"
+        }
       end
       @job_id
     end
@@ -38,7 +48,9 @@ class Gondola
         eval @converter.ruby
       rescue AssertionError
       rescue ::Selenium::Client::CommandError => e
-        add_error e.message, e.backtrace
+        add_error_with_trace e.message, e.backtrace
+      rescue Timeout::Error => e
+        add_error_with_trace "ERROR: Command timed out", e.backtrace
       ensure
         finish
       end
@@ -58,7 +70,18 @@ class Gondola
           @sel.failed!
         end
         @sel.stop
-      rescue ::Selenium::Client::CommandError
+      rescue ::Selenium::Client::CommandError => e
+        @errors << {
+          :cmd_num => 0,
+          :command => "",
+          :error => e.message
+        }
+      rescue Timeout::Error => e
+        @errors << {
+          :cmd_num => 0,
+          :command => "",
+          :error => "ERROR: Command timed out"
+        }
       end
     end
 
@@ -70,13 +93,13 @@ class Gondola
 
     # Add the current command to the error list
     # with the given description
-    def add_error(desc, trace=caller)
+    def add_error_with_trace(desc, trace=caller)
       cmd_num = get_cmd_num(trace)
-      @errors.push({ 
+      @errors.push << { 
         :cmd_num => cmd_num,
-        :command => cmd_num ? @converter.commands[cmd_num-1] : "#{SELENIUM_OBJECT}.start",
+        :command => @converter.commands[cmd_num-1],
         :error => desc 
-      })
+      }
     end
 
     # Handle all the assert functions by just making the respective
@@ -88,22 +111,22 @@ class Gondola
     end
 
     def verify(expr)
-      add_error "ERROR: Command returned false, expecting true" unless expr
+      add_error_with_trace "ERROR: Command returned false, expecting true" unless expr
       return expr
     end
 
     def verify_not(expr)
-      add_error "ERROR: Command returned true, expecting false" if expr
+      add_error_with_trace "ERROR: Command returned true, expecting false" if expr
       return !expr
     end
 
     def verify_equal(eq, expr)
-      add_error "ERROR: Command returned '#{expr}', expecting '#{eq}'" unless eq == expr
+      add_error_with_trace "ERROR: Command returned '#{expr}', expecting '#{eq}'" unless eq == expr
       return eq == expr
     end
 
     def verify_not_equal(eq, expr)
-      add_error "ERROR: Command returned '#{expr}', expecting anything but" unless eq != expr
+      add_error_with_trace "ERROR: Command returned '#{expr}', expecting anything but" unless eq != expr
       return eq != expr
     end
   end

data/lib/gondola/version.rb

@@ -1,3 +1,3 @@
 class Gondola
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
 end

data/lib/gondola.rb

@@ -14,6 +14,16 @@ require 'sauce'
 require 'parallel'
 
 class Gondola
+
+  DEFAULT_CONFIG = {
+    :project_name => "New Project",
+    :base_url => "http://www.google.com/",
+    :browsers => [
+      {:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"},
+      {:os => "Windows 2003", :browser => "iexplore", :browser_version => "8" },
+    ]
+  }
+
   attr_reader :runner
 
   def initialize

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Matthew Perry
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 Z
+date: 2011-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sauce
@@ -35,19 +35,30 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rainbow
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: shoulda
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: vcr
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,10 +88,10 @@ dependencies:
         version: 1.7.1
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,7 +99,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: "\n    Gondola is Ruby command line utility and as well as a library  which helps\n    for integrate the Selenium IDE more tightly with Sauce Labs' Ondemand services and\n    provide greater ease for those who would like to use both tools but do not have\n    enough technical knowledge\n  "
 email: mperry@agoragames.com
 executables: 
@@ -144,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1061792883
+      hash: 549041487
       segments: 
       - 0
       version: "0"