depot3 3.0.11 → 3.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd0846668a4adffcd65b2f18acb90ea9e2d358fc
-  data.tar.gz: 536dd741fc281d3a85f734338e9212c65c41c50f
+  metadata.gz: 80cce63be708933a3cc95c8c04130c7305f62821
+  data.tar.gz: 3b09f20666c177968106da0cb9a40d6f81c32528
 SHA512:
-  metadata.gz: d4bfebc0d804c371cae8e11a2e83acd62c5407a8165c55a7269dd0aa7ccf2370d27a56eb137c6c602d5ecbbb69aa9404a36d875e687fb8276594aacb8f31531f
-  data.tar.gz: cafd61d158574ebc192b34f0d8e3102e0929e28310cebccf75c870c21e1ef35019e217df45f3df6ace3f23a39d7e13b2f57f18e126702bd5e3096125e200f65b
+  metadata.gz: 43c2311387719eabfd9bf835d53e2582b637a8717baef425e19d9efb6140ba097bbfa5a4384cc53d5d0b92731893c008f823e1d7896135fd67a95357c2084d66
+  data.tar.gz: 3b3eeab2492cda0b170fe223a059fe5b434187fec73fd8c817f253a5ddd6ae03a3ef9350a1998046e4863e8d5e54b112fed8a99a9aafbbd37d375763b12501c9

data/CHANGES.md

@@ -1,5 +1,38 @@
 # Change History
 
+## v3.0.13 - 2016-12-07
+
+- Change: Updated CHANGES.md
+- Change: Updated depot3.gemspec to require ruby-jss v0.6.6
+
+## v3.0.12 - 2016-12-07
+
+- Change: Packages can how have multiple 'prohibiting proceses', which are entered as a comma-separated string of process names. If any one of them is running at install or uninstall, an error is raised. Use --force to override.
+
+
+## v3.0.11 - 2016-08-10
+
+- Change: Eliminate DEFAULT_CPU_TYPE constant in favor of DEFAULT_PROCESSOR
+- Fix: Prevent debug logging before it's asked for
+- Change: added 'forget' action to d3, removes local receipt without attempting uninstall
+- Fix: Client.update_receipts is more efficient now, only updating a rcpt once per run if needed
+- Change: Client.sync now does "clean_missing_receipts" - after doing updates,to remove rcpts that are missing from d3
+- Change: github issue #25 expiration path is now 'expiration paths' and can take a comma-separated list of paths. Any one of them coming to the foreground counts as 'being used' and will prevent expiration of the package. This is useful for single packages that install multiple apps, such as Microsoft Office.
+
+## v3.0.10 - 2016-07-25 (unreleased)
+
+- Fix: github issue #14 Don't crash when there's no rcpt file.
+- Fix: github issue #21 d3: ArgumentError: Unknown d3 action: list_queue
+- Change: remove hard-coded client timeout, use whatever is in ruby-jss.conf
+- Fix: github issue #13 when adding pkgs with new version, revision resets to 1 by default.
+- Fix: github issue #12allow 'n' or 'none' to unset expiration path
+- Added: method D3::Admin::Auth.connected?
+- Fix: no attempt to write log if it isn't writable to the user
+- Change: bump max DB schema version to 9.93
+- Change: remove 2-line log entries
+- Change: d3admin: default to deleting unused scripts whe deleting packages
+- Fix: d3 & d3admin: don't check the TTY unless there is one
+
 ## v3.0.9 - 2016-04-11
 
 - d3: better text feedback during manual installs.

data/bin/d3admin

@@ -71,7 +71,7 @@ class App
     end
 
     # run config if it hasn't ever run
-    unless D3::Admin::Prefs.prefs[:last_config]
+    unless D3::Admin::Prefs.prefs[:last_config] || JSS.superuser?
       puts
       puts "********  INITIAL D3ADMIN CONFIGURATION  ********"
       puts
@@ -81,7 +81,7 @@ class App
     end
 
     ### our admin is us
-    @admin = ENV['USER']
+    @admin = @options.admin || ENV['USER']
 
     # admin can't be a badmin
     if D3.badmins.include? @admin and D3::Admin::ACTIONS_NEEDING_ADMIN.include? @action
@@ -89,13 +89,17 @@ class App
     end
 
     # config before connecting
-    if @action =~ /^c/
+    if @action =~ /^c/ and !JSS.superuser?
       config
       return
     end
 
     ### connect to the server, prompting for info as needed
-    D3::Admin::Auth.connect
+    if @admin == 'root'
+      D3::Client.connect
+    else
+      D3::Admin::Auth.connect
+    end
 
     case @action
 
@@ -177,6 +181,9 @@ class App
         when '--auto-confirm'
           @options.auto_confirm = true
 
+        when '--admin'
+          @options.admin = arg
+
       # search and report
         when '--status'
           @options.status +=  arg.split(/,\s*/)
@@ -230,8 +237,8 @@ class App
           @options.auto_groups = arg
         when '--excluded-groups'
           @options.excluded_groups = arg
-        when '--prohibiting-process'
-          @options.prohibiting_process = arg
+        when '--prohibiting-processes'
+          @options.prohibiting_processes = arg
         when '--cpu_type'
           @options.cpu_type = arg
         when '--category'

data/bin/d3helper

@@ -326,7 +326,7 @@ Watch a parade of cute puppies while these items are installed:
           :removable =>  d3_pkg.removable,
           :expiration => d3_pkg.expiration,
           :expiration_paths => d3_pkg.expiration_paths,
-          :prohibiting_process => d3_pkg.prohibiting_process,
+          :prohibiting_processes => d3_pkg.prohibiting_processes,
           :pre_remove_script_id => d3_pkg.pre_remove_script_id,
           :post_remove_script_id => d3_pkg.post_remove_script_id
         )

data/data/d3/d3.conf.example

@@ -379,6 +379,20 @@ jss_default_pkg_category:
 ###
 jss_default_script_category:
 
+### - notification_image_path
+###   the path to a directory of images that can be randomly selected
+###   for various jamf_helper prompts from d3.
+###
+###   If you leave this blank:
+###
+###   the default is
+###   /Library/Application Support/d3/notification_images/
+###
+###   If this folder is empty, do not fret.
+###   jamf_helper prompts will still function without images.
+###
+notification_image_path:
+
 ### - admin_make_live_script
 ###   The id or name of an existing Casper script to execute when
 ###   a package is made live.

data/data/d3/puppytime/notification_image

@@ -1 +1 @@
-slideshow/Beagle_puppy_Cadet.jpg
+data/d3/puppytime/slideshow/Beagle_puppy_Cadet.jpg

data/data/d3/puppytime/opt_out_image

@@ -1 +1 @@
-slideshow/Alert_Pug_Puppy.jpg
+data/d3/puppytime/slideshow/Alert_Pug_Puppy.jpg

data/lib/d3/admin/add.rb

@@ -46,7 +46,7 @@ module D3
           reboot
           removable
           remove_first
-          prohibiting_process
+          prohibiting_processes
           auto_groups
           excluded_groups
           pre_install
@@ -461,4 +461,3 @@ END_HEADER
     end # module Add
   end # module Admin
 end # module D3
-

data/lib/d3/admin/edit.rb

@@ -45,7 +45,7 @@ module D3
         reboot
         removable
         remove_first
-        prohibiting_process
+        prohibiting_processes
         auto_groups
         excluded_groups
         pre_install
@@ -295,4 +295,3 @@ Current Settings => New Settings
     end # module edit
   end # module Admin
 end # module D3
-

data/lib/d3/admin/help.rb

@@ -84,7 +84,7 @@ Action add and edit:
   -T, --post-remove <script>         Name, id, or path to post-remove script
   -g, --auto-groups <groups>         Computer groups to get this pkg automatically
   -G, --excluded-groups <groups>     Computer groups that can't see this pkg
-  -x, --prohibiting-process <proc>   Process name that prevents installation
+  -x, --prohibiting-processes <proc> Process name(s) that prevent installation
   -R, --reboot <y/n>                 Reboot required after install, puppies!
   -F, --remove-first <y/n>           Uninstall older versions before installing
   -u, --removable <y/n>              Can this package be uninstalled?
@@ -314,10 +314,10 @@ Action add and edit:
                                        without using force.
                                        Use "n" for 'none'.
 
-  -x, --prohibiting-process <proc>   Specify a name to match with process names
+  -x, --prohibiting-processes <proc>   Specify name(s) to match with process names
                                        as output by `/bin/ps -A -c -o comm`.
                                        If a match is found at install time,
