gondola 1.2.2 → 1.2.3

data/bin/gondola

@@ -49,6 +49,8 @@ class RunCommand < CmdParse::Command
     result[:browser].each_value { |v| bs = bs + "#{v} " }
     if result[:status] == :in_progress
       puts "#{result[:id]}: Started test \"#{result[:name]}\" with #{bs}"
+    elsif result[:status] == :not_started
+      puts "#{result[:id]}: \"#{result[:name]}\" failed to start"
     else
       num = result[:errors].size
       puts "#{result[:id]}: \"#{result[:name]}\" with #{bs}has completed with #{num} errors"

data/gondola.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]
-  s.date = %q{2011-03-26}
+  s.date = %q{2011-03-28}
   s.default_executable = %q{gondola}
   s.description = %q{
     Gondola is Ruby command line utility and as well as a library  which helps
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/perrym5/gondola}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services}
   s.test_files = [
     "test/helper.rb",

data/lib/gondola/converter.rb

@@ -31,10 +31,8 @@ module Gondola
     def ruby
       unless @ruby
         @ruby = ""
-        enum = @body.lines
-        enum.each do |l|
+        @body.each_line do |l|
           @commands.push({ :ruby => l })
-          l = l + "cmd_inc\n"
           @ruby << l
         end
       end  

data/lib/gondola/html_converter.rb

@@ -51,8 +51,7 @@ module Gondola
             selenese = selenese + ")"
             ruby = html_to_ruby(cmd[0], args)
             @commands.push({ :selenese => selenese, :ruby => ruby })
-            @ruby << ruby
-            @ruby << "\ncmd_inc\n"
+            @ruby << ruby + "\n"
           end
         end         
       end  
@@ -131,7 +130,7 @@ module Gondola
         # A command with a postfix of AndWait simply adds
         # a second command which waits a certain time
         firstPart = html_to_ruby($1, args)
-        secondPart = "\n#{@s_obj}.wait_for_page_to_load \"30000\""
+        secondPart = "; #{@s_obj}.wait_for_page_to_load \"30000\""
         return firstPart + secondPart
 
         # store command

data/lib/gondola/tester.rb

@@ -8,7 +8,7 @@ module Gondola
   end
 
   class Tester
-    attr_reader :cmd_num, :errors, :job_id, :status
+    attr_reader :errors, :job_id, :status
 
     def initialize(req, converter)
       @sel = Gondola::Selenium.new req
@@ -24,6 +24,7 @@ module Gondola
         @job_id = @sel.session_id
         @status = :in_progress
       rescue ::Selenium::Client::CommandError => e
+        @status = :not_started
         add_error e.message
         finish
       end
@@ -60,16 +61,18 @@ module Gondola
       end
     end
 
-    def cmd_inc
-      @cmd_num+=1
+    def get_eval_cmd_num
+      ev = caller.keep_if { |c| c =~ /\(eval\)/ }[0]
+      ev.match(/:(\d+)/)[1].to_i - 1
     end
 
     # Add the current command to the error list
     # with the given description
     def add_error(desc)
+      cmd_num = get_eval_cmd_num
       @errors.push({ 
-        :cmd_num => @cmd_num,
-        :command => @converter.commands[@cmd_num],
+        :cmd_num => cmd_num,
+        :command => @converter.commands[cmd_num],
         :error => desc 
       })
     end

data/lib/gondola/version.rb

@@ -1,3 +1,3 @@
 module Gondola
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
 end

data/test/test_converter.rb

@@ -8,43 +8,24 @@ class TestConverter < Test::Unit::TestCase
 
     should "properly convert a ruby file to a gondola ruby file" do
       expected = %q{ @sel.open "/"
-        cmd_inc
         @sel.wait_for_page_to_load "30000"
-        cmd_inc
         @sel.type "q", "agora games"
-        cmd_inc
         @sel.click "btnG"
-        cmd_inc
         @sel.click "link=Careers"
-        cmd_inc
         @sel.wait_for_page_to_load "30000"
-        cmd_inc
         verify_equal "Agora Games", @sel.get_title
-        cmd_inc
         verify @sel.is_text_present("At Agora")
-        cmd_inc
         assert @sel.is_text_present("Platform Engineer")
-        cmd_inc
         @sel.click "link=Application Engineer"
-        cmd_inc
         assert @sel.is_text_present("Application Engineer")
-        cmd_inc
         @sel.click "link=Producer"
-        cmd_inc
         assert @sel.is_text_present("Producer")
-        cmd_inc
         @sel.click "link=work at Agora."
-        cmd_inc
         @sel.wait_for_page_to_load "30000"
-        cmd_inc
         @sel.click "link=Fun at Agora"
-        cmd_inc
         @sel.click "link=Hack-a-thon"
-        cmd_inc
         @sel.click "link=Our Town"
-        cmd_inc
         @sel.click "link=Communication at Agora"
-        cmd_inc
       }.lines.map { |l| l.strip! }.join("\n")
       assert_equal expected, @converter.ruby
       assert_equal 19, @converter.commands.size
@@ -62,41 +43,22 @@ class TestConverter < Test::Unit::TestCase
 
     should "properly convert a selenese HTML file to a gondola ruby file" do
       expected = %q{ @sel.open "/"
-        cmd_inc
         @sel.wait_for_page_to_load "30000"
-        cmd_inc
         @sel.type "q", "agora games"
-        cmd_inc
         @sel.click "btnG"
-        cmd_inc
-        @sel.click "link=Careers"
-        @sel.wait_for_page_to_load "30000"
-        cmd_inc
+        @sel.click "link=Careers"; @sel.wait_for_page_to_load "30000"
         verify_equal "Agora Games", @sel.get_title
-        cmd_inc
         verify @sel.is_text_present("At Agora")
-        cmd_inc
         assert @sel.is_text_present("Platform Engineer")
-        cmd_inc
         @sel.click "link=Application Engineer"
-        cmd_inc
         assert @sel.is_text_present("Application Engineer")
-        cmd_inc
         @sel.click "link=Producer"
-        cmd_inc
         assert @sel.is_text_present("Producer")
-        cmd_inc
-        @sel.click "link=work at Agora."
-        @sel.wait_for_page_to_load "30000"
-        cmd_inc
+        @sel.click "link=work at Agora."; @sel.wait_for_page_to_load "30000"
         @sel.click "link=Fun at Agora"
-        cmd_inc
         @sel.click "link=Hack-a-thon"
-        cmd_inc
         @sel.click "link=Our Town"
-        cmd_inc
         @sel.click "link=Communication at Agora"
-        cmd_inc
       }.lines.map { |l| l.strip! }.join("\n")
       assert_equal expected, @converter.ruby
       assert_equal 17, @converter.commands.size

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Matthew Perry
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -04:00
+date: 2011-03-28 00:00:00 -04:00
 default_executable: gondola
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 145022769040170971
+      hash: 299527533
       segments: 
       - 0
       version: "0"
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services