win_gui 0.2.16 → 0.2.17

data/HISTORY

@@ -69,3 +69,7 @@
 == 0.2.16 / 2010-10-06
 
 * Debug removed
+
+== 0.2.17 / 2010-10-18
+
+* Gemspec changed for Bundler

data/VERSION

@@ -1 +1 @@
-0.2.16
+0.2.17

data/lib/win_gui/app.rb

@@ -67,7 +67,7 @@ module WinGui
       private
 
       def cygwin?
-        RUBY_PLATFORM =~ /cygwin/
+        @cygwin_flag ||= RUBY_PLATFORM =~ /cygwin/
       end
 
       def launch_app(app_path, dir_path)

data/lib/win_gui/window.rb

@@ -22,7 +22,7 @@ module WinGui
             timeout(opts[:timeout]) do
               sleep SLEEP_DELAY until handle = yield
             end
-          rescue TimeoutError
+          rescue Timeout::Error
             nil
           end
         end

data/lib/win_gui.rb

@@ -1,5 +1,6 @@
-require_relative 'version'
-require_relative 'extension'
+require 'version'
+require 'extension'
+require 'timeout'
 
 module WinGui
 

data/spec/extension_spec.rb

@@ -1,68 +1,65 @@
 # encoding: UTF-8
-require_relative "spec_helper.rb"
+require "spec_helper.rb"
 
-module WinGuiTest
-
-  describe String do
-    describe '#to_key' do
-      it 'transforms number char into [equivalent key code]' do
-        ('0'..'9').each {|char| char.to_key.should == char.unpack('C')}
-      end
-
-      it 'transforms uppercase letters into [shift, equivalent key code]' do
-        ('A'..'Z').each {|char| char.to_key.should == [0x10, *char.unpack('C')]}
-      end
+describe String do
+  describe '#to_key' do
+    it 'transforms number char into [equivalent key code]' do
+      ('0'..'9').each { |char| char.to_key.should == char.unpack('C') }
+    end
 
-      it 'transforms lowercase letters into [(upcase) key code]' do
-        ('a'..'z').each {|char| char.to_key.should == char.upcase.unpack('C')}
-      end
+    it 'transforms uppercase letters into [shift, equivalent key code]' do
+      ('A'..'Z').each { |char| char.to_key.should == [0x10, *char.unpack('C')] }
+    end
 
-      it 'transforms space into [equivalent key code]' do
-        ' '.to_key.should == " ".unpack('C')
-      end
+    it 'transforms lowercase letters into [(upcase) key code]' do
+      ('a'..'z').each { |char| char.to_key.should == char.upcase.unpack('C') }
+    end
 
-      it 'transforms \n into [VK_RETURN]' do
-        "\n".to_key.should == [VK_RETURN]
-      end
+    it 'transforms space into [equivalent key code]' do
+      ' '.to_key.should == " ".unpack('C')
+    end
 
-      it 'transforms .,:;\\ into [equivalent key code]' do
-        ','.to_key.should == [VK_OEM_COMMA]
-        '.'.to_key.should == [VK_OEM_PERIOD]
-        ':'.to_key.should == [VK_SHIFT, VK_OEM_1]
-        ';'.to_key.should == [VK_OEM_1]
-        "\\".to_key.should == [VK_OEM_102]
-      end
+    it 'transforms \n into [VK_RETURN]' do
+      "\n".to_key.should == [VK_RETURN]
+    end
 
-      it 'raises error if char is not implemented punctuation' do
-        ('!'..'+').each {|char| lambda {char.to_key}.should raise_error ERROR_CONVERSION }
-        (']'..'`').each {|char| lambda {char.to_key}.should raise_error ERROR_CONVERSION }
-        ('{'..'~').each {|char| lambda {char.to_key}.should raise_error ERROR_CONVERSION }
-        ['-', '/', '['].each {|char| lambda {char.to_key}.should raise_error ERROR_CONVERSION }
-      end
+    it 'transforms .,:;\\ into [equivalent key code]' do
+      ','.to_key.should == [VK_OEM_COMMA]
+      '.'.to_key.should == [VK_OEM_PERIOD]
+      ':'.to_key.should == [VK_SHIFT, VK_OEM_1]
+      ';'.to_key.should == [VK_OEM_1]
+      "\\".to_key.should == [VK_OEM_102]
+    end
 
-      it 'raises error if char is non-printable or non-ascii' do
-        lambda {1.chr.to_key}.should raise_error ERROR_CONVERSION
-        lambda {230.chr.to_key}.should raise_error ERROR_CONVERSION
-      end
+    it 'raises error if char is not implemented punctuation' do
+      ('!'..'+').each { |char| lambda { char.to_key }.should raise_error ERROR_CONVERSION }
+      (']'..'`').each { |char| lambda { char.to_key }.should raise_error ERROR_CONVERSION }
+      ('{'..'~').each { |char| lambda { char.to_key }.should raise_error ERROR_CONVERSION }
+      ['-', '/', '['].each { |char| lambda { char.to_key }.should raise_error ERROR_CONVERSION }
+    end
 
-      it 'raises error if string is multi-char' do
-        lambda {'hello'.to_key}.should raise_error ERROR_CONVERSION
-        lambda {'23'.to_key}.should raise_error ERROR_CONVERSION
-      end
+    it 'raises error if char is non-printable or non-ascii' do
+      lambda { 1.chr.to_key }.should raise_error ERROR_CONVERSION
+      lambda { 230.chr.to_key }.should raise_error ERROR_CONVERSION
     end
 
-    describe '#to_print' do
-      it 'converts String from (implied) WinCyrillic (CP1251) to default output encoding' do
-        string = "Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства"
-        win_string = string.encode('cp1251')
-        print_string = win_string.encode(Encoding.default_external, :undef => :replace)
-        win_string_thought_utf8 = win_string.force_encoding('utf-8')
-        win_string_thought_dos = win_string.force_encoding('cp866')
+    it 'raises error if string is multi-char' do
+      lambda { 'hello'.to_key }.should raise_error ERROR_CONVERSION
+      lambda { '23'.to_key }.should raise_error ERROR_CONVERSION
+    end
+  end
 
-        win_string_thought_utf8.to_print.should == print_string
-        win_string_thought_dos.to_print.should == print_string
-      end
+  describe '#to_print' do
+    it 'converts String from (implied) WinCyrillic (CP1251) to default output encoding' do
+      string                  = "Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства"
+      win_string              = string.encode('cp1251')
+      print_string            = win_string.encode(Encoding.default_external, :undef => :replace)
+      win_string_thought_utf8 = win_string.force_encoding('utf-8')
+      win_string_thought_dos  = win_string.force_encoding('cp866')
 
+      win_string_thought_utf8.to_print.should == print_string
+      win_string_thought_dos.to_print.should == print_string
     end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'win_gui'
 
 # Customize RSpec with my own extensions
@@ -14,86 +13,85 @@ module SpecMacros
   # reads description line from source file and drops external brackets (like its{}, use{}
   def description_from(file, line)
     File.open(file) do |f|
-      f.lines.to_a[line-1].gsub( /(spec.*?{)|(use.*?{)|}/, '' ).strip
+      f.lines.to_a[line-1].gsub(/(spec.*?{)|(use.*?{)|}/, '').strip
     end
   end
 end
 
-Spec::Runner.configure { |config| config.extend(SpecMacros) }
+RSpec.configure { |config|
+  config.include Win::Gui # This is a namespace from win gem.
+  config.include WinGui # This is our own main namespace. TODO: looks confusing... better names?
+  config.extend SpecMacros }
 
-module WinGuiTest
-  include Win::Gui  # This is a namespace from win gem.
-  include WinGui    # This is our own main namespace. TODO: looks confusing... better names?
 
-  # Test related Constants:
-  TIMEOUT = 0.001
-  KEY_DELAY = 0.001
-  SLEEP_DELAY = 0.01
-  APP_PATH = File.join(File.dirname(__FILE__), "../misc/locknote/LockNote.exe" )
-  DIALOG_TITLE = "Save As"
-  WIN_TITLE = 'LockNote - Steganos LockNote'
-  WIN_CLASS = 'ATL:00434098'
-  TEXTAREA_CLASS = 'ATL:00434310'
-  STATUSBAR_CLASS = 'msctls_statusbar32'
-  IMPOSSIBLE = 'Impossible'
-  ERROR_CONVERSION = /Can.t convert/
+# Test related Constants:
+TIMEOUT          = 0.001
+KEY_DELAY        = 0.001
+SLEEP_DELAY      = 0.01
+APP_PATH         = File.join(File.dirname(__FILE__), "../misc/locknote/LockNote.exe")
+DIALOG_TITLE     = "Save As"
+WIN_TITLE        = 'LockNote - Steganos LockNote'
+WIN_CLASS        = 'ATL:00434098'
+TEXTAREA_CLASS   = 'ATL:00434310'
+STATUSBAR_CLASS  = 'msctls_statusbar32'
+IMPOSSIBLE       = 'Impossible'
+ERROR_CONVERSION = /Can.t convert/
 
-  # Helper methods:
-  def use
-    lambda {yield}.should_not raise_error
-  end
+# Helper methods:
+def use
+  lambda { yield }.should_not raise_error
+end
 
-  def any_handle
-    find_window(nil, nil)
-  end
+def any_handle
+  find_window(nil, nil)
+end
 
-  def not_a_handle
-    123
-  end
+def not_a_handle
+  123
+end
 
-  def any_block
-    lambda {|*args| args}
-  end
+def any_block
+  lambda { |*args| args }
+end
 
-  def launch_test_app
-    #system APP_START
-    @test_app = App.launch( path: APP_PATH, title: WIN_TITLE, timeout: 1)
-  end
+def launch_test_app
+  #system APP_START
+  @test_app = App.launch(path: APP_PATH, title: WIN_TITLE, timeout: 1)
+end
 
-  def close_test_app
-      while @test_app && @test_app.main_window.window?
-      @test_app.close
-      # Dealing with closing confirmation modal dialog
-      if dialog = dialog( title: "Steganos Locknote", timeout: SLEEP_DELAY)
-        dialog.set_foreground_window
-        keystroke("N")
-      end
+def close_test_app
+  while @test_app && @test_app.main_window.window?
+    @test_app.close
+    # Dealing with closing confirmation modal dialog
+    if dialog = dialog(title: "Steganos Locknote", timeout: SLEEP_DELAY)
+      dialog.set_foreground_window
+      keystroke("N")
     end
-    @test_app = nil
   end
+  @test_app = nil
+end
 
-  # Creates test app object and yields it back to the block
-  def test_app
-    yield launch_test_app
-    close_test_app
-  end
+# Creates test app object and yields it back to the block
+def test_app
+  yield launch_test_app
+  close_test_app
+end
 
-  def with_dialog(type=:close)
-    case type
-      when :close
-        keystroke('A')
-        @app.close
-        title, key = "Steganos Locknote", "N"
-      when :save
-        keystroke(VK_ALT, 'F', 'A')
-        title, key = "Save As", VK_ESCAPE
-    end
-    sleep 0.01 until dialog = Window.top_level(title: title)
-    yield dialog
-    while dialog.window?
-      dialog.set_foreground_window
-      keystroke(key)
-      sleep 0.01
-    end
+def with_dialog(type=:close)
+  case type
+    when :close
+      keystroke('A')
+      @app.close
+      title, key = "Steganos Locknote", "N"
+    when :save
+      keystroke(VK_ALT, 'F', 'A')
+      title, key = "Save As", VK_ESCAPE
+  end
+  sleep 0.01 until dialog = Window.top_level(title: title)
+  yield dialog
+  while dialog.window?
+    dialog.set_foreground_window
+    keystroke(key)
+    sleep 0.01
   end
 end

data/spec/win_gui/app_spec.rb

@@ -1,120 +1,117 @@
-require_relative "../spec_helper.rb"
+require "spec_helper.rb"
 
-module WinGuiTest
-
-  describe App do
-    after(:each) do # Reliably closes launched app window (without calling close_test_app)
-      app = App.find(title: WIN_TITLE)
-      app.exit(timeout=10) if app
-    end
-
-    context 'initializing' do
-      context '::new' do
-        before(:each) { launch_test_app }
-        after(:each) { close_test_app }
-
-        it 'wraps new App around existing Window' do
-          window = Window.top_level(title: WIN_TITLE)
-          @app = App.new(window)
-          @app.should be_an App
-          @app.main_window.should == window
-        end
+describe WinGui::App do
+  after(:each) do # Reliably closes launched app window (without calling close_test_app)
+    app = App.find(title: WIN_TITLE)
+    app.exit(timeout=10) if app
+  end
 
-        it 'wraps new App around active window handle (of top-level Window)' do
-          window = Window.top_level(title: WIN_TITLE)
-          @app = App.new(window.handle)
-          @app.should be_an App
-          @app.main_window.handle.should == window.handle
-        end
+  context 'initializing' do
+    context '::new' do
+      before(:each) { launch_test_app }
+      after(:each) { close_test_app }
 
-        it 'raises error trying to create App with wrong init args' do
-          expect { App.new() }.to raise_error ArgumentError, /wrong number of arguments/
-          [[nil], 1.2, {title: WIN_TITLE}].each do |args|
-            expect { App.new(*args) }.to raise_error WinGui::Errors::InitError
-          end
-        end
+      it 'wraps new App around existing Window' do
+        window = Window.top_level(title: WIN_TITLE)
+        @app   = App.new(window)
+        @app.should be_an App
+        @app.main_window.should == window
       end
 
-      context '::find' do
-        before(:each) { launch_test_app }
-        after(:each) { close_test_app }
+      it 'wraps new App around active window handle (of top-level Window)' do
+        window = Window.top_level(title: WIN_TITLE)
+        @app   = App.new(window.handle)
+        @app.should be_an App
+        @app.main_window.handle.should == window.handle
+      end
 
-        it 'finds already launched App given valid Window info' do
-          use { @app = App.find(title: WIN_TITLE) }
-          @app.should be_an App
+      it 'raises error trying to create App with wrong init args' do
+        expect { App.new() }.to raise_error ArgumentError, /wrong number of arguments/
+        [[nil], 1.2, {title: WIN_TITLE}].each do |args|
+          expect { App.new(*args) }.to raise_error WinGui::Errors::InitError
         end
+      end
+    end
 
-        it 'returns nil if asked to find App with invalid Window info' do
-          App.find(title: IMPOSSIBLE).should == nil
-        end
+    context '::find' do
+      before(:each) { launch_test_app }
+      after(:each) { close_test_app }
 
-        it 'raises error only if asked to find App with invalid Window info and :raise option is set' do
-          expect { App.find(title: IMPOSSIBLE, raise: WinGui::Errors::InitError) }.
-                  to raise_error WinGui::Errors::InitError
-        end
+      it 'finds already launched App given valid Window info' do
+        use { @app = App.find(title: WIN_TITLE) }
+        @app.should be_an App
       end
 
-      context '::launch' do
-        it 'launches new App given valid path and Window info' do
-          use { @app = App.launch(path: APP_PATH, title: WIN_TITLE) }
-          @app.should be_an App
-        end
+      it 'returns nil if asked to find App with invalid Window info' do
+        App.find(title: IMPOSSIBLE).should == nil
+      end
 
-        it 'raises error if asked to launch App with invalid path' do
-          expect { App.launch(path: IMPOSSIBLE, title: WIN_TITLE) }.
-                  to raise_error WinGui::Errors::InitError, /Unable to launch "Impossible"/
-        end
+      it 'raises error only if asked to find App with invalid Window info and :raise option is set' do
+        expect { App.find(title: IMPOSSIBLE, raise: WinGui::Errors::InitError) }.
+            to raise_error WinGui::Errors::InitError
+      end
+    end
 
-        it 'raises error if asked to launch App with invalid Window info' do
-          expect { App.launch(path: APP_PATH, title: IMPOSSIBLE) }.
-                  to raise_error WinGui::Errors::InitError, /Unable to launch App with .*?:title=>"Impossible"/
-        end
+    context '::launch' do
+      it 'launches new App given valid path and Window info' do
+        use { @app = App.launch(path: APP_PATH, title: WIN_TITLE) }
+        @app.should be_an App
+      end
 
-        it 'changes to given valid directory before launch' do
-          use { @app = App.launch(dir: APP_PATH.sub(/LockNote.exe/, ''), path: 'Locknote.exe', title: WIN_TITLE) }
-          @app.should be_an App
-        end
+      it 'raises error if asked to launch App with invalid path' do
+        expect { App.launch(path: IMPOSSIBLE, title: WIN_TITLE) }.
+            to raise_error WinGui::Errors::InitError, /Unable to launch "Impossible"/
+      end
 
-        it 'raises error if given invalid directory to change' do
-          expect { @app = App.launch(dir: APP_PATH, path: APP_PATH, title: WIN_TITLE) }.
-          to raise_error WinGui::Errors::InitError, /Unable to change to ".*LockNote.exe"/
-        end
+      it 'raises error if asked to launch App with invalid Window info' do
+        expect { App.launch(path: APP_PATH, title: IMPOSSIBLE) }.
+            to raise_error WinGui::Errors::InitError, /Unable to launch App with .*?:title=>"Impossible"/
       end
 
-      context 'properties:' do
-        before(:each) { @app = App.launch(path: APP_PATH, title: WIN_TITLE) }
-        after(:each) { @app.close }
+      it 'changes to given valid directory before launch' do
+        use { @app = App.launch(dir: APP_PATH.sub(/LockNote.exe/, ''), path: 'Locknote.exe', title: WIN_TITLE) }
+        @app.should be_an App
+      end
 
-        it 'main_window' do
-          @app.main_window.should be_a Window
-          @app.main_window.title.should == WIN_TITLE
-        end
+      it 'raises error if given invalid directory to change' do
+        expect { @app = App.launch(dir: APP_PATH, path: APP_PATH, title: WIN_TITLE) }.
+            to raise_error WinGui::Errors::InitError, /Unable to change to ".*LockNote.exe"/
       end
     end
 
-    context 'manipulating' do
+    context 'properties:' do
       before(:each) { @app = App.launch(path: APP_PATH, title: WIN_TITLE) }
+      after(:each) { @app.close }
 
-      it 'exits App gracefully' do
-        @app.exit
-        sleep SLEEP_DELAY # needed to ensure window had enough time to close down
-        @app.main_window.visible?.should == false
-        @app.main_window.window?.should == false
+      it 'main_window' do
+        @app.main_window.should be_a Window
+        @app.main_window.title.should == WIN_TITLE
       end
+    end
+  end
 
-      it 'closes App gracefully' do
-        @app.close
-        sleep SLEEP_DELAY # needed to ensure window had enough time to close down
-        @app.main_window.visible?.should == false
-        @app.main_window.window?.should == false
-      end
+  context 'manipulating' do
+    before(:each) { @app = App.launch(path: APP_PATH, title: WIN_TITLE) }
 
-      it 'exits App with timeout' do
-        @app.exit(1)
-        # No sleep SLEEP_DELAY needed!
-        @app.main_window.visible?.should == false
-        @app.main_window.window?.should == false
-      end
+    it 'exits App gracefully' do
+      @app.exit
+      sleep SLEEP_DELAY # needed to ensure window had enough time to close down
+      @app.main_window.visible?.should == false
+      @app.main_window.window?.should == false
+    end
+
+    it 'closes App gracefully' do
+      @app.close
+      sleep SLEEP_DELAY # needed to ensure window had enough time to close down
+      @app.main_window.visible?.should == false
+      @app.main_window.window?.should == false
+    end
+
+    it 'exits App with timeout' do
+      @app.exit(1)
+      # No sleep SLEEP_DELAY needed!
+      @app.main_window.visible?.should == false
+      @app.main_window.window?.should == false
     end
   end
 end

data/spec/win_gui/convenience_spec.rb

@@ -1,75 +1,72 @@
-require_relative "../spec_helper.rb"
+require "spec_helper.rb"
 
-module WinGuiTest
+describe WinGui, 'Convenience methods' do
+  before(:each) { @win = launch_test_app.main_window }
+  after(:each) { close_test_app }
 
-  describe 'Convenience methods' do
-    before(:each){ @win = launch_test_app.main_window }
-    after(:each) { close_test_app }
+  describe '#dialog' do
+    it 'returns top-level dialog window with given title if no block attached' do
+      with_dialog(:save) do
+        dialog_window = dialog(title: DIALOG_TITLE, timeout: 0.1)
+        dialog_window.should_not == nil
+        dialog_window.should be_a Window
+        dialog_window.text.should == DIALOG_TITLE
+      end
+    end
 
-    describe '#dialog' do
-      it 'returns top-level dialog window with given title if no block attached' do
-        with_dialog(:save) do
-          dialog_window = dialog(title: DIALOG_TITLE, timeout: 0.1)
+    it 'yields found dialog window to block if block is attached' do
+      with_dialog(:save) do
+        dialog(title: DIALOG_TITLE) do |dialog_window|
           dialog_window.should_not == nil
           dialog_window.should be_a Window
           dialog_window.text.should == DIALOG_TITLE
         end
       end
+    end
 
-      it 'yields found dialog window to block if block is attached' do
-        with_dialog(:save) do
-          dialog(title: DIALOG_TITLE) do |dialog_window|
-            dialog_window.should_not == nil
-            dialog_window.should be_a Window
-            dialog_window.text.should == DIALOG_TITLE
-          end
-        end
-      end
-
-      it 'returns nil if there is no dialog with given title' do
-        with_dialog(:save) do
-          dialog(title: IMPOSSIBLE, timeout: 0.1).should == nil
-        end
+    it 'returns nil if there is no dialog with given title' do
+      with_dialog(:save) do
+        dialog(title: IMPOSSIBLE, timeout: 0.1).should == nil
       end
+    end
 
-      it 'yields nil to attached block if no dialog found' do
-        with_dialog(:save) do
-          dialog(title: IMPOSSIBLE, timeout: 0.1) do |dialog_window|
-            dialog_window.should == nil
-          end
+    it 'yields nil to attached block if no dialog found' do
+      with_dialog(:save) do
+        dialog(title: IMPOSSIBLE, timeout: 0.1) do |dialog_window|
+          dialog_window.should == nil
         end
       end
+    end
 
-      it 'considers all arguments optional' do
-        with_dialog(:save) do
-          use { dialog_window = dialog() }
-        end
+    it 'considers all arguments optional' do
+      with_dialog(:save) do
+        use { dialog_window = dialog() }
       end
-    end # describe dialog
+    end
+  end # describe dialog
 
-    describe 'convenience input methods on top of Windows API' do
-      describe '#keystroke' do
-        spec{ use{ keystroke( vkey = 30, char = 'Z') }}
+  describe 'convenience input methods on top of Windows API' do
+    describe '#keystroke' do
+      spec { use { keystroke(vkey = 30, char = 'Z') } }
 
-        it 'emulates combinations of keys pressed (Ctrl+Alt+P+M, etc)' do
-          keystroke(VK_CONTROL, 'A')
-          keystroke(VK_SPACE)
-          textarea = @win.child(class: TEXTAREA_CLASS)
-          textarea.text.should.should == ' '
-          keystroke('1', '2', 'A', 'B'.ord)
-          textarea.text.should.should == ' 12ab'
-        end
-      end # describe '#keystroke'
+      it 'emulates combinations of keys pressed (Ctrl+Alt+P+M, etc)' do
+        keystroke(VK_CONTROL, 'A')
+        keystroke(VK_SPACE)
+        textarea = @win.child(class: TEXTAREA_CLASS)
+        textarea.text.should.should == ' '
+        keystroke('1', '2', 'A', 'B'.ord)
+        textarea.text.should.should == ' 12ab'
+      end
+    end # describe '#keystroke'
 
-      describe '#type_in' do
-        it 'types text message into the window holding the focus' do
-          text = '1234 abcdefg'
-          type_in(text)
-          textarea = @win.child(class: TEXTAREA_CLASS)
-          textarea.text.should =~ Regexp.new(text)
-        end
-      end # describe '#type_in'
+    describe '#type_in' do
+      it 'types text message into the window holding the focus' do
+        text = '1234 abcdefg'
+        type_in(text)
+        textarea = @win.child(class: TEXTAREA_CLASS)
+        textarea.text.should =~ Regexp.new(text)
+      end
+    end # describe '#type_in'
 
-    end # Input methods
-  end # Convenience methods
-end
+  end # Input methods
+end # Convenience methods

data/spec/win_gui/window_spec.rb

@@ -1,275 +1,272 @@
-require_relative "../spec_helper.rb"
+require "spec_helper.rb"
 
-module WinGuiTest
+describe WinGui::Window do
+  before(:each) { @win = launch_test_app.main_window }
+  after(:each) { close_test_app }
 
-  describe Window do
-    before(:each) { @win = launch_test_app.main_window }
-    after(:each){ close_test_app }
+  context 'initializing' do
+    it 'can be wrapped around any existing window' do
+      any_handle = find_window(nil, nil)
+      use { Window.new any_handle }
+    end
+  end
 
-    context 'initializing' do
-      it 'can be wrapped around any existing window' do
-        any_handle = find_window(nil, nil)
-        use{ Window.new any_handle }
-      end
+  context 'manipulating' do
+    it 'closes when asked nicely' do
+      @win.close
+      sleep SLEEP_DELAY # needed to ensure window had enough time to close down
+      find_window(nil, WIN_TITLE).should == nil
     end
 
-    context 'manipulating' do
-      it 'closes when asked nicely' do
-        @win.close
-        sleep SLEEP_DELAY # needed to ensure window had enough time to close down
-        find_window(nil, WIN_TITLE).should == nil
-      end
+    it 'waits for window to disappear (NB: this happens before handle is released!)' do
+      start = Time.now
+      @win.close
+      @win.wait_for_close
+      (Time.now - start).should be <= CLOSE_TIMEOUT
+      window_visible?(@win.handle).should be false
+      window?(@win.handle).should be false
+    end
+  end
 
-      it 'waits for window to disappear (NB: this happens before handle is released!)' do
-        start = Time.now
-        @win.close
-        @win.wait_for_close
-        (Time.now - start).should be <= CLOSE_TIMEOUT
-        window_visible?(@win.handle).should be false
-        window?(@win.handle).should be false
-      end
+  context 'handle-related WinGui functions as instance methods' do
+    it 'calls all WinGui functions as instance methods (with handle as implicit first argument)' do
+      @win.window?.should == true
+      @win.visible?.should == true
+      @win.foreground?.should == true
+      @win.maximized?.should == false
+      @win.minimized?.should == false
+      @win.child?(any_handle).should == false
+
+      @win.window_rect.should be_an Array
+      @win.window_thread_process_id.should be_an Array
+      @win.enum_child_windows.should be_an Array
     end
+  end
 
-    context 'handle-related WinGui functions as instance methods' do
-      it 'calls all WinGui functions as instance methods (with handle as implicit first argument)' do
-        @win.window?.should == true
-        @win.visible?.should == true
-        @win.foreground?.should == true
-        @win.maximized?.should == false
-        @win.minimized?.should == false
-        @win.child?(any_handle).should == false
-
-        @win.window_rect.should be_an Array
-        @win.window_thread_process_id.should be_an Array
-        @win.enum_child_windows.should be_an Array
-      end
-   end
+  context 'derived properties' do
+    it 'has handle property equal to underlying window handle' do
+      any = Window.new any_handle
+      any.handle.should == any_handle
+    end
 
-    context 'derived properties' do
-      it 'has handle property equal to underlying window handle' do
-        any = Window.new any_handle
-        any.handle.should == any_handle
-      end
+    it 'has class_name and text/title properties (derived from WinGui function calls)' do
+      @win.class_name.should == WIN_CLASS
+      # text propery accessed by sending WM_GETTEXT directly to window (convenience method in WinGui)
+      @win.text.should == WIN_TITLE
+      # window_text propery accessed via GetWindowText
+      @win.window_text.should == WIN_TITLE
+      # title property is just an alias for window_text
+      @win.title.should == WIN_TITLE
+    end
 
-      it 'has class_name and text/title properties (derived from WinGui function calls)' do
-        @win.class_name.should == WIN_CLASS
-        # text propery accessed by sending WM_GETTEXT directly to window (convenience method in WinGui)
-        @win.text.should == WIN_TITLE
-        # window_text propery accessed via GetWindowText
-        @win.window_text.should == WIN_TITLE
-        # title property is just an alias for window_text
-        @win.title.should == WIN_TITLE
-      end
+    it 'has thread and process properties derived from get_window_thread_process_id' do
+      thread  = @win.thread
+      process = @win.process
+      [thread, process].should == get_window_thread_process_id(@win.handle)
+    end
 
-      it 'has thread and process properties derived from get_window_thread_process_id' do
-        thread = @win.thread
-        process = @win.process
-        [thread, process].should == get_window_thread_process_id(@win.handle)
-      end
+    it 'has id property that only makes sense for controls' do
+      use { @win.id }
+    end
+  end
 
-      it 'has id property that only makes sense for controls' do
-        use{ @win.id }
-      end
+  describe '::top_level' do
+    it 'finds top-level window by title and wraps it in a Window object' do
+      window = Window.top_level(title: WIN_TITLE, timeout: 1)
+      window.handle.should == @win.handle
     end
 
-    describe '::top_level' do
-      it 'finds top-level window by title and wraps it in a Window object' do
-        window = Window.top_level( title: WIN_TITLE, timeout: 1)
-        window.handle.should == @win.handle
-      end
+    it 'finds top-level window by class and wraps it in a Window object' do
+      window = Window.top_level(class: WIN_CLASS, timeout: 1)
+      window.handle.should == @win.handle
+    end
 
-      it 'finds top-level window by class and wraps it in a Window object' do
-        window = Window.top_level( class: WIN_CLASS, timeout: 1)
-        window.handle.should == @win.handle
-      end
+    it 'finds ANY top-level window without args and wraps it in a Window object' do
+      use { @window = Window.top_level() }
+      @window.should be_a Window
+    end
 
-      it 'finds ANY top-level window without args and wraps it in a Window object' do
-        use { @window = Window.top_level() }
-        @window.should be_a Window
-      end
+    it 'returns nil immediately if top-level window with given title not found' do
+      start = Time.now
+      Window.top_level(title: IMPOSSIBLE).should == nil
+      (Time.now - start).should be_within(0.03).of 0
+    end
 
-      it 'returns nil immediately if top-level window with given title not found' do
-        start = Time.now
-        Window.top_level( title: IMPOSSIBLE).should == nil
-        (Time.now - start).should be_close 0, 0.03
-      end
+    it 'returns nil after timeout if top-level window with given title not found' do
+      start = Time.now
+      Window.top_level(title: IMPOSSIBLE, timeout: 0.3).should == nil
+      (Time.now - start).should be_within(0.03).of 0.3
+    end
 
-      it 'returns nil after timeout if top-level window with given title not found' do
-        start = Time.now
-        Window.top_level( title: IMPOSSIBLE, timeout: 0.3).should == nil
-        (Time.now - start).should be_close 0.3, 0.03
-      end
+    it 'raises exception if asked to' do
+      expect { Window.top_level(title: IMPOSSIBLE, raise: "Horror!") }.to raise_error "Horror!"
+    end
 
-      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
 
-      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
+    spec { use { @child = @win.child(title: "Title", class: "Class", id: 0) } }
 
-    describe '#child' do
-      spec { use { @child = @win.child(title: "Title", class: "Class", id: 0)  }}
+    it 'returns nil immediately if specific child not found' do
+      start = Time.now
+      @win.child(title: IMPOSSIBLE).should == nil
+      (Time.now - start).should be_within(0.03).of 0
+    end
 
-      it 'returns nil immediately if specific child not found' do
-        start = Time.now
-        @win.child( title: IMPOSSIBLE).should == nil
-        (Time.now - start).should be_close 0, 0.03
-      end
+    it 'returns nil after timeout if specific child not found' do
+      start = Time.now
+      @win.child(title: IMPOSSIBLE, timeout: 0.5).should == nil
+      (Time.now - start).should be_within(0.03).of 0.5
+    end
 
-      it 'returns nil after timeout if specific child not found' do
-        start = Time.now
-        @win.child( title: IMPOSSIBLE, timeout: 0.5).should == nil
-        (Time.now - start).should be_close 0.5, 0.03
-      end
+    it 'finds ANY child window without args' do
+      use { @child = @win.child() }
+      @child.should_not == nil
+      @win.child?(@child.handle).should == true
+    end
 
-      it 'finds ANY child window without args' do
-        use { @child = @win.child() }
-        @child.should_not == nil
-        @win.child?(@child.handle).should == true
-      end
+    it 'finds child window by class and returns it as a Window object (no timeout)' do
+      child = @win.child(class: TEXTAREA_CLASS)
+      child.should_not == nil
+      @win.child?(child.handle).should == true
+    end
+
+    it 'finds child window by class and returns it as a Window object (with timeout)' do
+      child = @win.child(class: TEXTAREA_CLASS, timeout: 0.5)
+      child.should_not == nil
+
+      @win.child?(child.handle).should == true
+      child = @win.child(class: STATUSBAR_CLASS, timeout: 0.5)
+      child.should_not == nil
+      @win.child?(child.handle).should == true
+    end
 
-      it 'finds child window by class and returns it as a Window object (no timeout)' do
-        child = @win.child( class: TEXTAREA_CLASS)
+    it 'finds child with specific text and returns it as a Window object' do
+      with_dialog(:save) do |dialog|
+        child = dialog.child(title: "Cancel")
         child.should_not == nil
-        @win.child?(child.handle).should == true
+        dialog.child?(child.handle).should == true
+        child.get_dlg_ctrl_id.should == IDCANCEL
+
+        child = dialog.child(title: "&Save")
+        child.should_not == nil
+        dialog.child?(child.handle).should == true
+        child.get_dlg_ctrl_id.should == IDOK
       end
+    end
 
-      it 'finds child window by class and returns it as a Window object (with timeout)' do
-        child = @win.child( class: TEXTAREA_CLASS, timeout: 0.5)
+    it 'finds child control with a given ID and returns it as a Window object' do
+      with_dialog(:save) do |dialog|
+        child = dialog.child(id: IDCANCEL)
         child.should_not == nil
+        dialog.child?(child.handle).should == true
+        child.text.should == "Cancel"
+      end
+    end
 
-        @win.child?(child.handle).should == true
-        child = @win.child( class: STATUSBAR_CLASS, timeout: 0.5)
+    context 'indirect child' do
+      it 'returns nil if specified child not found' do
+        @win.child(title: IMPOSSIBLE, indirect: true).should == nil
+      end
+
+      it 'finds ANY child window without other args' do
+        use { @child = @win.child(indirect: true) }
+        @child.should_not == nil
+        @win.child?(@child.handle).should == true
+      end
+
+      it 'finds child window by class' do
+        child = @win.child(class: TEXTAREA_CLASS, indirect: true)
         child.should_not == nil
         @win.child?(child.handle).should == true
       end
 
-      it 'finds child with specific text and returns it as a Window object' do
+      it 'finds child with specific text' do
         with_dialog(:save) do |dialog|
-          child = dialog.child( title: "Cancel")
+          child = dialog.child(title: "Cancel", indirect: true)
           child.should_not == nil
           dialog.child?(child.handle).should == true
-          child.get_dlg_ctrl_id.should == IDCANCEL
+          child.id.should == IDCANCEL
 
-          child = dialog.child( title: "&Save")
+          child = dialog.child(title: "&Save", indirect: true)
           child.should_not == nil
           dialog.child?(child.handle).should == true
-          child.get_dlg_ctrl_id.should == IDOK
+          child.id.should == IDOK
         end
       end
 
-      it 'finds child control with a given ID and returns it as a Window object' do
+      it 'finds child control with a given ID ' do
         with_dialog(:save) do |dialog|
-          child = dialog.child( id: IDCANCEL)
+          child = dialog.child(id: IDCANCEL, indirect: true)
           child.should_not == nil
           dialog.child?(child.handle).should == true
           child.text.should == "Cancel"
         end
       end
-
-      context 'indirect child' do
-        it 'returns nil if specified child not found' do
-          @win.child( title: IMPOSSIBLE, indirect: true).should == nil
-        end
-
-        it 'finds ANY child window without other args' do
-          use { @child = @win.child(indirect: true) }
-          @child.should_not == nil
-          @win.child?(@child.handle).should == true
-        end
-
-        it 'finds child window by class' do
-          child = @win.child( class: TEXTAREA_CLASS, indirect: true)
-          child.should_not == nil
-          @win.child?(child.handle).should == true
-        end
-
-        it 'finds child with specific text' do
-          with_dialog(:save) do |dialog|
-            child = dialog.child( title: "Cancel", indirect: true)
-            child.should_not == nil
-            dialog.child?(child.handle).should == true
-            child.id.should == IDCANCEL
-
-            child = dialog.child( title: "&Save", indirect: true)
-            child.should_not == nil
-            dialog.child?(child.handle).should == true
-            child.id.should == IDOK
-          end
-        end
-
-        it 'finds child control with a given ID ' do
-          with_dialog(:save) do |dialog|
-            child = dialog.child( id: IDCANCEL, indirect: true)
-            child.should_not == nil
-            dialog.child?(child.handle).should == true
-            child.text.should == "Cancel"
-          end
-        end
-      end # context indirect
-    end # describe child
-
-    describe '#children' do
-      spec { use { children = @win.children  }}
-
-      it 'returns an array of Windows that are descendants (not only DIRECT children) of a given Window' do
-        children = @win.children
-        children.should be_a_kind_of Array
-        children.should_not be_empty
-        children.should have(2).elements
-        children.each{|child| child?(@win.handle, child.handle).should == true }
-        children.last.class_name.should == TEXTAREA_CLASS
+    end # context indirect
+  end # describe child
+
+  describe '#children' do
+    spec { use { children = @win.children } }
+
+    it 'returns an array of Windows that are descendants (not only DIRECT children) of a given Window' do
+      children = @win.children
+      children.should be_a_kind_of Array
+      children.should_not be_empty
+      children.should have(2).elements
+      children.each { |child| child?(@win.handle, child.handle).should == true }
+      children.last.class_name.should == TEXTAREA_CLASS
+    end
+  end # describe #children
+
+  describe '#click' do
+    it 'emulates left click of the control identified by id, returns click coords' do
+      with_dialog(:save) do |dialog|
+        point = dialog.click(id: IDCANCEL)
+        point.should be_an Array
+        sleep 0.3
+        dialog.window?.should == false
       end
-    end # describe #children
+    end
 
-    describe '#click' do
-      it 'emulates left click of the control identified by id, returns click coords' do
-        with_dialog(:save) do |dialog|
-          point = dialog.click(id: IDCANCEL)
-          point.should be_an Array
-          sleep 0.3
-          dialog.window?.should == false
-        end
+    it 'emulates left click of the control identified by title, returns click coords' do
+      with_dialog(:save) do |dialog|
+        point = dialog.click(title: "Cancel")
+        point.should be_an Array
+        sleep 0.3
+        dialog.window?.should == false
       end
+    end
 
-      it 'emulates left click of the control identified by title, returns click coords' do
-        with_dialog(:save) do |dialog|
-          point = dialog.click(title: "Cancel")
-          point.should be_an Array
-          sleep 0.3
-          dialog.window?.should == false
-        end
-      end
-
-      it 'emulates right click of the control identified by id, returns click coords' do
-        with_dialog(:save) do |dialog|
-          point = dialog.click(id: IDCANCEL, mouse_button: :right)
-          point.should be_an Array
-          sleep 0.3
-          dialog.window?.should == true
-        end
+    it 'emulates right click of the control identified by id, returns click coords' do
+      with_dialog(:save) do |dialog|
+        point = dialog.click(id: IDCANCEL, mouse_button: :right)
+        point.should be_an Array
+        sleep 0.3
+        dialog.window?.should == true
       end
+    end
 
-      it 'emulates right click of the control identified by title, returns click coords' do
-        with_dialog(:save) do |dialog|
-          point = dialog.click(title: "Cancel", mouse_button: :right)
-          point.should be_an Array
-          sleep 0.3
-          dialog.window?.should == true
-        end
+    it 'emulates right click of the control identified by title, returns click coords' do
+      with_dialog(:save) do |dialog|
+        point = dialog.click(title: "Cancel", mouse_button: :right)
+        point.should be_an Array
+        sleep 0.3
+        dialog.window?.should == true
       end
+    end
 
-      it 'returns nil if the specified control was not found' do
-        with_dialog(:save) do |dialog|
-          dialog.click(title: "Shpancel").should == nil
-          dialog.click(id: 66).should == nil
-          sleep 0.3
-          dialog.window?.should == true
-        end
+    it 'returns nil if the specified control was not found' do
+      with_dialog(:save) do |dialog|
+        dialog.click(title: "Shpancel").should == nil
+        dialog.click(id: 66).should == nil
+        sleep 0.3
+        dialog.window?.should == true
       end
-    end # describe #click
-  end
+    end
+  end # describe #click
 end

data/tasks/spec.rake

@@ -2,17 +2,13 @@ desc 'Alias to spec:spec'
 task :spec => 'spec:spec'
 
 namespace :spec do
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 
   desc "Run all specs"
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_opts = ['--options', %Q{"#{BASE_PATH}/spec/spec.opts"}]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
+  RSpec::Core::RakeTask.new(:spec){|task|}
 
   desc "Run specs with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
+  RSpec::Core::RakeTask.new(:rcov) do |t|
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec']
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: win_gui
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 16
-  version: 0.2.16
+  prerelease: 
+  version: 0.2.17
 platform: ruby
 authors: 
 - arvicco
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +04:00
+date: 2011-02-16 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id001
@@ -42,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -56,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
         version: 0.3.1
   type: :runtime
   version_requirements: *id003
@@ -82,7 +64,6 @@ files:
 - lib/win_gui/window.rb
 - lib/win_gui.rb
 - spec/extension_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/win_gui/app_spec.rb
 - spec/win_gui/convenience_spec.rb
@@ -121,29 +102,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: ""
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Abstractions/wrappers around GUI-related Win32 API functions
 test_files: 
 - spec/extension_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/win_gui/app_spec.rb
 - spec/win_gui/convenience_spec.rb

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format nested