fspath-mac 3.1.2 → 3.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWQzMDU4MWVlNDU2OGVlNzU4MmViNzlhODNjZTQ1OWE1NzZhMzI3MA==
-  data.tar.gz: !binary |-
-    NDY2MzQ4NGJkMjY1M2JkMzlhNmMzYmZmMTgwNzMwMmRkM2Q5NTM3MA==
+SHA256:
+  metadata.gz: b4f31c6128cb217d68a3515a0239ef84d9e1b2f92f84a029f1380000a21b698f
+  data.tar.gz: 23f50da059db2274c3a5453dc748bd35a1bce096d38c4143da3d91ea1ba2ead7
 SHA512:
-  metadata.gz: !binary |-
-    NzFkNDk2NGY5ZTNkMGVhN2VjYTg4NjA0MDU2ZWVhZTEzMDJkMTNlMzI4ODBm
-    ZGJhYTQ0MDNmNzA3YjYzNTliNGIyNjhmYmYwNjBmOTU4YWI2N2Q0YzM5NmFl
-    OGZiNDRlYjU4ODI1NmYyMjc1ZTk3ODFjYzcwMjcyMWQzNmRiNjQ=
-  data.tar.gz: !binary |-
-    ZTVlZWI0ZWFlMmQxMzYzM2U1ZDkwYWZiOGNkMDVlMGM2MGQ4OTAzM2RhYzRj
-    N2I1MzA4OTYwMGFmYjE4MTg2ZDU3ZWU2NzIwMjA2OTBjMWFjY2NiZDdkY2Y1
-    MDI2MGY1NzkwNjAwNDk5OGVmM2U3ZWYyMTY2MjRiNDYzYWYyMWQ=
+  metadata.gz: 6df521685cea142e7d6d6b903b86f3425dcb32cad597fd957252fc1c74c53d189fcaa9ee3227a16656d2e5d23e2d38f6074f6bc1c9361ccffc2b902fd8cf1c94
+  data.tar.gz: 26381bf3d49cc0d8945b14be747af7a6ae634e6a74e7cc972b62585bd1733cc57c47a099e785547feb90bdecb917af1afc61d37c661d88518033400804f99a9c

data/.travis.yml

@@ -1,8 +1,13 @@
-language:
-  - objective-c
-  - ruby
+os: osx
+language: ruby
 rvm:
-  - '1.9'
-  - '2.0'
-  - '2.1'
+  - default
+  - '2.3.7'
+  - '2.4.4'
+  - '2.5.1'
 script: bundle exec rspec
+matrix:
+  include:
+    - env: CHECK_RUBIES=✓
+      rvm: '2.4.4'
+      script: bundle exec travis_check_rubies

data/Gemfile

@@ -1,3 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 Ivan Kuchin
+Copyright (c) 2010-2018 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -28,4 +28,4 @@ Set spotlight comment:
 
 ## Copyright
 
-Copyright (c) 2010-2016 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2018 Ivan Kuchin. See LICENSE.txt for details.

data/ext/fspath/mac/ext.m

@@ -1,6 +1,7 @@
 #include "ruby.h"
 #include <AppKit/AppKit.h>
 #include <CoreServices/CoreServices.h>
+#include <Carbon/Carbon.h>
 
 CFStringRef get_path(VALUE self){
 	VALUE path = rb_iv_get(self, "@path");
@@ -28,17 +29,18 @@ CFURLRef get_url(VALUE self){
 
 void raise_cf_error(CFErrorRef errorRef){
 	CFStringRef errorDescriptionRef = CFErrorCopyDescription(errorRef);
+	CFRelease(errorRef);
 
-	const char *errorDescriptionC = CFStringGetCStringPtr(errorDescriptionRef, kCFStringEncodingUTF8);
-	if (errorDescriptionC) {
-		rb_raise(rb_eRuntimeError, "%s", errorDescriptionC);
-	} else {
-		CFIndex length = CFStringGetLength(errorDescriptionRef);
-		CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8);
-		char *errorDescription = (char *) malloc(maxSize);
-		CFStringGetCString(errorDescriptionRef, errorDescription, maxSize, kCFStringEncodingUTF8);
-		rb_raise(rb_eRuntimeError, "%s", errorDescription);
-	}
+	CFIndex length = CFStringGetLength(errorDescriptionRef);
+	CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8);
+	char *errorDescription = (char *) malloc(maxSize);
+	CFStringGetCString(errorDescriptionRef, errorDescription, maxSize, kCFStringEncodingUTF8);
+	CFRelease(errorDescriptionRef);
+
+	VALUE message = rb_str_new_cstr(errorDescription);
+	free(errorDescription);
+
+	rb_exc_raise(rb_exc_new3(rb_eRuntimeError, message));
 }
 
 static VALUE finder_label_number_get(VALUE self){
@@ -86,6 +88,99 @@ static VALUE finder_label_number_set(VALUE self, VALUE labelNumber){
 	return Qnil;
 }
 
+static VALUE spotlight_comment_get(VALUE self){
+	ProcessSerialNumber psn = { 0, kCurrentProcess };
+	NSAppleEventDescriptor *target = [NSAppleEventDescriptor descriptorWithDescriptorType:typeProcessSerialNumber bytes:&psn length:sizeof(ProcessSerialNumber)];
+	NSAppleEventDescriptor *event = [NSAppleEventDescriptor appleEventWithEventClass:kASAppleScriptSuite eventID:kASSubroutineEvent targetDescriptor:target returnID:kAutoGenerateReturnID transactionID:kAnyTransactionID];
+
+	NSAppleEventDescriptor *subroutineDescriptor = [NSAppleEventDescriptor descriptorWithString:@"_get"];
+	[event setParamDescriptor:subroutineDescriptor forKeyword:keyASSubroutineName];
+
+	NSAppleEventDescriptor *parameters = [NSAppleEventDescriptor listDescriptor];
+	CFURLRef urlRef = get_url(self);
+	NSAppleEventDescriptor *fileUrlDescriptor = [NSAppleEventDescriptor descriptorWithFileURL:(NSURL *)urlRef];
+	[parameters insertDescriptor:fileUrlDescriptor atIndex:0];
+	[event setParamDescriptor:parameters forKeyword:keyDirectObject];
+
+	NSDictionary *errors;
+	NSAppleScript *script = [[NSAppleScript alloc] initWithSource:@"on _get(_path)\ntell application \"Finder\" to get comment of (_path as alias)\nend"];
+	NSAppleEventDescriptor *result = [script executeAppleEvent:event error:&errors];
+
+	[script release];
+	[event release];
+	[target release];
+	[parameters release];
+	[fileUrlDescriptor release];
+	CFRelease(urlRef);
+	[subroutineDescriptor release];
+
+	if (result) {
+		NSString *stringValue = [result stringValue];
+		[result release];
+
+		VALUE rbResult = rb_str_new_cstr([stringValue UTF8String]);
+		[stringValue release];
+
+		return rbResult;
+	} else {
+		NSString *errorsDescription = [errors description];
+		[errors release];
+
+		VALUE rbMessage = rb_str_new_cstr([errorsDescription UTF8String]);
+		[errorsDescription release];
+
+		rb_exc_raise(rb_exc_new3(rb_eRuntimeError, rbMessage));
+	}
+}
+
+static VALUE spotlight_comment_set(VALUE self, VALUE commentValue){
+	commentValue = rb_obj_as_string(commentValue);
+
+	ProcessSerialNumber psn = { 0, kCurrentProcess };
+	NSAppleEventDescriptor *target = [NSAppleEventDescriptor descriptorWithDescriptorType:typeProcessSerialNumber bytes:&psn length:sizeof(ProcessSerialNumber)];
+	NSAppleEventDescriptor *event = [NSAppleEventDescriptor appleEventWithEventClass:kASAppleScriptSuite eventID:kASSubroutineEvent targetDescriptor:target returnID:kAutoGenerateReturnID transactionID:kAnyTransactionID];
+
+	NSAppleEventDescriptor *subroutineDescriptor = [NSAppleEventDescriptor descriptorWithString:@"_set"];
+	[event setParamDescriptor:subroutineDescriptor forKeyword:keyASSubroutineName];
+
+	NSAppleEventDescriptor *parameters = [NSAppleEventDescriptor listDescriptor];
+	CFURLRef urlRef = get_url(self);
+	NSAppleEventDescriptor *fileUrlDescriptor = [NSAppleEventDescriptor descriptorWithFileURL:(NSURL *)urlRef];
+	[parameters insertDescriptor:fileUrlDescriptor atIndex:0];
+	NSString *comment = [NSString stringWithCString:StringValueCStr(commentValue) encoding:NSUTF8StringEncoding];
+	NSAppleEventDescriptor *commentDescriptor = [NSAppleEventDescriptor descriptorWithString:comment];
+	[parameters insertDescriptor:commentDescriptor atIndex:0];
+	[event setParamDescriptor:parameters forKeyword:keyDirectObject];
+
+	NSDictionary *errors;
+	NSAppleScript *script = [[NSAppleScript alloc] initWithSource:@"on _set(_path, _comment)\ntell application \"Finder\" to set comment of (_path as alias) to _comment\nend"];
+	NSAppleEventDescriptor *result = [script executeAppleEvent:event error:&errors];
+
+	[script release];
+	[event release];
+	[target release];
+	[parameters release];
+	[commentDescriptor release];
+	[comment release];
+	[fileUrlDescriptor release];
+	CFRelease(urlRef);
+	[subroutineDescriptor release];
+
+	if (result) {
+		[result release];
+	} else {
+		NSString *errorsDescription = [errors description];
+		[errors release];
+
+		VALUE rbMessage = rb_str_new_cstr([errorsDescription UTF8String]);
+		[errorsDescription release];
+
+		rb_exc_raise(rb_exc_new3(rb_eRuntimeError, rbMessage));
+	}
+
+	return Qnil;
+}
+
 static VALUE move_to_trash(VALUE self){
 	CFStringRef pathRef = get_path(self);
 	NSString *path = (NSString *)pathRef;
@@ -113,5 +208,7 @@ void Init_ext() {
 	VALUE mMac = rb_const_get(cFSPath, rb_intern("Mac"));
 	rb_define_private_method(mMac, "finder_label_number", finder_label_number_get, 0);
 	rb_define_private_method(mMac, "finder_label_number=", finder_label_number_set, 1);
+	rb_define_method(mMac, "spotlight_comment", spotlight_comment_get, 0);
+	rb_define_method(mMac, "spotlight_comment=", spotlight_comment_set, 1);
 	rb_define_method(mMac, "move_to_trash", move_to_trash, 0);
 }

data/fspath-mac.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'fspath-mac'
-  s.version     = '3.1.2'
+  s.version     = '3.2.0'
   s.summary     = %q{FSPath methods for mac (move_to_trash, color labeling, spotlight comments, …)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/fspath/mac.rb

@@ -25,24 +25,12 @@ class FSPath
 
     # Get spotlight comment
     def spotlight_comment
-      with_argv_tell_finder_to 'get comment of (POSIX file (item 1 of argv) as alias)'
+      # actual implementation in extension
     end
 
     # Set spotlight comment
     def spotlight_comment=(comment)
-      with_argv_tell_finder_to 'set comment of (POSIX file (item 1 of argv) as alias) to (item 2 of argv)', comment.to_s
-    end
-
-  private
-
-    def with_argv_tell_finder_to(command, *args)
-      applescript = <<-APPLESCRIPT
-        on run argv
-          tell application "Finder" to #{command}
-        end run
-      APPLESCRIPT
-      arguments = [%w[osascript], applescript.lines.map{ |line| ['-e', line.strip] }, expand_path.to_s, *args].flatten
-      `#{arguments.shelljoin}`.chomp("\n")
+      # actual implementation in extension
     end
   end
 

data/spec/fspath/mac_spec.rb

@@ -107,44 +107,22 @@ describe FSPath::Mac do
     end
 
     describe "spotlight comments" do
-      describe "getting" do
-        it "should call comment get using with_argv_tell_finder_to" do
-          @path = FSPath(__FILE__)
-
-          expect(@path).to receive(:with_argv_tell_finder_to).with('get comment of (POSIX file (item 1 of argv) as alias)')
-
-          expect(@path.spotlight_comment).to eq(@comment_text)
-        end
-      end
-
-      describe "setting" do
-        it "should call comment set using with_argv_tell_finder_to" do
-          @path = FSPath(__FILE__)
-
-          expect(@path).to receive(:with_argv_tell_finder_to).with('set comment of (POSIX file (item 1 of argv) as alias) to (item 2 of argv)', 'abc')
-
-          @path.spotlight_comment = 'abc'
-        end
-      end
-
-      describe "getting" do
-        it "should call comment get using with_argv_tell_finder_to" do
-          @path = FSPath.temp_file_path
+      it "sets and retrieves spotlight comment" do
+        @path = FSPath.temp_file_path
 
-          expect(@path.spotlight_comment).to eq('')
+        expect(@path.spotlight_comment).to eq('')
 
-          @path.spotlight_comment = 'abc'
-          expect(@path.spotlight_comment).to eq('abc')
+        @path.spotlight_comment = 'abc'
+        expect(@path.spotlight_comment).to eq('abc')
 
-          @path.spotlight_comment = 1
-          expect(@path.spotlight_comment).to eq('1')
+        @path.spotlight_comment = 1
+        expect(@path.spotlight_comment).to eq('1')
 
-          @path.spotlight_comment = "def\nghi"
-          expect(@path.spotlight_comment).to eq("def\nghi")
+        @path.spotlight_comment = "def\nghi"
+        expect(@path.spotlight_comment).to eq("def\nghi")
 
-          @path.spotlight_comment = nil
-          expect(@path.spotlight_comment).to eq('')
-        end
+        @path.spotlight_comment = nil
+        expect(@path.spotlight_comment).to eq('')
       end
     end
   end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: fspath-mac
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -51,8 +51,8 @@ extensions:
 - ext/fspath/mac/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -72,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fspath-mac
-rubygems_version: 2.6.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: FSPath methods for mac (move_to_trash, color labeling, spotlight comments,
@@ -90,4 +90,3 @@ summary: FSPath methods for mac (move_to_trash, color labeling, spotlight commen
 test_files:
 - spec/fspath/mac_spec.rb
 - spec/spec_helper.rb
-has_rdoc: