oats 0.0.2 → 0.0.3

data/lib/oats/driver.rb

@@ -5,8 +5,6 @@ require 'oats/oats_data'
 require 'oats/roptions'
 require 'oats/build_id'
 
-autoload :Spreadsheet,  'spreadsheet'
-
 module Oats
 
   module Driver
@@ -45,7 +43,7 @@ module Oats
     # Returns oats_info object containing execution results
     def Driver.run(args)
       unless ENV['HOSTNAME']
-        if RUBY_PLATFORM =~ /mswin32/
+        if RUBY_PLATFORM =~ /(mswin|mingw)/
           ENV['HOSTNAME'] = ENV['COMPUTERNAME']
         else
           ENV['HOSTNAME'] = `hostname`.chomp
@@ -446,6 +444,7 @@ module Oats
     # Return all the included worksheet lists in XL and place all
     # their test arrays in $oats_global['xl']
     def Driver.parse_xl(path,id)
+      require 'spreadsheet' unless defined?(Spreadsheet)
       book = Spreadsheet.open path
       sheet = book.worksheet 'Main'
       Oats.assert sheet, "Could not locate worksheet 'Main' in: " + path

data/lib/oats/oats_lock.rb

@@ -1,5 +1,5 @@
 # Manages a lock file indicating a OATS session is in process
-require 'win32ole' if RUBY_PLATFORM =~ /mswin32/
+require 'win32ole' if RUBY_PLATFORM =~ /(mswin|mingw)/
 module Oats
 
   module OatsLock
@@ -14,7 +14,7 @@ module Oats
         @@file_handle = File.open(in_progress_file, 'w')
         my_pid = Process.pid.to_s
         @@file_handle.puts my_pid
-        if RUBY_PLATFORM !~ /mswin32/ or ENV['TEMP'] =~ /^\/cygdrive/
+        if RUBY_PLATFORM !~ /(mswin|mingw)/ or ENV['TEMP'] =~ /^\/cygdrive/
           # Leave file handle open for windows to detect and kill associated java, etc.
           # processes using file handles.
           @@file_handle.close
@@ -30,7 +30,7 @@ module Oats
     def OatsLock.locked?(verify = nil)
       return @@is_locked unless verify
       @@is_locked = false
-      if RUBY_PLATFORM !~ /mswin32/ or ENV['TEMP'] =~ /^\/cygdrive/
+      if RUBY_PLATFORM !~ /(mswin|mingw)/ or ENV['TEMP'] =~ /^\/cygdrive/
         if File.exist?(in_progress_file)
           pids = IO.readlines(in_progress_file)
           ruby_pid = pids.shift
@@ -140,7 +140,7 @@ module Oats
 
     def OatsLock.find_matching_processes(proc_names)
       matched = []
-      if RUBY_PLATFORM =~ /mswin32/
+      if RUBY_PLATFORM =~ /(mswin|mingw)/
         processes = WIN32OLE.connect("winmgmts://").ExecQuery("select * from win32_process")
         #      for process in processes do
         #        for property in process.Properties_ do
@@ -222,7 +222,7 @@ module Oats
         @@file_handle = nil
         @@is_locked = true
       else # Doesn't return status properly for non-windows, just resets the lock
-        if $oats_execution['agent'].nil? and RUBY_PLATFORM !~ /mswin32/ and File.exist?(in_progress_file)
+        if $oats_execution['agent'].nil? and RUBY_PLATFORM !~ /(mswin|mingw)/ and File.exist?(in_progress_file)
           pids = IO.readlines(in_progress_file)
           current_pid = pids.shift
           pids.each { |pid| OatsLock.kill_pid(pid.chomp) } # Legacy firefox

data/lib/oats/oselenium.rb

@@ -45,13 +45,13 @@ module Oats
         if browser_type == 'firefox'
           $oats_global['download_dir'] = $oats['execution']['dir_results'] + '/downloads'
         elsif Oats.data("selenium.default_downloads")
-          $oats_global['download_dir'] = File.join(ENV[ RUBY_PLATFORM =~ /mswin32/ ? 'USERPROFILE' : 'HOME'], 'Downloads')
-          $oats_global['download_dir'].gsub!('\\','/') if RUBY_PLATFORM =~ /mswin32/
+          $oats_global['download_dir'] = File.join(ENV[ RUBY_PLATFORM =~ /(mswin|mingw)/ ? 'USERPROFILE' : 'HOME'], 'Downloads')
+          $oats_global['download_dir'].gsub!('\\','/') if RUBY_PLATFORM =~ /(mswin|mingw)/
         end
       end
 
       download_dir = $oats_global['download_dir'].gsub('/','\\\\') if $oats_global['download_dir'] and
-        RUBY_PLATFORM =~ /mswin32/
+        RUBY_PLATFORM =~ /(mswin|mingw)/
       download_dir ||= $oats_global['download_dir']
       case browser_type
       when 'firefox'
@@ -70,7 +70,7 @@ module Oats
         profile['download.prompt_for_download'] = false
         profile['download.default_directory'] = download_dir
 #        unless $oats_global['browser_path']
-#          vpath = File.join($oats['_']['vendor'], ENV['OS'], 'chromedriver' + (RUBY_PLATFORM =~ /mswin32/ ? '.exe' : '') )
+#          vpath = File.join($oats['_']['vendor'], ENV['OS'], 'chromedriver' + (RUBY_PLATFORM =~ /(mswin|mingw)/ ? '.exe' : '') )
 #          $oats_global['browser_path'] = vpath if File.exist?(vpath)
 #        end
       end
@@ -129,7 +129,7 @@ module Oats
       else
         file_os = RUBY_PLATFORM
       end
-      file_os =~ /mswin32/ ? file.gsub('/','\\') : file
+      file_os =~ /(mswin|mingw)/ ? file.gsub('/','\\') : file
     end
 
     def Oselenium.reset

data/lib/oats/test_case.rb

@@ -432,7 +432,7 @@ module Oats
           out_contents = IO.read(file_out).gsub(/\s/,'')
           unless ok_contents == out_contents
             err = "File in out folder did not match out folder in: #{file_ok}"
-            diff_lines =  `diff -b '#{file_ok}' '#{file_out}'` unless RUBY_PLATFORM =~ /mswin32/
+            diff_lines =  `diff -b '#{file_ok}' '#{file_out}'` unless RUBY_PLATFORM =~ /(mswin|mingw)/
           end
         else
           err = "Extra output [#{file}] missing from: #{test_ok_out}"

data/lib/oats/test_data.rb

@@ -62,7 +62,7 @@ module Oats
       extn = File.extname(test_file)
       extn = nil if extn == ''
       found_file = catch :found_file do
-        if  RUBY_PLATFORM =~ /mswin32/ ? test_file[1] == ?: : test_file[0] == ?/ # absolute path
+        if  RUBY_PLATFORM =~ /(mswin|mingw)/ ? test_file[1] == ?: : test_file[0] == ?/ # absolute path
           # Try exact match
           throw(:found_file, test_file) if File.exist?(test_file) and (is_dir or not FileTest.directory?(test_file))
 

data/lib/oats/util.rb

@@ -1,4 +1,4 @@
-autoload :Process, 'win32/process'
+require 'win32/process' if RUBY_PLATFORM =~ /(mswin|mingw)/ and not defined?(Process)
 
 module Oats
   module Util

data/lib/oats/version.rb

@@ -1,3 +1,3 @@
 module Oats
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/oats.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'log4r'
   s.add_dependency 'net-http-persistent' unless RUBY_VERSION =~ /^1.9/ # Speed up 1.8 connections
 
-  if RUBY_PLATFORM =~ /mswin32/ # Assume won't use the agent
+  if RUBY_PLATFORM =~ /(mswin|mingw)/ # Assume won't use the agent
     s.add_dependency 'win32-process'
   else
     s.add_dependency 'json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oats
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Levent Atasoy