win_gui 0.2.14 → 0.2.15

data/HISTORY

@@ -61,3 +61,7 @@
 == 0.2.14 / 2010-10-04
 
 * Reimplemented App#close with timeout
+
+== 0.2.15 / 2010-10-05
+
+* Window.find added as alias to Window.top_level

data/VERSION

@@ -1 +1 @@
-0.2.14
+0.2.15

data/lib/win_gui/application.rb

@@ -81,7 +81,9 @@ module WinGui
         end
 
         # Launch App in a separate window
+        p command
         system command  # TODO: make sure only valid commands are fed into system
+        p "Returned from system"
       end
 
     end

data/lib/win_gui/window.rb

@@ -9,36 +9,40 @@ module WinGui
 
     attr_reader :handle
 
-    # Looks up window handle using code specified in attached block (either with or without :timeout).
-    # Returns either Window instance (for a found handle) or nil if nothing found.
-    # Private method to dry up other window lookup methods
-    #
-    def self.lookup_window(opts) # :yields: index, position
-      # Need this to avoid handle considered local in begin..end block
-      handle = yield
-      if opts[:timeout]
-        begin
-          timeout(opts[:timeout]) do
-            sleep SLEEP_DELAY until handle = yield
+    class << self
+      # Looks up window handle using code specified in attached block (either with or without :timeout).
+      # Returns either Window instance (for a found handle) or nil if nothing found.
+      # Private method to dry up other window lookup methods
+      #
+      def lookup_window(opts) # :yields: index, position
+        # Need this to avoid handle considered local in begin..end block
+        handle = yield
+        if opts[:timeout]
+          begin
+            timeout(opts[:timeout]) do
+              sleep SLEEP_DELAY until handle = yield
+            end
+          rescue TimeoutError
+            nil
           end
-        rescue TimeoutError
-          nil
         end
+        raise opts[:raise] if opts[:raise] && !handle
+        Window.new(handle) if handle
       end
-      raise opts[:raise] if opts[:raise] && !handle
-      Window.new(handle) if handle
-    end
 
-    # Finds top level window by title/class, returns wrapped Window object or nil (raises exception if asked to).
-    # If timeout option given, waits for window to appear within timeout, returns nil if it didn't.
-    # Options:
-    # :title:: window title
-    # :class:: window class
-    # :timeout:: timeout (seconds)
-    # :raise:: raise this exception instead of returning nil if nothing found
-    #
-    def self.top_level(opts={})
-      lookup_window(opts) { WinGui.find_window opts[:class], opts[:title] }
+      # Finds top level window by title/class, returns wrapped Window object or nil (raises exception if asked to).
+      # If timeout option given, waits for window to appear within timeout, returns nil if it didn't.
+      # Options:
+      # :title:: window title
+      # :class:: window class
+      # :timeout:: timeout (seconds)
+      # :raise:: raise this exception instead of returning nil if nothing found
+      #
+      def top_level(opts={})
+        lookup_window(opts) { WinGui.find_window opts[:class], opts[:title] }
+      end
+
+      alias_method :find, :top_level
     end
 
     # Finds child window (control) by either control ID or window class/title.
@@ -72,7 +76,7 @@ module WinGui
     # Returns array of Windows that are descendants (not only DIRECT children) of a given Window
     #
     def children
-      enum_child_windows.map{|child_handle| Window.new child_handle}
+      enum_child_windows.map { |child_handle| Window.new child_handle }
     end
 
     # Emulates click of the control identified by opts (:id, :title, :class).
@@ -92,13 +96,13 @@ module WinGui
 
         where = opts[:point] || opts[:where] || opts[:position]
         point = case where
-          when Array
-            where                                                  # Explicit screen coords
-          when :random
-            [left + rand(right - left), top + rand(bottom - top)]  # Random point within control window
-          else
-            [(left + right) / 2, (top + bottom) / 2]               # Center of a control window
-        end
+                  when Array
+                    where # Explicit screen coords
+                  when :random
+                    [left + rand(right - left), top + rand(bottom - top)] # Random point within control window
+                  else
+                    [(left + right) / 2, (top + bottom) / 2] # Center of a control window
+                end
 
         WinGui.set_cursor_pos *point
 
@@ -117,7 +121,7 @@ module WinGui
 
     # Waits for this window to close with timeout (default CLOSE_TIMEOUT).
     #
-    def wait_for_close(timeout=CLOSE_TIMEOUT )
+    def wait_for_close(timeout=CLOSE_TIMEOUT)
       timeout(timeout) do
         sleep SLEEP_DELAY while window_visible?
       end

data/spec/win_gui/window_spec.rb

@@ -103,6 +103,11 @@ module WinGuiTest
       it 'raises exception if asked to' do
         expect{ Window.top_level( title: IMPOSSIBLE, raise: "Horror!")}.to raise_error "Horror!"
       end
+
+      it 'uses .find as alias for .top_level' do
+        use { @window = Window.find() }
+        @window.should be_a Window
+      end
     end # describe .top_level
 
     describe '#child' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: win_gui
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - arvicco
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +04:00
+date: 2010-10-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency