depot3 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80cce63be708933a3cc95c8c04130c7305f62821
-  data.tar.gz: 3b09f20666c177968106da0cb9a40d6f81c32528
+  metadata.gz: 16ccf3f7c58877a4d5cab64e36ec412aba7f4b04
+  data.tar.gz: 96f9128b249fb8fa2c1ca7a2bb6b67a2cd014bc9
 SHA512:
-  metadata.gz: 43c2311387719eabfd9bf835d53e2582b637a8717baef425e19d9efb6140ba097bbfa5a4384cc53d5d0b92731893c008f823e1d7896135fd67a95357c2084d66
-  data.tar.gz: 3b3eeab2492cda0b170fe223a059fe5b434187fec73fd8c817f253a5ddd6ae03a3ef9350a1998046e4863e8d5e54b112fed8a99a9aafbbd37d375763b12501c9
+  metadata.gz: 75c17b5a895ea1efa62a09458bb88cdbb89d50d66d312c3eae253f7f2de6f0cb2233b5ba36230812c9d061ac8bd1277265bcd92b13edcd04c69920a5df433927
+  data.tar.gz: 4ddec6877a7b22eb2edf09fb2f65a396365ce02a4560d78412a26c2a66b3847946f40ddb93de012eaeb48bb00929bf2bd75a98d0e0cde8873f71dd26504dd909

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Change History
 
+## v3.0.14 - 2016-12-08
+
+- Bugfix: Stored receipts with the singulare 'prohibiting_process' are now handled and updated to the plural 'prohibiting_processes'
+
 ## v3.0.13 - 2016-12-07
 
 - Change: Updated CHANGES.md

data/lib/d3/client/class_methods.rb

@@ -325,6 +325,11 @@ module D3
         end # if removable
 
         # prohibiting_processes
+        # make sure they are all arrays as of v3.0.12
+        unless rcpt.prohibiting_processes.is_a? Array
+          rcpt.prohibiting_processes = JSS.to_s_and_a(rcpt.prohibiting_processes)[:arrayform]
+          need_update = true
+        end
         if rcpt.prohibiting_processes.sort != pkgdata[:prohibiting_processes].sort
           rcpt.prohibiting_processes = pkgdata[:prohibiting_processes]
           D3.log "Updating prohibiting_processes for #{rcpt.edition}", :info

data/lib/d3/client/receipt.rb

@@ -576,12 +576,15 @@ module D3
 
         @removable = args[:removable]
         @prohibiting_processes = args[:prohibiting_processes]
+        @prohibiting_processes ||= []
+
         @frozen = args[:frozen]
         @pre_remove_script_id = args[:pre_remove_script_id]
         @post_remove_script_id = args[:post_remove_script_id]
 
         @expiration = args[:expiration].to_i
         @expiration_paths = args[:expiration_paths]
+        @expiration_paths ||= []
         @custom_expiration = args[:custom_expiration]
 
         @manually_installed = (@admin != D3::AUTO_INSTALL_ADMIN)

data/lib/d3/utility.rb

@@ -32,6 +32,9 @@ module D3
   ### @return [Boolean]
   ###
   def self.prohibited_by_process_running? (xprocs)
+      # this is needed in case saved rcpts have nil or a string instead
+      # of an array, from pre v3.0.12
+      xprocs = JSS.to_s_and_a(xprocs)[:arrayform]
       processes = `/bin/ps -A -c -o comm`.split("\n")
       current_prohibiting = processes & xprocs
       return true unless current_prohibiting.empty?

data/lib/d3/version.rb

@@ -25,5 +25,5 @@
 
 ###
 module D3
-  VERSION = '3.0.13'.freeze
+  VERSION = '3.0.14'.freeze
 end # module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depot3
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors:
 - Chris Lasell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-keychain