openmeta.rb 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA512: 
-  metadata.gz: ce1f732416e536da204d4f3ad1900c101e0413abc2c236919ef69035a894ef3ee7d3bccb228fb1a7220cf21307ae3a1f34d2e55c0facd4d94c48fddcfe887d8d
-  data.tar.gz: bdc9d8a8cc54c29c0829f15215767a410540460e1da5b56e09391aa7b2ea9f6783d5f45e9d79993cc898250d9a83c499a1a87ee110e7b61a8e30cc7e256e844f
-SHA1: 
-  metadata.gz: 4384cc488a0106eef40bf46391de0dace21dd1c1
-  data.tar.gz: 5d3fedc88d8e62b971a34580bfd7a12ce370f7e3
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTUyMzM1NGJjM2Q5YjgzNWY4OTE0YWEyYjc0YmExMDc4NDM4YWU5ZA==
+  data.tar.gz: !binary |-
+    YTRjOWE0OWYyNWQ4ZGZkNzE2NTYxMDVhOTViZTJiNTZmZmE2OWMxMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTk5YWFmMzdhYTBkNjcwNzE5MTY4NzY1OGJjZDE2M2IzNDBmNzk2NzZlMTk0
+    MTg5ODVhOGMwZWJhODcwNGFiMGZkZmUzMTAzNDYzZGJjMWJkYjA4ZTQxNjE0
+    ZTkyNzRkNjIzOTY5NDMzNThkZWRmZDdlNGFiYzllNDgwMTVkZmQ=
+  data.tar.gz: !binary |-
+    ZDY3MDEyNWFhMTE4ODY5ZTRkY2M5Nzc1MDE1ZmY2MGQ5MDlhNWVhZDZkMzE1
+    NzQzYjE2MzcxNzdiNzY4YzMwOWY5NWJkMTZiMDA0YzdjYTQ0NDRhYzUyZjc0
+    ZjQxOWQxYmE2ZTY0ZDVlODYxODA1ZDczMmMzYjc5MTA4NTkwNmE=

data/Guardfile

@@ -0,0 +1,18 @@
+require 'guard/rspec'
+
+notification :growl
+# notification :terminal_notifier
+
+group :backend do
+
+  guard 'rspec', :rvm  => ["macruby"], :notification  => true  do
+
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')  { "spec" }
+  end
+
+end
+
+
+

data/History.txt

@@ -1,5 +1,14 @@
+1.3.0 / 2013-03-30
+==================
+  * [Fix]( recent tags update )
+  * [Improve]( spec test )
+  * [Remove]( Gemfile, bundler exec is not working with macruby. )
+
+1.2.0 / 2013-03-30
+==================
+  * [Improve]( polish openmeta api )
 
-1.1.0 / 2013-03-27 
+1.1.0 / 2013-03-27
 ==================
 
   * ! cli: support multiple files input

data/Manifest.txt

@@ -1,6 +1,5 @@
 .ruby-version
-Gemfile
-Gemfile.lock
+Guardfile
 History.txt
 Manifest.txt
 README.md
@@ -21,3 +20,5 @@ lib/openmeta/framework/OpenMeta.framework/Versions/Current
 lib/openmeta/friendly_errors.rb
 lib/openmeta/ui.rb
 lib/openmeta/version.rb
+spec/openmeta_spec.rb
+spec/spec_helper.rb

data/Rakefile

@@ -12,16 +12,30 @@ Hoe.plugin :version
 Hoe.spec 'openmeta.rb' do
 
   developer('Zhao Cai', 'caizhaoff@gmail.com')
+  license 'GPL-3'
 
   extra_deps << ['thor', '~> 0.17.0']
+
+
+
+
+
+  extra_dev_deps << ['rspec', '>= 2.13']
+  extra_dev_deps << ['rake', '>= 10.0.0']
+  extra_dev_deps << ['hoe'] << ['hoe-gemspec'] << ['hoe-git'] << ['hoe-version'] << ['hoe-bundler']
+  extra_dev_deps << ['guard'] << ['guard-rspec'] << ['terminal-notifier-guard'] << ['growl']
 end
 
 %w{major minor patch}.each { |v| 
-  desc "Bump #{v.capitalize} Version and Commit"
+  desc "Bump #{v.capitalize} Version"
   task "bump:#{v}", [:message] => ["version:bump:#{v}"] do |t, args|
     m = args[:message] ? args[:message] : "Bump version to #{ENV["VERSION"]}"
     sh "git commit -am '#{m}'"
   end
 }
 
+desc "Default Test"
+task :default => [:spec] do
+end
+
 # vim: syntax=ruby

data/lib/openmeta/cli.rb

@@ -19,9 +19,7 @@ module Openmeta
       :type         => :string               ,
       :desc         => "print as yaml/plist"
     def recent
-      tags = OpenMetaPrefs.recentTags
-
-      puts_to(options[:format], tags)
+      puts_to(options[:format], Openmeta.recent_tags)
     end
 
     desc "clone", "clone openmeta tags and rating"

data/lib/openmeta/version.rb

@@ -1,4 +1,4 @@
 module Openmeta
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end
 

data/lib/openmeta.rb

@@ -53,11 +53,46 @@ module Openmeta
       tags
     end
 
-    def set_tags(tags, path)
-      e = OpenMeta.setUserTags(tags, path:File.expand_path(path))
-      if e
+    def set_tags(new_tags, path)
+      path = File.expand_path(path)
+
+      existing_tags = OpenMeta.getUserTags(path, error:error)
+      if error.value
+        raise Openmeta::ObjCError, error.value.inspect
+      end
+
+      if e = OpenMeta.setUserTags(new_tags, path:path)
         raise Openmeta::ObjCError, e.inspect
       end
+
+      OpenMetaPrefs.updatePrefsRecentTags(existing_tags, newTags:new_tags)
+    end
+
+    def add_tags(new_tags, to_files)
+      to_files = fu_list(to_files)
+
+      to_files.each { |file|
+        existing_tags = get_tags(file)
+
+        if e = OpenMeta.addUserTags(new_tags, path:file)
+          raise Openmeta::ObjCError, e.inspect
+        end
+
+        OpenMetaPrefs.updatePrefsRecentTags(existing_tags, newTags:new_tags)
+      }
+    end
+
+    def remove_tags(tags, from_files)
+      from_files = fu_list(from_files)
+
+      from_files.each { |file|
+        # duplicate a frozen array
+        existing_tags = get_tags(file).dup
+        unless existing_tags.empty?
+          existing_tags.delete_if { |t| tags.include?(t) }
+          set_tags(existing_tags, file)
+        end
+      }
     end
 
     def get_rating(path)
@@ -76,6 +111,7 @@ module Openmeta
     end
 
     def clone(from_file, to_files)
+
       unless File.exist?(from_file)
         raise Openmeta::PathError, "#{from_file} does not exist!"
       end
@@ -83,41 +119,30 @@ module Openmeta
       tags = get_tags(from_file)
       rating = get_rating(from_file)
 
-      files.each { |file|
+      to_files = fu_list(to_files)
+      to_files.each { |file|
         set_tags(tags, file) unless tags.empty?
         set_rating(rating, file) unless rating == 0.0
       }
     end
 
     def clear(files)
+      files = fu_list(files)
       files.each { |file|
         set_tags([], file)
         set_rating(0.0, file)
       }
     end
 
-    def add_tags(tags, to_files)
-      to_files.each { |file|
-        t = tags
-        existing_tags = get_tags(file)
-        # union
-        t |= existing_tags if existing_tags
 
-        unless t.eql? existing_tags
-          set_tags(t, file)
-        end
-      }
+    def recent_tags
+      OpenMetaPrefs.recentTags
     end
 
-    def remove_tags(tags, to_files)
-      to_files.each { |file|
-        # duplicate a frozen array
-        existing_tags = get_tags(file).dup
-        unless existing_tags.empty?
-          existing_tags.delete_if { |t| tags.include?(t) }
-          set_tags(existing_tags, file)
-        end
-      }
+    private
+
+    def fu_list(arg)   #:nodoc:
+      [arg].flatten.map {|path| File.path(path) }
     end
 
   end

data/spec/openmeta_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+
+describe "Openmeta" do
+  before :all do
+    Dir.chdir("test/")
+  end
+
+  context "with new files" do
+    before :all do
+      @testfiles = ['testfile1.openmeta', 'testfile2.openmeta']
+      FileUtils .touch @testfiles
+    end
+
+    it "should return raise ArgumentError if file does not exist" do
+      expect { Openmeta.get_tags("/path/to/nowhere") }.to raise_error(Openmeta::ObjCError)
+    end
+
+    it "should set tags and rating correctly" do
+      tags = ["Test","Tag"]
+      rating = 4
+      Openmeta.set_tags(tags, @testfiles[0])
+      Openmeta.set_rating(rating, @testfiles[0])
+
+      rtags = Openmeta.get_tags(@testfiles[0])
+      rrating = Openmeta.get_rating(@testfiles[0])
+      rtags.should == tags
+      rrating.should == rating
+    end
+
+    it "should clone tags and ratings correctly" do
+      tags = ["Test","Tag"]
+      rating = 4
+      Openmeta.clone(@testfiles[0], @testfiles[1])
+
+      rtags = Openmeta.get_tags(@testfiles[1])
+      rrating = Openmeta.get_rating(@testfiles[1])
+      rtags.should == tags
+      rrating.should == rating
+    end
+
+    it "should add tags correctly" do
+      tags = ["Test","Tag"] << 'Favorite'
+      Openmeta.add_tags(['Favorite'], @testfiles[1])
+
+      rtags = Openmeta.get_tags(@testfiles[1])
+      rtags.should match_array(tags)
+    end
+
+    it "should remove tags correctly" do
+      tags = ["Test", "Favorite"]
+      Openmeta.remove_tags(['Tag'], @testfiles[1])
+
+      rtags = Openmeta.get_tags(@testfiles[1])
+      rtags.should match_array(tags)
+    end
+
+    after :all do
+      FileUtils.safe_unlink(@testfiles)
+    end
+
+    context "recent tags" do
+      it "should contains recently used tags" do
+        Openmeta.recent_tags.should include("Test", "Tag", "Favorite")
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require "rspec"
+
+require "openmeta"
+require 'fileutils'
+
+RSpec.configure do |c|
+  c.color_enabled = true
+
+  # Use color not only in STDOUT but also in pagers and files
+  c.tty = true
+
+  c.formatter = :documentation # :progress, :html, :textmate
+
+  c.mock_with :rspec
+end
+
+class String
+  def strip_heredoc
+    indent = scan(/^[ \t]*(?=\S)/).min.size || 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
+end
+
+

metadata

@@ -1,60 +1,210 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: openmeta.rb
-version: !ruby/object:Gem::Version 
-  version: 1.2.0
+version: !ruby/object:Gem::Version
+  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Zhao Cai
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.17.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
   name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.5"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe-gemspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe-git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: openMeta in Ruby (MacRuby, more exactly!). This gem ports [openmeta]( http://code.google.com/p/openmeta/ ) api to macruby using framework.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe-version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: openMeta in Ruby (MacRuby, more exactly!). This gem ports [openmeta](
+  http://code.google.com/p/openmeta/ ) api to macruby using framework.
+email:
 - caizhaoff@gmail.com
-executables: 
+executables:
 - tag
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+files:
 - .ruby-version
-- Gemfile
-- Gemfile.lock
+- Guardfile
 - History.txt
 - Manifest.txt
 - README.md
@@ -72,32 +222,33 @@ files:
 - lib/openmeta/friendly_errors.rb
 - lib/openmeta/ui.rb
 - lib/openmeta/version.rb
+- spec/openmeta_spec.rb
+- spec/spec_helper.rb
+- .gemtest
 homepage: http://zhaocai.github.com/openmeta.rb
-licenses: []
-
+licenses:
+- GPL-3
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id004 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+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: openmeta.rb
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: openMeta in Ruby (MacRuby, more exactly!)
 test_files: []
-

data/Gemfile

@@ -1,12 +0,0 @@
-# -*- ruby -*-
-
-# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
-
-source "https://rubygems.org/"
-
-gem "thor", "~>0.17.0"
-
-gem "rdoc", "~>3.10", :group => [:development, :test]
-gem "hoe", "~>3.5", :group => [:development, :test]
-
-# vim: syntax=ruby

data/Gemfile.lock

@@ -1,13 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    hoe (3.5.2)
-      rake (>= 0.8, < 11.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hoe (~> 3.5)
-  rdoc (~> 3.10)
-  thor (~> 0.17.0)