rb-scpt 1.0.3 → 1.0.4

data/test/test_appscriptcommands.rb

@@ -3,17 +3,11 @@
 require 'minitest/autorun'
 require 'rb-scpt'
 
-# rb-appscript 0.5.0+ should no longer require the following kludge:
-#class AS_SafeObject
-#	def self.hide(name)
-#	end
-#end
-
 class TC_AppscriptNewApp < Minitest::Test
 
   def test_by_name
     [
-     '/Applications/TextEdit.app',
+     '/System/Applications/TextEdit.app',
      'Finder.app',
      'System Events'
     ].each do |name|
@@ -22,8 +16,8 @@ class TC_AppscriptNewApp < Minitest::Test
       assert_instance_of(Appscript::Application, a)
       assert_instance_of(Appscript::Reference, a.name)
     end
-    assert_equal('app("/Applications/TextEdit.app")', Appscript.app('TextEdit').to_s)
-    assert_equal('app("/Applications/TextEdit.app")', Appscript.app.by_name('TextEdit').to_s)
+    assert_equal('app("/System/Applications/TextEdit.app")', Appscript.app('TextEdit').to_s)
+    assert_equal('app("/System/Applications/TextEdit.app")', Appscript.app.by_name('TextEdit').to_s)
 
     assert_raises(Appscript::ApplicationNotFoundError) { Appscript.app('/non-existent/app') }
     assert_raises(Appscript::ApplicationNotFoundError) { Appscript.app('non-existent.app') }
@@ -39,7 +33,7 @@ class TC_AppscriptNewApp < Minitest::Test
       assert_instance_of(Appscript::Application, a)
       assert_instance_of(Appscript::Reference, a.name)
     end
-    assert_equal('app("/Applications/TextEdit.app")', Appscript.app.by_id('com.apple.textedit').to_s)
+    assert_equal('app("/System/Applications/TextEdit.app")', Appscript.app.by_id('com.apple.textedit').to_s)
 
     assert_raises(Appscript::ApplicationNotFoundError) { Appscript.app.by_id('non.existent.app') }
   end
@@ -47,7 +41,7 @@ class TC_AppscriptNewApp < Minitest::Test
   def test_by_creator
     a = Appscript.app.by_creator('ttxt')
     assert_instance_of(Appscript::Reference, a.name)
-    assert_equal('app("/Applications/TextEdit.app")', a.to_s)
+    assert_equal('app("/System/Applications/TextEdit.app")', a.to_s)
     assert_raises(Appscript::ApplicationNotFoundError) { Appscript.app.by_id('!@$o') }
   end
 
@@ -60,9 +54,9 @@ class TC_AppscriptNewApp < Minitest::Test
   end
 
   def test_by_aem_app
-    a = Appscript.app.by_aem_app(AEM::Application.by_path('/Applications/TextEdit.app'))
+    a = Appscript.app.by_aem_app(AEM::Application.by_path('/System/Applications/TextEdit.app'))
     assert_instance_of(Appscript::Reference, a.name)
-    assert_equal('app.by_aem_app(AEM::Application.by_path("/Applications/TextEdit.app"))', a.to_s)
+    assert_equal('app.by_aem_app(AEM::Application.by_path("/System/Applications/TextEdit.app"))', a.to_s)
   end
 end
 
@@ -75,6 +69,8 @@ class TC_AppscriptCommands < Minitest::Test
   end
 
   def test_commands_1
+    skip "Not on CI" if ENV["CI"]
+
     assert_equal('TextEdit', @te.name.get)
     d = @te.make(:new=>:document, :with_properties=>{:text=>'test test_commands'})
     assert_instance_of(Appscript::Reference, d)
@@ -105,6 +101,8 @@ class TC_AppscriptCommands < Minitest::Test
   end
 
   def test_commands_2
+    skip "Not on CI" if ENV["CI"]
+
     d = @te.make(:new=>:document, :at=>@te.documents.end)
 
     @te.set(d.text, :to=> 'test1')
@@ -138,12 +136,12 @@ class TC_AppscriptCommands < Minitest::Test
   end
 
   def test_command_error
-    begin
+    e = assert_raises Appscript::CommandError do
       @f.items[10000].get
-    rescue Appscript::CommandError => e
-      assert_equal(-1728, e.to_i)
-      assert_equal("CommandError\n\t\tOSERROR: -1728\n\t\tMESSAGE: Can't get reference.\n\t\tOFFENDING OBJECT: app(\"/System/Library/CoreServices/Finder.app\").items[10000]\n\t\tCOMMAND: app(\"/System/Library/CoreServices/Finder.app\").items[10000].get()\n", e.to_s)
-      assert_instance_of(AEM::EventError, e.real_error)
     end
