gondola 1.1.1 → 1.1.3

data/lib/gondola/tester.rb

@@ -1,92 +1,89 @@
-# Gondola v2
-# FILE: tester.rb
-# AUTHOR: Matthew Perry
-# DESCRIPTION:
+# Gondola - tester.rb:
 #   Module which contains all the necessary functions
 #   for asserting and verifying various functions without
 #   the need for a unit testing framework
 
 module Gondola
-    class Tester
-        attr_reader :cmdNum, :sel, :converter, :job_id
+  class Tester
+    attr_reader :cmd_num, :sel, :converter, :job_id
 
-        class AssertionFailed < StandardError
-        end
+    class AssertionFailed < StandardError
+    end
+
+    def initialize(sel, converter)
+      @sel = sel
+      @converter = converter
+      @cmd_num = 1
+    end
 
-        def initialize( sel, converter )
-            @sel = sel
-            @converter = converter
-            @cmdNum = 1
-        end
+    def begin
+      @sel.start()
+      @job_id = @sel.session_id
+      begin
+        eval(@converter.ruby)
+      rescue AssertionFailed 
+      end
+      @sel.stop()
+    end
 
-        def begin
-            @sel.start()
-            @job_id = @sel.session_id
-            begin
-                eval( @converter.ruby )
-            rescue AssertionFailed 
-            end
-            @sel.stop()
-        end
+    def cmd_inc
+      @cmd_num+=1
+    end
 
-        def cmdInc
-            @cmdNum+=1
-        end
+    def assert(expr)
+      unless verify(expr)
+        raise AssertionFailed
+      end
+    end
 
-        def assert( expr )
-            unless verify( expr )
-                raise AssertionFailed
-            end
-        end
+    def assert_not(expr)
+      unless verifyNot(expr)
+        raise AssertionFailed
+      end
+    end
 
-        def assertNot( expr )
-            unless verifyNot( expr )
-                raise AssertionFailed
-            end
-        end
-        
-        def assertEq( eq, expr )
-            unless verify( eq, expr )
-                raise AssertionFailed
-            end
-        end
+    def assert_eq(eq, expr)
+      unless verify(eq, expr)
+        raise AssertionFailed
+      end
+    end
 
-        def assertNotEq( eq, expr )
-            unless verifyNot( eq, expr )
-                raise AssertionFailed
-            end
-        end
+    def assert_not_eq(eq, expr)
+      unless verifyNot(eq, expr)
+        raise AssertionFailed
+      end
+    end
 
-        def verify( expr )
-            unless expr
-                $stderr.puts "Command #{@cmdNum} returned false, expecting true"
-                return false
-            end
-            return true
-        end
+    def verify(expr)
+      unless expr
+        $stderr.puts "Command #{@cmd_num} returned false, expecting true"
+        return false
+      end
+      return true
+    end
 
-        def verifyNot( expr )
-            if expr
-                $stderr.puts "Command #{@cmdNum} returned true, expecting false"
-                return false
-            end
-            return true
-        end
+    def verify_not(expr)
+      if expr
+        $stderr.puts "Command #{@cmd_num} returned true, expecting false"
+        return false
+      end
+      return true
+    end
 
-        def verifyEq( eq, expr )
-            unless eq == expr
-                @stderr.puts "Command #{@cmdNum} returned '#{expr}', expecting '#{eq}'"
-                return false
-            end
-            return true
-        end
+    def verify_eq(eq, expr)
+      unless eq == expr
+        @stderr.puts "Command #{@cmd_num} returned '#{expr}', expecting '#{eq}'"
+        return false
+      end
+      return true
+    end
 
-        def verifyNotEq( eq, expr )
-            if eq == expr
-                @stderr.puts "Command #{@cmdNum} returned '#{expr}', expecting '#{eq}'"
-                return false
-            end
-            return true
-        end
+    def verify_not_eq(eq, expr)
+      if eq == expr
+        @stderr.puts "Command #{@cmd_num} returned '#{expr}', expecting '#{eq}'"
+        return false
+      end
+      return true
     end
+  end
 end

data/lib/gondola/testrunner.rb

@@ -1,7 +1,4 @@
-# Gondola v2
-# FILE: testrunner.rb
-# AUTHOR: Matthew Perry
-# DESCRIPTION:
+# Gondola v2 - testrunner.rb:
 #   A wrapper for all the tasks required for launching a run
 #   of a test suite or test case on several browsers
 
@@ -9,109 +6,107 @@ require 'rubygems'
 require 'gondola'
 
 module Gondola
-    class TestRunner
-        attr_accessor :tests
+  class TestRunner
+    attr_accessor :tests
 
-        def initialize
-            @tests = []
-        end
+    def initialize
+      @tests = []
+    end
 
-        def addTest( file )
-            @tests.push( file )
-        end
+    def add_test(file)
+      @tests.push(file)
+    end
 
-        def run( opts = {} )
-            if @tests.empty?
-                puts "No tests to run"
+    def run(opts = {})
+      if @tests.empty?
+        puts "No tests to run"
+      end
+      if opts[:super_parallel] == true
+        puts "Work in progress, please run again without the super parallel flag"
+      else
+        @tests.each do |test|
+          if File.directory? test
+            Dir.chdir(test)
+            prepend = ""
+            if opts[:recursive] == true
+              prepend = "**/"
+            end
+            files = Dir.glob(prepend + "*.html")
+            if opts[:legacy] == true
+              files.concat(Dir.glob(prepend + "*.rb"))
             end
-            if opts[:super_parallel] == true
-                puts "Work in progress, please run again without the super parallel flag"
-            else
-                @tests.each do |test|
-                    if File.directory? test
-                        Dir.chdir( test )
-                        prepend = ""
-                        if opts[:recursive] == true
-                            prepend = "**/"
-                        end
-                        files = Dir.glob( prepend + "*.html" )
-                        if opts[:legacy] == true
-                            files.concat( Dir.glob( prepend + "*.rb" ) )
-                        end
-                        files.each do |file|
-                            conf = configure( File.expand_path( File.dirname( file ) ) )
-                            runTest( file, conf )
-                        end
-                    else
-                        conf = configure( File.expand_path( File.dirname( test ) ) )
-                        runTest( file, conf )
-                    end
-                end
+            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)
+          end
         end
+      end
+    end
 
-        private
-        # 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 )
-            # Load possible paths for the api information (Sauce already does this to some extent
-            # but more paths were required for this gem)
-            conf = {}
-            apiPaths = [
-                File.expand_path( File.join( file, "ondemand.yml" ) ),
-                File.expand_path( File.join( file, "../ondemand.yml" ) ),
-            ]
-            apiPaths.each do |path|
-                if File.exists?( path )
-                    conf = YAML.load_file( path )
-                    break
-                end
-            end          
-
-            # Load possible paths for the configuration information
-            configPaths = [
-                File.expand_path( File.join( 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          
-            conf = conf.inject({}) { |memo,(k,v)| memo[k.to_sym] = v; memo }
-            conf[:browsers].map! do |browser|
-                browser.inject({}) { |memo,(k,v)| memo[k.to_sym] = v; memo }
-            end
-            return conf
+    private
+    # 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)
+      # Load possible paths for the api information (Sauce already does this to some extent
+      # but more paths were required for this gem)
+      conf = {}
+      apiPaths = [
+        File.expand_path(File.join(file, "ondemand.yml")),
+        File.expand_path(File.join(file, "../ondemand.yml")),
+      ]
+      apiPaths.each do |path|
+        if File.exists?(path)
+          conf = YAML.load_file(path)
+          break
         end
+      end          
 
-        # Function to run and parallelize the given test on the given browsers
-        def runTest( file, conf )
-            # Initialize a converter object
-            converter = Gondola::Converter.new( file )
-            # Set global information
-            global = {}
-            global[:job_name] = converter.name
-            if conf[:project_name]
-                global[:job_name] = "#{conf[:project_name]} - #{global[:job_name]}"
-            end
-            global[:browser_url] = conf[:base_url]
-            # Spawn n threads
-            Parallel.map( conf[:browsers], :in_threads => conf[:browsers].size ) do |browser|
-                # Convert to symbols
-                browser = browser.inject({}) { |memo,(k,v)| memo[k.to_sym] = v; memo }
-                # Add global information to this configuration
-                browser.merge! global
-                # Request a new selenium object from Sauce
-                selenium = Sauce::Selenium.new( browser )
-                # Begin test using a tester object
-                tester = Gondola::Tester.new( selenium, converter )
-                browser_string = "#{browser[:os]} #{browser[:browser]} #{browser[:browser_version]}"
-                puts "Starting test case \"#{file}\" with: #{browser_string}"
-                tester.begin
-                puts "#{file} finished - Sauce Job ID: #{tester.job_id}"
-            end
-            puts
+      # Load possible paths for the configuration information
+      configPaths = [
+        File.expand_path(File.join(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          
+      conf = conf.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      conf[:browsers].map! do |browser|
+        browser.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      end
+      return conf
+    end
+
+    # 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)
+      # Set global information
+      global = {}
+      global[:job_name] = converter.name
+      if conf[:project_name]
+        global[:job_name] = "#{conf[:project_name]} - #{global[:job_name]}"
+      end
+      global[:browser_url] = conf[:base_url]
+      # Spawn n threads
+      Parallel.map(conf[:browsers], :in_threads => conf[:browsers].size)do |browser|
+        # Add global information to this configuration
+        browser.merge! global
+        # Request a new selenium object from Sauce
+        selenium = Sauce::Selenium.new(browser)
+        # Begin test using a tester object
+        tester = Gondola::Tester.new(selenium, converter)
+        browser_string = "#{browser[:os]} #{browser[:browser]} #{browser[:browser_version]}"
+        puts "Starting test case \"#{file}\" with: #{browser_string}"
+        tester.begin
+        puts "#{file} finished - Sauce Job ID: #{tester.job_id}"
+      end
+      puts
     end
+  end
 end

data/lib/gondola/version.rb

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

data/test/helper.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'gondola'
+
+class Test::Unit::TestCase
+end

data/test/test_gondola.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestGondola < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors: 
 - Matthew Perry
@@ -10,12 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -05:00
-default_executable: 
+date: 2011-03-09 00:00:00 -05:00
+default_executable: gondola
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sauce
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.17.5
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: parallel
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,31 +33,73 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.2
   type: :runtime
+  prerelease: false
   version_requirements: *id002
-description: "        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"
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+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: 
 - gondola
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE.txt
+- README.rdoc
 files: 
-- LICENSE
-- README.markdown
+- .document
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.rdoc
 - Rakefile
 - bin/gondola
 - examples/config.yml
 - examples/gondola_agora_fail.html
 - examples/gondola_agora_pass.html
+- gondola.gemspec
+- lib/gondola.rb
 - lib/gondola/converter.rb
 - lib/gondola/tester.rb
 - lib/gondola/testrunner.rb
-- lib/gondola.rb
+- lib/gondola/version.rb
+- test/helper.rb
+- test/test_gondola.rb
 has_rdoc: true
-homepage: https://github.com/perrym5/Gondola_Gem
-licenses: []
-
+homepage: http://github.com/perrym5/gondola
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -69,6 +110,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -875425795
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -79,9 +123,10 @@ 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
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/test_gondola.rb