alfred-workflow 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ee366993693d75c97ac4e0b7d578a9874721dd
-  data.tar.gz: 9def2870e5c324c723d913b2c1a3d6759b79b63d
+  metadata.gz: c46c948baa33e334a81a7a9cb828a30080201a9a
+  data.tar.gz: 7612b59e92b7a65251e50f0f01d686d66d3d95a7
 SHA512:
-  metadata.gz: da21d87b846ca231258650ce9cf2099e67e15b1c78823e0bb0ca2c8f034aae3c51b4d58deaaf723a206556ed4b165853a356489bf43e612da9adf330346cbe3e
-  data.tar.gz: 98e932532fbdfe9e83c33203a2798a2cc378eace608914cf145cc02148494a3b5a73d47a360409359d08a7a40dfc929879858ca8b99be4742bed856add0562f7
+  metadata.gz: c048fe616f7c59fcf4b636a1151a94c3fcdd962ecc93e721515aa735aff4d046b925fe177f0376aa267d2caf7a58a481b7ddc0d0c4f8eaafb29b9a62d8336d24
+  data.tar.gz: a9ede3a26cbd8bffac326282541a32196097f94e112db9853af28eb96a2c9528fa51f15c56dbcd2c4221ef15f0fab819f9a415cebce9203d532bbaef569068a8

data.tar.gz.sig

@@ -1,4 +1,3 @@
-����:4�n����M=�G<)!
L��~�~a{4�"��9�w ? g
-H@$���@���~WƱ��a�_}/�	"�:�7&Tgmj��
-%J/g��y��ye���S&ϩ��n���B��5���ǞH�V
-���t����Ӻ�u��R85bp��ؚ�|ĮN�B�B�W���)�K�h����\�lx�R ��=Ia�C�1x�6cc�.�Y�b�✧�{�� ҵEW�)�^s�[_�I�Dj�J�
+P��Z-e�TY���B� J�R-v���_�IS`\��n˙k�
+*ϲM�����)C�J(IN1�v ŧ����0?��ҝ���W��K��BY.��썤t��e��؁ͮB��ܕ�E8do�1��u�j��̐�+�k�`u�P�Y<F��ʒQb����)se
��."�(�M˓z�*f%3��6X[�{��
+�h�

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alfred-workflow (2.0.1.20131023022544)
+    alfred-workflow (2.0.1.20131023093234)
       fuzzy_match (>= 2.0.4)
       gyoku (>= 1.1.0)
       moneta (>= 0.7.19)

data/Guardfile

@@ -15,7 +15,7 @@ end
 
 group :singleruby do
 
-  guard 'rspec', :rvm => ['default'], :notification  => true  do
+  guard 'rspec', :rvm => ['system'], :notification  => true  do
 
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
@@ -26,7 +26,7 @@ end
 
 group :multirubies do
 
-  guard 'rspec', :rvm => ['default', '1.9.3', '1.8.7'], :notification  => true  do
+  guard 'rspec', :rvm => ['system', '1.9.3', '1.8.7'], :notification  => true  do
 
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }

data/alfred-workflow.gemspec

@@ -2,11 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = "alfred-workflow"
-  s.version = "2.0.1.20131023022544"
+  s.version = "2.0.1.20131023093234"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhao Cai"]
-  s.cert_chain = ["/Users/zhaocai/.gem/gem-public_cert.pem"]
   s.date = "2013-10-23"
   s.description = "alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow."
   s.email = ["caizhaoff@gmail.com"]
@@ -18,7 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = "alfred-workflow"
   s.rubygems_version = "2.0.3"
-  s.signing_key = "/Users/zhaocai/.gem/gem-private_key.pem"
   s.summary = "alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow."
 
   if s.respond_to? :specification_version then

data/lib/alfred.rb

@@ -44,9 +44,41 @@ module Alfred
     #      MyHandler.new(alfred).register
     #    end
     #
-    def with_friendly_error(alfred = Alfred::Core.new, &blk)
+    def with_friendly_error(alfred_core = nil, &blk)
       begin
