casper 0.0.3 → 0.0.4

data/lib/casper.rb

@@ -13,17 +13,17 @@ module Casper
             
       # Press the given mouse button down (default is 1: primary)
       def down(button=1)
-        Libxdo.xdo_mousedown xdo, Libxdo::CurrentWindow, button
+        xdo { |xdo| Libxdo.xdo_mousedown(xdo, Libxdo::CurrentWindow, button) }
       end
       
       # Release the given mouse button (default is 1: primary)
       def up(button=1)
-        Libxdo.xdo_mouseup xdo, Libxdo::CurrentWindow, button
+        xdo { |xdo| Libxdo.xdo_mouseup(xdo, Libxdo::CurrentWindow, button) }
       end
       
       # Click the given mouse button (default is 1: primary)
       def click(button=1)
-        Libxdo.xdo_click xdo, Libxdo::CurrentWindow, button
+        xdo { |xdo| Libxdo.xdo_click(xdo, Libxdo::CurrentWindow, button) }
       end
       
       # Gives the current mouse position
@@ -31,7 +31,7 @@ module Casper
         x = FFI::MemoryPointer.new :pointer
         y = FFI::MemoryPointer.new :pointer
         s = FFI::MemoryPointer.new :pointer
-        Libxdo.xdo_mouselocation xdo, x, y, s
+        xdo { |xdo| Libxdo.xdo_mouselocation(xdo, x, y, s) }
         [ x.read_int, y.read_int ]
       end
       
@@ -69,7 +69,7 @@ module Casper
       #   drag :distance => [ 20, 0 ] do
       #     drag :distance => [ 0, 30 ]
       #   end
-      def drag(options={}, &block)        
+      def drag(options={}, &block)
         raise ArgumentError.new(":to or :distance is required to provide ending location") unless options.has_key?(:to) || options.has_key?(:distance)
         raise ArgumentError.new(":increments must be > 0") if options.has_key?(:increments) && options[:increments] <= 0
         
@@ -90,25 +90,28 @@ module Casper
       private
       
       # Returns a new xdo instance
-      def xdo
-        Libxdo.xdo_new(nil)
+      def xdo(&block)
+        xdo = Libxdo.xdo_new(nil)
+        yield(xdo)
+        Libxdo.xdo_free(xdo)
       end      
       
       # Performs an absolute mouse move
       def absolute(x, y)
-        xdor = xdo
-        
-        Libxdo.xdo_mousemove(xdor, x, y, 0)
-        Libxdo.xdo_mouse_wait_for_move_to(xdor, x, y)
+        xdo do |xdo|
+          Libxdo.xdo_mousemove(xdo, x, y, 0)
+          Libxdo.xdo_mouse_wait_for_move_to(xdo, x, y)
+        end
       end
       
       # Performs a relative mouse move
       def relative(x, y)
-        xdor = xdo
-        loc  = location
+        loc = location
         
-        Libxdo.xdo_mousemove_relative(xdor, x, y)
-        Libxdo.xdo_mouse_wait_for_move_to(xdor, loc[0] + x, loc[1] + y)
+        xdo do |xdo|
+          Libxdo.xdo_mousemove_relative(xdo, x, y)
+          Libxdo.xdo_mouse_wait_for_move_to(xdo, loc[0] + x, loc[1] + y)
+        end
       end
     end
   end

data/test/casper_test.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + "/lib/test_helper"
-require "casper"
+require File.dirname(__FILE__) + "/test_helper"
 
 # Yeah, we use Capybara & Selenium & jQuery & Firefox and X11 and all sorts
 # of other stuff when we could just as easily mock out the xdo lib and

data/test/cookbooks/rvm/recipes/default.rb

@@ -28,7 +28,7 @@ bash "install ruby 1.9.2" do
     rvm package install readline
     rvm install ruby-1.9.2 -C --with-readline-dir=$HOME/.rvm/usr
   BASH
-  not_if { ::FileTest.exists?("/usr/local/rvm/rubies/ruby-1.9.2") }
+  not_if { ::FileTest.exists?("/usr/local/rvm/rubies/ruby-1.9.2") || ::FileTest.exists?("/usr/local/rvm/rubies/ruby-1.9.2-p0") }
 end
 
 bash "source rvm in bashrc" do

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-Dir[File.expand_path(File.dirname(__FILE__) + "/../..") + "/lib/"].each{ |lib| $:.unshift(lib) }
+Dir[File.expand_path(File.dirname(__FILE__) + "/..") + "/lib/"].each{ |lib| $:.unshift(lib) }
 
 $:.unshift(File.dirname(__FILE__))
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ben Alavi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 -07:00
+date: 2010-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency