alfred-workflow 1.1.5 → 1.2.0

data/.autotest

@@ -2,22 +2,13 @@
 
 require 'autotest/restart'
 
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
+# Include plugins
+require 'autotest/fsevent'
+require 'autotest/growl'
 
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end
+Autotest.add_hook :initialize do |at|
+  %w{.git .DS_Store ._* vendor}.each { |exception| at.add_exception(exception) }
+
+  at.add_exception %r{^./tmp}  # ignore temp files, lest autotest will run again, and again...
+  false
+end

data/.rspec

@@ -0,0 +1 @@
+--colour

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    hoe (3.5.2)
+      rake (>= 0.8, < 11.0)
+    json (1.7.7)
+    little-plugger (1.1.3)
+    logging (1.8.0)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.3.6)
+    multi_json (1.3.7)
+    plist (3.1.0)
+    rake (10.0.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hoe (~> 3.5)
+  logging (~> 1.8.0)
+  plist (~> 3.1.0)
+  rdoc (~> 3.10)

data/Manifest.txt

@@ -1,10 +1,18 @@
 .autotest
 .gemtest
+.rspec
+Gemfile
+Gemfile.lock
 History.txt
 Manifest.txt
 README.md
 Rakefile
+autotest/discover.rb
 lib/alfred.rb
 lib/alfred/feedback.rb
+lib/alfred/feedback/file_item.rb
+lib/alfred/feedback/item.rb
 lib/alfred/ui.rb
 lib/alfred/version.rb
+spec/item_spec.rb
+spec/spec_helper.rb

data/README.md

@@ -1,9 +1,9 @@
 # alfred-workflow
 
 * home  :: https://github.com/zhaocai/alfred-workflow
+* rdoc  :: http://rubydoc.info/gems/alfred-workflow/
 * code  :: https://github.com/zhaocai/alfred-workflow
 * bugs  :: https://github.com/zhaocai/alfred-workflow/issues
-* rdoc  :: http://rubydoc.info/gems/alfred-workflow/
 
 
 ## DESCRIPTION:
@@ -33,7 +33,7 @@ Alfred.with_friendly_error do |alfred|
 
   fb.add_file_item(File.expand_path "~/Applications/")
 
-  puts fb.to_xml
+  puts fb.to_alfred(ARGV)
 end
 ```
 

data/Rakefile

@@ -4,7 +4,8 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :bundler
-Hoe.plugin :gemspec
+Hoe.plugin :test
+
 Hoe.plugin :git
 Hoe.plugin :rubygems
 Hoe.plugin :version
@@ -13,8 +14,23 @@ Hoe.spec 'alfred-workflow' do
 
   developer('Zhao Cai', 'caizhaoff@gmail.com')
 
+  testlib = :minitest
   extra_deps << ['plist', '~> 3.1.0']
   extra_deps << ['logging', '~> 1.8.0']
 end
 
+desc "Bump Major Version and Commit"
+task "bump:major" => ["version:bump:major"] do
+  sh "git commit -am '! Bump version to #{ENV["VERSION"]}'"
+end
+
+desc "Bump Minor Version and Commit"
+task "bump:minor" => ["version:bump:minor"] do
+  sh "git commit -am '* Bump version to #{ENV["VERSION"]}'"
+end
+desc "Bump Patch Version and Commit"
+task "bump:patch" => ["version:bump:patch"] do
+  sh "git commit -am 'Bump version to #{ENV["VERSION"]}'"
+end
+
 # vim: syntax=ruby

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/lib/alfred/feedback.rb

@@ -1,148 +1,12 @@
 require "rexml/document"
+require 'alfred/feedback/item'
+require 'alfred/feedback/file_item'
 
 module Alfred
 
   class Feedback
     attr_accessor :items
 
-    class Item
-      attr_accessor :uid, :arg, :valid, :autocomplete, :title, :subtitle, :icon
-
-      def initialize(title, opts = {})
-        @title    = title
-        @subtitle = opts[:subtitle] if opts[:subtitle]
-
-        if opts[:icon]
-          @icon    = opts[:icon]
-        else
-          @icon    = {:type => "default", :name => "icon.png"}
-        end
-
-        @uid      = opts[:uid] if opts[:uid]
-
-        if opts[:arg]
-          @arg    = opts[:arg]
-        else
-          @arg    = @title
-        end
-
-        if opts[:type]
-          @type    = opts[:type]
-        else
-          @type    = 'default'
-        end
-
-        if opts[:valid]
-          @valid    = opts[:valid]
-        else
-          @valid    = 'yes'
-        end
-
-        if opts[:autocomplete]
-          @autocomplete    = opts[:autocomplete]
-        else
-          @autocomplete    = @title
-        end
-      end
-
-      ## To customize a new match? function, overwrite it.
-      #
-      # Module Alfred
-      #   class Feedback
-      #     class Item
-      #       alias_method :default_match?, :match?
-      #       def match?(query)
-      #         # define new match? function here
-      #       end
-      #     end
-      #   end
-      # end
-      def match?(query)
-        return true if query.empty?
-        if smart_query(query).match(@title)
-          return true
-        else
-          return false
-        end
-      end
-
-      def to_xml
-        xml_element = REXML::Element.new('item')
-        xml_element.add_attributes({
-          'uid'          => @uid,
-          'arg'          => @arg,
-          'valid'        => @valid,
-          'autocomplete' => @autocomplete
-        })
-        xml_element.add_attributes('type' => 'file') if @type == "file"
-
-        REXML::Element.new("title", xml_element).text    = @title
-        REXML::Element.new("subtitle", xml_element).text = @subtitle
-
-        icon = REXML::Element.new("icon", xml_element)
-        icon.text = @icon[:name]
-        icon.add_attributes('type' => 'fileicon') if @icon[:type] == "fileicon"
-
-        xml_element
-      end
-
-      protected
-
-      def smart_query(query)
-        if query.is_a? Array
-          query = query.join(" ")
-        end
-        option = Regexp::IGNORECASE
-        if /[[:upper:]]/.match(query)
-          option = nil
-        end
-        Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*", option)
-      end
-
-    end
-
-    class FileItem < Item
-
-      def initialize(path)
-        if ['.ennote', '.webbookmark'].include? File.extname(path)
-          @title = %x{mdls -name kMDItemDisplayName -raw '#{path}'}
-        else
-          @title = File.basename(path)
-        end
-        @subtitle = path
-        @uid = path
-        @arg = path
-        @icon = {:type => "fileicon", :name => path}
-        @valid = 'yes'
-        @autocomplete = @title
-        @type = 'file'
-      end
-
-      def match?(query)
-        return true if query.empty?
-        if query.is_a? String
-          query = query.split("\s")
-        end
-
-        queries = []
-        query.each { |q|
-          queries << smart_query(q)
-        }
-
-        queries.delete_if { |q|
-          q.match(@title) or q.match(@subtitle)
-        }
-
-        if queries.empty?
-          return true
-        else
-          return false
-        end
-      end
-
-    end
-
-
     def initialize
       @items = []
     end
@@ -156,15 +20,15 @@ module Alfred
       @items << FileItem.new(path)
     end
 
-
-    def to_xml(query = '', items = @items)
+    def to_xml(with_query = '', items = @items)
       document = REXML::Element.new("items")
       items.each do |item|
-        document << item.to_xml if item.match?(query)
+        document << item.to_xml if item.match?(with_query)
       end
       document.to_s
     end
 
+    alias_method :to_alfred, :to_xml
   end
 
 end

data/lib/alfred/feedback/file_item.rb

@@ -0,0 +1,47 @@
+require "rexml/document"
+require "alfred/feedback/item"
+
+module Alfred
+  class Feedback
+    class FileItem < Item
+
+      def initialize(path)
+        if ['.ennote', '.webbookmark'].include? File.extname(path)
+          @title = %x{mdls -name kMDItemDisplayName -raw '#{path}'}
+        else
+          @title = File.basename(path)
+        end
+        @subtitle = path
+        @uid = path
+        @arg = path
+        @icon = {:type => "fileicon", :name => path}
+        @valid = 'yes'
+        @autocomplete = @title
+        @type = 'file'
+      end
+
+      def match?(query)
+        return true if query.empty?
+        if query.is_a? String
+          query = query.split("\s")
+        end
+
+        queries = []
+        query.each { |q|
+          queries << smart_query(q)
+        }
+
+        queries.delete_if { |q|
+          q.match(@title) or q.match(@subtitle)
+        }
+
+        if queries.empty?
+          return true
+        else
+          return false
+        end
+      end
+
+    end
+  end
+end

data/lib/alfred/feedback/item.rb

@@ -0,0 +1,101 @@
+require "rexml/document"
+
+module Alfred
+  class Feedback
+    class Item
+      attr_accessor :uid, :arg, :valid, :autocomplete, :title, :subtitle, :icon, :type
+
+      def initialize(title, opts = {})
+        @title    = title
+        @subtitle = opts[:subtitle] if opts[:subtitle]
+
+        if opts[:icon]
+          @icon    = opts[:icon]
+        else
+          @icon    = {:type => "default", :name => "icon.png"}
+        end
+
+        @uid      = opts[:uid] if opts[:uid]
+
+        if opts[:arg]
+          @arg    = opts[:arg]
+        else
+          @arg    = @title
+        end
+
+        if opts[:type]
+          @type    = opts[:type]
+        else
+          @type    = 'default'
+        end
+
+        if opts[:valid]
+          @valid    = opts[:valid]
+        else
+          @valid    = 'yes'
+        end
+
+        if opts[:autocomplete]
+          @autocomplete    = opts[:autocomplete]
+        else
+          @autocomplete    = @title
+        end
+      end
+
+      ## To customize a new match? function, overwrite it.
+      #
+      # Module Alfred
+      #   class Feedback
+      #     class Item
+      #       alias_method :default_match?, :match?
+      #       def match?(query)
+      #         # define new match? function here
+      #       end
+      #     end
+      #   end
+      # end
+      def match?(query)
+        return true if query.empty?
+        if smart_query(query).match(@title)
+          return true
+        else
+          return false
+        end
+      end
+
+      def to_xml
+        xml_element = REXML::Element.new('item')
+        xml_element.add_attributes({
+          'uid'          => @uid,
+          'arg'          => @arg,
+          'valid'        => @valid,
+          'autocomplete' => @autocomplete
+        })
+        xml_element.add_attributes('type' => 'file') if @type == "file"
+
+        REXML::Element.new("title", xml_element).text    = @title
+        REXML::Element.new("subtitle", xml_element).text = @subtitle
+
+        icon = REXML::Element.new("icon", xml_element)
+        icon.text = @icon[:name]
+        icon.add_attributes('type' => 'fileicon') if @icon[:type] == "fileicon"
+
+        xml_element
+      end
+
+      protected
+
+      def smart_query(query)
+        if query.is_a? Array
+          query = query.join(" ")
+        end
+        option = Regexp::IGNORECASE
+        if /[[:upper:]]/.match(query)
+          option = nil
+        end
+        Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*", option)
+      end
+
+    end
+  end
+end

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 end

data/spec/item_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe "Feedback Item" do
+  it "should return raise ArgumentError without Item title" do
+    expect { Alfred::Feedback::Item.new }.to raise_error(ArgumentError)
+  end
+
+  it "should match default xml item tags" do
+    item = Alfred::Feedback::Item.new("title")
+    item.title.should eql "title"
+    item.subtitle.should eql nil
+    item.autocomplete.should eql item.title
+    item.arg.should eql item.title
+    item.valid.should eql "yes"
+    item.type.should eql "default"
+
+    default_icon = {:type => "default", :name => "icon.png"}
+    item.icon.should eql default_icon
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require "rspec"
+require "alfred"
+
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alfred-workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -87,14 +87,22 @@ extra_rdoc_files:
 files:
 - .autotest
 - .gemtest
+- .rspec
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - README.md
 - Rakefile
+- autotest/discover.rb
 - lib/alfred.rb
 - lib/alfred/feedback.rb
+- lib/alfred/feedback/file_item.rb
+- lib/alfred/feedback/item.rb
 - lib/alfred/ui.rb
 - lib/alfred/version.rb
+- spec/item_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/zhaocai/alfred-workflow
 licenses: []
 post_install_message: