alfred-workflow 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 9c4c82b412f4a3023a7db409423ef9bb1121b061
-  data.tar.gz: c7b3e46014fafabe3c08d8570ca7763fc3ad799d
 SHA512: 
-  metadata.gz: 9ef40d750a2cc421483c52dd3f42f7bba173074ac49144908f7cdd10ce6f96f8b7ff9ec4082be03b133b2b337f6865e40a5b2c1507c68e891bcca670b146e3c6
-  data.tar.gz: b900b35159802ce2b0e730417ea75411b74a7837b807027194d4802928e15bc03777ece15bbbe84e4f1cb43f7d0070ba527aff378a4d248b3728d0e5768acf66
+  metadata.gz: 1197845c55b1b3fd2cf9ab22537bf476e38dea695d357754c126dd6742b9343f6e2f232d8e1b4415ff9f07344806d09c53c8f9de20fb8c17bfe152252ab87e69
+  data.tar.gz: 9254e444fe35cc41431aa6289f6b5317e82ddd5589348651ee6ca7ec29d07eb070dae256f70776c5fd579f39b0d0c9090426a5474f4dbcd5432635dd79ef6260
+SHA1: 
+  metadata.gz: bef39332c4f31d2b99fd1c4993f5d8554d65fe3e
+  data.tar.gz: 707f332c85f491779bd68797949ea1b875251202

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    alfred-workflow (1.7.0.20130502202146)
+    alfred-workflow (1.8.0.20130503002346)
       plist (>= 3.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    awesome_print (1.1.0)
     coderay (1.0.9)
     diff-lcs (1.2.4)
     facets (2.9.3)
@@ -27,8 +28,6 @@ GEM
       rspec (~> 2.11)
     hoe (3.6.0)
       rake (>= 0.8, < 11.0)
-    hoe-bundler (1.2.0)
-      hoe (>= 2.2.0)
     hoe-gemspec (1.0.0)
       hoe (>= 2.2.0)
     hoe-git (1.5.0)
@@ -71,13 +70,13 @@ PLATFORMS
 
 DEPENDENCIES
   alfred-workflow!
+  awesome_print (>= 1.1.0)
   facets (>= 2.9.0)
   growl
   guard (~> 1.7.0)
   guard-bundler
   guard-rspec
   hoe
-  hoe-bundler
   hoe-gemspec
   hoe-git
   hoe-version

data/Rakefile

@@ -2,8 +2,9 @@
 
 require 'rubygems'
 require 'hoe'
+require 'rake/clean'
+
 
-Hoe.plugin :bundler
 Hoe.plugin :git
 Hoe.plugin :gemspec
 Hoe.plugin :version
@@ -22,9 +23,10 @@ Hoe.spec 'alfred-workflow' do
 
 
   extra_dev_deps << ['rspec', '>= 2.13']
+  extra_dev_deps << ['awesome_print', '>= 1.1.0']
   extra_dev_deps << ['facets', '>= 2.9.0']
   extra_dev_deps << ['rake', '>= 10.0.0']
-  extra_dev_deps << ['hoe'] << ['hoe-gemspec'] << ['hoe-git'] << ['hoe-version'] << ['hoe-bundler'] << ['hoe-yard']
+  extra_dev_deps << ['hoe'] << ['hoe-gemspec'] << ['hoe-git'] << ['hoe-version'] << ['hoe-yard']
   extra_dev_deps << ['guard', '~> 1.7.0'] << ['guard-rspec'] << ['guard-bundler']
   extra_dev_deps << ['terminal-notifier-guard'] << ['growl']
 
@@ -49,7 +51,9 @@ task :multirubies  do
   sh %q{bundle exec guard --group=multirubies}
 end
 
-
+CLOBBER.include('log')
+CLEAN.include('tmp')
+CLEAN.include('test/workflow/tmp')
 
 
 # vim: syntax=ruby

data/alfred-workflow.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "alfred-workflow"
-  s.version = "1.7.0.20130502202146"
+  s.version = "1.8.0.20130503002346"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhao Cai"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = "alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow."
   s.email = ["caizhaoff@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "History.txt"]
-  s.files = [".gemtest", ".rspec", ".ruby-version", ".travis.yml", "Gemfile", "Gemfile.lock", "Guardfile", "History.txt", "Manifest.txt", "README.md", "Rakefile", "lib/alfred.rb", "lib/alfred/feedback.rb", "lib/alfred/feedback/file_item.rb", "lib/alfred/feedback/item.rb", "lib/alfred/setting.rb", "lib/alfred/ui.rb", "lib/alfred/version.rb", "spec/alfred_spec.rb", "spec/feedback_spec.rb", "spec/item_spec.rb", "spec/spec_helper.rb", "test/workflow/info.plist"]
+  s.files = [".rspec", ".ruby-version", "Gemfile", "Gemfile.lock", "Guardfile", "History.txt", "Manifest.txt", "README.md", "Rakefile", "alfred-workflow.gemspec", "lib/alfred.rb", "lib/alfred/feedback.rb", "lib/alfred/feedback/file_item.rb", "lib/alfred/feedback/item.rb", "lib/alfred/setting.rb", "lib/alfred/ui.rb", "lib/alfred/version.rb", "spec/alfred/feedback/item_spec.rb", "spec/alfred/feedback_spec.rb", "spec/alfred/setting_spec.rb", "spec/alfred/ui_spec.rb", "spec/alfred_spec.rb", "spec/spec_helper.rb", "test/workflow/info.plist", ".gemtest"]
   s.homepage = "http://zhaocai.github.com/alfred2-ruby-template/"
   s.licenses = ["GPL-3"]
   s.rdoc_options = ["--title", "TestAlfred::TestWorkflow Documentation", "--quiet"]
@@ -28,13 +28,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<plist>, [">= 3.1.0"])
       s.add_development_dependency(%q<hoe-yard>, [">= 0.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.13"])
+      s.add_development_dependency(%q<awesome_print>, [">= 1.1.0"])
       s.add_development_dependency(%q<facets>, [">= 2.9.0"])
       s.add_development_dependency(%q<rake>, [">= 10.0.0"])
       s.add_development_dependency(%q<hoe>, [">= 0"])
       s.add_development_dependency(%q<hoe-gemspec>, [">= 0"])
       s.add_development_dependency(%q<hoe-git>, [">= 0"])
       s.add_development_dependency(%q<hoe-version>, [">= 0"])
-      s.add_development_dependency(%q<hoe-bundler>, [">= 0"])
       s.add_development_dependency(%q<guard>, ["~> 1.7.0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<guard-bundler>, [">= 0"])
@@ -44,13 +44,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<plist>, [">= 3.1.0"])
       s.add_dependency(%q<hoe-yard>, [">= 0.1.2"])
       s.add_dependency(%q<rspec>, [">= 2.13"])
+      s.add_dependency(%q<awesome_print>, [">= 1.1.0"])
       s.add_dependency(%q<facets>, [">= 2.9.0"])
       s.add_dependency(%q<rake>, [">= 10.0.0"])
       s.add_dependency(%q<hoe>, [">= 0"])
       s.add_dependency(%q<hoe-gemspec>, [">= 0"])
       s.add_dependency(%q<hoe-git>, [">= 0"])
       s.add_dependency(%q<hoe-version>, [">= 0"])
-      s.add_dependency(%q<hoe-bundler>, [">= 0"])
       s.add_dependency(%q<guard>, ["~> 1.7.0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<guard-bundler>, [">= 0"])
@@ -61,13 +61,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<plist>, [">= 3.1.0"])
     s.add_dependency(%q<hoe-yard>, [">= 0.1.2"])
     s.add_dependency(%q<rspec>, [">= 2.13"])
+    s.add_dependency(%q<awesome_print>, [">= 1.1.0"])
     s.add_dependency(%q<facets>, [">= 2.9.0"])
     s.add_dependency(%q<rake>, [">= 10.0.0"])
     s.add_dependency(%q<hoe>, [">= 0"])
     s.add_dependency(%q<hoe-gemspec>, [">= 0"])
     s.add_dependency(%q<hoe-git>, [">= 0"])
     s.add_dependency(%q<hoe-version>, [">= 0"])
-    s.add_dependency(%q<hoe-bundler>, [">= 0"])
     s.add_dependency(%q<guard>, ["~> 1.7.0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<guard-bundler>, [">= 0"])

data/lib/alfred.rb

@@ -55,6 +55,9 @@ module Alfred
       end
     end
 
+    def workflow_folder
+      Dir.pwd
+    end
 
     # launch alfred with query
     def search(query = "")
@@ -67,12 +70,20 @@ module Alfred
   end
 
   class Core
-    attr_accessor :with_rescue_feedback
-
-    def initialize(with_rescue_feedback = false, &blk)
+    attr_reader :with_rescue_feedback
+    attr_accessor :with_help_feedback
+
+    def initialize(
+      with_help_feedback = false, 
+      with_rescue_feedback = false, 
+      &blk
+    )
+      @workflow_dir = Dir.pwd
       @with_rescue_feedback = with_rescue_feedback
+      @with_help_feedback = with_rescue_feedback
 
       instance_eval(&blk) if block_given?
+
     end
 
     def ui
@@ -84,6 +95,10 @@ module Alfred
       @setting ||= Setting.new(self, &blk)
     end
 
+    def workflow_setting(opts = {})
+      @workflow_setting ||= init_workflow_setting(opts)
+    end
+
     def with_cached_feedback(&blk)
       @feedback = CachedFeedback.new(self, &blk)
     end
@@ -122,6 +137,20 @@ module Alfred
     end
 
 
+    def help_feedback(opts = {})
+      ws = workflow_setting.load
+      if ws.has_key? :help
+        ws[:help].map do |item|
+          case item[:kind]
+          when 'url'
+            item[:folder] = storage_path
+            Feedback::UrlItem.new(item)
+          end
+        end
+      end
+    end
+
+
     def rescue_feedback(opts = {})
       default_opts = {
         :title    => "Failed Query!",
@@ -141,6 +170,20 @@ module Alfred
       feedback.to_alfred('', items)
     end
 
+    private
+
+    def init_workflow_setting(opts)
+      default_opts = {
+        :file    => "setting.yaml",
+        :format  => 'yaml',
+      }
+      opts = default_opts.update(opts)
+
+      @workflow_setting = Setting.new(self) do
+        use_setting_file opts
+      end
+      @workflow_setting
+    end
 
   end
 

data/lib/alfred/feedback/file_item.rb

@@ -5,7 +5,7 @@ module Alfred
   class Feedback
     class FileItem < Item
 
-      def initialize(path)
+      def initialize(path, opts = {})
         if ['.ennote', '.webbookmark'].include? File.extname(path)
           @title = %x{mdls -name kMDItemDisplayName -raw '#{path}'}
         else
@@ -27,3 +27,4 @@ module Alfred
     end
   end
 end
+

data/lib/alfred/feedback/item.rb

@@ -18,7 +18,7 @@ module Alfred
         if opts[:uid]
           @uid    = opts[:uid]
         else
-          @uid    = ''
+          @uid    = nil
         end
 
         if opts[:arg]
@@ -94,15 +94,23 @@ module Alfred
 
       def to_xml
         xml_element = REXML::Element.new('item')
-        xml_element.add_attributes({
-          'uid'          => @uid,
-          'arg'          => @arg,
-          'valid'        => @valid,
-          'autocomplete' => @autocomplete
-        })
+        if @uid
+          xml_element.add_attributes({
+            'uid'          => @uid,
+            'valid'        => @valid,
+            'autocomplete' => @autocomplete
+          })
+        else
+          xml_element.add_attributes({
+            'valid'        => @valid,
+            'autocomplete' => @autocomplete
+          })
+          
+        end
         xml_element.add_attributes('type' => 'file') if @type == "file"
 
         REXML::Element.new("title", xml_element).text    = @title
+        REXML::Element.new("arg", xml_element).text      = @arg
         REXML::Element.new("subtitle", xml_element).text = @subtitle
 
         icon = REXML::Element.new("icon", xml_element)

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

data/spec/alfred/feedback_spec.rb

@@ -24,8 +24,32 @@ describe "Feedback" do
       xml_data = <<-END.strip_heredoc
       <?xml version="1.0"?>
       <items>
-        <item valid="yes" arg="arg" autocomplete="autocomplete" uid="uid">
+        <item valid="yes" autocomplete="autocomplete" uid="uid">
           <title>Title</title>
+          <arg>Arg</arg>
+          <subtitle>Subtitle</subtitle>
+          <icon>icon.png</icon>
+        </item>
+      </items>
+      END
+
+      compare_xml(xml_data, @feedback.to_xml).should == true
+    end
+
+    it "should not have uid if not presented" do
+
+      @feedback.items = []
+      @feedback.add_item(:arg          => "arg"          ,
+                         :autocomplete => "autocomplete" ,
+                         :title        => "Title"        ,
+                         :subtitle     => "Subtitle")
+
+      xml_data = <<-END.strip_heredoc
+      <?xml version="1.0"?>
+      <items>
+        <item valid="yes" autocomplete="autocomplete">
+          <title>Title</title>
+          <arg>Arg</arg>
           <subtitle>Subtitle</subtitle>
           <icon>icon.png</icon>
         </item>
@@ -71,8 +95,9 @@ describe "Feedback" do
         @xml_data = <<-END.strip_heredoc
         <?xml version="1.0"?>
         <items>
-          <item valid="yes" arg="arg" autocomplete="autocomplete" uid="uid">
+          <item valid="yes" autocomplete="autocomplete" uid="uid">
             <title>Title</title>
+            <arg>Arg</arg>
             <subtitle>Subtitle</subtitle>
             <icon>icon.png</icon>
           </item>

data/spec/alfred_spec.rb

@@ -11,6 +11,17 @@ describe "Alfred" do
     @alfred.bundle_id.should == "me.zhaowu.alfred-workflow-gem"
   end
 
+  context "Help" do
+    before :all do
+      @alfred.with_help_feedback = true
+    end
+
+    it "should have correct default setting file" do
+      @alfred.workflow_setting.setting_file.should eq 'setting.yaml'
+    end
+
+
+  end
 
   after :all do
     reset_workflow

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "rspec"
-require 'facets/string'
 require 'fileutils'
+require 'awesome_print'
 
 
 require "alfred"
@@ -26,7 +26,7 @@ class String
 end
 
 $rspec_dir = Dir.pwd
-$workflow_dir = 'test/workflow/'
+$workflow_dir = File.expand_path('test/workflow/')
 def setup_workflow
   FileUtils.mkdir_p($workflow_dir)
   Dir.chdir($workflow_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alfred-workflow
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Zhao Cai
@@ -31,7 +31,7 @@ cert_chain:
   S6w/KYMnbhUxfyEU1MX10sJv87WIrtgF
   -----END CERTIFICATE-----
 
-date: 2013-05-03 00:00:00 Z
+date: 2013-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plist
@@ -64,66 +64,68 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: facets
+  name: awesome_print
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.0
+        version: 1.1.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: facets
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 10.0.0
+        version: 2.9.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - &id007 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 10.0.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: hoe-gemspec
+  name: hoe
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - &id008 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: hoe-git
+  name: hoe-gemspec
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: hoe-version
+  name: hoe-git
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: hoe-bundler
+  name: hoe-version
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -141,7 +143,7 @@ dependencies:
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -149,7 +151,7 @@ dependencies:
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -157,7 +159,7 @@ dependencies:
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -165,7 +167,7 @@ dependencies:
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
+    - *id008
   type: :development
   version_requirements: *id016
 description: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow.
@@ -219,10 +221,10 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id007
+  - *id008
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id007
+  - *id008
 requirements: []
 
 rubyforge_project: alfred-workflow