+
+    assert_equal(-1728, e.to_i)
+    assert_equal("CommandError\n\t\tOSERROR: -1728\n\t\tMESSAGE: Can't get reference.\n\t\tOFFENDING OBJECT: 10000\n\t\tEXPECTED TYPE: :file_url\n\t\tCOMMAND: app(\"/System/Library/CoreServices/Finder.app\").items[10000].get()\n", e.to_s)
+    assert_instance_of(AEM::EventError, e.real_error)
   end
 end

data/test/test_appscriptreference.rb

@@ -96,7 +96,7 @@ class TC_AppscriptReferences < Minitest::Test
       val2 = @te.AS_app_data.unpack(d)
       if val.class == @te.AS_app_data.unpack(d).class # note: Appscript::Reference and Appscript::GenericReference currently aren't comparable with each other, so the next test would always fail for those
         assert_equal(val, val2)
-        assert_predicate val, :eql?, val2
+        assert_operator val, :eql?, val2
       end
     end
   end

data/test/test_codecs.rb

@@ -78,8 +78,13 @@ class TC_Codecs < Minitest::Test
       data = num(data)
       d = @c.pack(val)
       assert_equal(type, d.type)
-      assert_equal(data, d.data)
-      assert_equal(val, @c.unpack(d))
+      assert_equal(data.b, d.data)
+
+      if type == KAE::TypeFloat then
+        assert_in_epsilon(val, @c.unpack(d))
+      else
+        assert_equal(val, @c.unpack(d))
+      end
     end
   end
 
@@ -101,7 +106,7 @@ class TC_Codecs < Minitest::Test
       data = ut16(data)
       d = @c.pack(val)
       assert_equal(KAE::TypeUnicodeText, d.type)
-      assert_equal(data, d.data)
+      assert_equal(data.b, d.data)
       assert_equal(val, @c.unpack(d))
     end
     assert_raises(TypeError) { @c.pack("\x88") } # non-valid UTF8 strings should raise error when coercing from typeUTF8Text to typeUnicodeText
@@ -116,17 +121,17 @@ class TC_Codecs < Minitest::Test
       data = num(data)
       d = @c.pack(t)
       assert_equal(KAE::TypeLongDateTime, d.type)
-      assert_equal(data, d.data)
+      assert_equal(data.b, d.data)
       assert_equal(t, @c.unpack(AE::AEDesc.new(KAE::TypeLongDateTime, data)))
     end
   end
 
   def test_file
-    path = '/Applications/TextEdit.app'
+    path = '/System/Applications/TextEdit.app'
     d = @c.pack(MacTypes::Alias.path(path))
     assert_equal(path, @c.unpack(d).to_s)
 
-    path = '/Applications/TextEdit.app'
+    path = '/System/Applications/TextEdit.app'
     d = @c.pack(MacTypes::FileURL.path(path))
     assert_equal(path, @c.unpack(d).to_s)
   end
@@ -141,10 +146,10 @@ class TC_Codecs < Minitest::Test
       d = @c.pack(val)
       val2 = @c.unpack(d)
       assert_equal(val, val2)
-      assert_predicate val, :eql?, val2
+      assert_operator val, :eql?, val2
       val2 = @c.unpack(d)
       assert_equal(val2, val)
-      assert_predicate val2, :eql?, val
+      assert_operator val2, :eql?, val
     end
     assert_raises(ArgumentError) { AEM::AEType.new(3) }
     assert_raises(ArgumentError) { AEM::AEType.new("docum") }

data/test/test_findapp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-require 'minitest/autorun'
+require "minitest/autorun"
 require "_aem/findapp"
 
 
@@ -8,15 +8,15 @@ class TC_FindApp < Minitest::Test
 
   def test_find
     [
-     ['/Applications/iCal.app', '/Applications/iCal.app'],
-     ['ical.app', '/Applications/iCal.app'],
-     ['ICAL', '/Applications/iCal.app'],
-    ].each do |val, res|
-      assert_equal(res, FindApp.by_name(val))
+      "/System/Applications/Calendar.app",
+      "Calendar.app",
+      "Calendar",
+     ].each do |name|
+      assert_equal("/System/Applications/Calendar.app", FindApp.by_name(name))
     end
-    assert_equal('/Applications/TextEdit.app', FindApp.by_creator('ttxt'))
-    assert_equal('/System/Library/CoreServices/Finder.app', FindApp.by_id('com.apple.finder'))
-    assert_raises(FindApp::ApplicationNotFoundError) { FindApp.by_name('NON-EXISTENT-APP') }
+    assert_equal("/System/Applications/TextEdit.app", FindApp.by_creator("ttxt"))
+    assert_equal("/System/Library/CoreServices/Finder.app", FindApp.by_id("com.apple.finder"))
+    assert_raises(FindApp::ApplicationNotFoundError) { FindApp.by_name("NON-EXISTENT-APP") }
 
     # assert_equal("/Users/has/\306\222\303\270u\314\210.app", FindApp.by_name("\306\222\303\270u\314\210.app")) # utf8 paths work ok
   end

data/test/test_mactypes.rb

@@ -18,6 +18,8 @@ class TC_MacTypes < Minitest::Test
   end
 
   def test_alias
+    skip "MacTypes::Alias needs to be ported off of Carbon's aliases"
+
     # make alias
     f = MacTypes::Alias.path(@path1)
 
@@ -42,9 +44,9 @@ class TC_MacTypes < Minitest::Test
     # check alias keeps track of moved file
     `mv #{@path1} #{@path2}`
     # puts "alias path 2: #{f}" # /private/tmp/moved-codecs-test.HWr1EnE3
-    assert_equal(p2, f.to_s)
+    assert_equal(p2.b, f.to_s)
 
-    assert_equal(p2, normalize(f.path))
+    assert_equal(p2.b, normalize(f.path))
 
     # check a FileNotFoundError is raised if getting path/FileURL for a filesystem object that no longer exists
     `rm #{@path2}`
@@ -63,7 +65,7 @@ class TC_MacTypes < Minitest::Test
     assert_equal('/non/existent path', g.to_s)
 
     assert_equal('furl', g.desc.type)
-    assert_equal('file://localhost/non/existent%20path', g.desc.data)
+    assert_equal('file:///non/existent%20path', g.desc.data)
 
     assert_equal('MacTypes::FileURL.path("/non/existent path")', g.to_file_url.inspect)
 

data/test/test_osax.rb

@@ -6,7 +6,7 @@ require 'osax'
 class TC_OSAX < Minitest::Test
 
   def test_1
-    sa = OSAX.osax('Standardadditions')
+    sa = OSAX.osax('StandardAdditions')
 
     assert_equal(65, sa.ASCII_number('A'))
 
@@ -18,35 +18,47 @@ class TC_OSAX < Minitest::Test
     assert_raises(RuntimeError) { sa.non_existent_command }
   end
 
+  # These calls to `sa.ASCII_number` aren't valid anymore. They will
+  # intentionally raise a -10004 (privilege violation occurred) error
+  # due to unnecessary cross-application scripting (ie, the command is
+  # perfectly fine in the current application rather than the "remote"
+  # application). See:
+  #
+  #   https://developer.apple.com/library/archive/releasenotes/AppleScript/RN-AppleScript/RN-10_6/RN-10_6.html#//apple_ref/doc/uid/TP40000982-CH106-SW6
+  #
+  # As such, maybe these tests should be performing something with the
+  # finder? Hrm. Nope! That's an error too. `sa` is the
+  # StandardAdditions osax and nothing shall change that. I'm not
+  # really sure what these tests were trying to achive tbh.
+
   def test_2
-    sa = OSAX.osax('Standardadditions').by_name('Finder')
-    assert_equal(65, sa.ASCII_number('A'))
+    sa = OSAX.osax('StandardAdditions').by_name('Finder')
+    # assert_equal(65, sa.ASCII_number('A'))
     assert_equal(MacTypes::Alias.path("/System/Library/CoreServices/Finder.app/"), sa.path_to(nil))
   end
 
   def test_3
-    sa = OSAX.osax('Standardadditions').by_creator('MACS')
-    assert_equal(65, sa.ASCII_number('A'))
+    sa = OSAX.osax('StandardAdditions').by_creator('MACS')
+    # assert_equal(65, sa.ASCII_number('A'))
     assert_equal(MacTypes::Alias.path("/System/Library/CoreServices/Finder.app/"), sa.path_to(nil))
   end
 
   def test_4
-    sa = OSAX.osax('Standardadditions').by_id('com.apple.finder')
-    assert_equal(65, sa.ASCII_number('A'))
+    sa = OSAX.osax('StandardAdditions').by_id('com.apple.Finder')
+    # assert_equal(65, sa.ASCII_number('A'))
     assert_equal(MacTypes::Alias.path("/System/Library/CoreServices/Finder.app/"), sa.path_to(nil))
   end
 
   def test_5
-    sa = OSAX.osax('Standardadditions').by_pid(`top -l1 | grep Finder | awk '{ print $1 }'`.to_i)
+    pid = `top -l1 | grep Finder | awk '{ print $1 }'`.to_i
+    sa = OSAX.osax('StandardAdditions').by_pid(pid)
+    # assert_equal(65, sa.ASCII_number('A'))
     assert_equal(MacTypes::Alias.path("/System/Library/CoreServices/Finder.app/"), sa.path_to(nil))
