osaka 0.4.8 → 0.4.10

data/lib/osaka/preview.rb

@@ -23,4 +23,4 @@ module Osaka
     end
     
   end
-end
+end

data/lib/osaka/remotecontrol.rb

@@ -5,25 +5,25 @@ module Osaka
 
   class InvalidLocation < RuntimeError
   end
-  
+
   class RemoteControl
-  
+
     attr_reader :name
     attr_accessor :base_location
-    
+
     def initialize(name, base_location = Location.new(""))
       @name = name
       @base_location = base_location
     end
-    
+
     def ==(obj)
       @name == obj.name && base_location == obj.base_location
     end
-    
+
     def tell(command)
       ScriptRunner::execute("tell application \"#{@name}\"; #{command}; end tell")
     end
-  
+
     def system_event!(event)
       ScriptRunner::execute("tell application \"System Events\"; tell process \"#{@name}\"; #{event}; end tell; end tell")
     end
@@ -31,27 +31,27 @@ module Osaka
     def running?
       ScriptRunner::execute("tell application \"System Events\"; (name of processes) contains \"#{@name}\"; end tell").strip == "true"
     end
-    
+
     def print_warning(action, message)
       puts "Osaka WARNING while doing #{action}: #{message}"
     end
-    
+
     def check_output(output, action)
       print_warning(action, output) unless output.empty?
       output
     end
-    
+
     def activate
       check_output( tell("activate"), "activate" )
     end
-    
+
     def launch
       check_output( tell("launch"), "launch" )
     end
-  
+
     def quit
       keystroke("q", :command)
-    end  
+    end
 
     def system_event(event)
       activate
@@ -65,34 +65,34 @@ module Osaka
     def not_exists?(location)
       system_event!("not exists #{construct_location(location)}").strip == "true"
     end
-        
+
     def wait_until(locations, action)
-      
+
       begin
-        Timeout::timeout(5) {
+        Timeout::timeout(10) {
           while(true)
-              locations.flatten.each { |location| 
+              locations.flatten.each { |location|
                 return location if yield location
             }
             action.() unless action.nil?
           end
         }
       rescue Exception
-        raise Osaka::TimeoutError, "Timed out while waiting for: #{locations.to_s}"
+        raise Osaka::TimeoutError, "Timed out while waiting for: #{locations.join(", ")}"
       end
     end
-    
+
     def wait_until_exists(*locations, &action)
       activate
       wait_until_exists!(*locations, &action)
     end
-    
+
     def wait_until_exists!(*locations, &action)
       wait_until(locations, action) { |location|
         exists?(location)
       }
     end
-    
+
     alias until_exists wait_until_exists
     alias until_exists! wait_until_exists!
 
@@ -110,29 +110,29 @@ module Osaka
     alias until_not_exists wait_until_not_exists
     alias until_not_exists! wait_until_not_exists!
 
-        
+
     def construct_modifier_statement(modifier_keys)
       modified_key_string = [ modifier_keys ].flatten.collect! { |mod_key| mod_key.to_s + " down"}.join(", ")
       modifier_command = " using {#{modified_key_string}}" unless modifier_keys.empty?
       modifier_command
     end
-    
+
     def construct_key_statement(key_keys)
       return "return" if key_keys == :return
       "\"#{key_keys}\""
     end
-    
+
     def keystroke!(key, modifier_keys = [])
       check_output( system_event!("keystroke #{construct_key_statement(key)}#{construct_modifier_statement(modifier_keys)}"), "keystroke")
       self
     end
-    
+
     def keystroke(key, modifier_keys = [])
       activate
       focus
       (modifier_keys == []) ? keystroke!(key) : keystroke!(key, modifier_keys)
     end
-        
+
     def click!(element)
       # Click seems to often output stuff, but it doesn't have much meaning so we ignore it.
       system_event!("click #{construct_location(element)}")
@@ -143,19 +143,19 @@ module Osaka
       activate
       click!(element)
     end
-    
+
     def click_menu_bar(menu_item, menu_name)
       activate
       menu_bar_location = at.menu_bar_item(menu_name).menu_bar(1)
-      click!(menu_item + at.menu(1) + menu_bar_location)      
+      click!(menu_item + at.menu(1) + menu_bar_location)
     end
-        
+
     def set!(element, location, value)
       encoded_value = (value.class == String) ? "\"#{value}\"" : value.to_s
       check_output( system_event!("set #{element}#{construct_prefixed_location(location)} to #{encoded_value}"), "set")
     end
-    
-    def focus      
+
+    def focus
       if (base_location.to_s.empty? || not_exists?(base_location))
         currently_active_window = window_list[0]
         currently_active_window ||= ""
@@ -164,17 +164,17 @@ module Osaka
 
       focus!
     end
-    
+
     def focus!
       system_event!("set value of attribute \"AXMain\" of #{base_location.top_level_element} to true") unless base_location.top_level_element.to_s.empty?
     end
-    
+
     def form_location_with_window(location)
       new_location = Location.new(location)
       new_location += @base_location unless new_location.has_top_level_element?
       new_location
     end
-    
+
     def construct_location(location)
       form_location_with_window(location).to_s
     end
@@ -182,7 +182,7 @@ module Osaka
     def construct_prefixed_location(location)
       form_location_with_window(location).as_prefixed_location
     end
-    
+
     def get!(element, location = "")
       system_event!("get #{element}#{construct_prefixed_location(location)}").strip
     end
@@ -190,7 +190,7 @@ module Osaka
     def get_app!(element)
       system_event!("get #{element}").strip
     end
-    
+
     def attributes(location = "")
       attributelist = get!("attributes", location)
       attributelist.split("of application process #{name}").collect { |attribute|
@@ -202,24 +202,32 @@ module Osaka
       activate
       set!(element, location, value)
     end
-    
+
     def window_list
       windows = get_app!("windows").strip.split(',')
       windows.collect { |window|
         window[7...window =~ / of application process/].strip
       }
-    end 
-    
+    end
+
+    def standard_window_list
+      window_list.collect { |window|
+        if get!("subrole", at.window(window)) == "AXStandardWindow"
+          window
+        end
+      }.compact
+    end
+
     def set_current_window(window_name)
       @base_location = at.window(window_name)
     end
-    
+
     def current_window_name
       matchdata = @base_location.to_s.match(/window "(.*)"/)
       return "" if matchdata.nil? || matchdata[1].nil?
       matchdata[1]
     end
-    
+
     def current_window_invalid?(window_list)
       @base_location.to_s.empty? || window_list.index(current_window_name).nil?
     end
@@ -233,21 +241,23 @@ module Osaka
           :lion
         when /^10.8.*/
           :mountain_lion
+        when /^10.10.*/
+          :yosemite
         else
           :other
         end
-        
+
     end
-    
+
     def mac_version_string
       mac_version
       @mac_version_string
     end
-    
-    
+
+
     def convert_mac_version_string_to_symbol(version_string)
-      
+
     end
-    
+
   end
-end
+end

data/lib/osaka/scriptrunner.rb

@@ -5,9 +5,6 @@ module Osaka
   class ScriptRunnerError < RuntimeError
   end
   
-  class SystemCommandFailed < RuntimeError
-  end
-
   class TimeoutError < RuntimeError
   end
 
@@ -70,7 +67,7 @@ module Osaka
       
       output = ""
       begin
-        output = do_system("osascript#{escaped_commands}")
+        output = CommandRunner::run("osascript#{escaped_commands}")
       rescue Osaka::SystemCommandFailed => ex
         if ex.message =~ /assistive devices/ 
           puts <<-eom
@@ -94,14 +91,8 @@ module Osaka
     end  
   
     def self.execute_file(scriptName, parameters = "")
-      do_system("osascript #{scriptName} #{parameters}".strip)
+      CommandRunner::run("osascript #{scriptName} #{parameters}".strip)
     end
 
-  private
-    def self.do_system(command)
-      output = `#{command} 2>&1`
-      raise Osaka::SystemCommandFailed, "message" + output unless $?.success?
-      output
-    end
   end
 end

data/lib/osaka/textedit.rb

@@ -17,4 +17,4 @@ module Osaka
     end
     
   end
-end
+end

data/lib/osaka/typicalapplication.rb

@@ -10,6 +10,9 @@ module Osaka
     end    
   end
 
+  class ApplicationWindowsMustBeClosed < StandardError
+  end
+
   class TypicalApplication
   
     attr_accessor :control
@@ -70,7 +73,7 @@ module Osaka
       control.activate
       latest_window_list = original_window_list = control.window_list
       yield
-      while (original_window_list == latest_window_list)
+      while ((latest_window_list - original_window_list).size == 0)
         latest_window_list = control.window_list
       end
       (latest_window_list - original_window_list)[0]
@@ -112,7 +115,7 @@ module Osaka
     
     def duplicate_and_close_original
       new_instance = duplicate        
-      close        
+      close  
       @control = new_instance.control
     end
     
@@ -195,7 +198,10 @@ module Osaka
       dialog = create_dialog(TypicalOpenDialog, dialog_location)
       dialog.set_folder(File.dirname(filename))
       dialog.select_file(File.basename(filename))
-      
+    end
+    
+    def raise_error_on_open_standard_windows(error_message)
+      raise Osaka::ApplicationWindowsMustBeClosed, error_message if ! control.standard_window_list.empty?
     end
   end
-end
+end

data/lib/osaka/typicalfinderdialog.rb

@@ -17,4 +17,4 @@ module Osaka
     end
   end
   
-end
+end

data/lib/osaka/typicalopendialog.rb

@@ -1,31 +1,35 @@
 # encoding: utf-8
 module Osaka
-  
+
   class OpenDialogCantSelectFile < StandardError
   end
-        
+
   class TypicalOpenDialog < TypicalFinderDialog
-      
+
     def file_list_location
-      at.outline(1).scroll_area(2).splitter_group(1).group(1)
+      if [:snow_leopard, :lion, :mountain_lion, :mavericks].include? control.mac_version
+        at.outline(1).scroll_area(2).splitter_group(1).group(1)
+      else
+        at.outline(1).scroll_area(1).splitter_group(1).splitter_group(1).group(1)
+      end
     end
-    
+
     def text_field_location_from_row(row)
       at.text_field(1).ui_element(1).row(row) + file_list_location
     end
-    
+
     def static_field_location_from_row(row)
-      at.static_text(1).ui_element(1).row(row) + file_list_location      
+      at.static_text(1).ui_element(1).row(row) + file_list_location
     end
-    
+
     def greyed_out?(row)
       !control.exists?(text_field_location_from_row(row))
     end
-    
+
     def click_open
       control.click(at.button("Open"))
     end
-    
+
     def field_location_from_row(row)
       if (greyed_out?(row))
         static_field_location_from_row(row)
@@ -33,23 +37,23 @@ module Osaka
         text_field_location_from_row(row)
       end
     end
-    
+
     def select_file_by_row(row)
       raise(OpenDialogCantSelectFile, "Tried to select a file, but it either doesn't exist or is greyed out") if (greyed_out?(row))
       control.set!("selected", at.row(row) + file_list_location, true)
     end
-      
+
     def amount_of_files_in_list
       amount_of_rows = control.get!("rows", file_list_location)
       amount_match_data = amount_of_rows.match(/.*row (\d) of/)
-      amount_match_data.nil? ? 0 : amount_match_data[1].to_i 
+      amount_match_data.nil? ? 0 : amount_match_data[1].to_i
     end
-    
+
     def filename_at(row)
       control.get!("value", field_location_from_row(row))
     end
-      
-    def select_file(filename)      
+
+    def select_file(filename)
       amount_of_files_in_list.times() { |row|
         if filename_at(row+1) == filename
           select_file_by_row(row+1)
@@ -58,6 +62,6 @@ module Osaka
         end
       }
     end
-  end  
+  end
 
-end
+end