gondola 1.1.3 → 1.1.4

data/Rakefile

@@ -24,7 +24,7 @@ Jeweler::Tasks.new do |gem|
   }
   gem.email = "mperry@agoragames.com"
   gem.authors = ["Matthew Perry"]
-  gem.version = Gondola::Version::STRING
+  gem.version = Gondola::VERSION
   # Dependencies in GemFile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -53,7 +53,7 @@ task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : Gondola::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "gondola #{version}"

data/bin/gondola

@@ -16,7 +16,7 @@ require 'gondola'
 # Command parsing stuff
 cmd = CmdParse::CommandParser.new(true, true)
 cmd.program_name = "gondola"
-cmd.program_version = Gondola::Version::STRING
+cmd.program_version = Gondola::VERSION
 cmd.add_command(CmdParse::HelpCommand.new)
 cmd.add_command(CmdParse::VersionCommand.new)
 
@@ -34,9 +34,6 @@ class RunCommand < CmdParse::Command
       opt.on('-r', '--recursive', 'Execute all sub suites') do |r|
         @opts[:recursive] = true
       end
-      opt.on('-l', '--legacy', 'Allow legacy Gondola suites') do |l|
-        @opts[:legacy] = true
-      end
     end
   end
 

data/gondola.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]
@@ -37,6 +37,8 @@ Gem::Specification.new do |s|
     "gondola.gemspec",
     "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",

data/lib/gondola/converter.rb

@@ -1,13 +1,13 @@
 # Gondola - converter.rb:
-#   Function definition for turning Selenium HTML into
-#   webdriver ruby code
+#   Class definition for turning one format into
+#   another
 
 module Gondola
   class Converter
-    # Constructor that opens an HTML file
+    # Constructor that opens a file
     def initialize(filename, sel="@sel")
       File.open(filename, "r") do |f|
-        @html = f.read
+        @body = f.read
       end
       @s_obj = sel
       ruby()
@@ -17,197 +17,19 @@ module Gondola
     # Returns the name of this test case
     def name
       unless @name
-        @name = /<title>(.*)<\/title>/.match(@html)[1]
+        @name = "Abstract Converter"
       end
       @name
     end
 
     # Function: ruby
-    # This function parses the selenium
-    # HTML file and sends commands to the
-    # html_to_ruby helper function
+    # This function parses the given file
+    # and returns valid selenium ruby code
     def ruby
       unless @ruby
-        @ruby = ""
-        # Get body of commands from flattened html
-        cmd_body = /<tbody>(.*)<\/tbody>/.match(@html.split("\n").join(''))[1]
-
-        # Define some patterns for the individual commands
-        block_rxp = Regexp.new(/<tr>(.*?)<\/tr>/)
-        cmd_rxp = Regexp.new(/<td>(.*?)<\/td>\s*<td>(.*?)<\/td>\s*<td>(.*?)<\/td>/)
-
-        # Loop over all commands
-        cmd_body.scan(block_rxp ) do |cmd_block|
-          cmd_block[0].scan(cmd_rxp ) do |cmd|
-            # Need to make sure arguements are represented
-            # correctly
-            if cmd[1] =~ /\$\{(.*)\}/
-              cmd[1] = $1
-            elsif cmd[1] != ""
-              cmd[1] = cmd[1].inspect
-            end
-            if cmd[2] =~ /\$\{(.*)\}/
-              cmd[2] = $1
-            elsif cmd[2] != ""
-              cmd[2] = cmd[2].inspect
-            end
-            # Append commands to a result string
-            args = [ cmd[1], cmd[2] ]
-            @ruby << html_to_ruby(cmd[0], args)
-            @ruby << "\ncmd_inc\n"
-          end
-        end         
+        @ruby = "puts 'This is an abstract converter, do not use this.'"
       end  
       @ruby
     end
