plist4r 1.1.5 → 1.1.6

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/plist4r/mixin/data_methods.rb

@@ -10,13 +10,14 @@ module Plist4r
     ClassesForKeyType = 
     {
       :string => [String], 
+      :string_or_integer => [String,Integer,Fixnum], 
       :bool => [TrueClass,FalseClass],
       :bool_or_string => [TrueClass,FalseClass,String],
-      :integer => [Fixnum], 
+      :integer => [Integer,Fixnum],
       :array_of_strings => [Array],
       :array_of_hashes => [Array],
       :array => [Array],
-      :array_or_integer => [Array,Fixnum],
+      :array_or_integer => [Array,Integer,Fixnum],
       :array_or_hash => [Array, Hash],
       :hash_of_bools => [Hash],
       :hash_of_strings => [Hash],
@@ -116,7 +117,7 @@ module Plist4r
         end
       end
 
-      unless @plist.strict_keys
+      if (! @plist) || (@plist && @plist.strict_keys == false)
         key_type = nil
         return set_or_return_of_type key_type, key, value
       else

data/lib/plist4r/plist_type/launchd.rb

@@ -13,19 +13,20 @@ module Plist4r
     # @see Plist4r::DataMethods
     ValidKeys =
     {
-      :string           => %w[ Label UserName GroupName LimitLoadToSessionType Program RootDirectory \
+      :string           => %w[ Label UserName GroupName LimitLoadToSessionType Program RootDirectory
                                WorkingDirectory StandardInPath StandardOutPath StandardErrorPath ],
 
-      :bool             => %w[ Disabled EnableGlobbing EnableTransactions OnDemand RunAtLoad InitGroups \
-                               StartOnMount Debug WaitForDebugger AbandonProcessGroup HopefullyExitsFirst \
-                               HopefullyExitsLast LowPriorityIO LaunchOnlyOnce ],
+      :bool             => %w[ Disabled EnableGlobbing EnableTransactions OnDemand RunAtLoad InitGroups
+                               StartOnMount Debug WaitForDebugger AbandonProcessGroup HopefullyExitsFirst
+                               HopefullyExitsLast LowPriorityIO LaunchOnlyOnce SessionCreate ServiceIPC
+                               IgnoreProcessGroupAtShutdown ],
 
       :integer          => %w[ Umask TimeOut ExitTimeOut ThrottleInterval StartInterval Nice ],
 
       :array_of_strings => %w[ LimitLoadToHosts LimitLoadFromHosts ProgramArguments WatchPaths QueueDirectories ],
 
-      :method_defined   => %w[ inetdCompatibility KeepAlive EnvironmentVariables StartCalendarInterval 
-                               SoftResourceLimits, HardResourceLimits MachServices Socket ]
+      :method_defined   => %w[ inetdCompatibility KeepAlive EnvironmentVariables UserEnvironmentVariables
+                               StartCalendarInterval SoftResourceLimits, HardResourceLimits MachServices Socket ]
     }
 
 
@@ -69,8 +70,8 @@ module Plist4r
     class KeepAlive < ArrayDict
       ValidKeys =
       {
-        :bool => %w[SuccessfulExit NetworkState],
-        :bool_or_hash_of_bools => %w[PathState OtherJobEnabled]
+        :bool => %w[SuccessfulExit NetworkState AfterInitialDemand],
+        :bool_or_hash_of_bools => %w[PathState OtherJobEnabled OtherJobActive]
       }
     end
 
@@ -169,6 +170,39 @@ module Plist4r
       end
     end
 
+    # Set or return the plist key +UserEnvironmentVariables+
+    #
+    # @example
+    #  # Set user environment variables
+    #  launchd_plist.user_environment_variables({ "VAR1" => "VAL1", "VAR2" => "VAL2" })
+    #
+    #  # Return user environment variables
+    #  launchd_plist.user_environment_variables => { "VAR1" => "VAL1", "VAR2" => "VAL2" }
+    #
+    # @param [Hash <String>] value 
+    # This optional key is used to specify additional user environmental variables to be set before running the job.
+    # UserEnvironmentVariables is not a documented feature of Apple Launchd. So it might not be supported.
+    # If in doubt, use "EnvironmentVariables".
+    def user_environment_variables value=nil, &blk
+      key = "UserEnvironmentVariables"
+      case value
+      when Hash
+        value.each do |k,v|
+          unless k.class == String
+            raise "Invalid key: #{method_name}[#{k.inspect}]. Should be of type String"
+          end
+          unless v.class == String
+            raise "Invalid value: #{method_name}[#{k.inspect}] = #{v.inspect}. Should be of type String"
+          end
+        end
+        @hash[key] = value
+      when nil
+        @hash[key]
+      else
+        raise "Invalid value: #{method_name} #{value.inspect}. Should be: #{method_name} { hash_of_strings }"
+      end
+    end
+
     class StartCalendarInterval < ArrayDict
       ValidKeys = { :integer => %w[ Minute Hour Day Weekday Month ] }
     end
@@ -378,7 +412,7 @@ module Plist4r
 
   	class MachServices < ArrayDict
     	class MachService < ArrayDict
-    	  ValidKeys = { :bool => %w[ ResetAtClose HideUntilCheckIn ] }
+    	  ValidKeys = { :bool => %w[ ResetAtClose HideUntilCheckIn DrainMessagesOnCrash ] }
       end
 
   	  def add service, value=nil, &blk
@@ -447,9 +481,11 @@ module Plist4r
       class Socket < ArrayDict
         ValidKeys =
         {
-          :string  => %w[ SockType SockNodeName SockServiceName SockFamily SockProtocol \
+          :string  => %w[ SockType SockNodeName SockFamily SockProtocol
                           SockPathName SecureSocketWithKey MulticastGroup ],
 
+          :string_or_integer => %w[ SockServiceName ],
+
           :bool    => %w[ SockPassive ],
 
           :integer => %w[ SockPathMode ],

data/plist4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plist4r}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dreamcat4"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-09-14}
   s.default_executable = %q{plist4r}
   s.description = %q{Plist4r is for editing Plist files in an easy-to-use, fast, and reliabile way. A comprehensive and fully featured Ruby library. Xml and Binary file formats are supported, with backends for Linux and Mac.}
   s.email = %q{dreamcat4@gmail.com}
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dreamcat4/plist4r}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Dreamcat4's plist4r gem. For reading/writing plists in ruby}
   s.test_files = [
     "spec/launchd_examples.rb",
@@ -134,7 +134,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<libxml4r>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plist4r
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - dreamcat4
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +01:00
+date: 2010-09-14 00:00:00 +01:00
 default_executable: plist4r
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: libxml4r
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -71,9 +80,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,9 +94,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -196,23 +209,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Dreamcat4's plist4r gem. For reading/writing plists in ruby