sapphire 0.8.3 → 0.8.4

data/lib/sapphire/UI/ProcessBuilder.rb

@@ -1,174 +1,174 @@
-module ChildProcess
-  module Windows
-    class ProcessBuilder
-      attr_accessor :inherit, :detach, :duplex, :environment, :stdout, :stderr
-      attr_reader :stdin
-
-      def initialize(args)
-        @args        = args
-
-        @inherit     = false
-        @detach      = false
-        @duplex      = false
-        @environment = nil
-
-        @stdout      = nil
-        @stderr      = nil
-        @stdin       = nil
-
-        @flags       = 0
-        @cmd_ptr     = nil
-        @env_ptr     = nil
-      end
-
-      def start
-        create_command_pointer
-        create_environment_pointer
-
-        setup_detach
-        setup_io
-
-        pid = create_process
-        close_handles
-
-        pid
-      end
-
-      private
-
-      def create_command_pointer
-        string = @args.map { |arg| quote_if_necessary(arg.to_s) }.join ' '
-        @cmd_ptr = FFI::MemoryPointer.from_string string
-      end
-
-      def create_environment_pointer
-        return unless @environment.kind_of?(Hash) && @environment.any?
-
-        # inherited env
-        strings = ENV.map { |k,v| "#{k}=#{v}\0" }
-
-        # extras
-        @environment.each do |key, value|
-          if key.include?("=")
-            raise InvalidEnvironmentVariableName, key
-          end
-
-          strings << "#{key}=#{value}\0"
-        end
-
-        strings << "\0" # terminate the env block
-        env_str = strings.join
-
-        @env_ptr = FFI::MemoryPointer.new(:long, env_str.bytesize)
-        @env_ptr.put_bytes 0, env_str, 0, env_str.bytesize
-      end
-
-      def create_process
-        @startup_info[:lpDesktop] = FFI::MemoryPointer.from_string("test") if $isVirtual
-
-        ok = Lib.create_process(
-            nil,          # application name
-            @cmd_ptr,     # command line
-            nil,          # process attributes
-            nil,          # thread attributes
-            @inherit,     # inherit handles
-            @flags,       # creation flags
-            @env_ptr,     # environment
-            nil,          # current directory
-            startup_info, # startup info
-            process_info  # process info
-        )
-
-        ok or raise LaunchError, Lib.last_error_message
-
-        process_info[:dwProcessId]
-      end
-
-      def startup_info
-        @startup_info ||= StartupInfo.new
-      end
-
-      def process_info
-        @process_info ||= ProcessInfo.new
-      end
-
-      def setup_detach
-        @flags |= DETACHED_PROCESS if @detach
-      end
-
-      def setup_io
-        if @stdout || @stderr
-          startup_info[:dwFlags] ||= 0
-          startup_info[:dwFlags] |= STARTF_USESTDHANDLES
-
-          @inherit = true
-
-          if @stdout
-            startup_info[:hStdOutput] = std_stream_handle_for(@stdout)
-          end
-
-          if @stderr
-            startup_info[:hStdError] = std_stream_handle_for(@stderr)
-          end
-        end
-
-        setup_stdin if @duplex
-      end
-
-      def setup_stdin
-        read_pipe_ptr  = FFI::MemoryPointer.new(:pointer)
-        write_pipe_ptr = FFI::MemoryPointer.new(:pointer)
-        sa             = SecurityAttributes.new(:inherit => true)
-
-        ok = Lib.create_pipe(read_pipe_ptr, write_pipe_ptr, sa, 0)
-        Lib.check_error ok
-
-        @read_pipe  = read_pipe_ptr.read_pointer
-        @write_pipe = write_pipe_ptr.read_pointer
-
-        @inherit = true
-        Lib.set_handle_inheritance @read_pipe, true
-        Lib.set_handle_inheritance @write_pipe, false
-
-        startup_info[:hStdInput] = @read_pipe
-      end
-
-      def std_stream_handle_for(io)
-        handle = Lib.handle_for(io)
-
-        begin
-          Lib.set_handle_inheritance handle, true
-        rescue ChildProcess::Error
-          # If the IO was set to close on exec previously, this call will fail.
-          # That's probably OK, since the user explicitly asked for it to be
-          # closed (at least I have yet to find other cases where this will
-          # happen...)
-        end
-
-        handle
-      end
-
-      def close_handles
-        Lib.close_handle process_info[:hProcess]
-        Lib.close_handle process_info[:hThread]
-
-        if @duplex
-          @stdin = Lib.io_for(Lib.duplicate_handle(@write_pipe), File::WRONLY)
-          Lib.close_handle @read_pipe
-          Lib.close_handle @write_pipe
-        end
-      end
-
-      def quote_if_necessary(str)
-        quote = str.start_with?('"') ? "'" : '"'
-
-        case str
-          when /[\s\\'"]/
-            [quote, str, quote].join
-          else
-            str
-        end
-      end
-    end # ProcessBuilder
-  end # Windows
+module ChildProcess
+  module Windows
+    class ProcessBuilder
+      attr_accessor :inherit, :detach, :duplex, :environment, :stdout, :stderr
+      attr_reader :stdin
+
+      def initialize(args)
+        @args        = args
+
+        @inherit     = false
+        @detach      = false
+        @duplex      = false
+        @environment = nil
+
+        @stdout      = nil
+        @stderr      = nil
+        @stdin       = nil
+
+        @flags       = 0
+        @cmd_ptr     = nil
+        @env_ptr     = nil
+      end
+
+      def start
+        create_command_pointer
+        create_environment_pointer
+
+        setup_detach
+        setup_io
+
+        pid = create_process
+        close_handles
+
+        pid
+      end
+
+      private
+
+      def create_command_pointer
+        string = @args.map { |arg| quote_if_necessary(arg.to_s) }.join ' '
+        @cmd_ptr = FFI::MemoryPointer.from_string string
+      end
+
+      def create_environment_pointer
+        return unless @environment.kind_of?(Hash) && @environment.any?
+
+        # inherited env
+        strings = ENV.map { |k,v| "#{k}=#{v}\0" }
+
+        # extras
+        @environment.each do |key, value|
+          if key.include?("=")
+            raise InvalidEnvironmentVariableName, key
+          end
+
+          strings << "#{key}=#{value}\0"
+        end
+
+        strings << "\0" # terminate the env block
+        env_str = strings.join
+
+        @env_ptr = FFI::MemoryPointer.new(:long, env_str.bytesize)
+        @env_ptr.put_bytes 0, env_str, 0, env_str.bytesize
+      end
+
+      def create_process
+        @startup_info[:lpDesktop] = FFI::MemoryPointer.from_string("test") if $isVirtual
+
+        ok = Lib.create_process(
+            nil,          # application name
+            @cmd_ptr,     # command line
+            nil,          # process attributes
+            nil,          # thread attributes
+            @inherit,     # inherit handles
+            @flags,       # creation flags
+            @env_ptr,     # environment
+            nil,          # current directory
+            startup_info, # startup info
+            process_info  # process info
+        )
+
+        ok or raise LaunchError, Lib.last_error_message
+
+        process_info[:dwProcessId]
+      end
+
+      def startup_info
+        @startup_info ||= StartupInfo.new
+      end
+
+      def process_info
+        @process_info ||= ProcessInfo.new
+      end
+
+      def setup_detach
+        @flags |= DETACHED_PROCESS if @detach
+      end
+
+      def setup_io
+        if @stdout || @stderr
+          startup_info[:dwFlags] ||= 0
+          startup_info[:dwFlags] |= STARTF_USESTDHANDLES
+
+          @inherit = true
+
+          if @stdout
+            startup_info[:hStdOutput] = std_stream_handle_for(@stdout)
+          end
+
+          if @stderr
+            startup_info[:hStdError] = std_stream_handle_for(@stderr)
+          end
+        end
+
+        setup_stdin if @duplex
+      end
+
+      def setup_stdin
+        read_pipe_ptr  = FFI::MemoryPointer.new(:pointer)
+        write_pipe_ptr = FFI::MemoryPointer.new(:pointer)
+        sa             = SecurityAttributes.new(:inherit => true)
+
+        ok = Lib.create_pipe(read_pipe_ptr, write_pipe_ptr, sa, 0)
+        Lib.check_error ok
+
+        @read_pipe  = read_pipe_ptr.read_pointer
+        @write_pipe = write_pipe_ptr.read_pointer
+
+        @inherit = true
+        Lib.set_handle_inheritance @read_pipe, true
+        Lib.set_handle_inheritance @write_pipe, false
+
+        startup_info[:hStdInput] = @read_pipe
+      end
+
+      def std_stream_handle_for(io)
+        handle = Lib.handle_for(io)
+
+        begin
+          Lib.set_handle_inheritance handle, true
+        rescue ChildProcess::Error
+          # If the IO was set to close on exec previously, this call will fail.
+          # That's probably OK, since the user explicitly asked for it to be
+          # closed (at least I have yet to find other cases where this will
+          # happen...)
+        end
+
+        handle
+      end
+
+      def close_handles
+        Lib.close_handle process_info[:hProcess]
+        Lib.close_handle process_info[:hThread]
+
+        if @duplex
+          @stdin = Lib.io_for(Lib.duplicate_handle(@write_pipe), File::WRONLY)
+          Lib.close_handle @read_pipe
+          Lib.close_handle @write_pipe
+        end
+      end
+
+      def quote_if_necessary(str)
+        quote = str.start_with?('"') ? "'" : '"'
+
+        case str
+          when /[\s\\'"]/
+            [quote, str, quote].join
+          else
+            str
+        end
+      end
+    end # ProcessBuilder
+  end # Windows
 end # ChildProcess

data/lib/sapphire/Virtualization.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) +'/UI/ProcessBuilder.rb', File.dirname(__FILE__)) if Platform::OS == :win32
-require File.expand_path(File.dirname(__FILE__) +'/UI/VirtualUI.rb', File.dirname(__FILE__)) if Platform::OS == :win32
-
-module Sapphire
-  module UI
-
-  end
+require File.expand_path(File.dirname(__FILE__) +'/UI/ProcessBuilder.rb', File.dirname(__FILE__)) if Platform::OS == :win32
+require File.expand_path(File.dirname(__FILE__) +'/UI/VirtualUI.rb', File.dirname(__FILE__)) if Platform::OS == :win32
+
+module Sapphire
+  module UI
+
+  end
 end

data/lib/sapphire/Web.rb

@@ -1,3 +1,3 @@
-Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/WebAbstractions/Browsers/*.rb'].each {|file| require file }

data/lib/sapphire/WebAbstractions/Controls/AlertBox.rb

@@ -1,21 +1,21 @@
-module Sapphire
-  module WebAbstractions
-    class AlertBox < Control
-      def Accept
-        $driver.AcceptAlert
-      end
-
-      def Set(text)
-        $driver.SetAlert(text)
-      end
-
-      def Visible()
-        Evaluation.new($driver.AlertShown(), true)
-      end
-
-      def Find(comparator = nil)
-        return $driver.FindAlert
-      end
-    end
-  end
+module Sapphire
+  module WebAbstractions
+    class AlertBox < Control
+      def Accept
+        $driver.AcceptAlert
+      end
+
+      def Set(text)
+        $driver.SetAlert(text)
+      end
+
+      def Visible()
+        Evaluation.new($driver.AlertShown(), true)
+      end
+
+      def Find(comparator = nil)
+        return $driver.FindAlert
+      end
+    end
+  end
 end

data/lib/sapphire/WebAbstractions/Controls/Base/Control.rb

@@ -4,6 +4,7 @@ module Sapphire
 
       attr_accessor :found_by_type
       attr_accessor :found_by_value
+      attr_accessor :control
 
       def initialize(args)
         return if args.nil?
@@ -11,13 +12,13 @@ module Sapphire
 
         if args.is_a? Hash
           @control = args.fetch :instance if args.has_key? :instance
-          @found_by_type = @by
-          @found_by_value = @value
+          @found_by_type = args.keys.first
+          @found_by_value = args.fetch(args.keys.first)
         end
       end
 
       def Find(comparator = nil)
-        @control, @found_by_type, @found_by_value = $driver.FindItemWithWait(@array, comparator) if @control.nil?
+        @control, @found_by_type, @found_by_value = $driver.FindItemWithWait(@array, comparator)
         @control
       end
 
@@ -33,7 +34,8 @@ module Sapphire
       end
 
       def FindWithoutWait(comparator = nil)
-        $driver.FindItemWithoutWait(@array, comparator)
+        @control, @found_by_type, @found_by_value = $driver.FindItemWithoutWait(@array, comparator)
+        @control
       end
 
       def Text
@@ -42,11 +44,12 @@ module Sapphire
       end
 
       def Click
-        control = self.Find
-        control.click
+        self.Find if @control.nil?
+        @control.click
       end
 
       def MouseOver
+        self.Find
         if(@found_by_type == :id)
           $driver.ExecuteScript("document.getElementById('"+ @found_by_value +"').style.visibility = 'visible'; ")
         elsif (@found_by_type == :name)
@@ -69,8 +72,8 @@ module Sapphire
         EqualsComparison.new(evaluation)
       end
 
-      def Contain(value)
-        return ContainsComparison.new(ControlEvaluation.new(self.Text, value, self))
+      def Contain(expected_value)
+        return ContainsComparison.new(ControlEvaluation.new(self.Text, expected_value, self))
       end
 
       def In(values, comparator)
@@ -105,6 +108,7 @@ module Sapphire
 
           return result
         rescue
+          puts $!.backtrace if !$verbose.nil?
           return ControlEvaluation.new(evaluation.left, evaluation.right, self)
         end
       end