gondola 1.0.4 → 1.1.0

data/bin/gondola

@@ -10,121 +10,62 @@
 require 'rubygems'
 require 'yaml'
 require 'cmdparse'
-require 'parallel'
-require 'sauce'
 
 lib_dir = File.expand_path( File.join( File.dirname( __FILE__ ), '..', 'lib/' ) )
 $LOAD_PATH.unshift( lib_dir ) unless $LOAD_PATH.include?( lib_dir )
 
 require 'gondola'
 
-# Function to configure sauce labs' gem with proper api information
-# as well as populate the configuration for the specific test being run
-def configure( file )
-    puts "Configuring"
-    # Load possible paths for the api information (Sauce already does this to some extent
-    # but more paths were required for this gem
-    api = {}
-    apiPaths = [
-        File.expand_path( File.join( file, "ondemand.yml" ) ),
-        File.expand_path( File.join( File.dirname( file ), "ondemand.yml" ) ),
-        File.expand_path( File.join( File.dirname( file ), "../ondemand.yml" ) ),
-    ]
-    apiPaths.each do |path|
-        if File.exists?( path )
-            api = YAML.load_file( path )
-            break
-        end
-    end          
-
-    # Load possible paths for the configuration information
-    conf = {}
-    configPaths = [
-        File.expand_path( File.join( File.dirname( file ), "../config.yml" ) ),
-        File.expand_path( File.join( File.dirname( file ), "config.yml" ) ),
-        File.expand_path( File.join( file, "config.yml" ) ),
-    ]
-    configPaths.each do |path|
-        if File.exists?( path )
-            conf.merge! YAML.load_file( path )
-        end
-    end          
-
-    # Configure Sauce accordingly
-    Sauce.config do |config|
-        if api["username"]
-            config.username = api["username"]
-        end
-        if api["access_key"]
-            config.access_key = api["access_key"]
-        end
-        config.browser_url = conf["base_url"]
-        config.browsers = conf["browsers"]
-        config.job_name = conf["project_name"]
-    end
-end
-
-# Function to run and parallelize the given test on the given browsers
-def run( file, browsers )
-    # Initialize a converter object
-    converter = Gondola::Converter.new( file )
-    # Spawn n threads
-    Parallel.map( browsers, :in_threads => browsers.size ) do |browser|
-        os,browser,version = browser
-        name = converter.name
-        if Sauce.get_config.job_name
-            name = "#{Sauce.get_config.job_name} - #{name}"
-        end
-        # Request a new selenium object from Sauce
-        selenium = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
-                                        :job_name => name })
-        # Begin test using a tester object
-        tester = Gondola::Tester.new( selenium, converter )
-        puts "Starting test case \"#{file}\" with: #{os} #{browser} #{version}"
-        tester.begin
-        puts "#{file} finished - Sauce Job ID: #{tester.job_id}"
-    end
-    puts
-end
-
 # Command parsing stuff
 cmd = CmdParse::CommandParser.new( true, true )
-cmd.program_name = "gondola "
+cmd.program_name = "gondola"
+cmd.program_version = "Gondola v1.1.0"
 cmd.add_command( CmdParse::HelpCommand.new )
+cmd.add_command( CmdParse::VersionCommand.new )
 
 # Run command
 class RunCommand < CmdParse::Command
-    def usage
-        "Usage: #{commandparser.program_name}run PATH [CONFIG]"
+    def initialize
+        super( 'run', false )
+        @opts = {}
+        self.short_desc = "Run an entire test suite or one test case"
+        # User supplied options for running a suite
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+            opt.on( '-s', '--super_parallel', 'Execute all test cases at once' ) do |sp|
+                @opts[:super_parallel] = true
+            end
+            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
-end
-run = RunCommand.new( 'run', false )
-run.short_desc = "Run an entire test suite or one test case"
-run.set_execution_block do |args|
-    if args.length < 1
-        puts run.usage
-        exit 1
+
+    # Proper usage format
+    def usage
+        "Usage: #{commandparser.program_name} run [options] [tests]"
     end
-    test = args[0]
-    # Can either provide directory or file
-    if File.directory?( test )
-        puts "Running test suite \"#{test}\""
-        configure( test )
-        Dir.chdir( test )
-        dirlist = Dir.glob( "*.html" )
-        dirlist.each do |file|
-            run( file, Sauce.get_config.browsers )
+    
+    # Function that is executed when a user issues a run command
+    def execute( args )
+        if args.length < 1
+            puts run.usage
+            exit 1
+        end
+        test = args[0]
+        # Can either provide directory or file
+        if File.exists?( test )
+            runner = Gondola::TestRunner.new
+            runner.addTest( test )
+            runner.run( @opts )
+        else
+            puts "Could not find file \"#{test}\""
         end
-    elsif File.exists?( test )
-        puts "Running test case \"#{test}\""
-        configure( test )
-        run( test, Sauce.get_config.browsers )
-    else
-        puts "Could not find file \"#{test}\""
     end
 end
-cmd.add_command( run )
+cmd.add_command( RunCommand.new )
 
 cmd.parse
-
 exit( 0 )

data/examples/config.yml

@@ -2,10 +2,10 @@ project_name: "Test Project"
 base_url: "http://www.google.com"
 browsers:
   -
-    - "Windows 2003"
-    - "firefox"
-    - "3.6"
+    os: "Windows 2003"
+    browser: "firefox"
+    browser_version: "3.6"
   -
-    - "Windows 2003"
-    - "iexplore"
-    - "8"
+    os: "Windows 2003"
+    browser: "iexplore"
+    browser_version: "8"

data/lib/gondola.rb

@@ -1,3 +1,6 @@
 require 'rubygems'
 require 'gondola/converter'
 require 'gondola/tester'
+require 'gondola/testrunner'
+require 'sauce'
+require 'parallel'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: gondola
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Matthew Perry
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 17
-        - 5
         version: 0.17.5
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 2
         version: 0.5.2
   type: :runtime
   version_requirements: *id002
@@ -80,21 +68,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services