osaka 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c3111ee1c6b444321590382e2bca76f4341c674
-  data.tar.gz: ab4b79b6eb693de745f8b0d13014301217aba48e
+  metadata.gz: b98f479a2e3a76f17e9727eacb616a4668126f06
+  data.tar.gz: 2cc8d297e7bc54fa57120ba557988582ffc27874
 SHA512:
-  metadata.gz: 6925989beb9445a8356c78d08adef696fdf63a98e9f6193e8803b48cf5ca6993328e876812a3d0f77f8b1c96a0995a6868e56a6f2382dadde21fffcfdb10e35c
-  data.tar.gz: 14554cb5bc06dbff9e95779a0f1651ce176582f0bbdc3c76b0765db757349239506311f09cc46835ef73a2b55155e71140ae9a7d643ac327127c70f2d3c40a4e
+  metadata.gz: f269e4e1d5fbf49387ffe48a7adfec8881f221e13b73800d550b9da99809af18bbc1e401f281ede9b9462588e97f21407acd2b0a4c81318e8815e0e9f27380be
+  data.tar.gz: f8ad1bf37387d5b294c7d86e39cd7aaf2e7fc104743abb1eb6c994d5a76d245a25228cfdabe4744b8c11f4436187161b67baa2f052da5e1a5750a4e6b513c641

data/lib/osaka/remotecontrol.rb

@@ -195,6 +195,7 @@ module Osaka
     end
 
     def get!(element, location = "")
+      debug_print "Getting attribute '#{element}' of: #{construct_prefixed_location(location)}"
       system_event!("get #{element}#{construct_prefixed_location(location)}").strip
     end
 
@@ -223,7 +224,7 @@ module Osaka
 
     def standard_window_list
       window_list.collect { |window|
-        if get!("subrole", at.window(window)) == "AXStandardWindow"
+        if exists?(at.window(window)) && get!("subrole", at.window(window)) == "AXStandardWindow"
           window
         end
       }.compact

data/lib/osaka/version.rb

@@ -1,4 +1,4 @@
 
 module Osaka
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/spec/remotecontrol_spec.rb

@@ -13,7 +13,7 @@ describe "Osaka::RemoteControl" do
   before (:each) do
     Osaka::ScriptRunner.enable_debug_prints
   end
-  
+
   after (:each) do
     Osaka::ScriptRunner.disable_debug_prints
   end
