depot3 3.0.9 → 3.0.11

data/lib/d3/package/getters.rb

@@ -110,7 +110,7 @@ Installation prohibited by process: #{@prohibiting_process 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: #{@expiration_path}
+Expiration path(s): #{D3::Database::ARRAY_OF_PATHNAMES_TO_COMMA_STRING.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

@@ -77,7 +77,7 @@ module D3
             :pre_remove_script_id => @pre_remove_script_id,
             :post_remove_script_id => @post_remove_script_id,
             :expiration => @expiration_to_apply.to_i,
-            :expiration_path => @expiration_path,
+            :expiration_paths => @expiration_paths,
             :custom_expiration => @custom_expiration,
             :prohibiting_process => @prohibiting_process)
 

data/lib/d3/package/questions.rb

@@ -81,7 +81,7 @@ module D3
     ### @return [Boolean] Does this pkg expire by default?
     ###
     def expires?
-      @expiration.to_i > 0 && @expiration_path
+      @expiration.to_i > 0 && @expiration_paths
     end
 
     ### @return [Boolean] Is this pkg 'indexed' in the jss, so that it can be removable?

data/lib/d3/package/server_actions.rb

@@ -328,7 +328,7 @@ INSERT INTO #{P_TABLE[:table_name]} (
       #### First the deprecated pkgs
 
       # the id's of the deprecated pkgs for this basename, in numerical order
-      # the last ones are the newest. 
+      # the last ones are the newest.
       deprecated_ids = D3::Package.deprecated_data.values.select{|dp| dp[:basename] == @basename}
       deprecated_ids.map!{|dp| dp[:id] }.sort!
 
@@ -342,14 +342,14 @@ INSERT INTO #{P_TABLE[:table_name]} (
       deprecated_ids_to_keep = []
       number_deprecated_to_keep.times{ deprecated_ids_to_keep << deprecated_ids.pop  }
       deprecated_ids_to_keep.compact!
-      
+
       # delete them if we should
       deprecated_ids.each do |id|
         next if deprecated_ids_to_keep.include? id
         victim = D3::Package.new(:id => id)
         victim.delete(
           admin: admin,
-          delete_scripts: true,
+          keep_scripts: false,
           keep_in_jss: false,
           rwpw: D3::Admin::Auth.rw_credentials(:dist)[:password]
         )
@@ -381,7 +381,7 @@ INSERT INTO #{P_TABLE[:table_name]} (
         victim = D3::Package.new(:id => id)
         victim.delete(
           admin: admin,
-          delete_scripts: true,
+          keep_scripts: false,
           keep_in_jss: false,
           rwpw: D3::Admin::Auth.rw_credentials(:dist)[:password]
         )
@@ -395,7 +395,7 @@ INSERT INTO #{P_TABLE[:table_name]} (
     ###
     ### @param keep_in_jss[Boolean] should we keep the JSS package around? defaults to false
     ###
-    ### @param delete_scripts[Boolean] should the related scripts also be deleted?
+    ### @param keep_scripts[Boolean] should the related scripts be kept in the JSS?
     ###
     ### @param admin[String] who's doing this?
     ###
@@ -403,9 +403,9 @@ INSERT INTO #{P_TABLE[:table_name]} (
     ###
     ### @return [Array<String>] a textual list of scripts delted and not
     ###   deleted because they're in use by other d3 pkgs or casper policies
-    ###    (empty if delete_scripts is false)
+    ###    (empty if keep_scripts is true)
     ###
-    def delete (keep_in_jss: false, delete_scripts: false, admin: @admin, rwpw: nil)
+    def delete (keep_in_jss: false, keep_scripts: false, admin: @admin, rwpw: nil)
 
       unless keep_in_jss
         # raise an exception if any polcies are using this pkg.
@@ -419,8 +419,8 @@ INSERT INTO #{P_TABLE[:table_name]} (
       # use @ admin if its defined and needed
       admin ||= @admin
 
-      # if delete_scripts
-      script_actions = delete_scripts ? delete_pkg_scripts : []
+      # delete scripts or not?  the result is an array of what happened.
+      script_actions = keep_scripts ? [] : delete_pkg_scripts
 
       # delete it from the pakcages table
       stmt = JSS::DB_CNX.db.prepare "DELETE FROM #{P_TABLE[:table_name]} WHERE #{P_FIELDS[:id][:field_name]} = '#{@id}'"

data/lib/d3/package/setters.rb

@@ -93,7 +93,7 @@ module D3
 
     ### Set the expiration period for all installs of this pkg.
     ### Once installed, if this many days go by without
-    ### the @expiration_path being launched, as noted by casper's the pkg
+    ### the @expiration_paths being launched, as noted by d3repoman, the pkg
     ### will be silently uninstalled.
     ###
     ### Use nil, false, or 0 (the default) to prevent expiration.
@@ -115,24 +115,51 @@ module D3
       @need_to_update_d3 = true unless  @initializing
     end # expiration =
 
-    ### Set the expiration path for this pkg.
-    ### This is the path to the app that must be launched
-    ### at least once every @expiration days to prevent
+    ### Set the expiration paths for this pkg.
+    ### These are abosulute paths to executables one of which must be brought to the
+    ### foreground at least once every @expiration days to prevent
     ### silent un-installing of this package.
     ###
-    ### This is the path as recorded in Casper's application usage logs.
-    ### @example "/Applications/FileMaker Pro 11/FileMaker Pro.app"
+    ### 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] The path to the application
+    ### @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_path= (new_val = @expiration_path)
-      return @expiration_path if new_val == @expiration_path
-      @expiration_path = validate_expiration_path (new_val)
+    def expiration_paths= (new_val = @expiration_paths)
+      return @expiration_paths if new_val == @expiration_paths
+      @expiration_paths = validate_expiration_paths (new_val)
       @need_to_update_d3 = true unless @initializing
     end # expiration =
 
+    ### Add a path to expiration_paths
+    ### @param new_val[String,Pathname]
+    ###
+    ### The paths are those recorded in d3RepoMan's timestamp plists.
+    ### @example "/Applications/FileMaker Pro 11/FileMaker Pro.app/Contents/MacOS/Filemaker Pro"
+    ###
+    def add_expiration_path (path)
+      path = validate_expiration_path(path)
+      @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]
+    ###
+    ### The paths are those recorded in d3RepoMan's timestamp plists.
+    ### @example "/Applications/FileMaker Pro 11/FileMaker Pro.app/Contents/MacOS/Filemaker Pro"
+    ###
+    def remove_expiration_path (path)
+      @expiration_paths.delete Pathname.new(path)
+      @need_to_update_d3 = true unless @initializing
+    end # remove_expiration_path
+    
+  
     ### Set the prohibiting process for this installer.
     ###
     ### The value of this attribute is compared at install time to the lines output

data/lib/d3/package/validate.rb

@@ -346,7 +346,7 @@ module D3
       ### @return [Symbol] the valid CPU type
       ###
       def validate_cpu_type (type)
-        type = JSS::Package::DEFAULT_CPU_TYPE if type.to_s.empty?
+        type = JSS::Package::DEFAULT_PROCESSOR if type.to_s.empty?
         type = "None" if type =~ /^n(one)?$/i
         type = "x86" if type.casecmp('intel') == 0
         type = "ppc" if type.casecmp('ppc') == 0
@@ -428,21 +428,40 @@ module D3
         exp.to_i
       end
 
+      ### Confirm the validity of one or more expiration paths.
+      ### Any string that starts with a / is valid.
+      ### The strings "n" or "none" returns an empty array.
+      ###
+      ### @param paths[Pathname, String, Array<String,Pathname>] the path(s) to check
+      ###
+      ### @return [Array<Pathname>] the valid path
+      ###
+      def validate_expiration_paths (paths)
+        return [] if paths.to_s.empty? or paths.to_s =~ /^n(one)?$/i
+
+        paths = paths.chomp.split(/\s*,\s*/) if paths.is_a? String
+
+        if paths.is_a? Array
+          return paths.map!{|p| validate_expiration_path p}
+        else
+          return [validate_expiration_path(paths)]
+        end
+      end
+
       ### Confirm the validity of an expiration path.
-      ### any string that starts with a / is valid.
+      ### Any string that starts with a / is valid, d3 can't confirm
+      ### the paths existing on client machines.
       ###
-      ### @param path[Pathname, String] the path to check
+      ### @param paths[Pathname, String] the path to check
       ###
-      ### @return [Pathname, nil] the valid path
+      ### @return [Pathname] the valid path
       ###
       def validate_expiration_path (path)
         path = path.to_s
-        return nil if path.empty?
         raise JSS::InvalidDataError, "Expiration Path must be a full path starting with /." unless path.start_with? "/"
         Pathname.new path
       end
 
-
     end # module Validate
 
   end # class package

data/lib/d3/version.rb

@@ -25,5 +25,5 @@
 
 ###
 module D3
-  VERSION = '3.0.9'
+  VERSION = '3.0.11'
 end # module

metadata

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