-    assert_equal(65, sa.ASCII_number('A'))
   end
 
   def test_6
-    sa = OSAX.osax('Standardadditions').by_aem_app(AEM::Application.by_path("/System/Library/CoreServices/Finder.app/"))
-    assert_equal(65, sa.ASCII_number('A'))
+    sa = OSAX.osax('StandardAdditions').by_aem_app(AEM::Application.by_path("/System/Library/CoreServices/Finder.app/"))
+    # assert_equal(65, sa.ASCII_number('A'))
     assert_equal(MacTypes::Alias.path("/System/Library/CoreServices/Finder.app/"), sa.path_to(nil))
   end
-
-
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: rb-scpt
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - hhas
 - Brendan Thompson
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
+  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
+  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
+  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
+  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
+  deKfBjgVAq7EYHu1AczzlUly
+  -----END CERTIFICATE-----
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: brendan@btsystems.com.au
 executables: []
 extensions:
-- extconf.rb
+- ext/ae/extconf.rb
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - CHANGES
-- Makefile
+- Manifest.txt
 - README.md
 - Rakefile
-- bin/rb-scpt-1.0.0.gem
-- bin/rb-scpt-1.0.1.gem
 - doc/aem-manual/01_introduction.html
 - doc/aem-manual/02_apioverview.html
 - doc/aem-manual/03_packingandunpackingdata.html
@@ -67,8 +87,28 @@ files:
 - doc/osax-manual/04_notes.html
 - doc/osax-manual/index.html
 - doc/rb-appscript-logo.png
-- extconf.rb
-- rb-scpt-1.0.2.gem
+- ext/ae/SendThreadSafe.c
+- ext/ae/SendThreadSafe.h
+- ext/ae/ae.c
+- ext/ae/extconf.rb
+- lib/_aem/aemreference.rb
+- lib/_aem/codecs.rb
+- lib/_aem/connect.rb
+- lib/_aem/encodingsupport.rb
+- lib/_aem/findapp.rb
+- lib/_aem/mactypes.rb
+- lib/_aem/send.rb
+- lib/_aem/typewrappers.rb
+- lib/_appscript/defaultterminology.rb
+- lib/_appscript/referencerenderer.rb
+- lib/_appscript/reservedkeywords.rb
+- lib/_appscript/safeobject.rb
+- lib/_appscript/terminology.rb
+- lib/aem.rb
+- lib/kae.rb
+- lib/osax.rb
+- lib/rb-scpt.rb
+- lib/version.rb
 - rb-scpt.gemspec
 - sample/AB_export_vcard.rb
 - sample/AB_list_people_with_emails.rb
@@ -87,26 +127,6 @@ files:
 - sample/Stagger_Finder_windows.rb
 - sample/TextEdit_demo.rb
 - sample/iTunes_top40_to_html.rb
-- src/SendThreadSafe.c
-- src/SendThreadSafe.h
-- src/lib/_aem/aemreference.rb
-- src/lib/_aem/codecs.rb
-- src/lib/_aem/connect.rb
-- src/lib/_aem/encodingsupport.rb
-- src/lib/_aem/findapp.rb
-- src/lib/_aem/mactypes.rb
-- src/lib/_aem/send.rb
-- src/lib/_aem/typewrappers.rb
-- src/lib/_appscript/defaultterminology.rb
-- src/lib/_appscript/referencerenderer.rb
-- src/lib/_appscript/reservedkeywords.rb
-- src/lib/_appscript/safeobject.rb
-- src/lib/_appscript/terminology.rb
-- src/lib/aem.rb
-- src/lib/kae.rb
-- src/lib/osax.rb
-- src/lib/rb-scpt.rb
-- src/rbae.c
 - test/README
 - test/test_aemreference.rb
 - test/test_appscriptcommands.rb
@@ -116,9 +136,10 @@ files:
 - test/test_mactypes.rb
 - test/test_osax.rb
 homepage: https://github.com/BrendanThompson/rb-scpt
-licenses: []
+licenses:
+- AML
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,25 +147,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.8'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: This is a fork of the original rb-appscript. Ruby AppleScript (rb-scpt) is
   a high-level, user-friendly Apple event bridge that allows you to control scriptable
   Mac OS X applications using ordinary Ruby scripts.
 test_files:
+- test/README
+- test/test_aemreference.rb
+- test/test_appscriptcommands.rb
+- test/test_appscriptreference.rb
 - test/test_codecs.rb
+- test/test_findapp.rb
 - test/test_mactypes.rb
-- test/test_appscriptcommands.rb
-- test/test_aemreference.rb
 - test/test_osax.rb
-- test/test_findapp.rb
-- test/test_appscriptreference.rb