alfred-workflow 1.11.3 → 2.0.0

data/lib/alfred/osx.rb

@@ -0,0 +1,63 @@
+module Alfred
+  module OSX
+
+    class << self
+
+      def version
+        @version ||= get_osx_version
+      end
+
+      def version_number
+        "#{version[:major]}.#{version[:minor]}"
+      end
+
+      def notification_center?
+        version[:major] >= 10.8
+      end
+
+
+      def full_name
+        "Mac OS X " + version_number
+      end
+
+
+      def short_name
+        case version[:major]
+        when 10.4
+          short_name = "Tiger"
+        when 10.5
+          short_name = "Leopard"
+        when 10.6
+          short_name = "Snow Leopard"
+        when 10.7
+          short_name = "Lion"
+        when 10.8
+          short_name = "Mountain Lion"
+        when 10.9
+          short_name = "Mavericks"
+        end
+
+        return short_name
+      end
+
+
+      private
+
+      def get_osx_version
+        begin
+          version = %x{/usr/bin/sw_vers -productVersion}.chop
+        rescue Errno::ENOENT => e
+          raise Errno::ENOENT, "This computer is not running Mac OS X becasue #{e.message}"
+        end
+
+        segments = version.split('.')[0,3].map!{|p| p.to_i}
+        {
+          :major => "#{segments[0]}.#{segments[1]}".to_f,
+          :minor => segments[2],
+        }
+      end
+
+    end
+  end
+end
+

data/lib/alfred/setting.rb

@@ -1,101 +1,57 @@
 require 'yaml'
-require 'plist'
 
 module Alfred
 
-  class Setting
-    attr_accessor :settings
+  class Setting < ::Hash
+    attr_accessor :backend_file
+    attr_reader :format
 
-    def initialize(alfred, &blk)
+    def initialize(alfred, &block)
+      super()
       @core = alfred
-      instance_eval(&blk) if block_given?
-      raise InvalidFormat, "#{format} is not suported." unless validate_format
-      @backend = get_format_class(format).new(@core, setting_file)
-    end
-
-    def use_setting_file(opts = {})
-      @setting_file = opts[:file] if opts[:file]
-      @format = opts[:format] ? opts[:format] : "yaml"
-    end
 
+      instance_eval(&block) if block_given?
 
-    def validate_format
-      ['yaml', 'plist'].include?(format)
-    end
-
-    def format
       @format ||= "yaml"
-    end
+      @backend_file ||= File.join(@core.storage_path, "setting.#{@format}")
+
+      raise InvalidFormat, "#{format} is not suported." unless validate_format
 
-    def setting_file
-      @setting_file ||= File.join(@core.storage_path, "setting.#{@format}")
+      unless File.exist?(@backend_file)
+        self.merge!({:id => @core.bundle_id})
+        dump(:flush => true)
+      else
+        load
+      end
     end
 
-    def get_format_class(format_class)
-      Alfred::Setting.const_get("#{format.to_s.capitalize}End")
+    def validate_format
+      ['yaml'].include?(format)
     end
 
     def load
-      @backend.send(:load)
+      send("load_from_#{format}".to_sym)
     end
 
-    def dump(settings = nil, opts = {})
-      @backend.send(:dump, settings, opts)
+    def dump(opts = {})
+      send("dump_to_#{format}".to_sym, opts)
     end
 
-    class YamlEnd
-      attr_reader :setting_file
-      def initialize(alfred, file)
-        @core = alfred
-        @setting_file = file
-      end
+    alias_method :close, :dump
 
-      def load
-        unless File.exist?(setting_file)
-          @settings = {:id => @core.bundle_id}
-          dump
-        end
+    protected
 
-        @settings = YAML::load( File.read(setting_file) )
-      end
-
-      def dump(settings = nil, opts = {})
-        settings = @settings unless settings
-
-        File.open(setting_file, "wb") { |f|
-          YAML::dump(settings, f)
-          f.flush if opts[:flush]
-        }
-      end
+    def load_from_yaml
+      self.merge!(YAML::load_file(@backend_file))
     end
 
-    class PlistEnd
-      attr_reader :setting_file
-      def initialize(alfred, file)
-        @core = alfred
-        @setting_file = file
-      end
-
-      def load
-        unless File.exist?(setting_file)
-          @settings = {:id => @core.bundle_id}
-          dump
-        end
-
-        @settings = Plist::parse_xml( File.read(setting_file) )
-      end
-
-      def dump(settings = nil, opts = {})
-        settings = @settings unless settings
-
-        File.open(setting_file, "wb") { |f|
-          f.puts settings.to_plist
-          f.flush if opts[:flush]
-        }
-      end
+    def dump_to_yaml(opts = {})
+      File.open(@backend_file, File::WRONLY|File::TRUNC|File::CREAT) { |f|
+        YAML::dump(self, f)
+        f.flush if opts[:flush]
+      }
     end
 
-
   end
 end
 

data/lib/alfred/ui.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'fileutils'
 
+
 module Alfred
 
   class LogUI < ::Logger

data/lib/alfred/util.rb

@@ -1,3 +1,7 @@
+require 'uri'
+require 'terminal-notifier'
+require 'alfred/osx'
+
 class String
   def strip_heredoc
     indent = scan(/^[ \t]*(?=\S)/).min.size || 0
@@ -18,23 +22,67 @@ module Alfred
       def make_webloc(name, url, folder=nil, comment = '')
         date = Time.now.strftime("%m-%d-%Y %I:%M%p")
         folder = Alfred.workflow_folder unless folder
