fspath-mac 3.0.2 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc3OTNmODI0YzZlMTJjOTVjZGI3MjExNjg3YzAxMGNhNzM1OTA4OA==
+    OGYwYzQwZjNkNTQ5MGRjZDNjZTE0OWUyNWVmOWRmZTNjYmRkYjAwNw==
   data.tar.gz: !binary |-
-    MjlkOTQ0Zjk5OWQ0ZDdhN2ZjMmUzN2U2NWY2MGU2YWEyN2IxOTU3NA==
-!binary "U0hBNTEy":
+    ODgyMWYwZDBkMDU2OWQ1ZDI0YjFlMTlkOGZjM2YxOGVjMWRmYTcwMA==
+SHA512:
   metadata.gz: !binary |-
-    Y2JmMjY1YzgyYTNhZTdjOGI4OTJmMDEzMmU0OTI0NjIxNWEyNTJlNTRiNzli
-    ODhjMzdlZmJjNDI2YmEwZmZmZDdiYzE5MjEwNjRkOTY0MmI5NjcxNTBiZmJi
-    MjJlZmRmMWYyNDAyNTVlZmJmY2NmMzUzZDhhNTQ3ZGQ3NTYyZTQ=
+    YTc2ZDQ5OTNjZjdiYThhZWU0OWVkM2ZjMGE5MGZkMzM1MTdkYzQ3MTVmZjdh
+    MDE2N2JhNWNkZGIzNjBkMjg4MGI3NmJhYWU2ODQ2MjdmMDU4N2Y1MGM4MGY3
+    MmU5MWI1N2YzOTQ5MTRlMmNkMWJkNWJiZDU1MDA3MjdmZGFiZTA=
   data.tar.gz: !binary |-
-    ZjQ2NWM1YmYzMDU2YjkzNjMyMGE0YjQ0Y2NmYzUxMTUwOGJjZDRlYTNkNTVl
-    Zjc0YzY1ZDU1ZGNkZTFlOTlhNGQwYWZlMDc4Y2MyY2U3ODhjY2FmZTJkODQ2
-    NjVhZTg5ZjFjYjliMWU0YjVmYTI2NThkZWVkOTdmZjU0ZDI0YzM=
+    MzIxYmM3ZmI1YjFkMjBkNjM3YjFkOTJhNmE4NzM4OWVmYzMyNzE2YWVlZjU1
+    OTNhNjE4ZjY3MWJhZTk4YjE0MzIzZTcwYTlhYjA4MTVkNjA3OTRmYjdiNmU3
+    ZjcwNjE4ODIyMTg5NzEzOTFkYTkxNjgzMTEwYmIxYmI1ZjQ0ZWU=

data/.travis.yml

@@ -2,6 +2,6 @@ language:
   - objective-c
   - ruby
 rvm:
-  - system
-  - default
+  - 1.9.3
+  - 2.0.0
 script: "bundle exec rspec"

data/ext/fspath/mac/{finder_label_number.c → ext.m}

@@ -1,17 +1,24 @@
 #include "ruby.h"
+#include <AppKit/AppKit.h>
 #include <CoreServices/CoreServices.h>
 
