fspath-mac 2.0.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTQ0YjllNjljZjdmNDFkODY5ZDdlODU2OTAzY2FiYzMwZTA5MDBkZQ==
+  data.tar.gz: !binary |-
+    NGEwYWQ2NzIyYzIxYTA0OWVhYTVmNjExMGI0YjM0NzI3ZjM5N2FlYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTE5NTZhODUxNWY2MGY5MThhZmIwMzU2ODk3ZjQ1NDNiMzVkODEyMTI2NDU2
+    MjhhMmY3OWI0NDdhYWNiYmI2MzQyMDdjZjU5ZThiYTI3ZDI2ZmI4OTRlNWNj
+    YzVmZGJiZmZkMzcxMzNiNDlhZjVkNWQwM2EzNDc5ZWI2MmQwOTE=
+  data.tar.gz: !binary |-
+    MTUzNWQyOTliMzY2YjI0Y2VlMjNlMDYyZjgyNGQ1NWFlNjE3MzQwODIwMGY3
+    YzRkYmE1ZTMwYTY4MWE4OWFhMzg4YWU3YjlhYmZlMmQyMmViMTY0M2Y5Yzcw
+    ZjNlYzViMmE0OTE4NzYwNzc4ZmM5NTNiMDg4YWYzMjExMDE2ZjE=

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Ivan Kuchin
+Copyright (c) 2010-2013 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

@@ -26,4 +26,4 @@ Set spotlight comment:
 
 ## Copyright
 
-Copyright (c) 2010-2011 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2013 Ivan Kuchin. See LICENSE.txt for details.

data/fspath-mac.gemspec

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

data/lib/fspath/mac.rb

@@ -1,19 +1,20 @@
 require 'fspath'
-require 'appscript'
 
 class FSPath
   module Mac
     # Move to trash using finder
     def move_to_trash
-      mac_finder_alias.delete
+      with_argv_tell_finder_to 'move (POSIX file (item 1 of argv) as alias) to trash'
     end
 
     FINDER_LABEL_COLORS = [nil, :grey, :green, :purple, :blue, :yellow, :red, :orange].freeze
     FINDER_LABEL_COLOR_ALIASES = {:gray => :grey}.freeze
+
     # Get finder label (one of nil, :orange, :red, :yellow, :blue, :purple, :green and :grey)
     def finder_label
       FINDER_LABEL_COLORS[finder_label_number]
     end
+
     # Set finder label (:grey is same as :gray, nil or false as :none)
     def finder_label=(color)
       color = FINDER_LABEL_COLOR_ALIASES[color] || color
@@ -24,32 +25,24 @@ class FSPath
 
     # Get spotlight comment
     def spotlight_comment
-      mac_finder_alias.comment.get
+      with_argv_tell_finder_to 'get comment of (POSIX file (item 1 of argv) as alias)'
     end
 
     # Set spotlight comment
     def spotlight_comment=(comment)
-      mac_finder_alias.comment.set(comment.to_s)
-    end
-
-    # MacTypes::Alias for path
-    def mac_alias
-      MacTypes::Alias.path(@path)
+      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
 
-    # MacTypes::FileURL for path
-    def mac_file_url
-      MacTypes::FileURL.path(@path)
-    end
-
-    # Finder item for path through mac_alias
-    def mac_finder_alias
-      Appscript.app('Finder').items[mac_alias]
-    end
+  private
 
-    # Finder item for path through mac_alias
-    def mac_finder_file_url
-      Appscript.app('Finder').items[mac_file_url]
+    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")
     end
   end
 

data/spec/fspath/mac_spec.rb

@@ -4,12 +4,10 @@ require 'fspath/mac'
 describe FSPath::Mac do
   describe "mac related" do
     describe "move_to_trash" do
-      it "should call delete on mac_finder_alias" do
+      it "should call delete command using with_argv_tell_finder_to" do
         @path = FSPath('to_delete')
-        @finder_alias = mock(:finder_alias)
 
-        @path.should_receive(:mac_finder_alias).and_return(@finder_alias)
-        @finder_alias.should_receive(:delete)
+        @path.should_receive(:with_argv_tell_finder_to).with('move (POSIX file (item 1 of argv) as alias) to trash')
 
         @path.move_to_trash
       end
@@ -80,6 +78,16 @@ describe FSPath::Mac do
       end
 
       describe "number" do
+        def label_index_through_osascript(path)
+          applescript = <<-APPLESCRIPT
+            on run argv
+              tell application "Finder" to get label index of (POSIX file (item 1 of argv) as alias)
+            end run
+          APPLESCRIPT
+          arguments = [%w[osascript], applescript.lines.map{ |line| ['-e', line.strip] }, path.to_s].flatten
+          `#{arguments.shelljoin}`.to_i
+        end
+
         it "should set label" do
           @path = FSPath.temp_file_path
 
@@ -87,7 +95,7 @@ describe FSPath::Mac do
           8.times do |label_number|
             @path.send(:finder_label_number=, label_number)
             @path.send(:finder_label_number).should == label_number
-            color = mac_finder_alias_colors[@path.mac_finder_alias.label_index.get]
+            color = mac_finder_alias_colors[label_index_through_osascript(@path)]
             FSPath::Mac::FINDER_LABEL_COLORS.index(color).should == label_number
           end
         end
@@ -96,70 +104,42 @@ describe FSPath::Mac do
 
     describe "spotlight comments" do
       describe "getting" do
-        it "should call comment.get on mac_finder_alias" do
+        it "should call comment get using with_argv_tell_finder_to" do
           @path = FSPath(__FILE__)
-          @finder_alias = mock(:finder_alias)
-          @comment = mock(:comment)
-          @comment_text = mock(:comment_text)
 
-          @path.should_receive(:mac_finder_alias).and_return(@finder_alias)
-          @finder_alias.should_receive(:comment).and_return(@comment)
-          @comment.should_receive(:get).and_return(@comment_text)
+          @path.should_receive(:with_argv_tell_finder_to).with('get comment of (POSIX file (item 1 of argv) as alias)')
 
           @path.spotlight_comment.should == @comment_text
         end
       end
 
       describe "setting" do
-        it "should call comment.set on mac_finder_alias" do
+        it "should call comment set using with_argv_tell_finder_to" do
           @path = FSPath(__FILE__)
-          @finder_alias = mock(:finder_alias)
-          @comment = mock(:comment)
-          @comment_text = mock(:comment_text)
 
-          @path.should_receive(:mac_finder_alias).and_return(@finder_alias)
-          @finder_alias.should_receive(:comment).and_return(@comment)
-          @comment.should_receive(:set).with(@comment_text.to_s)
+          @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')
 
-          @path.spotlight_comment = @comment_text
+          @path.spotlight_comment = 'abc'
         end
       end
-    end
 
-    describe "appscript objects" do
-      before do
-        @file_path = File.expand_path(__FILE__)
-      end
+      describe "getting" do
+        it "should call comment get using with_argv_tell_finder_to" do
+          @path = FSPath.temp_file_path
 
-      describe "mac_alias" do
-        it "should return instance of MacTypes::Alias" do
-          FSPath(@file_path).mac_alias.should be_kind_of(MacTypes::Alias)
-        end
+          @path.spotlight_comment.should == ''
 
-        it "should point to same path" do
-          FSPath(@file_path).mac_alias.path.should == @file_path
-        end
-      end
+          @path.spotlight_comment = 'abc'
+          @path.spotlight_comment.should == 'abc'
 
-      describe "mac_file_url" do
-        it "should return instance of MacTypes::FileURL" do
-          FSPath(@file_path).mac_file_url.should be_kind_of(MacTypes::FileURL)
-        end
+          @path.spotlight_comment = 1
+          @path.spotlight_comment.should == '1'
 
-        it "should point to same path" do
-          FSPath(@file_path).mac_file_url.path.should == @file_path
-        end
-      end
-
-      describe "mac_finder_alias" do
-        it "should return same ref" do
-          FSPath(@file_path).mac_finder_alias.should == Appscript.app('Finder').items[FSPath(@file_path).mac_alias]
-        end
-      end
+          @path.spotlight_comment = "def\nghi"
+          @path.spotlight_comment.should == "def\nghi"
 
-      describe "mac_finder_file_url" do
-        it "should return same ref" do
-          FSPath(@file_path).mac_finder_file_url.should == Appscript.app('Finder').items[FSPath(@file_path).mac_file_url]
+          @path.spotlight_comment = nil
+          @path.spotlight_comment.should == ''
         end
       end
     end

metadata

@@ -1,75 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fspath-mac
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+version: !ruby/object:Gem::Version
+  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fspath
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rb-appscript
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
-
-extensions: 
+extensions:
 - ext/fspath/mac/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - LICENSE.txt
 - README.markdown
@@ -80,39 +55,30 @@ files:
 - spec/fspath/mac_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/toy/fspath-mac
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: "FSPath methods for mac (move_to_trash, color labeling, spotlight comments, \xE2\x80\xA6)"
-test_files: 
+specification_version: 4
+summary: FSPath methods for mac (move_to_trash, color labeling, spotlight comments,
+  …)
+test_files:
 - spec/fspath/mac_spec.rb
 - spec/spec_helper.rb
-has_rdoc: