sikuli 0.2.4 → 0.3.0

data/README.md

@@ -6,19 +6,24 @@ Sikuli Ruby
 Requirements
 ------------
 
-* JRuby `rvm install jruby`
+* [JRuby](http://jruby.org/download) or `rvm install jruby`
 * [Sikuli X 1.0rc3](http://sikuli.org/)
-* OSX
 
 Compatibility
 -------------
-It's recommended to use JRuby ~> 1.6.0 and run it in 1.9 mode to get unicode characters working
-as expected.
+It's recommended to use JRuby ~> 1.6.0 and run it in 1.9 mode to get unicode characters working as expected.
 
 ```
 export JRUBY_OPTS=--1.9
 ```
 
+On Windows or Linux make sure to set SIKULI_HOME to the Sikuli installation directory and to add the Sikuli installation directory and Sikuli libs directory to the include path.
+
+```
+export SIKULI_HOME="~/bin/Sikuli-X-1.0rc3/Sikuli-IDE/"
+PATH="${PATH}:~/bin/Sikuli-X-1.0rc3/Sikuli-IDE/:~/bin/Sikuli-X-1.0rc3/Sikuli-IDE/libs/"
+```
+
 Installation
 ------------
 
@@ -39,7 +44,7 @@ Usage
     screen.click(10, 10) # should open your apple menu
 
     app = Sikuli::App.new("iPhone Simulator")
-    app.window.click('ui_element.png') if app.window.exists?('ui_element.png')
+    app.window.click('ui_element.png') if app.window.find('ui_element.png')
     
 Running the test suite
 ----------------------

data/lib/sikuli.rb

@@ -1,4 +1,5 @@
-require "sikuli/sikuli-script.jar"
+require "sikuli/platform"
+require Sikuli::Platform.sikuli_script_path
 require "sikuli/version"
 
 require "sikuli/app"
@@ -6,4 +7,4 @@ require "sikuli/exception"
 require "sikuli/region"
 require "sikuli/screen"
 require "sikuli/key_code"
-require "sikuli/config"
+require "sikuli/config"

data/lib/sikuli/platform.rb

@@ -0,0 +1,34 @@
+# Detect the platform we're running on so we can tweak behaviour
+# in various places.
+
+module Sikuli
+  class Platform
+
+    WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin/
+    LINUX = RbConfig::CONFIG['host_os'] =~ /linux/
+    MINGW = RbConfig::CONFIG['host_os'] =~ /mingw/
+    OS_X = RbConfig::CONFIG['host_os'] =~ /darwin/
+
+    def self.sikuli_script_path
+      if OS_X
+        path = "/Applications/Sikuli-IDE.app/Contents/Resources/Java/sikuli-script.jar"
+      else
+        raise LoadError, no_sikuli_home_err_msg if ENV['SIKULI_HOME'].nil?
+        path = "#{ENV['SIKULI_HOME']}/sikuli-script.jar"
+      end
+      unless File.exist?(path)
+        raise LoadError, "Failed to load '#{path}'\nIs Sikuli installed?"
+      end
+      path
+    end
+
+    private
+
+    def self.no_sikuli_home_err_msg
+      err = "Failed to load 'sikuli-script.jar' from the Sikuli home directory"
+      return err + "\nMake sure %SIKULI_HOME% is set!" if WINDOWS
+      return err + "\nMake sure $SIKULI_HOME is set!" if LINUX
+      err + "\nMake sure %SIKULI_HOME% or $SIKULI_HOME is set!"
+    end
+  end
+end

data/lib/sikuli/version.rb

@@ -1,3 +1,3 @@
 module Sikuli
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: sikuli
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
   - Chas Lemley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 Z
+date: 2012-05-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
@@ -43,10 +43,10 @@ files:
   - lib/sikuli/config.rb
   - lib/sikuli/exception.rb
   - lib/sikuli/key_code.rb
+  - lib/sikuli/platform.rb
   - lib/sikuli/region.rb
   - lib/sikuli/screen.rb
   - lib/sikuli/searchable.rb
-  - lib/sikuli/sikuli-script.jar
   - lib/sikuli/typeable.rb
   - lib/sikuli/version.rb
   - sikuli.gemspec