-                                       prevents installation. Use "n" for 'none'
+                                       graceful quit will be attempted. Use "n" for 'none'
 
   -R, --reboot <y/n>                 Reboot is required after install.
                                        (PuppyTime!)

data/lib/d3/admin/interactive.rb

@@ -145,7 +145,7 @@ module D3
       ###
       ### A Description of the option is displayed, followed by a prompt.
       ### If a default value is provided, the prompt includes the text
-      ###  (Hit return for '#{default_value}')
+      ###  (Hit return for #{default_value})
       ###
       ### If the option is defined in D3::Admin::OPTIONS, the data for
       ### the option is used, if not provided in the args.
@@ -205,9 +205,8 @@ module D3
 
         data_entered = ''
         puts "\n#{desc}" if desc
-        puts unset_line if unset_line
         prompt ||= "Please enter a value"
-        hit_return = default_display.empty? ? "" : " (Hit return for '#{default_display}')"
+        hit_return = default_display.empty? ? "" : " (Hit return for '#{default_display}' )"
         prompt_line = "#{prompt}#{hit_return}: "
 
         while true do
@@ -733,30 +732,32 @@ Enter:
         result
       end
 
-      ### Get a pattern to match for the prohibiting process
+      ### Get a pattern to match for the prohibiting processes
       ### If this matches a line of output from `/bin/ps -A -c -o comm`
-      ### at install time, then the install won't happen.
+      ### at install time, then graceful quit will be attempted.
       ### Strings must match a whole line, Regexps will work with
       ### any match.
       ###
-      ### @param default[String,Regexp] the default pattern when hitting return
+      ### @param default[String,Array<String>,Regexp] the default pattern when hitting return
       ###
       ### @return [Regexp,nil] the pattern to match
       ###
-      def get_prohibiting_process (default = 'n')
+      def get_prohibiting_processes (default = 'n')
         desc = <<-END_DESC
-PROHIBITING PROCESS
-Enter the name of a process as it appears on one line
-of the output of `/bin/ps -A -c -o comm`
+PROHIBITING PROCESSES
+Enter a comma separated string of process name(s) as they appear in the
+of the output of `/bin/ps -A -c -o comm`.
 
-If this process is running at install time,
-the installation will be skipped.
-Matching is case-insensitive
+Example: Safari, Google Chrome, cfprefsd
+
+If a process is running at install time, the installer will
+quit any background processes automatically, and may prompt the user
+to quit GUI applications gracefully. Matching is case sensitive.
 
 Enter 'n' for none.
         END_DESC
 
-        result = prompt_for_data(desc: desc, prompt: "Prohibiting Process", default: default, required: true)
+        result = prompt_for_data(desc: desc, prompt: "Prohibiting Processes", opt: :prohibiting_processes, default: default, required: true)
         return nil if result == 'n'
         result
       end

data/lib/d3/admin/options.rb

@@ -127,6 +127,11 @@ module D3
           :get => nil,
           :validate => nil
         },
+        admin: {
+          :cli => ['--admin', GetoptLong::REQUIRED_ARGUMENT ],
+          :arg => 'admin',
+          :help => "who is doing something with d3?"
+        },
 
         # Package Identification: Add/Edit/Info/Delete
 
@@ -274,14 +279,15 @@ module D3
           :get => :get_remove_first,
           :validate => :validate_yes_no
         },
-        prohibiting_process: {
+        prohibiting_processes: {
           :default => nil,
-          :cli => [ '--prohibiting-process', '-x', GetoptLong::REQUIRED_ARGUMENT ],
+          :cli => [ '--prohibiting-processes', '--prohibiting-process', '-x', GetoptLong::REQUIRED_ARGUMENT ],
           :label => "Installation prohibited by processes matching",
-          :display_conversion => DISPLAY_DFT_NONE,
-          :get => :get_prohibiting_process,
+          :display_conversion => DISPLAY_COMMA_SEP_LIST,
+          :get => :get_prohibiting_processes,
           :unsetable => true,
-          :validate => :validate_prohibiting_process
+          :validate => :validate_prohibiting_processes,
+          :compare => Proc.new{|o,n| o.to_a.sort == n.to_a.sort}
         },
         auto_groups: {
           :default => nil,
@@ -355,7 +361,8 @@ module D3
           :display_conversion => D3::Database::ARRAY_OF_PATHNAMES_TO_COMMA_STRING ,
           :get => :get_expiration_paths,
           :unsetable => true,
-          :validate => :validate_expiration_paths
+          :validate => :validate_expiration_paths,
+          :compare => Proc.new{|o,n| o.to_a.sort == n.to_a.sort}
         },
         description: {
           :default => '',

data/lib/d3/admin/validate.rb

@@ -366,14 +366,16 @@ module D3
         D3::Package::Validate.validate_category cat
       end
 
-      ### Check the offered prohibiting process
+      ### Check multiple prohibiting_processes for validity
       ###
-      ### @param match_string[String] the data entered by the user
+      ### @param process_names[String,Array<String>] A comma-separated String, or an Array of process names to be validated.
       ###
-      ### @return [String, nil] the regexp used to do the match
+      ### @return [Array<String>]
       ###
-      def validate_prohibiting_process (match_string)
-        D3::Package::Validate.validate_prohibiting_process match_string
+      def validate_prohibiting_processes (process_names)
+        process_names = [] if process_names.to_s =~ /^n(one)?$/i
+        names_as_array = JSS.to_s_and_a(process_names)[:arrayform]
+        names_as_array.map { |procname| D3::Package::Validate.validate_prohibiting_process(procname) }.compact
       end
 
       ### check the validity of a yes/no true/false reply

data/lib/d3/basename.rb

@@ -112,10 +112,10 @@ module D3
     # @return [Symbol] Is this package a .dmg or .pkg?
     attr_reader :package_type
 
-    ### @return [String] a string for matching to the output lines
+    ### @return [Array<String>] an array of Strings for matching to the output lines
     ###   of '/bin/ps -A -c -o comm'. If there's a match, this pkg won't be
-    ###   installed or uninstalled
-    attr_reader :prohibiting_process
+    ###   installed or uninstalled without a graceful quit
+    attr_reader :prohibiting_processes
 
     # @return [Integer] the days of disuse before an expirable edition expires. 0=never
     attr_reader :expiration
@@ -201,19 +201,6 @@ module D3
       @status == :deleted
     end
 
-    private
-
-    ### set the status
-    ###
-    ### @param new_status[Symnol]  one of the  valid STATUSES
-    ###
-    ### @return [Symbol] the new status
-    ###
-    def status= (new_status)
-      raise JSS::InvalidDataError, "status must be one of :#{STATUSES.join(', :')}" unless STATUSES.include? new_status
-      @status = new_status
-    end
-    
     ### Does a given array of pathnames have the same elements as
     ### @expiration_paths regardless of order?
     ###
@@ -225,9 +212,22 @@ module D3
     ### @return [Boolean] Are they the same aside from order?
     ###
     def expiration_paths_match?(other_exp_paths)
-      return false unless @expiration_paths.length == other_exp_paths.length
+      return false unless @expiration_paths and @expiration_paths.length == other_exp_paths.length
       (@expiration_paths -  other_exp_paths).empty?
     end
 
+    private
+
+    ### set the status
+    ###
+    ### @param new_status[Symbol]  one of the  valid STATUSES
+    ###
+    ### @return [Symbol] the new status
+    ###
+    def status= (new_status)
+      raise JSS::InvalidDataError, "status must be one of :#{STATUSES.join(', :')}" unless STATUSES.include? new_status
+      @status = new_status
+    end
+
   end # module Basename
 end # module PixD3

data/lib/d3/client.rb

@@ -32,6 +32,13 @@ module D3
   ###
   class Client < JSS::Client
 
+    ### Default notification_image_path
+    ### Unless otherwise specified in /etc/d3.conf,
+    ### this is the default directory that can be populated
+    ### with image(s) to display randomly alongside user notifications.
+
+    DFT_NOTIFICATION_IMAGE_PATH = D3::SUPPORT_DIR + "notification_images"
+
   end # class Client
 end # module D3
 
@@ -43,4 +50,3 @@ require "d3/client/auth"
 require "d3/client/cli"
 require "d3/client/lists"
 require "d3/client/help"
-

data/lib/d3/client/class_methods.rb

@@ -244,7 +244,7 @@ module D3
     ### - status
     ### - pre- or post-remove scripts
     ### - removability
-    ### - prohibiting process
+    ### - prohibiting processes
     ### - expiration details
     ###
     ### Also update
@@ -316,7 +316,7 @@ module D3
             D3.log "Updating expiration path(s) for #{rcpt.edition}", :info
             need_update = true
           end # if
-          
+
           if (rcpt.expiration != pkgdata[:expiration].to_i) and (not rcpt.custom_expiration)
             rcpt.expiration = pkgdata[:expiration].to_i
             D3.log "Updating expiration for #{rcpt.edition}", :info
@@ -324,17 +324,17 @@ module D3
           end # if
         end # if removable
 
-        # prohibiting_process
-        if rcpt.prohibiting_process.to_s != pkgdata[:prohibiting_process].to_s
-          rcpt.prohibiting_process = pkgdata[:prohibiting_process]
-          D3.log "Updating prohibiting_process for #{rcpt.edition}", :info
+        # prohibiting_processes
+        if rcpt.prohibiting_processes.sort != pkgdata[:prohibiting_processes].sort
+          rcpt.prohibiting_processes = pkgdata[:prohibiting_processes]
+          D3.log "Updating prohibiting_processes for #{rcpt.edition}", :info
           need_update = true
         end # if
 
 
         rcpt.update if need_update
       end # each do basename, rcpt
-    end # update
+    end # update_rcpts
 
     ### remove any invalid puppies from the queue
     ### invalid = id is no longer in d3, or status is missing
@@ -807,4 +807,3 @@ module D3
     end
   end # class
 end # module D3
-

data/lib/d3/client/environment.rb

@@ -132,4 +132,3 @@ module D3
     end
   end # class Client
 end # module D3
-

data/lib/d3/client/receipt.rb

@@ -106,7 +106,7 @@ module D3
         :post_remove_script_id,
         :expiration,
         :expiration_paths,
-        :prohibiting_process
+        :prohibiting_processes
       ]
 
       ################## Class Variables #################
@@ -575,7 +575,7 @@ module D3
         @installed_at = args[:installed_at]
 
         @removable = args[:removable]
-        @prohibiting_process = args[:prohibiting_process]
+        @prohibiting_processes = args[:prohibiting_processes]
         @frozen = args[:frozen]
         @pre_remove_script_id = args[:pre_remove_script_id]
         @post_remove_script_id = args[:post_remove_script_id]
@@ -622,7 +622,7 @@ module D3
 
         begin # ...ensure...
           if uninstall_prohibited_by_process? and (not force)
-            raise D3::InstallError, "#{edition} cannot be uninstalled now because '#{@prohibiting_process}' is running."
+            raise D3::InstallError, "#{edition} cannot be uninstalled now because one or more of the following processes is running: #{D3::Admin::OPTIONS[:prohibiting_processes][:display_conversion].call @prohibiting_processes}"
           end
           D3::Client.set_env :removing, edition
           D3.log "Uninstalling #{edition}", :warn
@@ -760,10 +760,11 @@ module D3
         begin
           installed_apple_rcpts = `#{JSS::Composer::PKG_UTIL} --pkgs`.split("\n")
           @apple_pkg_ids.each do |pkgid|
-
             unless installed_apple_rcpts.include? pkgid
-              raise D3::UninstallError, "No local Apple receipt for '#{pkgid}'"
+              D3.log "No local Apple receipt for '#{pkgid}', ignoring", :warn
+              next
             end
+
             # this gets them in reverse order, so we can
             # delete files and then test for and delete empty dirs on the way
             to_delete[pkgid] = `#{JSS::Composer::PKG_UTIL} --files '#{pkgid}' 2>/dev/null`.split("\n").reverse
@@ -866,9 +867,9 @@ module D3
         @expiration_paths = new_val
       end
 
-      ### Set a new prohibiting process
-      def prohibiting_process=(new_val)
-        @prohibiting_process = new_val
+      ### Set new prohibiting process(es)
+      def prohibiting_processes=(new_val)
+        @prohibiting_processes = new_val
       end
 
       ### Update the current receipt in the receipt store
@@ -1134,6 +1135,9 @@ Last brought to foreground: #{last_usage_display}
           # if never been used, last usage is the install date
           @last_usage ||= @installed_at
 
+          # prohibiting_processes should always be an array
+          @prohibiting_processes ||= []
+
           # if the install time is newer than the last usage,
           # use the install time.
           # this basically "resets the timer" when
@@ -1151,7 +1155,7 @@ Last brought to foreground: #{last_usage_display}
 
       ### set the status - for rcpts, this can't be a private method
       ###
-      ### @param new_status[Symnol]  one of the  valid STATUSES
+      ### @param new_status[Symbol]  one of the  valid STATUSES
       ###
       ### @return [Symbol] the new status
       ###
@@ -1162,7 +1166,7 @@ Last brought to foreground: #{last_usage_display}
       end
 
 
-      ################# Provate Instance Methods #################
+      ################# Private Instance Methods #################
 
       private
 
@@ -1171,8 +1175,7 @@ Last brought to foreground: #{last_usage_display}
       ### @return [Boolean]
       ###
       def uninstall_prohibited_by_process?
-        return false unless @prohibiting_process
-        D3.prohibited_by_process_running? @prohibiting_process
+        D3.prohibited_by_process_running? @prohibiting_processes
       end #
 
     end # class Receipt

data/lib/d3/configuration.rb

@@ -115,6 +115,8 @@ module D3
       :puppy_title => :to_s,
       :puppy_display_secs => :to_i,
 
+      :notification_image_path => :jss_to_pathname,
+
       :admin_make_live_script => :to_s,
       :admin_auto_clean =>  :jss_to_bool,
       :admin_auto_clean_keep_deprecated => :to_i,

data/lib/d3/database.rb

@@ -42,7 +42,7 @@ module D3
     MIN_SCHEMA_VERSION = "9.4"
 
     # the minimum JSS schema version allower
-    MAX_SCHEMA_VERSION = "9.93"
+    MAX_SCHEMA_VERSION = "9.97"
 
     ### these Proc objects allow us to encapsulate and pass around various
     ### blocks of code more easily for converting data between their mysql
@@ -59,10 +59,10 @@ module D3
 
     ### Some values are stored as comma-separated strings, but used as Arrays
     COMMA_STRING_TO_ARRAY = Proc.new{|v| JSS.to_s_and_a(v)[:arrayform] }
-    
+
     ### Some values are stored as comma-separated strings, but used as Arrays of Pathnames
     COMMA_STRING_TO_ARRAY_OF_PATHNAMES = Proc.new{|v| JSS.to_s_and_a(v)[:arrayform].map{|p| Pathname.new(p)} }
-    ARRAY_OF_PATHNAMES_TO_COMMA_STRING = Proc.new{|v| v.join(", ")}
+    ARRAY_OF_PATHNAMES_TO_COMMA_STRING = Proc.new{|v| v.is_a?(Array) ? v.join(", ") : "" }
 
     ### Some values are used as Arrays but stored as comma-separated strings
     ARRAY_TO_COMMA_STRING = Proc.new{|v| JSS.to_s_and_a(v)[:stringform] }
@@ -157,7 +157,7 @@ module D3
     ### - :triggers_swu [Boolean] when installed, will this package trigger a GUI software update check,
     ###   either immediately if there's a console user, or at the next console login?
     ###
-    ### - :prohibiting_process [String] a string for matching to the output lines
+    ### - :prohibiting_processes [Array<String>] An array of strings for matching to the output lines
     ###   of '/bin/ps -A -c -o comm'. If there's a matching line, this pkg won't be installed
     ###
     ### - :remove_first [Boolean] should any currently installed versions of this basename
@@ -273,12 +273,12 @@ module D3
           :to_ruby => COMMA_STRING_TO_ARRAY
         },
 
-        :prohibiting_process => {
+        :prohibiting_processes => {
           :field_name => "prohibiting_process",
           :sql_type => 'varchar(100)',
           :index => nil,
-          :to_sql => nil,
-          :to_ruby => nil
+          :to_sql => ARRAY_TO_COMMA_STRING,
+          :to_ruby => COMMA_STRING_TO_ARRAY
         },
 
         :remove_first => {
@@ -490,5 +490,3 @@ module D3
 
   end # module Database
 end # module D3
-
-

data/lib/d3/package/client_actions.rb

@@ -158,7 +158,7 @@ module D3
         else
 
           unless forced
-            raise D3::InstallError, "#{edition} cannot be installed now because '#{@prohibiting_process}' is running."  if install_prohibited_by_process?
+            raise D3::InstallError, "#{edition} cannot be installed now because one or more of the following processes is running: #{D3::Admin::OPTIONS[:prohibiting_processes][:display_conversion].call @prohibiting_processes}."  if install_prohibited_by_process?
           end # unless forced
 
           remove_previous_installs_if_needed (args[:verbose])

data/lib/d3/package/constructor.rb

@@ -175,10 +175,13 @@ module D3
       # some nil-values shouldn't be nil
       @auto_groups ||= []
       @excluded_groups ||= []
-      
+
       # expiration_paths should always be an array
       @expiration_paths ||= []
 
+      # prohibiting_processes should always be an array
+      @prohibiting_processes ||= []
+
       # these don't come from the table def.
       @admin = args[:admin]
 

data/lib/d3/package/getters.rb

@@ -106,11 +106,11 @@ Post-remove script: #{post_remove_script_name or 'None'}
 CPU limitation: #{@required_processor or 'None'}
 OS limitations: #{os_disp.empty? ? 'None' : os_disp}
 Uninstalls older versions: #{@remove_first or 'false'}
-Installation prohibited by process: #{@prohibiting_process or 'None'}
+Installation prohibited by process(es): #{D3::Admin::OPTIONS[:prohibiting_processes][:display_conversion].call @prohibiting_processes or 'None'}
 Auto installed for groups: #{auto_disp.empty? ? 'None' : auto_disp}
 Excluded for groups: #{excl_disp.empty? ? 'None' : excl_disp}
 Expiration period: #{@expiration.to_i} days
-Expiration path(s): #{D3::Database::ARRAY_OF_PATHNAMES_TO_COMMA_STRING.call @expiration_paths}
+Expiration path(s): #{D3::Admin::OPTIONS[:expiration_paths][:display_conversion].call @expiration_paths}
 Released by: #{@released_by or '-'}
 Release date: #{@release_date ? @release_date.strftime('%Y-%m-%d') : '-'}
       END_DEETS

data/lib/d3/package/private_methods.rb

@@ -35,8 +35,9 @@ module D3
     ### @return [Boolean]
     ###
     def install_prohibited_by_process?
-      return false unless @prohibiting_process
-        D3.prohibited_by_process_running? @prohibiting_process
+      return false unless @prohibiting_processes
+      return false if @prohibiting_processes.empty?
+      D3.prohibited_by_process_running? @prohibiting_processes
     end #
 
     ### If needed, uninstall any previously installed versions of this basename
@@ -79,7 +80,7 @@ module D3
             :expiration => @expiration_to_apply.to_i,
             :expiration_paths => @expiration_paths,
             :custom_expiration => @custom_expiration,
-            :prohibiting_process => @prohibiting_process)
+            :prohibiting_processes => @prohibiting_processes)
 
         D3::Client::Receipt.add_receipt new_rcpt, :replace
 