-
-    private
-    # Function: html_to_ruby
-    #   cmd - the name of the command
-    #   args - array of arguements to cmd
-    # This function turns a command that has been
-    # extracted from a selenium HTML file into
-    # one that can be used by the ruby-driver for
-    # selenium
-    def html_to_ruby(cmd, args)
-      # Select over various command types
-      case cmd
-        # Assert command
-      when /^(assert|verify)(.*)$/ then
-        # Check to see if this is a negated assertion
-        tester = $1
-        string = $2
-        if $1 =~ /(.*)Not(.*)$/
-          string = $1 + $2
-          tester = tester + "_not"
-        end
-
-        # Check the semantics of the command
-        if semantic_is?(string)
-          retval = "#{tester} #{@s_obj}.is_#{underscore(string)}"
-          if args[0] != ""
-            retval += "(#{args[0]}"
-          end
-          if args[1] != ""
-            retval += ", #{args[1]}"
-          end
-          retval += ")"
-        else
-          var = args[0]
-          extra = ''
-          if args[1] != ""
-            var = args[1]
-            extra = "(#{args[0]})"
-          end
-          retval = "#{tester}_eq #{var}, #{@s_obj}.get_#{underscore(string)}" + extra
-        end
-
-        # All commands return arrays that need to be joined
-        if string =~ /^All/
-          retval += ".join(\",\")"
-        end
-        return retval
-
-        # Wait For command
-      when /^waitFor(.*)$/ then
-        # Special case
-        if $1 == "PageToLoad"
-          return "#{@s_obj}.wait_for_page_to_load \"30000\""
-        end
-        # The expression that is checked against depends on whether
-        # or not the command uses the "is" or the "get" semantic
-        if semantic_is?($1)
-          expression = "#{@s_obj}.is_#{underscore($1)}(#{args[0]}"
-          if args[1] != ""
-            expression += ", #{args[1]}"
-          end
-          expression += ")"
-        else
-          expression = "#{args[1]} == #{@s_obj}.get_#{underscore($1)}(#{args[1]})"
-        end
-        # The waitFor commands loop until something is satisfied
-        return "assert !60.times{ break if(#{expression} rescue false); sleep 1 }"
-
-        # AndWait command POSTFIX
-      when /^(.*)AndWait$/ then
-        # 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\""
-        return firstPart + secondPart
-
-        # store command
-      when /^store(.*)$/ then
-        string = $1
-        # Store by itself doesnt use any selenium functions
-        # its the same as a regular assignment
-        if $1 == ""
-          # Arguements have quotes by default
-          # they need to be stripped for LHS assignments
-          args[1] = args[1].match(/"(.*)"/)[1]
-          return "#{args[1]} = #{args[0]}"
-        end
-
-        # Otherwise, a store command takes the result of the
-        # cmd and stores it somewhere
-        var = args[0]
-        extra = ""
-        if args[1] != ""
-          var = args[1]
-          extra = "(#{args[0]})"
-        end
-        # Arguements have quotes by default
-        # they need to be stripped for LHS assignments
-        var = var.match(/"(.*)"/)[1]
-        if semantic_is?(string)
-          return "#{var} = #{@s_obj}.is_#{underscore(string)}" + extra
-        else 
-          return "#{var} = #{@s_obj}.get_#{underscore(string)}" + extra
-        end
-
-        # Pause is directly translated
-      when /^pause$/ then
-        convert = args[0].to_f * 0.001
-        return "sleep #{convert}"
-
-        # Default case
-      else
-        # Most commands just need to be converted to
-        # underscore_case and have their arguements
-        # appeneded
-        cmd_new = underscore(cmd)
-        add = ""
-        if args[1] != ""
-          add = ", #{args[1]}"
-        end
-        return "#{@s_obj}.#{cmd_new} #{args[0]}" + add
-      end
-    end
-
-    # Function to turn CamelCase into underscore_case
-    def underscore(str)
-      str.gsub(/(.)([A-Z])/,'\1_\2').downcase
-    end
-
-    # Function to weed out 11 special functions that
-    # use an "is" semantic
-    def semantic_is?(str)
-      case str
-      when /Present$/
-        return true
-      when /Checked$/
-        return true
-      when /Editable$/
-        return true
-      when /Ordered$/
-        return true
-      when /Selected$/
-        return true
-      when /Visible$/
-        return true
-      else
-        return false
-      end
-    end
   end
 end

data/lib/gondola/html_converter.rb

@@ -0,0 +1,206 @@
+# Gondola - html_converter.rb:
+#   Class definition for turning Selenium HTML into
+#   webdriver ruby code
+require 'rubygems'
+require 'gondola'
+
+module Gondola
+  class HtmlConverter < Converter
+    # Function: name
+    # Returns the name of this test case
+    def name
+      unless @name
+        @name = @body.match(/<title>(.*)<\/title>/m)[1]
+      end
+      @name
+    end
+
+    # Function: ruby
+    # This function parses the selenium
+    # HTML file and sends commands to the
+    # html_to_ruby helper function
+    def ruby
+      unless @ruby
+        @ruby = ""
+        # Get body of commands from flattened html
+        cmd_body = @body.match(/<tbody>(.*)<\/tbody>/m)[1]
+
+        # Define some patterns for the individual commands
+        block_rxp = Regexp.new(/<tr>(.*?)<\/tr>/m)
+        cmd_rxp = Regexp.new(/<td>(.*?)<\/td>\s*<td>(.*?)<\/td>\s*<td>(.*?)<\/td>/m)
+
+        # Loop over all commands
+        cmd_body.scan(block_rxp) do |cmd_block|
+          cmd_block[0].scan(cmd_rxp) do |cmd|
+            # Need to make sure arguements are represented
+            # correctly
+            if cmd[1] =~ /\$\{(.*)\}/
+              cmd[1] = $1
+            elsif cmd[1] != ""
+              cmd[1] = cmd[1].inspect
+            end
+            if cmd[2] =~ /\$\{(.*)\}/
+              cmd[2] = $1
+            elsif cmd[2] != ""
+              cmd[2] = cmd[2].inspect
+            end
+            # Append commands to a result string
+            args = [ cmd[1], cmd[2] ]
+            @ruby << html_to_ruby(cmd[0], args)
+            @ruby << "\ncmd_inc\n"
+          end
+        end         
+      end  
+      @ruby
+    end
+
+    private
+    # Function: html_to_ruby
+    #   cmd - the name of the command
+    #   args - array of arguements to cmd
+    # This function turns a command that has been
+    # extracted from a selenium HTML file into
+    # one that can be used by the ruby-driver for
+    # selenium
+    def html_to_ruby(cmd, args)
+      # Select over various command types
+      case cmd
+        # Assert command
+      when /^(assert|verify)(.*)$/ then
+        # Check to see if this is a negated assertion
+        tester = $1
+        string = $2
+        if $1 =~ /(.*)Not(.*)$/
+          string = $1 + $2
+          tester = tester + "_not"
+        end
+
+        # Check the semantics of the command
+        if semantic_is?(string)
+          retval = "#{tester} #{@s_obj}.is_#{underscore(string)}"
+          if args[0] != ""
+            retval += "(#{args[0]}"
+          end
+          if args[1] != ""
+            retval += ", #{args[1]}"
+          end
+          retval += ")"
+        else
+          var = args[0]
+          extra = ''
+          if args[1] != ""
+            var = args[1]
+            extra = "(#{args[0]})"
+          end
+          retval = "#{tester}_eq #{var}, #{@s_obj}.get_#{underscore(string)}" + extra
+        end
+
+        # All commands return arrays that need to be joined
+        if string =~ /^All/
+          retval += ".join(\",\")"
+        end
+        return retval
+
+        # Wait For command
+      when /^waitFor(.*)$/ then
+        # Special case
+        if $1 == "PageToLoad"
+          return "#{@s_obj}.wait_for_page_to_load \"30000\""
+        end
+        # The expression that is checked against depends on whether
+        # or not the command uses the "is" or the "get" semantic
+        if semantic_is?($1)
+          expression = "#{@s_obj}.is_#{underscore($1)}(#{args[0]}"
+          if args[1] != ""
+            expression += ", #{args[1]}"
+          end
+          expression += ")"
+        else
+          expression = "#{args[1]} == #{@s_obj}.get_#{underscore($1)}(#{args[1]})"
+        end
+        # The waitFor commands loop until something is satisfied
+        return "assert !60.times{ break if(#{expression} rescue false); sleep 1 }"
+
+        # AndWait command POSTFIX
+      when /^(.*)AndWait$/ then
+        # 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\""
+        return firstPart + secondPart
+
+        # store command
+      when /^store(.*)$/ then
+        string = $1
+        # Store by itself doesnt use any selenium functions
+        # its the same as a regular assignment
+        if $1 == ""
+          # Arguements have quotes by default
+          # they need to be stripped for LHS assignments
+          args[1] = args[1].match(/"(.*)"/)[1]
+          return "#{args[1]} = #{args[0]}"
+        end
+
+        # Otherwise, a store command takes the result of the
+        # cmd and stores it somewhere
+        var = args[0]
+        extra = ""
+        if args[1] != ""
+          var = args[1]
+          extra = "(#{args[0]})"
+        end
+        # Arguements have quotes by default
+        # they need to be stripped for LHS assignments
+        var = var.match(/"(.*)"/)[1]
+        if semantic_is?(string)
+          return "#{var} = #{@s_obj}.is_#{underscore(string)}" + extra
+        else 
+          return "#{var} = #{@s_obj}.get_#{underscore(string)}" + extra
+        end
+
+        # Pause is directly translated
+      when /^pause$/ then
+        convert = args[0].to_f * 0.001
+        return "sleep #{convert}"
+
+        # Default case
+      else
+        # Most commands just need to be converted to
+        # underscore_case and have their arguements
+        # appeneded
+        cmd_new = underscore(cmd)
+        add = ""
+        if args[1] != ""
+          add = ", #{args[1]}"
+        end
+        return "#{@s_obj}.#{cmd_new} #{args[0]}" + add
+      end
+    end
+
+    # Function to turn CamelCase into underscore_case
+    def underscore(str)
+      str.gsub(/(.)([A-Z])/,'\1_\2').downcase
+    end
+
+    # Function to weed out 11 special functions that
+    # use an "is" semantic
+    def semantic_is?(str)
+      case str
+      when /Present$/
+        return true
+      when /Checked$/
+        return true
+      when /Editable$/
+        return true
+      when /Ordered$/
+        return true
+      when /Selected$/
+        return true
+      when /Visible$/
+        return true
+      else
+        return false
+      end
+    end
+  end
+end

data/lib/gondola/legacy_converter.rb

@@ -0,0 +1,41 @@
+# 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
+

data/lib/gondola/testrunner.rb

@@ -32,16 +32,14 @@ module Gondola
               prepend = "**/"
             end
             files = Dir.glob(prepend + "*.html")
-            if opts[:legacy] == true
-              files.concat(Dir.glob(prepend + "*.rb"))
-            end
+            files.concat(Dir.glob(prepend + "*.rb"))
             files.each do |file|
               conf = configure(File.expand_path(File.dirname(file)))
               run_test(file, conf)
             end
           else
             conf = configure(File.expand_path(File.dirname(test)))
-            run_test(file, conf)
+            run_test(test, conf)
           end
         end
       end
@@ -84,8 +82,13 @@ module Gondola
 
     # Function to run and parallelize the given test on the given browsers
     def run_test(file, conf)
-      # Initialize a converter object
-      converter = Gondola::Converter.new(file)
+      # Initialize a converter object based on filetype
+      converter = nil
+      if File.extname(file) == '.html'
+        converter = Gondola::HtmlConverter.new(file)
+      elsif File.extname(file) == '.rb'
+        converter = Gondola::LegacyConverter.new(file)
+      end
       # Set global information
       global = {}
       global[:job_name] = converter.name

data/lib/gondola/version.rb

@@ -1,9 +1,3 @@
 module Gondola
-  module Version
-    MAJOR = 1
-    MINOR = 1
-    PATCH = 3
-
-    STRING = [MAJOR, MINOR, PATCH].compact.join('.')
-  end
+    VERSION = "1.1.4"
 end

data/lib/gondola.rb

@@ -1,5 +1,7 @@
 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.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Matthew Perry
@@ -91,6 +91,8 @@ files:
 - gondola.gemspec
 - 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
@@ -110,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -875425795
+      hash: -286975601
       segments: 
       - 0
       version: "0"