sikuli 0.1.2 → 0.1.3

data/README.md

@@ -6,7 +6,7 @@ Sikuli Ruby
 Requirements
 ------------
 
-* JRuby (rvm install jruby)
+* JRuby `rvm install jruby`
 * [Sikuli X 1.0rc2](http://sikuli.org/)
 * OSX
 
@@ -21,7 +21,10 @@ Usage
     require 'java'
     require 'sikuli'
     
-    Sikuli.addImagePath("#{Dir.pwd}/images/")
+    Sikuli::Config.run do |config| 
+      config.image_path = "#{Dir.pwd}/images/"
+      config.logging = false
+    end
     
     screen = Sikuli::Screen.new
     screen.click(10, 10) # should open your apple menu

data/lib/sikuli.rb

@@ -5,26 +5,4 @@ require "sikuli/app"
 require "sikuli/region"
 require "sikuli/screen"
 require "sikuli/key_code"
-
-module Sikuli
-  include KeyCode
-  
-  def self.getImagePath
-    paths = java.lang.System.getProperty("SIKULI_IMAGE_PATH") || ""
-    paths.split(":")
-  end
-  
-  def self.addImagePath(path)
-    paths = self.getImagePath
-    paths << path
-    
-    java.lang.System.setProperty("SIKULI_IMAGE_PATH", paths.join(':'))
-  end
-  
-  def self.logging=(boolean)
-    return unless [TrueClass, FalseClass].include? boolean.class
-    org.sikuli.script::Settings.InfoLogs = boolean
-    org.sikuli.script::Settings.ActionLogs = boolean
-    org.sikuli.script::Settings.DebugLogs = boolean
-  end
-end
+require "sikuli/config"

data/lib/sikuli/config.rb

@@ -0,0 +1,24 @@
+module Sikuli
+  class Config
+    def self.image_path
+      java.lang.System.getProperty("SIKULI_IMAGE_PATH")
+    end
+    
+    def self.image_path=(path)
+      java.lang.System.setProperty("SIKULI_IMAGE_PATH", path)
+    end
+    
+    def self.logging=(boolean)
+      return unless [TrueClass, FalseClass].include? boolean.class
+      org.sikuli.script::Settings.InfoLogs = boolean
+      org.sikuli.script::Settings.ActionLogs = boolean
+      org.sikuli.script::Settings.DebugLogs = boolean
+    end
+    
+    def self.run(*args)
+      if block_given?
+        yield self
+      end
+    end
+  end
+end

data/lib/sikuli/key_code.rb

@@ -1,16 +1,14 @@
 module Sikuli
-  module KeyCode
-    KEY_CMD   = java.awt.event.InputEvent::META_MASK
-    KEY_SHIFT = java.awt.event.InputEvent::SHIFT_MASK
-    KEY_CTRL  = java.awt.event.InputEvent::CTRL_MASK
-    KEY_ALT   = java.awt.event.InputEvent::ALT_MASK
-  
-    KEY_BACKSPACE = "\u0008"
-    KEY_RETURN    = "\n"
-  
-    UP_ARROW      = nil
-    LEFT_ARROW    = "\ue003"
-    DOWN_ARROW    = nil
-    RIGHT_ARROW   = nil
-  end
+  KEY_CMD   = java.awt.event.InputEvent::META_MASK
+  KEY_SHIFT = java.awt.event.InputEvent::SHIFT_MASK
+  KEY_CTRL  = java.awt.event.InputEvent::CTRL_MASK
+  KEY_ALT   = java.awt.event.InputEvent::ALT_MASK
+
+  KEY_BACKSPACE = "\u0008"
+  KEY_RETURN    = "\n"
+
+  UP_ARROW      = nil
+  LEFT_ARROW    = "\ue003"
+  DOWN_ARROW    = nil
+  RIGHT_ARROW   = nil
 end

data/lib/sikuli/searchable.rb

@@ -13,5 +13,6 @@ module Sikuli
       pattern = org.sikuli.script::Pattern.new(filename).similar(similarity)
       @java_obj.exists(pattern, time)
     end
+    alias_method :contains?, :exists?
   end
 end

data/lib/sikuli/version.rb

@@ -1,3 +1,3 @@
 module Sikuli
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/{sikuli_spec.rb → sikuli/config_spec.rb}

@@ -1,17 +1,24 @@
 require 'spec_helper'
 
-describe Sikuli, "image path" do
+describe Sikuli::Config do
   it "should retain a list of directories to search in for images" do
-    Sikuli.getImagePath().should == []
+    Sikuli::Config.image_path = ""
+    java.lang.System.getProperty("SIKULI_IMAGE_PATH").should == ""
   end
   
   it "should allow a path to be added" do
-    Sikuli.addImagePath('/Users/images/')
-    Sikuli.getImagePath().should == ['/Users/images/']
+    Sikuli::Config.run do |config|
+      config.image_path = '/Users/images/'
+    end
+    
+    java.lang.System.getProperty("SIKULI_IMAGE_PATH").should == '/Users/images/'
+    Sikuli::Config.image_path.should == '/Users/images/'
   end
   
   it "should allow logging to be turned on" do
-    Sikuli.logging = true
+    Sikuli::Config.run do |config|
+      config.logging = true
+    end
     
     org.sikuli.script::Settings.InfoLogs.should be_true
     org.sikuli.script::Settings.ActionLogs.should be_true
@@ -19,7 +26,9 @@ describe Sikuli, "image path" do
   end
   
   it "should allow logging to be turned off" do
-    Sikuli.logging = false
+    Sikuli::Config.run do |config|
+      config.logging = false
+    end
     
     org.sikuli.script::Settings.InfoLogs.should be_false
     org.sikuli.script::Settings.ActionLogs.should be_false

data/spec/sikuli/searchable_spec.rb

@@ -22,6 +22,10 @@ describe Sikuli::Region, "#Searchable" do
     @region.exists?("smiley_face.png").should be_true
   end
   
+  it "should allow you to call contains?" do
+    @region.contains?("smiley_face.png").should be_true
+  end
+  
   it "should return false if the image is not found" do
     @region.exists?("apple.png").should be_false
   end

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@ require 'java'
 require 'rspec'
 require 'sikuli'
 
-Sikuli.logging = false
+Sikuli::Config.logging = false
 
 def setup_test_area
-  Sikuli.addImagePath("#{Dir.pwd}/spec/support/images/")
+  Sikuli::Config.image_path = "#{Dir.pwd}/spec/support/images/"
   screen = Sikuli::Screen.new
   app = Sikuli::App.new('Preview')
   app.focus()

metadata

@@ -2,7 +2,7 @@
 name: sikuli
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
   - Chas Lemley
@@ -41,6 +41,7 @@ files:
   - lib/sikuli.rb
   - lib/sikuli/app.rb
   - lib/sikuli/clickable.rb
+  - lib/sikuli/config.rb
   - lib/sikuli/key_code.rb
   - lib/sikuli/region.rb
   - lib/sikuli/screen.rb
@@ -51,11 +52,11 @@ files:
   - sikuli.gemspec
   - spec/sikuli/app_spec.rb
   - spec/sikuli/clickable_spec.rb
+  - spec/sikuli/config_spec.rb
   - spec/sikuli/region_spec.rb
   - spec/sikuli/screen_spec.rb
   - spec/sikuli/searchable_spec.rb
   - spec/sikuli/typeable_spec.rb
-  - spec/sikuli_spec.rb
   - spec/spec_helper.rb
   - spec/support/images/.DS_Store
   - spec/support/images/apple.png
@@ -92,11 +93,11 @@ summary: Ruby wrapper for Sikuli GUI automation library
 test_files: 
   - spec/sikuli/app_spec.rb
   - spec/sikuli/clickable_spec.rb
+  - spec/sikuli/config_spec.rb
   - spec/sikuli/region_spec.rb
   - spec/sikuli/screen_spec.rb
   - spec/sikuli/searchable_spec.rb
   - spec/sikuli/typeable_spec.rb
-  - spec/sikuli_spec.rb
   - spec/spec_helper.rb
   - spec/support/images/.DS_Store
   - spec/support/images/apple.png