data/lib/d3/package/setters.rb

@@ -123,15 +123,15 @@ module D3
     ### The paths are those recorded in d3RepoMan's timestamp plists.
     ### @example "/Applications/FileMaker Pro 11/FileMaker Pro.app/Contents/MacOS/Filemaker Pro"
     ###
-    ### @param new_val[String,Pathname,Array<String,Pathname>] The expiration paths. 
-    ###   A Pathname for a single path, a String for single, or multiple 
+    ### @param new_val[String,Pathname,Array<String,Pathname>] The expiration paths.
+    ###   A Pathname for a single path, a String for single, or multiple
     ###   (comma-separated) or an Array of Strings or Pathnames for single paths.
     ###   Each path must be an absolute path starting with a /
     ###
     ### @return [void]
     ###
     def expiration_paths= (new_val = @expiration_paths)
-      return @expiration_paths if new_val == @expiration_paths
+      return @expiration_paths if D3::Admin::OPTIONS[:expiration_paths][:compare].call(@expiration_paths, new_val)
       @expiration_paths = validate_expiration_paths (new_val)
       @need_to_update_d3 = true unless @initializing
     end # expiration =
@@ -147,7 +147,7 @@ module D3
       @expiration_paths << path
       @need_to_update_d3 = true unless @initializing
     end # add_expiration_path