@@ -22,19 +22,19 @@ describe "Osaka::RemoteControl" do
     expect_execute_osascript.and_return("An Error")
     expect(subject).to receive(:puts).with(/#{action}/)
   end
-  
+
   it "Should be able to print warning messages" do
     expect(subject).to receive(:puts).with("Osaka WARNING while doing ThisAction: Message")
     subject.print_warning("ThisAction", "Message")
   end
-  
+
   context "Query things from the OS" do
 
     it "Should be possible to check whether an application is still running" do
       expect_execute_osascript("tell application \"System Events\"; (name of processes) contains \"#{name}\"; end tell").and_return("false")
       expect(subject.running?).to be false
     end
-    
+
     it "Can get the OS version (lion)" do
       expect_execute_osascript("system version of (system info)").and_return("10.7.4\n")
       expect(subject.mac_version).to eq :lion
@@ -55,42 +55,42 @@ describe "Osaka::RemoteControl" do
       expect_execute_osascript("system version of (system info)").and_return("1\n")
       expect(subject.mac_version).to eq :other
     end
-  end  
+  end
 
   context "Able to compare different remote controls" do
-    
+
     it "Should be able to clone controls" do
       subject.set_current_window "Window"
       new_control = subject.clone
       expect(new_control).to eq subject
-      expect(new_control).not_to be subject 
+      expect(new_control).not_to be subject
     end
-    
+
     it "Should be having different current window instances when cloning" do
       subject.set_current_window "Window"
       new_control = subject.clone
       new_control.set_current_window "Not the same"
       expect(subject.current_window_name).not_to be new_control.current_window_name
-      
+
     end
-  
+
     it "Should be able to compare objects using names" do
       expect(subject).to eq Osaka::RemoteControl.new(name)
       expect(subject).not_to eq Osaka::RemoteControl.new("otherName")
     end
-  
+
     it "Should be able to compare objects using window" do
       equal_object = Osaka::RemoteControl.new(name)
       unequal_object = Osaka::RemoteControl.new(name)
       equal_object.set_current_window("Window")
       subject.set_current_window("Window")
       unequal_object.set_current_window "Another Window"
-    
+
       expect(subject).to eq equal_object
       expect(subject).not_to eq unequal_object
     end
   end
-  
+
   context "Basic control functionality of telling and sending system events" do
 
     quoted_name = "\"#{name}\""
@@ -116,9 +116,9 @@ describe "Osaka::RemoteControl" do
       subject.system_event("quit")
     end
   end
-  
+
   context "Check whether things exist or not" do
-    
+
     it "Should be able to check whether a location exists" do
       expect_execute_osascript(/exists button 1/).and_return("true\n")
       expect(subject.exists?(at.button(1))).to be true
@@ -129,9 +129,9 @@ describe "Osaka::RemoteControl" do
       expect(subject.not_exists?(at.window(1))).to be true
     end
   end
-  
+
   context "Waiting and doing until elements exist or not" do
-  
+
     it "Should be able to wait for only one location to exist" do
       expect_exists?(at.button(1)).and_return(false, false, true)
       expect(subject.wait_until_exists!(at.button(1))).to eq at.button(1)
@@ -142,7 +142,7 @@ describe "Osaka::RemoteControl" do
       expect_exists?(at.button(1)).and_return(false, false, true)
       expect(subject.wait_until_exists(at.button(1))).to eq at.button(1)
     end
-      
+
     it "Should be able to wait until multiple locations exists and return the one that happened" do
       expect_exists?(at.button(1)).and_return(false, false, false)
       expect_exists?(at.sheet(5)).and_return(false, false, true)
@@ -155,29 +155,29 @@ describe "Osaka::RemoteControl" do
       expect_exists?(at.sheet(5)).and_return(false, true)
       expect(subject.wait_until_exists(at.button(1), at.sheet(5))).to eq at.sheet(5)
     end
-    
+
     it "Should be able to wait for one location to NOT exist" do
       expect_not_exists?(at.button(1)).and_return(false, false, true)
-      expect(subject.wait_until_not_exists!(at.button(1))).to eq at.button(1)      
+      expect(subject.wait_until_not_exists!(at.button(1))).to eq at.button(1)
     end
 
     it "Should be able to wait for one location to NOT exist (with activate)" do
       expect_activate
       expect_not_exists?(at.button(4)).and_return(false, true)
-      expect(subject.wait_until_not_exists(at.button(4))).to eq at.button(4)      
+      expect(subject.wait_until_not_exists(at.button(4))).to eq at.button(4)
     end
-    
+
     it "Should be able to loop over some script until something happens" do
       expect(Timeout).to receive(:timeout).with(10).and_yield
       expect_execute_osascript.and_return("false", "false", "true")
       expect_activate.twice
-      
-      
+
+
       subject.until_exists!(at.window(1)) {
         subject.activate
       }
     end
-    
+
     it "Should print a proper error message when it times out while waiting for something" do
       expect(Timeout).to receive(:timeout).with(10).and_raise(Timeout::Error.new)
       expect { subject.until_exists!(at.window(1)) }.to raise_error(Osaka::TimeoutError, "Timed out while waiting for: window 1")
@@ -200,17 +200,17 @@ describe "Osaka::RemoteControl" do
       expect_execute_and_warning_for("activate")
       subject.activate
     end
-    
+
     it "Should be able to launch and deal with the warning" do
       expect_execute_and_warning_for("launch")
-      subject.launch      
+      subject.launch
     end
   end
-    
-    
+
+
 
   context "Can send keystrokes to the application" do
-  
+
     it "Should be able to generate keystroke events" do
       expect_execute_osascript(/keystroke "p"/).and_return("")
       subject.keystroke!("p")
@@ -230,17 +230,17 @@ describe "Osaka::RemoteControl" do
       expect_activate
       expect_focus
       expect_keystroke!("a")
-      subject.keystroke("a")        
+      subject.keystroke("a")
     end
 
     it "Should be able to do keystrokes with command down" do
       expect_execute_osascript(/keystroke "p" using {command down}/).and_return("")
-      subject.keystroke!("p", :command)    
+      subject.keystroke!("p", :command)
     end
 
     it "Should be able to do keystrokes with option and command down" do
       expect_execute_osascript(/keystroke "p" using {option down, command down}/).and_return("")
-      subject.keystroke!("p", [ :option, :command ])    
+      subject.keystroke!("p", [ :option, :command ])
     end
 
     it "Should be able to do a keystroke and wait until something happen in one easy line" do
@@ -254,11 +254,11 @@ describe "Osaka::RemoteControl" do
       expect_focus
       expect_execute_osascript(/keystroke "p"/).and_return("")
       expect_execute_osascript(/exists window 1/).and_return("true")
-      subject.keystroke("p").wait_until_exists!(at.window(1))    
+      subject.keystroke("p").wait_until_exists!(at.window(1))
     end
-    
+
   end
-  
+
   context "Can send mouse clicks to the application" do
 
     it "Should be able to do clicks" do
@@ -269,7 +269,7 @@ describe "Osaka::RemoteControl" do
     it "Should be able to do click and activate" do
       expect_activate
       expect_click!("button")
-      subject.click("button")    
+      subject.click("button")
     end
 
     it "Should be able to do clicks and wait until something happened in one easy line" do
@@ -288,18 +288,18 @@ describe "Osaka::RemoteControl" do
     it "Should be able to click on menu bar items" do
       expect_activate
       expect_click!(at.menu_item("Hey").menu(1).menu_bar_item("File").menu_bar(1))
-      subject.click_menu_bar(at.menu_item("Hey"), "File")    
+      subject.click_menu_bar(at.menu_item("Hey"), "File")
     end
-    
+
   end
-  
+
   context "Control should be able to set and get different application values" do
-  
+
     it "Should be able to set a value to an element" do
       expect_system_event!(/set value of window 1 to "newvalue"/).and_return("")
       subject.set!("value", at.window(1), "newvalue")
     end
-    
+
     it "Prints a warning when setting and element and output is received" do
       expect_execute_and_warning_for("set")
       subject.set!("value", at.window(1), "newvalue")
@@ -307,7 +307,7 @@ describe "Osaka::RemoteControl" do
 
     it "Should be able to set to boolean values" do
       expect_system_event!(/set value of window 1 to true/).and_return("")
-      subject.set!("value", at.window(1), true)    
+      subject.set!("value", at.window(1), true)
     end
 
     it "Should be able to get a value from an element" do
@@ -324,7 +324,7 @@ describe "Osaka::RemoteControl" do
     it "Should combine the location and the window" do
       subject.set_current_window("1")
       expect_system_event!(/get value of dialog 2 of window "1"/).and_return("1\n")
-      expect(subject.get!("value", at.dialog(2))).to eq "1"    
+      expect(subject.get!("value", at.dialog(2))).to eq "1"
     end
 
     it "Should be able to get values from the application itself" do
@@ -345,27 +345,30 @@ describe "Osaka::RemoteControl" do
 
     it "Should be able get an array with one window name when there is exactly one window" do
       expect_get_app!("windows").and_return("window one of application process process\n")
-      expect(subject.window_list).to eq ["one"]    
+      expect(subject.window_list).to eq ["one"]
     end
-    
+
     it "Should be able to get a list of standard windows which is empty" do
       expect(subject).to receive(:window_list).and_return([])
       subject.standard_window_list
     end
-    
+
     it "Should be able to get a list of all the standard windows when there are only standard windows " do
       expect(subject).to receive(:window_list).and_return(["window 1"])
+      expect_exists?(at.window("window 1")).and_return(true)
       expect_get!("subrole", at.window("window 1")).and_return("AXStandardWindow")
       expect(subject.standard_window_list).to eq ["window 1"]
     end
-    
+
     it "Should be able to get a list of all the standard windows excluding the floating ones" do
       expect(subject).to receive(:window_list).and_return(["window", "float"])
+      expect_exists?(at.window("window")).and_return(true)
+      expect_exists?(at.window("float")).and_return(true)
       expect_get!("subrole", at.window("window")).and_return("AXStandardWindow")
       expect_get!("subrole", at.window("float")).and_return("AXFloatingWindow")
-      expect(subject.standard_window_list).to eq ["window"]      
+      expect(subject.standard_window_list).to eq ["window"]
     end
-    
+
     it "Should be able to get the attributes of a window and parse the result" do
       expect_get!("attributes", at.window(1)).and_return("attribute AXRole of window 1 of application process ApplicationName, attribute AXRoleDescription of window 1 of application process ApplicationName, attribute AXSubrole of window 1 of application process ApplicationName")
       expect(subject.attributes(at.window(1))).to eq ["AXRole", "AXRoleDescription", "AXSubrole"]
@@ -375,7 +378,7 @@ describe "Osaka::RemoteControl" do
     expect_get!("attributes", at.window(1)).and_return("attribute AXRole of application process ApplicationName, attribute AXRoleDescription of application process ApplicationName")
       expect(subject.attributes(at.window(1))).to eq ["AXRole", "AXRoleDescription"]
     end
-    
+
   end
 
   describe "Dealing with base locations and window lists" do
@@ -387,44 +390,44 @@ describe "Osaka::RemoteControl" do
 
     it "Should be able to get an array of multiple window names" do
       expect_get_app!("windows").and_return("window one of application process process, window two of application process process\n")
-      expect(subject.window_list).to eq ["one", "two"]    
+      expect(subject.window_list).to eq ["one", "two"]
     end
-    
+
     it "Should be able to focus the currently active window" do
       subject.base_location = at.sheet(1).window("boo")
       expect_system_event!("set value of attribute \"AXMain\" of window \"boo\" to true")
       subject.focus!
     end
-    
-    it "Should initialize the current window when it is not focused yet" do      
+
+    it "Should initialize the current window when it is not focused yet" do
       expect_window_list.and_return(["1"])
       expect_focus!
       subject.focus
       expect(subject.current_window_name).to eq "1"
     end
-    
+
     it "Should be able to extract the current window name also when the base location has more than just a window " do
       subject.base_location = at.sheet(1).window("Window")
-      expect(subject.current_window_name).to eq "Window"      
+      expect(subject.current_window_name).to eq "Window"
     end
 
     it "Shouldn't initialize current window when it is already set" do
       subject.set_current_window("1")
       expect_not_exists?(at.window("1")).and_return(false)
       expect_focus!
-      
+
       subject.focus
       expect(subject.base_location).to eq at.window("1")
     end
-    
+
     it "Should re-initialize the current window when it doesn't exist anymore" do
       subject.set_current_window("1")
       expect_not_exists?(at.window("1")).and_return(true)
       expect_window_list.and_return(["2"])
       expect_focus!
-            
+
       subject.focus
-      expect(subject.current_window_name).to eq "2"    
+      expect(subject.current_window_name).to eq "2"
     end
 
     it "Should focus the current window when it doesn't have focus" do
@@ -433,11 +436,11 @@ describe "Osaka::RemoteControl" do
       expect_focus!
       subject.focus
     end
-    
+
     it "Shouldn't focus when there is no window set at all" do
       expect_window_list.and_return([""])
       subject.focus
     end
-    
-  end 
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osaka
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Bas Vodde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake