alfred-workflow 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: d29778df5487c1362b6cd9267bd5a276f6cdac98
-  data.tar.gz: 2738751a1e78b5f73b0c0d664fe90675b3dca056
-SHA512: 
-  metadata.gz: 10dfebdd324418173566fc45507f381fae33e32942eb4aea2d70a321752cf42b3f53fb6136c3f3f132c24be1af62b707596fe14cc4246b3b1514a02b5bb1f338
-  data.tar.gz: 0bc242b4f2ae3381abdcb02dab7e9e420db0ac00bd8187a95eff420390e7a3ee5f5205f14e0109aadda46739e663bbc2650530bbd20a72318994ac3c9db2e305
+---
+SHA1:
+  metadata.gz: 8fcb6e46b36e66f0ee2e9970600261ef12ed77c8
+  data.tar.gz: 5a5f35e309cfec13365a3ff2786bf78bd7bf0073
+SHA512:
+  metadata.gz: f754ee10aa2686925905164700f87192f6907d8d1d28a706e7bd22ddf721a641ed8d53635c9e10b992dc753ad3d347f14da67df83887323fa4af3ec35d3b8945
+  data.tar.gz: 815158bc2fc767fbfea89a4f00eba434401f96d5802166e65c2e086022f4cc7a656e6e2506a0b161c26e014299c11dd4cd810acbcd624b09709cfa9ae04501db

data/Gemfile

@@ -7,19 +7,19 @@ source "https://rubygems.org/"
 gem "plist", ">=3.1.0"
 gem "logging", ">=1.8.0"
 
-gem "rdoc", "~>3.10", :group => [:development, :test]
-gem "rspec", ">=2.13", :group => [:development, :test]
-gem "rake", ">=10.0.0", :group => [:development, :test]
-gem "hoe", ">=0", :group => [:development, :test]
-gem "hoe-gemspec", ">=0", :group => [:development, :test]
-gem "hoe-git", ">=0", :group => [:development, :test]
-gem "hoe-version", ">=0", :group => [:development, :test]
-gem "hoe-bundler", ">=0", :group => [:development, :test]
-gem "guard", "~>1.7.0", :group => [:development, :test]
+gem "guard"
 gem "guard-rspec", ">=0", :group => [:development, :test]
 gem "guard-bundler", ">=0", :group => [:development, :test]
+gem "hoe-gemspec", ">=0", :group => [:development, :test]
+gem "rb-fsevent", "~>0.9", :group => [:development, :test]
+gem "rdoc", "~>3.10", :group => [:development, :test]
+gem "hoe", ">=0", :group => [:development, :test]
 gem "terminal-notifier-guard", ">=0", :group => [:development, :test]
+gem "rake", ">=10.0.0", :group => [:development, :test]
+gem "rspec", ">=2.13", :group => [:development, :test]
+gem "hoe-bundler", ">=0", :group => [:development, :test]
+gem "hoe-version", ">=0", :group => [:development, :test]
 gem "growl", ">=0", :group => [:development, :test]
-gem "rb-fsevent", "~>0.9", :group => [:development, :test]
+gem "hoe-git", ">=0", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.0.9)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.2)
     formatador (0.2.4)
     growl (1.0.3)
     guard (1.7.0)
@@ -40,7 +40,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.0.3)
+    rake (10.0.4)
     rb-fsevent (0.9.3)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -61,7 +61,7 @@ PLATFORMS
 
 DEPENDENCIES
   growl
-  guard (~> 1.7.0)
+  guard
   guard-bundler
   guard-rspec
   hoe

data/Guardfile

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

data/lib/alfred.rb

@@ -18,6 +18,7 @@ module Alfred
 
   class ObjCError           < AlfredError; status_code(1) ; end
   class NoBundleIDError     < AlfredError; status_code(2) ; end
+  class InvalidFormat       < AlfredError; status_code(11) ; end
   class NoMethodError       < AlfredError; status_code(13) ; end
   class PathError           < AlfredError; status_code(14) ; end
 
@@ -77,8 +78,8 @@ module Alfred
       @ui ||= Logger.new(bundle_id)
     end
 
-    def setting
-      @setting ||= Setting.new(self)
+    def setting(&blk)
+      @setting ||= Setting.new(self, &blk)
     end
 
     def with_cached_feedback(&blk)

data/lib/alfred/setting.rb

@@ -1,40 +1,101 @@
 require 'yaml'
+require 'plist'
 
 module Alfred
 
   class Setting
     attr_accessor :settings
 
-    def initialize(alfred, setting_file = nil)
+    def initialize(alfred, &blk)
       @core = alfred
-      @setting_file = setting_file if setting_file
+      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
 
 
+    def validate_format
+      ['yaml', 'plist'].include?(format)
+    end
+
+    def format
+      @format ||= "yaml"
     end
 
-    # settings
     def setting_file
-      @setting_file ||= File.join(@core.storage_path, 'setting.yml')
+      @setting_file ||= File.join(@core.storage_path, "setting.#{@format}")
+    end
+
+    def get_format_class(format_class)
+      Alfred::Setting.const_get("#{format.to_s.capitalize}End")
     end
 
     def load
-      unless File.exist?(setting_file)
-        @settings = {:id => @core.bundle_id}
-        dump
+      @backend.send(:load)
+    end
+
+    def dump(settings = nil, opts = {})
+      @backend.send(:dump, settings, opts)
+    end
+
+    class YamlEnd
+      attr_reader :setting_file
+      def initialize(alfred, file)
+        @core = alfred
+        @setting_file = file
       end
 
-      @settings = YAML::load( File.read(setting_file) )
+      def load
+        unless File.exist?(setting_file)
+          @settings = {:id => @core.bundle_id}
+          dump
+        end
+
+        @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
     end
 
-    def dump(settings = nil, opts = {})
-      settings = @settings unless settings
+    class PlistEnd
+      attr_reader :setting_file
+      def initialize(alfred, file)
+        @core = alfred
+        @setting_file = file
+      end
 
-      File.open(setting_file, "wb") { |f|
-        YAML::dump(settings, f)
-        f.flush if opts[:flush]
-      }
+      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
     end
 
+
   end
 end
 

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/spec/alfred_spec.rb

@@ -12,25 +12,61 @@ describe "Alfred" do
   end
 
   context "Setting" do
-    before :all do
+
+    it "should use yaml as defualt backend" do
       @setting = @alfred.setting
-    end
-    it "should correctly load settings" do
-      settings = @setting.load
-      settings[:id].should == "me.zhaowu.alfred-workflow-gem"
+      @setting.format.should == "yaml"
     end
 
-    it "should correctly save settings" do
-      settings = @setting.load
-      settings[:language] = "Chinese"
-      @setting.dump(settings, :flush => true)
+    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
 
-      settings = @alfred.setting.load
-      settings[:language].should == "Chinese"
+      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
     end
 
-    after :all do
-      File.unlink(@setting.setting_file)
+    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
     end
 
   end

metadata

@@ -1,172 +1,249 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: alfred-workflow
-version: !ruby/object:Gem::Version 
-  version: 1.6.0
+version: !ruby/object:Gem::Version
+  version: 1.7.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-04-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: plist
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: logging
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.13"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !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: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  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
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id007 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  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
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe-gemspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  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
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: hoe-git
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  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: *id009
-- !ruby/object:Gem::Dependency 
-  name: hoe-version
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  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
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: hoe-bundler
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  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
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
+  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 
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: guard-bundler
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: terminal-notifier-guard
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  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
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  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
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id017
-description: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+description: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com)
+  workflow.
+email:
 - caizhaoff@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+files:
 - .gemtest
 - .rspec
 - .ruby-version
@@ -191,28 +268,30 @@ files:
 - spec/spec_helper.rb
 - test/workflow/info.plist
 homepage: http://zhaocai.github.com/alfred2-ruby-template/
-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: 
-  - *id007
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+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: alfred-workflow
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow.
+summary: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com)
+  workflow.
 test_files: []
-