+        if alfred_core.nil? or !alfred_core.is_a?(::Alfred::Core)
+          alfred = Alfred::Core.new
+        end
+      rescue Exception => e
+        log_file = File.expand_path("~/Library/Logs/Alfred-Workflow.log")
+        rescue_feedback = %Q{
+          <items>
+            <item autocomplete="" uid="Rescue Feedback" valid="no">
+              <title>Alfred Gem Fail to Initialize.</title>
+              <arg>Alfred::NoBundleIDError: Wrong Bundle ID Test!</arg>
+              <subtitle>Check log #{log_file} for extra debug info.</subtitle>
+              <icon>/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/AlertStopIcon.icns</icon>
+            </item>
+            <item autocomplete="Alfred-Workflow.log" type="file" valid="yes">
+              <title>Alfred-Workflow.log</title>
+              <arg>#{log_file}</arg>
+              <subtitle>#{log_file}</subtitle>
+              <icon type="fileicon">/Applications/Utilities/Console.app</icon>
+            </item>
+          </items>
+        }
+        puts rescue_feedback
 
+        File.open(log_file, "a+") do |log|
+          log.puts "Alfred Gem Fail to Initialize.\n  #{e.message}"
+          log.puts e.backtrace.join("  \n")
+          log.flush
+        end
+
+        exit e.status_code
+      end
+
+      begin
         yield alfred
         alfred.start_handler
 
@@ -76,14 +108,16 @@ module Alfred
           "  #{e.inspect}\n  #{e.backtrace.join("  \n")}\n")
         puts alfred.rescue_feedback(
           :title => "Fatal Error!") if alfred.with_rescue_feedback
-        exit(-1)
+          exit(-1)
       end
     end
 
+
     def workflow_folder
       Dir.pwd
     end
 
+
     # launch alfred with query
     def search(query = "")
       %x{osascript <<__APPLESCRIPT__

data/lib/alfred/setting.rb

@@ -2,13 +2,13 @@ require 'yaml'
 
 module Alfred
 
-  class Setting < ::Hash
+  class Setting
     attr_accessor :backend_file
     attr_reader :format
 
     def initialize(alfred, &block)
-      super()
       @core = alfred
+      @table = {}
 
       instance_eval(&block) if block_given?
 
@@ -18,36 +18,106 @@ module Alfred
       raise InvalidFormat, "#{format} is not suported." unless validate_format
 
       unless File.exist?(@backend_file)
-        self.merge!({:id => @core.bundle_id})
+        @table.merge!({:id => @core.bundle_id})
         dump(:flush => true)
       else
         load
       end
     end
 
+
     def validate_format
       ['yaml'].include?(format)
     end
 
+
     def load
       send("load_from_#{format}".to_sym)
     end
 
+
     def dump(opts = {})
       send("dump_to_#{format}".to_sym, opts)
     end
 
     alias_method :close, :dump
 
+    #
+    # Provides marshalling support for use by the Marshal library.
+    #
+    def marshal_dump
+      @table
+    end
+
+    #
+    # Provides marshalling support for use by the Marshal library.
+    #
+    def marshal_load(x)
+      @table.merge! x
+    end
+    #
+    # Converts to hash
+    #
+    def to_h
+      @table.dup
+    end
+
+    def each_pair
+      return to_enum __method__ unless block_given?
+      @table.each_pair{|p| yield p}
+    end
+
+
+    def [](name)
+      @table[name]
+    end
+
+    #
+    # Sets the value of a member.
+    #
+    #   person = Alfred::Setting.new('name' => 'John Smith', 'age' => 70)
+    #   person[:age] = 42
+    #
+    def []=(name, value)
+      @table[name] = value
+    end
+
+    def has_key?(key)
+      @table.has_key?(key)
+    end
+    alias_method :key?, :has_key?
+
+
+    def ==(other)
+      return false unless other.kind_of?(Alfred::Setting)
+      @table == other.table
+    end
+
+    def eql?(other)
+      return false unless other.kind_of?(Alfred::Setting)
+      @table.eql?(other.table)
+    end
+
+    attr_reader :table # :nodoc:
+    protected :table
+
+
+    #
+    # Send missing method to @table to mimic a hash
+    #
+    def method_missing (name, *args, &block) # :nodoc:
+      @table.send(name, *args, &block)
+    end
+
     protected
 
     def load_from_yaml
-      self.merge!(YAML::load_file(@backend_file))
+      @table.merge!(YAML::load_file(@backend_file))
     end
 
     def dump_to_yaml(opts = {})
       File.open(@backend_file, File::WRONLY|File::TRUNC|File::CREAT) { |f|
-        YAML::dump(self, f)
+        YAML::dump(@table, f)
         f.flush if opts[:flush]
       }
     end

data/lib/alfred/util.rb

@@ -41,7 +41,20 @@ __APPLESCRIPT__}
 
       def open_url(url)
         uri = URI.parse(url)
-        %x{open #{uri.to_s}}
+        %x{/usr/bin/open #{uri.to_s}}
+      end
+
+      def open_with(app, path)
+        %x{osascript <<__APPLESCRIPT__
+        tell application "#{app}"
+            try
+                open "#{path}"
+                activate
+            on error err_msg number err_num
+                return err_msg
+            end try
+        end tell
+__APPLESCRIPT__}
       end
 
       def reveal_in_finder(path)

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/alfred/feedback_spec.rb

@@ -136,7 +136,7 @@ describe "Feedback" do
   after :all do
     @alfred.with_cached_feedback
     fb = @alfred.feedback
-    Fil.unlink(fb.backend_file)
+    File.unlink(fb.backend_file)
     reset_workflow
   end
 

data/spec/alfred/setting_spec.rb

@@ -7,25 +7,32 @@ describe "Setting with yaml as backend" do
   end
 
   it "should use yaml as defualt backend" do
-    @alfred.setting.format.should == "yaml"
+    @alfred.workflow_setting.format.should == "yaml"
   end
 
   it "should correctly load settings" do
-    @alfred.setting[:id].should == "me.zhaowu.alfred-workflow-gem"
+    @alfred.workflow_setting[:id].should == "me.zhaowu.alfred-workflow-gem"
   end
 
   it "should correctly save settings" do
-    @alfred.setting[:language] = "Chinese"
-    @alfred.setting.dump(:flush => true)
+    rand = Random.rand(100000) 
+
+    @alfred.workflow_setting[:rand] = rand
+    @alfred.workflow_setting.dump(:flush => true)
+
+    @alfred.workflow_setting.load
+    @alfred.workflow_setting[:rand].should == rand
 
-    @alfred.setting.load
-    @alfred.setting[:language].should == "Chinese"
   end
 
+  it "should handle common hash methods" do
+    @alfred.workflow_setting.delete :rand
+
+    @alfred.workflow_setting[:rand].should == nil
+  end
 
   after :all do
     reset_workflow
-    File.unlink(@alfred.setting.backend_file)
   end
 
 end
@@ -33,36 +40,4 @@ end
 
 
 
-# describe "Setting with plist as backend" do
-  # before :all do
-    # setup_workflow
-    # @alfred =  Alfred::Core.new
-
-    # @alfred.setting do
-      # @format = 'plist'
-    # end
-  # end
-
-  # it "should correctly load settings" do
-    # @alfred.setting['id'].should == "me.zhaowu.alfred-workflow-gem"
-  # end
-
-  # it "should correctly save settings" do
-    # @alfred.setting['language'] = "English"
-    # @alfred.setting.dump(:flush => true)
-
-    # @alfred.setting['language'].should == "English"
-  # end
-
-
-  # after :all do
-    # reset_workflow
-    # File.unlink(@alfred.setting.backend_file)
-  # end
-
-# end
-
-
-
-
 

data/test/workflow/setting.yaml

@@ -1,9 +1,11 @@
---- 
+---
 :id: me.zhaowu.alfred-workflow-gem
-:help: 
-  - :kind: url
-    :title: Check the Homepage for help
-    :webloc: homepage.webloc
-    :subtitle: https://github.com/zhaocai/alfred-workflow
-    :url: https://github.com/zhaocai/alfred-workflow
-  - :kind: url
+:help:
+- :kind: url
+  :title: Check the Homepage for help
+  :webloc: homepage.webloc
+  :subtitle: https://github.com/zhaocai/alfred-workflow
+  :url: https://github.com/zhaocai/alfred-workflow
+- :kind: file
+  :path: README.pdf
+:rand: 59510

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alfred-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Zhao Cai