win_gui 0.2.18 → 0.2.19

data/HISTORY

@@ -77,3 +77,7 @@
 == 0.2.18 / 2011-02-17
 
 * Full Regexp support for Window find operations
+
+== 0.2.19 / 2011-02-22
+
+* Command line arguments in WinGui::App.new

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/lib/win_gui/app.rb

@@ -56,8 +56,9 @@ module WinGui
       def launch(opts)
         app_path = opts.delete(:path) || opts.delete(:app_path)
         dir_path = opts.delete(:dir) || opts.delete(:cd)
+        args = opts.delete(:args) || opts.delete(:argv)
 
-        launch_app app_path, dir_path
+        launch_app app_path, dir_path, args
 
         defaults = {timeout: LAUNCH_TIMEOUT,
                     raise: WinGui::Errors::InitError.new("Unable to launch App with #{opts.inspect}")}
@@ -70,10 +71,11 @@ module WinGui
         @cygwin_flag ||= RUBY_PLATFORM =~ /cygwin/
       end
 
-      def launch_app(app_path, dir_path)
+      def launch_app(app_path, dir_path, args = nil)
 
         app = cygwin? ? app_path.to_s : app_path.to_s.gsub(/\//, "\\")
         command = cygwin? ? "cmd /c start `cygpath -w #{app}`" : "start #{app}"
+        command += " #{args}" if args
 
         if dir_path
           dir = cygwin? ? dir_path.to_s : dir_path.to_s.gsub(/\//, "\\")

data/lib/win_gui/window.rb

@@ -61,7 +61,7 @@ module WinGui
       # :raise:: raise this exception instead of returning nil if nothing found
       #
       def top_level opts={}
-        if opts[:class].is_a?(Regexp) or opts[:title].is_a?(Regexp)
+        if opts[:class].is_a?(Regexp) || opts[:title].is_a?(Regexp)
           lookup_window_in_collection(opts) { WinGui.enum_windows }
         else
           lookup_window(opts) { WinGui.find_window opts[:class], opts[:title] }
@@ -84,7 +84,7 @@ module WinGui
     def child(opts={})
       if opts[:indirect]
         self.class.lookup_window_in_collection(opts) { enum_child_windows }
-      elsif opts[:class].is_a?(Regexp) or opts[:title].is_a?(Regexp)
+      elsif opts[:class].is_a?(Regexp) || opts[:title].is_a?(Regexp)
         self.class.lookup_window_in_collection(opts) do
           enum_child_windows.select { |handle| child? handle }
         end

data/spec/win_gui/app_spec.rb

@@ -18,6 +18,13 @@ describe WinGui::App do
         @app.main_window.should == window
       end
 
+      it 'wraps new App around existing Window, given a Regexp' do
+        window = Window.top_level(:title => Regexp.new(WIN_TITLE))
+        @app   = App.new(window)
+        @app.should be_an App
+        @app.main_window.should == window
+      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)
@@ -42,6 +49,11 @@ describe WinGui::App do
         @app.should be_an App
       end
 
+      it 'finds already launched App given valid Regexp' do
+        use { @app = App.find(:title => Regexp.new(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
@@ -58,6 +70,11 @@ describe WinGui::App do
         @app.should be_an App
       end
 
+      it 'launches new App given valid path and Regexp' do
+        use { @app = App.launch(:path => APP_PATH, :title => Regexp.new(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"/

metadata

@@ -2,7 +2,7 @@
 name: win_gui
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors: 
 - arvicco
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +03:00
+date: 2011-02-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency