gondola 1.1.7 → 1.1.8

data/README.markdown

@@ -24,6 +24,19 @@ for more details.
 Gondola offers a simplistic command line application for quickly debugging tests written in the Selenium IDE. Gondola also offers a short and sweet API for
 integrating Gondola's features into any other application.
 
+NOTE: Make sure that you configure your Sauce Labs username and access key by doing one of two things:
+
+* Issue a command to the Sauce Labs gem:
+
+        $ sauce configure [username] [access-key]
+
+* or create an ondemand.yml file in the directory structure of your tests:
+
+        :username: [username]
+        :access_key: [access-key]
+
+before using Gondola in any capacity.
+
 ### Getting started
 
     $ gondola help

data/gondola.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]
-  s.date = %q{2011-03-16}
+  s.date = %q{2011-03-21}
   s.default_executable = %q{gondola}
   s.description = %q{
     Gondola is Ruby command line utility and as well as a library  which helps
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
     "lib/gondola.rb",
     "lib/gondola/converter.rb",
     "lib/gondola/html_converter.rb",
-    "lib/gondola/legacy_converter.rb",
     "lib/gondola/tester.rb",
     "lib/gondola/testrunner.rb",
     "lib/gondola/version.rb",
@@ -48,7 +47,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

@@ -4,20 +4,22 @@
 
 module Gondola
   class Converter
+    attr_writer :name
+    attr_reader :file
+
     # Constructor that opens a file
     def initialize(filename, sel="@sel")
       File.open(filename, "r") do |f|
         @body = f.read
       end
       @s_obj = sel
+      @file = filename
       ruby()
     end
 
-    # Function: name
-    # Returns the name of this test case
     def name
       unless @name
-        @name = "Abstract Converter"
+        @name = @file
       end
       @name
     end
@@ -27,7 +29,7 @@ module Gondola
     # and returns valid selenium ruby code
     def ruby
       unless @ruby
-        @ruby = "puts 'This is an abstract converter, do not use this.'"
+        @ruby = @body.gsub(/.*/, "\\&\ncmd_inc\n")
       end  
       @ruby
     end

data/lib/gondola/html_converter.rb

@@ -1,11 +1,9 @@
 # Gondola - html_converter.rb:
 #   Class definition for turning Selenium HTML into
 #   webdriver ruby code
-require 'rubygems'
-require 'gondola'
 
 module Gondola
-  class HtmlConverter < Converter
+  class HtmlConverter < Gondola::Converter
     # Function: name
     # Returns the name of this test case
     def name
@@ -92,7 +90,7 @@ module Gondola
             var = args[1]
             extra = "(#{args[0]})"
           end
-          retval = "#{tester}_eq #{var}, #{@s_obj}.get_#{underscore(string)}" + extra
+          retval = "#{tester}_equal #{var}, #{@s_obj}.get_#{underscore(string)}" + extra
         end
 
         # All commands return arrays that need to be joined

data/lib/gondola/tester.rb

@@ -42,13 +42,13 @@ module Gondola
       end
     end
 
-    def assert_eq(eq, expr)
+    def assert_equal(eq, expr)
       unless verify(eq, expr)
         raise "Assertion Failed"
       end
     end
 
-    def assert_not_eq(eq, expr)
+    def assert_not_equal(eq, expr)
       unless verifyNot(eq, expr)
         raise "Assertion Failed"
       end
@@ -70,7 +70,7 @@ module Gondola
       return true
     end
 
-    def verify_eq(eq, expr)
+    def verify_equal(eq, expr)
       unless eq == expr
         @stderr.puts "Command #{@cmd_num} returned '#{expr}', expecting '#{eq}'"
         return false
@@ -78,7 +78,7 @@ module Gondola
       return true
     end
 
-    def verify_not_eq(eq, expr)
+    def verify_not_equal(eq, expr)
       if eq == expr
         @stderr.puts "Command #{@cmd_num} returned '#{expr}', expecting '#{eq}'"
         return false

data/lib/gondola/testrunner.rb

@@ -2,9 +2,6 @@
 #   A wrapper for all the tasks required for launching a run
 #   of a test suite or test case on several browsers
 
-require 'rubygems'
-require 'gondola'
-
 module Gondola
   class TestRunner
     attr_reader :tests
@@ -66,7 +63,7 @@ module Gondola
       if File.extname(file) == '.html'
         converter = Gondola::HtmlConverter.new(file)
       elsif File.extname(file) == '.rb'
-        converter = Gondola::LegacyConverter.new(file)
+        converter = Gondola::Converter.new(file)
       end
       # Load file config data
       conf = config_from_file(file)

data/lib/gondola/version.rb

@@ -1,3 +1,3 @@
 module Gondola
-    VERSION = "1.1.7"
+    VERSION = "1.1.8"
 end

data/lib/gondola.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'gondola/converter'
 require 'gondola/html_converter'
-require 'gondola/legacy_converter'
 require 'gondola/tester'
 require 'gondola/testrunner'
 require 'gondola/version'

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors: 
 - Matthew Perry
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -04:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: gondola
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,6 @@ files:
 - lib/gondola.rb
 - lib/gondola/converter.rb
 - lib/gondola/html_converter.rb
-- lib/gondola/legacy_converter.rb
 - lib/gondola/tester.rb
 - lib/gondola/testrunner.rb
 - lib/gondola/version.rb
@@ -112,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1003150642294150752
+      hash: -420131987
       segments: 
       - 0
       version: "0"
@@ -125,7 +124,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

data/lib/gondola/legacy_converter.rb

@@ -1,41 +0,0 @@
-# Gondola - legacy_converter.rb
-#   Class definition for turning old selenium-test
-#   files into new ruby code for gondola
-require 'rubygems'
-require 'gondola'
-
-module Gondola
-  class LegacyConverter < Converter
-    # Function: name
-    # Returns the name of this test case
-    def name
-      unless @name
-        @name = @body.match(/class(.*?)</m)[1].strip
-      end
-      @name
-    end
-
-    # Function: ruby
-    # This function parses the given legacy
-    # test case file and parses it into the
-    # new streamlined form
-    def ruby
-      unless @ruby
-        @ruby = ""
-
-        # Only search through relevent portions
-        cmd_body = @body.match(/def test_case.*end/m)
-        # Define a pattern for commands
-        cmd_rxp = Regexp.new(/^.*?@selenium.*?$/)
-
-        # Loop over all lines
-        cmd_body[0].scan(cmd_rxp) do |cmd|
-          @ruby << cmd.strip.sub(/@selenium/, "@sel")
-          @ruby << "\ncmd_inc\n"
-        end
-      end
-      @ruby
-    end
-  end
-end
-