-    
+
     ### Remove a path from expiration_paths
     ### @param new_val[String,Pathname]
     ###
@@ -158,35 +158,38 @@ module D3
       @expiration_paths.delete Pathname.new(path)
       @need_to_update_d3 = true unless @initializing
     end # remove_expiration_path
-    
-  
-    ### Set the prohibiting process for this installer.
+
+
+    ### Set the prohibiting processes for this installer.
     ###
     ### The value of this attribute is compared at install time to the lines output
     ### by the command 'ps -A -c -o comm' (case insensitive)
     ###
-    ### If any line matches, an exception will be raised and the package will not be installed.
+    ### If any line matches, d3 will attempt to quit the process (or prompt the user
+    ### to quit the Application) to proceed with installation.
     ###
-    ### @param new_val[String] the process name that will prohibit installation
+    ### @param new_val[Array<String>] the process name(s) that should not be running during installation.
     ###
     ### @return [void]
     ###
-    def prohibiting_process= (new_val = @prohibiting_process)
-      return @prohibiting_process if new_val == @prohibiting_process
-      @prohibiting_process = validate_prohibiting_process (new_val)
+    def prohibiting_processes= (new_val = @prohibiting_processes)
+      new_val = JSS.to_s_and_a(new_val)[:arrayform]
+      return @prohibiting_processes if D3::Admin::OPTIONS[:prohibiting_processes][:compare].call(@prohibiting_processes, new_val)
+      @prohibiting_processes = new_val.each {|process| validate_prohibiting_process process}
       @need_to_update_d3 = true unless @initializing
     end
 
     ### Set the automatic-install groups for this package.
     ### See also {#add_auto_group} and {#remove_auto_group}
     ###
-    ### @param new_val [String,Array<String>] The group names as a comma-separated string or an array of strings
+    ### @param new_val[String,Array<String>] The group names as a comma-separated string or an array of strings
     ###
     ### @return [void]
     ###
     def auto_groups= (new_val = @auto_groups)
       @auto_groups ||= []
       new_val ||= []
+      return @auto_groups if D3::Admin::OPTIONS[:auto_groups][:compare].call(@auto_groups, new_val)
       new_groups = validate_auto_groups (new_val)
       validate_non_overlapping_groups new_groups, @excluded_groups
       @auto_groups =  new_groups
@@ -236,6 +239,7 @@ module D3
       @excluded_groups ||= []
       new_val ||= []
       new_groups = validate_auto_groups (new_val)
+      return @excluded_groups if D3::Admin::OPTIONS[:excluded_groups][:compare].call(@excluded_groups, new_val)
      validate_non_overlapping_groups @auto_groups, new_groups
       @excluded_groups =  new_groups
       @need_to_update_d3 = true unless @initializing

data/lib/d3/package/validate.rb

@@ -371,16 +371,16 @@ module D3
         cat
       end
 
-      ### Check the offered prohibiting process pattern
+      ### Check a single prohibiting process for validity
       ###
-      ### @param match_string[String] the data entered by the user
+      ### @param process_name[String] the process to be validated.
       ###
-      ### @return [String, nil] the regexp used to do the match
+      ### @return [String]
       ###
-      def validate_prohibiting_process (match_string)
-        match_string = nil if match_string.to_s =~ /^n(one)?$/i
-        return nil if match_string.nil? or match_string.empty?
-        match_string.to_s
+      def validate_prohibiting_process (process_name)
+        process_name = nil if process_name.to_s =~ /^n(one)?$/i
+        return nil if process_name.nil? or process_name.empty?
+        process_name.to_s
       end
 
       ### check the validity of a yes/no,true/false,1/0 input value

data/lib/d3/utility.rb

@@ -31,11 +31,10 @@ module D3
   ###
   ### @return [Boolean]
   ###
-  def self.prohibited_by_process_running? (xproc)
-    `/bin/ps -A -c -o comm`.lines.each do |ps_line|
-      return true if ps_line.strip.casecmp(xproc) == 0
-    end
-    return false
+  def self.prohibited_by_process_running? (xprocs)
+      processes = `/bin/ps -A -c -o comm`.split("\n")
+      current_prohibiting = processes & xprocs
+      return true unless current_prohibiting.empty?
   end #
 
   ### Try to figure out the login name of the admin running this code

data/lib/d3/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: depot3
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.13
 platform: ruby
 authors:
 - Chris Lasell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-keychain
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ruby-jss
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.6
 description: |
   d3 extends the package-deployment capabilities of the Casper Suite, an enterprise/education
   tool for managing Apple devices, from JAMF Software LLC.
@@ -67,7 +67,7 @@ extra_rdoc_files:
 - CHANGES.md
 - THANKS.md
 files:
-- .yardopts
+- ".yardopts"
 - CHANGES.md
 - LICENSE.txt
 - README.md
@@ -189,29 +189,28 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Depot3
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A package/patch management system for OS X which extends the capabilites
   of the Casper Suite.
 test_files: []
-has_rdoc: true