plist4r 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/plist4r/docs/InfoPlistExample.rdoc

@@ -11,19 +11,19 @@ In this example, we edit an Apple Info.plist, to modify a couple of the keys and
   # block method
   info_plist = Plist4r.open "/Applications/MyApp.app/Contents/Info.plist" do
 
-    # plist attributes
+    # plist file attributes
     filename    # => "/Applications/MyApp.app/Contents/Info.plist"
     file_format # => :xml
     plist_type  # => :info
 
-    # read
+    # read plist keys
     c_f_bundle_executable # => "MyApp"
     c_f_bundle_icon_file  # => "Icon"
     c_f_bundle_identifier # => "com.mydomain.MyApp"
     c_f_bundle_name       # => "MyApp"
     c_f_bundle_signature  # => "????"
 
-    # write
+    # write plist keys
     c_f_bundle_signature "MYAP"
     store "LSUIElement" true
     

data/lib/plist4r/docs/LaunchdPlistExample.rdoc

@@ -11,19 +11,19 @@ In this example, we edit an Apple Launchd plist, to modify a couple of the keys
   # block method
   launchd_plist = Plist4r.open "/Library/LaunchDaemons/com.mydomain.MyApp.plist" do
 
-    # plist attributes
+    # plist file attributes
     filename    # => "/Library/LaunchDaemons/com.mydomain.MyApp.plist"
     file_format # => :xml
     plist_type  # => :launchd
 
-    # read
+    # read plist keys
     label             # => "com.mydomain.Myapp"
     program_arguments # => ["/Applications/MyApp.app/Contents/MacOS/MyApp"]
     queue_directories # => ["/dir/to/watch/1","/dir/to/watch/2","etc..."]
     run_at_load    # => false
     start_on_mount # => false
 
-    # write
+    # write plist keys
     run_at_load true
     store "StartOnMount" true
     

data/lib/plist4r/plist_type/launchd.rb

@@ -26,6 +26,11 @@ module Plist4r
                                SoftResourceLimits, HardResourceLimits MachServices Socket ]
     }
 
+
+    class InetdCompatibility < ArrayDict
+      ValidKeys = { :bool => %w[Wait] }
+    end
+
     # Set or return the plist key +inetdCompatibility+
     # @param [Hash <true,false>] value the 
     # The presence of this key specifies that the daemon expects to be run as if it were launched from inetd.
@@ -41,20 +46,21 @@ module Plist4r
     # # return inetdCompatibility
     # launchd_plist.inetd_compatibility => hash or nil
     #
-    def inetd_compatibility value=nil
+    def inetd_compatibility value=nil, &blk
       key = "inetdCompatibility"
       case value
-      when Hash
-        if value[:wait]
-          @hash[key] = value[:wait]
+      when nil
+        if block_given?
+          @hash[key] = ::Plist4r::OrderedHash.new
+          @hash[key] = InetdCompatibility.new(@hash[key],&blk).to_hash
         else
-          raise "Invalid value: #{method_name} #{value.inspect}. Should be: #{method_name} :wait => true|false"
+          @hash[key]
         end
-      when nil
-        @hash[key]
       else
-        raise "Invalid value: #{method_name} #{value.inspect}. Should be: #{method_name} :wait => true|false"
+        raise "Invalid value: #{method_name} #{value.inspect}. Should be: #{method_name} { wait true|false }"
       end
+
+
     end
     
     class KeepAlive < ArrayDict
@@ -119,7 +125,6 @@ module Plist4r
         @hash[key] = value
       when nil
         if block_given?
-          puts KeepAlive.new(@hash[key],&blk).to_hash
           @hash[key] = ::Plist4r::OrderedHash.new
           @hash[key] = KeepAlive.new(@hash[key],&blk).to_hash
         else
@@ -296,7 +301,7 @@ module Plist4r
     def soft_resource_limits value=nil, &blk
       key = "SoftResourceLimits"
       if blk
-        @hash[key] ||= ::Plist4r::OrderedHash.new
+        @hash[key] = ::Plist4r::OrderedHash.new
         @hash[key] = ResourceLimits.new(@hash[key],&blk).to_hash
       else
         @hash[key]
@@ -361,7 +366,7 @@ module Plist4r
     def hard_resource_limits value=nil, &blk
       key = "HardResourceLimits"
       if blk
-        @hash[key] ||= ::Plist4r::OrderedHash.new
+        @hash[key] = ::Plist4r::OrderedHash.new
         @hash[key] = ResourceLimits.new(@hash[key],&blk).to_hash
       else
         @hash[key]
@@ -428,7 +433,7 @@ module Plist4r
     def mach_services value=nil, &blk
       key = "MachServices"
       if blk
-        @hash[key] ||= ::Plist4r::OrderedHash.new
+        @hash[key] = ::Plist4r::OrderedHash.new
         @hash[key] = MachServices.new(@hash[key],&blk).to_hash
       else
         @hash[key]
@@ -661,8 +666,8 @@ module Plist4r
     def socket index_or_key=nil, index=nil, &blk
       key = "Sockets"
       if blk
-        @hash[key] ||= ::Plist4r::OrderedHash.new
-        sockets = Sockets.new(@hash[key]).to_hash
+        @hash[key] = ::Plist4r::OrderedHash.new
+        sockets = Sockets.new(@hash[key])
       
         case index_or_key
         when nil
@@ -680,7 +685,7 @@ module Plist4r
         else
           raise "Invalid socket key: #{method_name} #{index_or_key.inspect}. Should be: #{method_name} <socket_key> &blk"
         end
-        @hash[key] = sockets
+        @hash[key] = sockets.to_hash
       else
         @hash[key]
       end

data/plist4r.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plist4r}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dreamcat4"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - dreamcat4