sikuli 0.1.6 → 0.1.7

data/lib/sikuli/clickable.rb

@@ -43,6 +43,28 @@ module Sikuli
         else raise ArgumentError
       end
     end
+    
+    # Public: Performs a click and hold on an image match or point (x, y)
+    #
+    # args - String representing filename of image to find and click
+    # args - Fixnum, Fixnum representing x and y coordinates within
+    # a Region (0,0) is the top left
+    # seconds - Fixnum representing the number of seconds to hold down
+    # before releasing
+    #
+    # Examples
+    #
+    #   region.click_and_hold('smile.png', 2)
+    #   region.click_and_hold(123, 432, 2)
+    #
+    # Returns nothing
+    def click_and_hold(seconds = 1, *args)
+      case args.length
+        when 1 then click_image_and_hold(args[0], seconds)
+        when 2 then click_point_and_hold(args[0], args[1], seconds)
+        else raise ArgumentError
+      end
+    end
 
     # Public: Performs a mouse down, drag, and mouse up
     #
@@ -66,6 +88,49 @@ module Sikuli
 
     private
 
+    # Private: clicks on a matched Region based on an image based search
+    #
+    # filename - A String representation of the filename of the region to
+    # match against
+    # seconds  - The length in seconds to hold the mouse
+    #
+    # Returns nothing
+    #
+    # Throws Sikuli::FileNotFound if the file could not be found on the system
+    # Throws Sikuli::ImageNotMatched if no matches are found within the region
+    def click_image_and_hold(filename, seconds)
+      begin
+        pattern = org.sikuli.script::Pattern.new(filename).similar(0.9)
+        @java_obj.hover(pattern)
+        @java_obj.mouseDown(java.awt.event.InputEvent::BUTTON1_MASK)
+        sleep(seconds.to_i)
+        @java_obj.mouseUp(0)
+      rescue NativeException => e
+        raise_exception e, filename
+      end
+    end
+    
+    # Private: clicks on a point within the region
+    #
+    # filename - A String representation of the filename of the region to
+    # match against
+    #
+    # Returns nothing
+    #
+    # Throws Sikuli::FileNotFound if the file could not be found on the system
+    # Throws Sikuli::ImageNotMatched if no matches are found within the region
+    def click_point_and_hold(x, y, seconds)
+      begin
+        location = org.sikuli.script::Location.new(x, y).offset(x(), y())
+        @java_obj.hover(location)
+        @java_obj.mouseDown(java.awt.event.InputEvent::BUTTON1_MASK)
+        sleep(seconds.to_i)
+        @java_obj.mouseUp(0)
+      rescue NativeException => e
+        raise_exception e, filename
+      end
+    end
+
     # Private: clicks on a matched Region based on an image based search
     #
     # filename - A String representation of the filename of the region to
@@ -76,7 +141,7 @@ module Sikuli
     #
     # Throws Sikuli::FileNotFound if the file could not be found on the system
     # Throws Sikuli::ImageNotMatched if no matches are found within the region
-    def click_image(filename, is_double = false)
+    def click_image(filename, is_double = false, and_hold = false)
       begin
         if is_double
           @java_obj.doubleClick(filename, 0)

data/lib/sikuli/version.rb

@@ -1,3 +1,3 @@
 module Sikuli
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/sikuli/clickable_spec.rb

@@ -27,6 +27,14 @@ describe Sikuli::Region, "#Clickable" do
 
   it "should not perform a click on an image that is outside of the region" do
     lambda { @region.click("apple.png") }.should
-      # raise_error(Sikuli::ImageNotFound, "The image 'apple.png' did not match in this region.")
+      raise_error(Sikuli::ImageNotFound, "The image 'apple.png' did not match in this region.")
+  end
+  
+  it "should perform a click and hold on an image" do
+    lambda { @region.click_and_hold(2, "green_apple.png") }.should_not raise_error
+  end
+  
+  it "should perform a click and hold on a point" do
+    lambda { @region.click_and_hold(2, 100, 100) }.should_not raise_error
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: sikuli
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
   - Chas Lemley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -04:00
+date: 2011-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency