win_gui 0.2.15 → 0.2.16

data/HISTORY

@@ -65,3 +65,7 @@
 == 0.2.15 / 2010-10-05
 
 * Window.find added as alias to Window.top_level
+
+== 0.2.16 / 2010-10-06
+
+* Debug removed

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.16

data/lib/win_gui/{application.rb → app.rb}

@@ -8,13 +8,13 @@ module WinGui
 
     def initialize(window_or_handle)
       @main_window = case window_or_handle
-        when Window
-          window_or_handle
-        when Integer
-          Window.new window_or_handle
-        else
-          raise WinGui::Errors::InitError, "Unable to create App from #{window_or_handle.inspect}"
-      end
+                       when Window
+                         window_or_handle
+                       when Integer
+                         Window.new window_or_handle
+                       else
+                         raise WinGui::Errors::InitError, "Unable to create App from #{window_or_handle.inspect}"
+                     end
     end
 
     # Exits application (optionally waiting _timeout_ seconds for main window to close)
@@ -25,8 +25,9 @@ module WinGui
           sleep SLEEP_DELAY while @main_window.window?
         end
       end
-#      @main_window.wait_for_close(timeout) if timeout
+#      @main_window.wait_for_close(timeout) if timeout - does not work as Window#wait_for_close relies on window_visible?
     end
+
     alias_method :exit, :close
 
     class << self
@@ -40,7 +41,6 @@ module WinGui
       #
       def find(opts)
         main_window = Window.top_level(opts)
-#        raise WinGui::Errors::InitError, "Unable to find App with #{opts.inspect}" unless main_window
         main_window ? new(main_window) : nil
       end
 
@@ -72,20 +72,25 @@ module WinGui
 
       def launch_app(app_path, dir_path)
 
-        raise WinGui::Errors::InitError, "Unable to launch #{app_path.inspect}" unless File.exists? app_path.to_s
-        command = cygwin? ? "cmd /c start `cygpath -w #{app_path}`" : "start #{app_path.to_s.gsub(/\//, "\\")}"
+        app = cygwin? ? app_path.to_s : app_path.to_s.gsub(/\//, "\\")
+        command = cygwin? ? "cmd /c start `cygpath -w #{app}`" : "start #{app}"
 
         if dir_path
-          raise WinGui::Errors::InitError, "Unable to change to #{dir_path.inspect}" unless File.exists? dir_path.to_s
-          command = "cd #{cygwin? ? dir_path : dir_path.to_s.gsub(/\//, "\\")} && #{command}"
+          dir = cygwin? ? dir_path.to_s : dir_path.to_s.gsub(/\//, "\\")
+          unless File.exists?(dir) && File.directory?(dir)
+            raise WinGui::Errors::InitError, "Unable to change to #{dir_path.inspect}"
+          end
+          unless File.exists?(app) || File.exists?(File.join(dir, app))
+            raise WinGui::Errors::InitError, "Unable to launch #{app_path.inspect}"
+          end
+          command = "cd #{dir} && #{command}"
+        else
+          raise WinGui::Errors::InitError, "Unable to launch #{app_path.inspect}" unless File.exists? app
         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"
+        system command # TODO: make sure only valid commands are fed into system
       end
-
     end
   end
 end

data/lib/win_gui/window.rb

@@ -15,7 +15,7 @@ module WinGui
       # 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
+        # Need this to avoid handle considered local var in begin..end block
         handle = yield
         if opts[:timeout]
           begin
@@ -41,7 +41,6 @@ module WinGui
       def top_level(opts={})
         lookup_window(opts) { WinGui.find_window opts[:class], opts[:title] }
       end
-
       alias_method :find, :top_level
     end
 

data/spec/extension_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.join(File.dirname(__FILE__), "spec_helper" )
+require_relative "spec_helper.rb"
 
 module WinGuiTest
 

data/spec/win_gui/{application_spec.rb → app_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative "../spec_helper.rb"
 
 module WinGuiTest
 
@@ -69,6 +69,16 @@ module WinGuiTest
           expect { App.launch(path: APP_PATH, title: IMPOSSIBLE) }.
                   to raise_error WinGui::Errors::InitError, /Unable to launch App with .*?:title=>"Impossible"/
         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 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 'properties:' do

data/spec/win_gui/convenience_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper" )
+require_relative "../spec_helper.rb"
 
 module WinGuiTest
 

data/spec/win_gui/window_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper" )
+require_relative "../spec_helper.rb"
 
 module WinGuiTest
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: win_gui
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - arvicco
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +04:00
+date: 2010-10-06 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,14 +77,14 @@ extra_rdoc_files:
 files: 
 - lib/extension.rb
 - lib/version.rb
-- lib/win_gui/application.rb
+- lib/win_gui/app.rb
 - lib/win_gui/convenience.rb
 - lib/win_gui/window.rb
 - lib/win_gui.rb
 - spec/extension_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/win_gui/application_spec.rb
+- spec/win_gui/app_spec.rb
 - spec/win_gui/convenience_spec.rb
 - spec/win_gui/window_spec.rb
 - features/step_definitions/win_gui_steps.rb
@@ -145,6 +145,6 @@ test_files:
 - spec/extension_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/win_gui/application_spec.rb
+- spec/win_gui/app_spec.rb
 - spec/win_gui/convenience_spec.rb
 - spec/win_gui/window_spec.rb