-        folder, name, url, comment = [folder, name, url, comment].map do |t| 
+        folder, name, url, comment = [folder, name, url, comment].map do |t|
           escape_applescript(t)
         end
 
         return %x{
         osascript << __APPLESCRIPT__
         tell application "Finder"
-            set webloc to make new internet location file at (POSIX file "#{folder}") ¬ 
-            to "#{url}" with properties ¬ 
+            set webloc to make new internet location file at (POSIX file "#{folder}") ¬
+            to "#{url}" with properties ¬
             {name:"#{name}",creation date:(AppleScript's date "#{date}"), ¬
             comment:"#{comment}"}
         end tell
         return POSIX path of (webloc as string)
-        __APPLESCRIPT__}.strip_heredoc
+__APPLESCRIPT__}
       end
+
+
+      def open_url(url)
+        uri = URI.parse(url)
+        %x{open #{uri.to_s}}
+      end
+
+      def reveal_in_finder(path)
+        raise InvalidArgument, "#{path} does not exist." unless File.exist? path
+        %x{osascript <<__APPLESCRIPT__
+        tell application "Finder"
+            try
+                reveal POSIX file "#{path}"
+                activate
+            on error err_msg number err_num
+                return err_msg
+            end try
+        end tell
+__APPLESCRIPT__}
+      end
+
+
+      def search_command(query = '')
+        %Q{osascript <<__APPLESCRIPT__
+      tell application "Alfred 2"
+        search "#{escape_applescript(query)}"
+      end tell
+__APPLESCRIPT__}
+      end
+
+
+      def notify(query, message, opts = {})
+        if Alfred::OSX.notification_center?
+          notifier_options = {
+            :title   => 'Alfred Notification'             ,
+            :sound   => 'default'                         ,
+            :execute => search_command(query)             ,
+          }.merge!(opts)
+          p notifier_options
+          TerminalNotifier.notify(message, notifier_options)
+        else
+          system search_command(query)
+        end
+      end
+
     end
   end
 
 end
-

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '1.11.3'
+  VERSION = '2.0.0'
 end

data/spec/alfred/feedback_spec.rb

@@ -6,7 +6,7 @@ describe "Feedback" do
     setup_workflow
 
     @alfred =  Alfred::Core.new
-    @feedback = Alfred::Feedback.new
+    @feedback = Alfred::Feedback.new(@alfred)
 
     @item_elements = %w{title subtitle icon}
     @item_attributes = %w{uid arg autocomplete}
@@ -67,15 +67,16 @@ describe "Feedback" do
         use_cache_file :expire => 10
       end
       fb = @alfred.feedback
-      fb.cache_file.should == File.join(@alfred.volatile_storage_path, "cached_feedback")
+      fb.backend_file.should == File.join(@alfred.volatile_storage_path, "cached_feedback")
     end
 
     it "should set correct cache file" do
-      @alfred.with_cached_feedback do
-        use_cache_file :file => "cached_feedback"
+      alfred =  Alfred::Core.new
+      alfred.with_cached_feedback do
+        use_cache_file :file => "new_cached_feedback"
       end
-      fb = @alfred.feedback
-      fb.cache_file.should == "cached_feedback"
+      fb = alfred.feedback
+      fb.backend_file.should == "new_cached_feedback"
     end
 
     context "With Valid Cached File" do
@@ -130,13 +131,12 @@ describe "Feedback" do
       end
 
     end
-
   end
 
   after :all do
     @alfred.with_cached_feedback
     fb = @alfred.feedback
-    File.unlink(fb.cache_file)
+    Fil.unlink(fb.backend_file)
     reset_workflow
   end
 

data/spec/alfred/setting_spec.rb

@@ -1,69 +1,31 @@
 require "spec_helper"
 
-describe "Setting" do
+describe "Setting with yaml as backend" do
   before :all do
     setup_workflow
     @alfred =  Alfred::Core.new
   end
 
   it "should use yaml as defualt backend" do
-    @setting = @alfred.setting
-    @setting.format.should == "yaml"
+    @alfred.setting.format.should == "yaml"
   end
 
-  context "with Yaml Backend" do
-    before :all do
-      @setting = @alfred.setting do
-        use_setting_file :format => 'yaml'
-      end
-    end
-    it "should correctly load settings" do
-      settings = @setting.load
-      settings[:id].should == "me.zhaowu.alfred-workflow-gem"
-    end
-
-    it "should correctly save settings" do
-      settings = @setting.load
-      settings[:language] = "Chinese"
-      @setting.dump(settings, :flush => true)
-
-      settings = @alfred.setting.load
-      settings[:language].should == "Chinese"
-    end
-
-    after :all do
-      File.unlink(@setting.setting_file)
-    end
+  it "should correctly load settings" do
+    @alfred.setting[:id].should == "me.zhaowu.alfred-workflow-gem"
   end
 
-  context "with Plist Backend" do
-    before :all do
-      @setting = @alfred.setting do
-        use_setting_file :format => 'plist'
-      end
-    end
-
-    it "should correctly load settings" do
-      settings = @setting.load
-      settings[:id].should == "me.zhaowu.alfred-workflow-gem"
-    end
-
-    it "should correctly save settings" do
-      settings = @setting.load
-      settings[:language] = "Chinese"
-      @setting.dump(settings, :flush => true)
-
-      settings = @alfred.setting.load
-      settings[:language].should == "Chinese"
-    end
-
-    after :all do
-      File.unlink(@setting.setting_file)
-    end
+  it "should correctly save settings" do
+    @alfred.setting[:language] = "Chinese"
+    @alfred.setting.dump(:flush => true)
+
+    @alfred.setting.load
+    @alfred.setting[:language].should == "Chinese"
   end
 
+
   after :all do
     reset_workflow
+    File.unlink(@alfred.setting.backend_file)
   end
 
 end
@@ -71,4 +33,36 @@ 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
+
+
+
+