-CFURLRef url_for_path(VALUE fsPath){
-	VALUE path = rb_iv_get(fsPath, "@path");
+CFStringRef get_path(VALUE self){
+	VALUE path = rb_iv_get(self, "@path");
 	char *pathStr = StringValueCStr(path);
-
 	CFStringRef pathRef = CFStringCreateWithCString(NULL, pathStr, kCFStringEncodingUTF8);
+
 	if (!pathRef) {
 		rb_raise(rb_eRuntimeError, "Can't convert path");
 	}
 
+	return pathRef;
+}
+
+CFURLRef get_url(VALUE self){
+	CFStringRef pathRef = get_path(self);
 	CFURLRef urlRef = CFURLCreateWithFileSystemPath(NULL, pathRef, kCFURLPOSIXPathStyle, false);
 	CFRelease(pathRef);
+
 	if (!urlRef) {
 		rb_raise(rb_eRuntimeError, "Can't initialize url for path");
 	}
@@ -35,7 +42,7 @@ void raise_cf_error(CFErrorRef errorRef){
 }
 
 static VALUE finder_label_number_get(VALUE self){
-	CFURLRef urlRef = url_for_path(self);
+	CFURLRef urlRef = get_url(self);
 
 	CFErrorRef errorRef;
 	CFNumberRef labelNumberRef;
@@ -63,7 +70,7 @@ static VALUE finder_label_number_set(VALUE self, VALUE labelNumber){
 		rb_raise(rb_eArgError, "label number can be in range 0..7");
 	}
 
-	CFURLRef urlRef = url_for_path(self);
+	CFURLRef urlRef = get_url(self);
 
 	CFNumberRef labelNumberRef = CFNumberCreate(NULL, kCFNumberSInt32Type, &labelNumberValue);
 
@@ -79,9 +86,32 @@ static VALUE finder_label_number_set(VALUE self, VALUE labelNumber){
 	return Qnil;
 }
 
-void Init_finder_label_number() {
+static VALUE move_to_trash(VALUE self){
+	CFStringRef pathRef = get_path(self);
+	NSString *path = (NSString *)pathRef;
+
+	NSString *dir = [path stringByDeletingLastPathComponent];
+	NSString *name = [path lastPathComponent];
+	NSArray *names = [NSArray arrayWithObject:name];
+	BOOL success = [[NSWorkspace sharedWorkspace]
+		performFileOperation:NSWorkspaceRecycleOperation
+		source:dir
+		destination:@""
+		files:names
+		tag:nil];
+	[names release];
+	[name release];
+	[dir release];
+
+	CFRelease(pathRef);
+
+	return success ? Qtrue : Qfalse;
+}
+
+void Init_ext() {
 	VALUE cFSPath = rb_const_get(rb_cObject, rb_intern("FSPath"));
 	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, "move_to_trash", move_to_trash, 0);
 }

data/ext/fspath/mac/extconf.rb

@@ -1,5 +1,5 @@
 require 'mkmf'
 
-with_ldflags($LDFLAGS + ' -framework Foundation'){ true }
+with_ldflags($LDFLAGS + ' -framework AppKit'){ true }
 
-create_makefile('fspath/mac/finder_label_number')
+create_makefile('fspath/mac/ext')

data/fspath-mac.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'fspath-mac'
-  s.version     = '3.0.2'
+  s.version     = '3.1.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']
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_dependency 'fspath', '~> 2.0'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/fspath/mac.rb

@@ -3,9 +3,9 @@ require 'shellwords'
 
 class FSPath
   module Mac
-    # Move to trash using finder
+    # Move to trash
     def move_to_trash
-      with_argv_tell_finder_to 'move (POSIX file (item 1 of argv) as alias) to trash'
+      # actual implementation in extension
     end
 
     FINDER_LABEL_COLORS = [nil, :grey, :green, :purple, :blue, :yellow, :red, :orange].freeze
@@ -49,4 +49,4 @@ class FSPath
   include Mac
 end
 
-require 'fspath/mac/finder_label_number'
+require 'fspath/mac/ext'

data/spec/fspath/mac_spec.rb

@@ -4,12 +4,16 @@ require 'fspath/mac'
 describe FSPath::Mac do
   describe "mac related" do
     describe "move_to_trash" do
-      it "should call delete command using with_argv_tell_finder_to" do
-        @path = FSPath('to_delete')
+      it "should remove file but not unlink it" do
+        @path = FSPath.temp_file_path
+        @link = FSPath.temp_file_path
+        @link.unlink
+        @link.make_link(@path)
 
-        @path.should_receive(:with_argv_tell_finder_to).with('move (POSIX file (item 1 of argv) as alias) to trash')
+        expect(@path.move_to_trash).to be true
 
-        @path.move_to_trash
+        expect(@path).not_to exist
+        expect(@link.stat.nlink).to eq(2)
       end
     end
 
@@ -18,7 +22,7 @@ describe FSPath::Mac do
         it "should call finder_label_number" do
           @path = FSPath('to_label')
 
-          @path.should_receive(:finder_label_number).and_return(0)
+          expect(@path).to receive(:finder_label_number).and_return(0)
 
           @path.finder_label
         end
@@ -27,8 +31,8 @@ describe FSPath::Mac do
           @path = FSPath('to_label')
 
           FSPath::FINDER_LABEL_COLORS.each_with_index do |label, index|
-            @path.stub(:finder_label_number).and_return(index)
-            @path.finder_label.should == label
+            allow(@path).to receive(:finder_label_number).and_return(index)
+            expect(@path.finder_label).to eq(label)
           end
         end
       end
@@ -37,7 +41,7 @@ describe FSPath::Mac do
         it "should call finder_label_number=" do
           @path = FSPath('to_label')
 
-          @path.should_receive(:finder_label_number=)
+          expect(@path).to receive(:finder_label_number=)
 
           @path.finder_label = nil
         end
@@ -49,7 +53,7 @@ describe FSPath::Mac do
 
           it "should call label_index.set with apporitate index" do
             FSPath::FINDER_LABEL_COLORS.each_with_index do |label, index|
-              @path.should_receive(:finder_label_number=).with(index).ordered
+              expect(@path).to receive(:finder_label_number=).with(index).ordered
               @path.finder_label = label
             end
           end
@@ -57,21 +61,21 @@ describe FSPath::Mac do
           it "should accept aliases" do
             FSPath::FINDER_LABEL_COLOR_ALIASES.each do |label_alias, label|
               index = FSPath::FINDER_LABEL_COLORS.index(label)
-              @path.should_receive(:finder_label_number=).with(index).ordered
+              expect(@path).to receive(:finder_label_number=).with(index).ordered
               @path.finder_label = label_alias
             end
           end
 
           it "should set to none when called with nil or false" do
-            @path.should_receive(:finder_label_number=).with(0).ordered
+            expect(@path).to receive(:finder_label_number=).with(0).ordered
             @path.finder_label = nil
           end
 
           it "should raise when called with something else" do
             [true, :shitty, 'hello'].each do |label|
-              proc do
+              expect do
                 @path.finder_label = label
-              end.should raise_error("Unknown label #{label.inspect}")
+              end.to raise_error("Unknown label #{label.inspect}")
             end
           end
         end
@@ -94,9 +98,9 @@ describe FSPath::Mac do
           mac_finder_alias_colors = [nil, :orange, :red, :yellow, :blue, :purple, :green, :grey]
           8.times do |label_number|
             @path.send(:finder_label_number=, label_number)
-            @path.send(:finder_label_number).should == label_number
+            expect(@path.send(:finder_label_number)).to eq(label_number)
             color = mac_finder_alias_colors[label_index_through_osascript(@path)]
-            FSPath::Mac::FINDER_LABEL_COLORS.index(color).should == label_number
+            expect(FSPath::Mac::FINDER_LABEL_COLORS.index(color)).to eq(label_number)
           end
         end
       end
@@ -107,9 +111,9 @@ describe FSPath::Mac do
         it "should call comment get using with_argv_tell_finder_to" do
           @path = FSPath(__FILE__)
 
-          @path.should_receive(:with_argv_tell_finder_to).with('get comment of (POSIX file (item 1 of argv) as alias)')
+          expect(@path).to receive(:with_argv_tell_finder_to).with('get comment of (POSIX file (item 1 of argv) as alias)')
 
-          @path.spotlight_comment.should == @comment_text
+          expect(@path.spotlight_comment).to eq(@comment_text)
         end
       end
 
@@ -117,7 +121,7 @@ describe FSPath::Mac do
         it "should call comment set using with_argv_tell_finder_to" do
           @path = FSPath(__FILE__)
 
-          @path.should_receive(:with_argv_tell_finder_to).with('set comment of (POSIX file (item 1 of argv) as alias) to (item 2 of argv)', 'abc')
+          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
@@ -127,19 +131,19 @@ describe FSPath::Mac do
         it "should call comment get using with_argv_tell_finder_to" do
           @path = FSPath.temp_file_path
 
-          @path.spotlight_comment.should == ''
+          expect(@path.spotlight_comment).to eq('')
 
           @path.spotlight_comment = 'abc'
-          @path.spotlight_comment.should == 'abc'
+          expect(@path.spotlight_comment).to eq('abc')
 
           @path.spotlight_comment = 1
-          @path.spotlight_comment.should == '1'
+          expect(@path.spotlight_comment).to eq('1')
 
           @path.spotlight_comment = "def\nghi"
-          @path.spotlight_comment.should == "def\nghi"
+          expect(@path.spotlight_comment).to eq("def\nghi")
 
           @path.spotlight_comment = nil
-          @path.spotlight_comment.should == ''
+          expect(@path.spotlight_comment).to eq('')
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-Dir.chdir File.join(File.dirname(__FILE__), '..') do
+Dir.chdir File.expand_path('../..', __FILE__) do # chdir to project root
   Dir['ext/**/extconf.rb'].each do |extconf|
     Dir.chdir(File.dirname(extconf)) do
       system('ruby extconf.rb') && system('make') or abort "failed compiling #{extconf}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fspath-mac
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -28,16 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: 
 email: 
 executables: []
@@ -50,9 +50,8 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.markdown
-- TODO
+- ext/fspath/mac/ext.m
 - ext/fspath/mac/extconf.rb
-- ext/fspath/mac/finder_label_number.c
 - fspath-mac.gemspec
 - lib/fspath/mac.rb
 - spec/fspath/mac_spec.rb
@@ -77,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fspath-mac
-rubygems_version: 2.0.3
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: FSPath methods for mac (move_to_trash, color labeling, spotlight comments,

data/TODO

@@ -1 +0,0 @@
-use NSFileManager#trashItemAtURL:resultingItemURL:error: for moving to trash