sikulix 1.1.0.3 → 1.1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79254b1df7a34649ceed1765590f4b3036b803a8
-  data.tar.gz: 79a7453162e4e577359c4ac98ca7a7a30901dd59
+  metadata.gz: 490fa003b67f867a66376c9f976594608f817c4d
+  data.tar.gz: 6d5462a07769b291b29b0a728f1aaf7e008f23ea
 SHA512:
-  metadata.gz: 3902b052eaba0ebf3b2dcbe8986983e98d787ddc79a24e4ba5d6f8a6868626c209f6edef920a74e25b1494556051f58e408d61368626b23de7dac18613bcb814
-  data.tar.gz: 23e8339486235a5c6989196f1712206af5e4b5ae7e02bf0ba26fd91b1b0fe6ce265f8d80f4440b5ff40cb7f266b4f5a1be44584cc12d03f45653d92203109b5e
+  metadata.gz: c8dd52131ad1612e31a1e0d9458127023fabd7bdc25833d51fb67cafea5563a93122c56148ad4aa360e47e0b68d0b254eee90f773e907aebeb95ecfcc449fe55
+  data.tar.gz: e9d407765e5cb56bd7e75b020634504bba817ff3f9bab8a70dfc9fdfe0a33704b69afb4523f10c86375d2dec6cbfac628e4ce05790c0caef094e8ec7d5760a82

data/lib/sikulix/platform.rb

@@ -4,8 +4,8 @@ module Sikulix
   class Platform
     def self.check_and_require
       begin
-        # check running from IDE
-        java_import org.sikuli.basics.Sikulix
+        # check running from SikuliX
+        java_import org.sikuli.script.Sikulix
       rescue
         # check external jar
         sikulix_path = (ENV['SIKULIXAPI_JAR'] || ENV['SIKULIX_HOME'] || "").chomp(' ')

data/lib/sikulix/sikulix.rb

@@ -6,53 +6,41 @@ require 'java'
 # Classes and methods for using SikuliX
 module Sikulix
   private
-
   # 'private' for avoiding of unexpected effects when
   #   'include Sikulix' is used.
+  java_import java.net.Socket
 
-  java_import org.sikuli.script.Sikulix
-  java_import org.sikuli.script.Screen
-  java_import org.sikuli.script.Region
-  java_import org.sikuli.script.ScreenUnion
+  java_import org.sikuli.script.support.RunTime
+	$RUNTIME = RunTime.get()
 
-  java_import org.sikuli.script.Observing
-  java_import org.sikuli.script.ObserverCallBack
+  java_import org.sikuli.script.Sikulix
 
+  java_import org.sikuli.basics.Settings
   java_import org.sikuli.script.Constants
-  java_import org.sikuli.script.Finder
-  java_import org.sikuli.script.ImageFinder
-  java_import org.sikuli.script.ImageFind
-
   java_import org.sikuli.script.Button
   java_import org.sikuli.basics.OS
 
-  java_import org.sikuli.script.Match
-  java_import org.sikuli.script.Pattern
+  java_import org.sikuli.basics.Debug
+
+  java_import org.sikuli.script.Screen
+  java_import org.sikuli.script.Region
   java_import org.sikuli.script.Location
+  java_import org.sikuli.script.Offset
 
   java_import org.sikuli.script.ImagePath
   java_import org.sikuli.script.Image
-  java_import org.sikuli.script.ImageGroup
+
+  java_import org.sikuli.script.ObserverCallBack
+  java_import org.sikuli.script.ObserveEvent
+
+  java_import org.sikuli.script.Finder
+  java_import org.sikuli.script.Match
+  java_import org.sikuli.script.Pattern
 
   java_import org.sikuli.script.App
   java_import org.sikuli.script.Key
   java_import org.sikuli.script.KeyModifier
   java_import org.sikuli.script.Mouse
-  java_import org.sikuli.script.Keys
-
-  java_import org.sikuli.basics.Settings
-  java_import org.sikuli.basics.ExtensionManager
-
-  java_import org.sikuli.script.compare.DistanceComparator
-  java_import org.sikuli.script.compare.VerticalComparator
-  java_import org.sikuli.script.compare.HorizontalComparator
-
-  java_import org.sikuli.basics.Debug
-
-	begin
-	  java_import org.sikuli.scriptrunner.ScriptRunner
-	rescue
-  end
 
   #
   # This method generates a wrapper for Java Native exception processing
@@ -92,47 +80,6 @@ module Sikulix
     private name
   end
 
-  # Redefinition of native org.sikuli.script.Region class
-  class Region
-    # Service class for all callbacks processing
-    class RObserverCallBack < ObserverCallBack # :nodoc: all
-      def initialize(block)
-        super()
-        @block = block
-      end
-      %w(appeared vanished changed).each do |name|
-        define_method(name) do |*args|
-          @block.call(*(args.first @block.arity))
-        end
-      end
-    end
-    alias_method :java_onAppear, :onAppear
-    alias_method :java_onVanish, :onVanish
-    alias_method :java_onChange, :onChange
-
-    # Redefinition of the java method for Ruby specific
-    def onAppear(target, &block)
-      java_onAppear target, RObserverCallBack.new(block)
-    end
-
-    # Redefinition of the java method for Ruby specific
-    def onVanish(target, &block)
-      java_onVanish target, RObserverCallBack.new(block)
-    end
-
-    # Redefinition of the java method for Ruby specific
-    def onChange(&block)
-      java_onChange RObserverCallBack.new(block)
-    end
-
-    # alias_method :java_findAll,  :findAll
-    # def findAll(*args)
-    #   begin
-    #     java_findAll(*args)
-    #   rescue NativeException => e; raise e.message; end
-    # end
-  end
-
   # Wrap following java-methods by an exception processor
   native_exception_protect(
     Region,
@@ -141,8 +88,22 @@ module Sikulix
      :type, :paste, :observe]
    )
 
-  # Default screen object for "undotted" methods.
+  # Default screen of host machine.
   $SIKULI_SCREEN = Screen.new
+  # Screen used for undotted methods.
+  $DEFAULT_SCREEN = $SIKULI_SCREEN
+
+  # Replaces default screen for which all undotted methods are
+  # called with another screen
+  # example:
+  # setDefaultScreen($SIKULI_SCREEN)
+  # click(Location(10,10)) <- click will be performed on local screen
+  def setDefaultScreen(screen)
+    if screen.respond_to?(:click)
+      $DEFAULT_SCREEN = screen
+      Debug.log("Screen switched")
+    end
+  end
 
 # This is an alternative for method generation using define_method
 #  # Generate hash of ('method name'=>method)
@@ -171,12 +132,13 @@ module Sikulix
 
   # Generate static methods in Sikulix context
   # for possible "undotted" methods.
-  [$SIKULI_SCREEN, Sikulix].each do |obj|
-    mtype = (obj.class == Class ? :java_class_methods : :java_instance_methods)
-    obj.java_class.method(mtype).call.map(&:name).uniq.each do |name|
-      obj_meth = obj.method(name)
-      dynamic_def(name) { |*args, &block| obj_meth.call(*args, &block) }
-    end
+  Sikulix.java_class.java_class_methods.map(&:name).uniq.each do |name|
+    obj_method = Sikulix.method(name)
+    dynamic_def(name) { |*args, &block| obj_method.call(*args, &block) }
+  end
+
+  $SIKULI_SCREEN.java_class.java_instance_methods.map(&:name).uniq.each do |name|
+    dynamic_def(name) { |*args, &block| $DEFAULT_SCREEN.method(name).call(*args, &block) }
   end
 
   # TODO: check it after Env Java-class refactoring
@@ -219,10 +181,11 @@ module Sikulix
 
   # Generate methods like constructors.
   # Example: Pattern("123.png").similar(0.5)
-  [Pattern, Region, Screen, App, Location].each do |cl|
+  [Pattern, Region, Screen, App].each do |cl|
     name = cl.java_class.simple_name
     dynamic_def(name) { |*args| cl.new(*args) }
   end
+  dynamic_def("Location") { |*args| Location.new(*args).setOtherScreen($DEFAULT_SCREEN) }
 end
 
 # This is an alternative for method generation using define_method

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sikulix
 version: !ruby/object:Gem::Version
-  version: 1.1.0.3
+  version: 1.1.4.0
 platform: ruby
 authors:
 - Roman S Samarev
 - Raimund Hocke
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies: []
-description: A wrapper over SikuliX java lib (sikulixapi.jar)
-email: rssdev10@gmail.com
+description: SikuliX Java API Wrapper (sikulixapi.jar version 1.1.4+)
+email: sikulix@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -24,24 +24,24 @@ homepage: http://sikulix.com
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2.3
+signing_key: 
 specification_version: 4
 summary: Sikulix gem
 test_files: []