depot3 3.0.9 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3958145701408de91742321b631220d28616638
-  data.tar.gz: 46cfaa84e02925dc7d3ea47d7616cb395ab4e2ab
+  metadata.gz: dd0846668a4adffcd65b2f18acb90ea9e2d358fc
+  data.tar.gz: 536dd741fc281d3a85f734338e9212c65c41c50f
 SHA512:
-  metadata.gz: 3e37917a62941a884946bea3e32425d1a1731098c2f6d0b03aa6373e9375b1173bb4aaaa2dc2877e8739b28359513ce7ed8a8127540d4ec6ad57b96de4fd3f22
-  data.tar.gz: bde22daae9f593443f68c4a71375e5e3624acebc38a639cded1159bc7440e014aa5d04ef9fbacca7cac0c10d8cb27eaeb12a3a98135eb32227a022254b061ae1
+  metadata.gz: d4bfebc0d804c371cae8e11a2e83acd62c5407a8165c55a7269dd0aa7ccf2370d27a56eb137c6c602d5ecbbb69aa9404a36d875e687fb8276594aacb8f31531f
+  data.tar.gz: cafd61d158574ebc192b34f0d8e3102e0929e28310cebccf75c870c21e1ef35019e217df45f3df6ace3f23a39d7e13b2f57f18e126702bd5e3096125e200f65b

data/bin/d3

@@ -243,6 +243,9 @@ class App
       when :thaw then
         D3::Client.thaw_receipts @targets
 
+      when :forget then
+        D3::Client.forget_receipts @targets
+
       when :list_available then
         D3::Client.list_available @options.force
 
@@ -261,6 +264,9 @@ class App
       when :list_puppies then
         D3::Client.list_pending_puppies
 
+      when :list_queue then
+        D3::Client.list_pending_puppies
+
       when :list_details then
         D3::Client.list_details @targets
 
@@ -305,8 +311,18 @@ end # class App
 ############
 # Do it
 ############
-stty_save = `stty -g`.chomp
-trap("SIGINT") { puts "\nCancelled! Woot!" ; system('stty', stty_save); exit 0 }
+
+
+### save terminal state incase user interrupts during readline or less
+if $stdin.tty?
+  stty_save = `stty -g`.chomp
+  trap("SIGINT") do
+    puts "\nCancelled! Woot!"
+    system('stty', stty_save)
+    exit 0
+  end
+end
+
 
 begin
   # if needed, set debugging even before we make the app

data/bin/d3admin

@@ -57,8 +57,8 @@ class App
     ### parse the commandline
     parse_commandline
 
-    # can't ever be run as root - no keychain, among other things
-    raise "d3admin can't be run as root" if JSS.superuser? and (not @action =~ /^h/)
+    # can't  be run as root other than help, search or report - no keychain, among other things
+    raise "d3admin can't make server changes as root" if JSS.superuser? and (not @action =~ /^[hsr]/)
 
   end #initialize
 
@@ -274,12 +274,12 @@ class App
           @options.oses = arg
         when '--expiration'
           @options.expiration = arg
-        when '--expiration-path'
-          @options.expiration_path = arg
+        when '--expiration-path', '--expiration_paths'
+          @options.expiration_paths = arg
 
       # delete
-        when '--delete-scripts'
-          @options.delete_scripts = 'y'
+        when '--keep-scripts'
+          @options.keep_scripts = 'y'
         when '--keep-in-jss'
           @options.keep_in_jss = 'y'
 
@@ -398,12 +398,21 @@ ENDVERS
 
     # via the commandline
     else
-      # for any options that weren't given on the commandline, use the defaults
-      default_options.each_pair do |opt, val|
-        next if @options[opt]
-        @options[opt] = val
+
+      # if we were given a new version but not a new revision,
+      # set the new revision to 1
+      if @options[:version] and  @options[:version] !=  default_options[:version]
+        @options[:revision] ||= 1
+        @options[:edition] ||=  "#{@options.basename}-#{@options[:version]}-#{@options[:revision]}"
+        @options.package_name ||= @options[:edition]
+        @options.filename ||= "#{@options[:edition]}.#{default_options.package_build_type}"
+
       end
 
+      # for any options that weren't given on the commandline, use the defaults
+      default_options.each_pair { |opt, val| @options[opt] ||= val }
+
+
       new_package_options = D3::Admin::Add.add_pilot_cli(@options)
 
       ##########################
@@ -594,17 +603,21 @@ ENDVERS
 
     got_scripts = (not pkg.script_ids.values.empty?)
 
-    if @options.walkthru
-      @options.delete_scripts = D3::Admin::Interactive.get_value(:get_delete_scripts, default = 'n', check_method = :validate_yes_no)
-      @options.keep_in_jss = D3::Admin::Interactive.get_value(:get_keep_in_jss, default = 'n', check_method = :validate_yes_no)
-    end
-
     if got_scripts
-      if @options.delete_scripts
-        deets = " - Deleting pre- or post- scripts not in use elsewhere"
-      else
+
+      if @options.walkthru
+        @options.keep_scripts =  D3::Admin::Interactive.get_value(:get_keep_scripts, default = 'n', check_method = :validate_yes_no)
+
+        @options.keep_in_jss = D3::Admin::Interactive.get_value(:get_keep_in_jss, default = 'n', check_method = :validate_yes_no)
+      end # if @options.walkthru
+
+
+      if @options.keep_scripts
         deets = " - Keeping pre- or post- scripts in the JSS"
-      end # if @options.delete_scripts
+      else
+        deets = " - Deleting pre- or post- scripts not used elsewhere"
+      end # if @options.keep_scripts
+
     else
       deets = " - No pre- or post- scripts to delete"
     end # if got_scripts
@@ -617,13 +630,13 @@ ENDVERS
 
     confirm "DELETE #{pkg.edition}, JSS id #{pkg.id}\nDist.Point Filename: #{pkg.filename}", deets
 
-    if @options.delete_scripts && got_scripts
+    if @options.keep_scripts && got_scripts
       puts "Scanning for other packages or policies using  pre- or post- scripts before deleting..."
     end
 
     script_actions = pkg.delete(
         admin: @admin,
-        delete_scripts: @options.delete_scripts,
+        keep_scripts: @options.keep_scripts,
         keep_in_jss: @options.keep_in_jss,
         rwpw: D3::Admin::Auth.rw_credentials(:dist)[:password]
         )
@@ -646,11 +659,11 @@ ENDVERS
     if script_ids.empty?
       deets = " - No pre- or post- scripts to delete"
     else
-      if @options.delete_scripts
-        deets = " - Deleting pre- or post- scripts not in use elsewhere"
-      else
+      if @options.keep_scripts
         deets = " - Keeping pre- or post- scripts in the JSS"
-      end # if @options.delete_scripts
+      else
+        deets = " - Deleting pre- or post- scripts not in use elsewhere"
+      end # if @options.keep_scripts
     end # if script_ids.empty?
 
     confirm "DELETE #{pkg_data[:edition]}\n** Already missing from the JSS **", deets
@@ -658,7 +671,7 @@ ENDVERS
     JSS::DB_CNX.db.query "DELETE FROM #{D3::Database::PACKAGE_TABLE[:table_name]} WHERE package_id = #{pkgid}"
     puts "Package #{pkg_data[:edition]} deleted."
 
-    if @options.delete_scripts && (not script_ids.empty?)
+    if (not @options.keep_scripts) && (not script_ids.empty?)
       puts "Scanning for other packages or policies using  pre- or post- scripts before deleting..."
       policy_scripts = D3.policy_scripts
       script_ids.each do |victim_script_id|
@@ -679,7 +692,7 @@ ENDVERS
           puts "Deleted script '#{victim_script_name}'"
         end
       end # do script id
-    end # if @options.delete_scripts && (not script_ids.empty?)
+    end # if @options.keep_scripts && (not script_ids.empty?)
 
   end # delete_missing_package (pkgid)
 
@@ -837,13 +850,6 @@ ENDDEETS
     end # @targets.each do |search_target|
   end # def search
 
-  ### show a list of packges on the server
-  def show_package_list (basename, statuses)
-
-      D3::Admin::Report.show_list basename, @options.status
-
-  end # show_package_list
-
   ### show a report
   ###
   ### @return [void]
@@ -923,6 +929,9 @@ ENDDEETS
         end
 
       end # if reporting puppies
+
+      # blank line between reports, for clarity
+      puts
     end # targets each
   end # show_report
 
@@ -941,73 +950,34 @@ ENDDEETS
     else
       D3::Admin::Prefs.config @targets, @options
     end
-
-#     if @options.walkthru
-#       tgt = D3::Admin::Interactive.get_value :get_config_target, "all"
-#       @targets = [tgt]
-#     end
-#
-#     if @targets.empty? or @targets.include?("all")
-#       @targets = D3::Admin::CONFIG_TARGETS - ["all"]
-#     end
-#
-#     @targets.each do |target|
-#       case target
-#       when"jss"
-#         puts "********  JSS-API LOCATION AND READ-WRITE CREDENTIALS  ********"
-#         D3::Admin::Auth.ask_for_rw_credentials :jss
-#
-#       when "db"
-#         puts "********  JSS MYSQL LOCATION AND READ-WRITE CREDENTIALS  ********"
-#         D3::Admin::Auth.ask_for_rw_credentials :db
-#
-#       when "dist"
-#         puts "********  MASTER DIST-POINT READ-WRITE PASSWORD  ********"
-#        D3::Admin::Auth.ask_for_rw_credentials :dist
-#
-#       when "workspace"
-#         puts "********  LOCAL PKG/DMG BUILD WORKSPACE  ********"
-#         pth = D3::Admin::Interactive.get_value :workspace, D3::Admin::Prefs.prefs[:workspace]
-#         D3::Admin::Prefs.set_pref :workspace, pth
-#         D3::Admin::Prefs.save_prefs
-#         puts "Thank you, the path has been saved in your d3admin prefs"
-#         puts
-#
-#       when "pkg-id-prefix"
-#         puts "********  .PKG IDENTIFIER PREFIX  ********"
-#         pfx = D3::Admin::Interactive.get_value(:get_pkg_identifier_prefix, D3::Admin::Prefs.prefs[:apple_pkg_id_prefix], :validate_package_identifier_prefix)
-#         D3::Admin::Prefs.set_pref :apple_pkg_id_prefix, pfx
-#         D3::Admin::Prefs.save_prefs
-#         puts "Thank you, the prefix has been saved in your d3admin prefs"
-#         puts
-#       else
-#         puts "(skipping unknown config setting: #{target}"
-#       end # case
-#     end # targets.each
   end # config
 
 
 end # class App
 
 
-### Create and run the application
 
-# save terminal state incase user interrupts during readline or less
-stty_save = `stty -g`.chomp
-trap("SIGINT") { puts "\nCancelled! Woot!" ; system('stty', stty_save); exit 0 }
+
+### save terminal state incase user interrupts during readline or less
+if $stdin.tty?
+  stty_save = `stty -g`.chomp
+  trap("SIGINT") do
+    puts "\nCancelled! Woot!"
+    system('stty', stty_save)
+    exit 0
+  end
+end
 
 begin
   app = App.new
   app.run
 rescue
-  # handle exceptions
   puts "An error occurred: #{$!.class}: #{$!}"
   puts $@ if D3::Admin.debug
   exit 1
 ensure
-  # cleanup
-  if JSS::API.connected?
-    JSS::DistributionPoint.master_distribution_point.unmount if JSS::DistributionPoint.master_distribution_point.mounted?
+  if D3::Admin::Auth.connected?
+    # JSS::DistributionPoint.master_distribution_point.unmount if JSS::DistributionPoint.master_distribution_point.mounted?
     D3::Admin::Auth.disconnect
   end
 end # begin

data/bin/d3helper

@@ -325,7 +325,7 @@ Watch a parade of cute puppies while these items are installed:
           :installed_at =>  jss_rcpt.mtime,
           :removable =>  d3_pkg.removable,
           :expiration => d3_pkg.expiration,
-          :expiration_path => d3_pkg.expiration_path,
+          :expiration_paths => d3_pkg.expiration_paths,
           :prohibiting_process => d3_pkg.prohibiting_process,
           :pre_remove_script_id => d3_pkg.pre_remove_script_id,
           :post_remove_script_id => d3_pkg.post_remove_script_id

data/lib/d3/admin/add.rb

@@ -54,7 +54,7 @@ module D3
           pre_remove
           post_remove
           expiration
-          expiration_path
+          expiration_paths
           source_path
         }.map{|i| i.to_sym}
 
@@ -115,6 +115,7 @@ END_HEADER
             # Here the value we're actually editing
             current_opt_value = options[chosen_opt]
 
+
             # if we're editing version or revision, and the current pkg or filenames are
             # based on them then make a note to update the names  when we get the new values
             if chosen_opt == :basename or chosen_opt == :version or chosen_opt == :revision
@@ -137,6 +138,14 @@ END_HEADER
             # prompt for a new value and put it in place
             options[chosen_opt] = D3::Admin::Interactive.get_value(chosen_opt, current_opt_value, nil)
 
+            # if we changed the version, reset the revision to 1 and update values as needed
+            if chosen_opt == :version and options[chosen_opt] != current_opt_value
+              options[:revision] = 1
+              update_edition = true
+              update_pkg_name = options.package_name.start_with? options.edition
+              update_filename = options.filename.start_with? options.edition
+            end
+
             # if we edited the version or revision, we might need to update names and edition
             options.edition = "#{options.basename}-#{options.version}-#{options.revision}" if update_edition
             options.package_name = "#{options.edition}.#{options.package_build_type}" if update_pkg_name
@@ -271,7 +280,7 @@ END_HEADER
 
         # expiration path if expiration
         if options_from_user[:expiration] > 0
-            errors << "expiration path cannot be empty if expiration is > 0 ." unless options_from_user[:expiration_path]
+            errors << "expiration path cannot be empty if expiration is > 0 ." unless options_from_user[:expiration_paths]
         end
         return [options_from_user, errors]
       end # validate_all_new_package_options

data/lib/d3/admin/auth.rb

@@ -50,6 +50,9 @@ module D3
       KEYCHAIN_DIST_SERVICE = KEYCHAIN_SERVICE_BASE + ".distribution"
       KEYCHAIN_DIST_LABEL = KEYCHAIN_LABEL_BASE + ".distribution"
 
+      @@connected = false
+
+
       ### Connect to the JSS API and MySQL DB
       ### with admin credentials from the keychain
       ###
@@ -62,15 +65,31 @@ module D3
         JSS::DB_CNX.connect :user => db[:user], :pw => db[:password], :connect_timeout => 10
         JSS::API.connect :user => api[:user], :pw => api[:password], :open_timeout => 10
         D3::Database.check_schema_version
+
+        @@connected = true
+
         return JSS::API.cnx.options[:server]
       end
 
-      # Disconnect admin credentials from the JSS API and MySQL DB
+      ### Disconnect admin credentials from the JSS API and MySQL DB
+      ###
+      ### @return [void]
+      ###
       def disconnect
         JSS::API.disconnect if JSS::API.connected?
         JSS::DB_CNX.disconnect if JSS::DB_CNX.connected?
+        @@connected = false
       end
 
+      ### Are we currently connected as an admin?
+      ###
+      ### return [Boolean]
+      ###
+      def connected?
+        @@connected
+      end
+
+
       ### Fetch read-write credentials from the login keychain
       ###
       ### If the login keychain is locked, the user will be prompted
@@ -449,8 +468,6 @@ module D3
         raise JSS::AuthenticationError, "Three incorrect attempts to unlock keychain" if tries == 3
         return true
       end # unlock keychain
-
-
     end # module Auth
 
     ### @see D3::Admin::Auth.connect

data/lib/d3/admin/edit.rb

@@ -53,7 +53,7 @@ module D3
         pre_remove
         post_remove
         expiration
-        expiration_path
+        expiration_paths
         description
       }.map{|i| i.to_sym}
 

data/lib/d3/admin/help.rb

@@ -92,11 +92,12 @@ Action add and edit:
   -c, --cpu <type>                   Limit installation to 'intel' or 'ppc'
   -C, --category <category>          The JSS Category for this package
   -X, --expiration <days>            Auto-uninstall if unused for <days>
-  -P, --expiration-path <path>       Path to executable that must be used
+  -P, --expiration-path(s) <path>    Path(s) to executable(s) that must be used
+                                     (Multiple paths should be comma separated)
 
 Action delete:
-  --delete-scripts                   Delete scripts associated with this pkg
-  --keep-in-jss                      Delete from d3 but leave in the JSS
+  --keep-scripts                     Keep pre-/post- scripts in Casper
+  --keep-in-jss                      Delete pkg from d3 but leave in Casper
 
 Action search or report:
   -S, --status <status>              Limit package list to this status
@@ -347,18 +348,19 @@ Action add and edit:
                                        and expiration must be allowed in the
                                        client config.
 
-  -P, --expiration-path <path>       The path to the executable the must be used
-                                       within the expiration period to avoid
-                                       being uninstalled
+  -P, --expiration-path(s) <path>    The path(s) to the executable(s) the must
+                                       be used within the expiration period to
+                                       avoid being uninstalled
 
 Action delete:
 
-  --delete-scripts                   Delete any scripts associated with this pkg
-                                       if they aren't in use elsewhere. Those in
-                                       use will be reported.
+  --keep-scripts                     Keep any scripts associated with this pkg
+                                       in Casper. Note: scripts used by other
+                                       packages or polices are never deleted.
 
-  --keep-in-jss                      Leave the package in the JSS after deleting
-                                       it from d3
+  --keep-in-jss                      Leave the package in Casper after deleting
+                                       it from d3. Note: packages used by
+                                       policies are never deleted from Casper.
 
 
 Action search:
@@ -394,4 +396,3 @@ ENDHELP
     end # module help
   end # module admin
 end # module D3
-

data/lib/d3/admin/interactive.rb

@@ -830,37 +830,38 @@ Enter the number of days, or 0 for no expiration.
         prompt_for_data(desc: desc, prompt: "Expiration days", default: default, required: true)
       end
 
-      ### Get the path to the application to monitor for expiration
+      ### Get the path to the executable(s) to monitor for expiration
       ###
-      ### @param default[Pathname, String] the default choice when typing return
+      ### @param default[String, Pathname, Array<String,Pathname>] the path(s)
       ###
-      ### @return [Pathname] the path to the application
+      ### @return [Array<Pathname>] the path(s) to the executable
       ###
-      def get_expiration_path (default = 'n')
+      def get_expiration_paths (default = 'n')
         desc = <<-END_DESC
-EXPIRATION PATH
-Enter the path to a the application that must be used
-to prevent expiration.
-E.g. /Applications/Google Chrome.app
+EXPIRATION PATH(S)
+Enter the path(s) to the executable(s) that must be used
+to prevent expiration. Multiple paths should be separated by commas, spaces
+should not be escaped. E.g.
+/Applications/Google Chrome.app/Contents/MacOS/Google Chrome, /Applications/Firefox.app/Contents/MacOS/firefox
 Enter 'n' for none
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Expiration Path", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: "Expiration Path(s)", default: default, required: true)
       end
 
-      ### when deleting a pkg, should its pre- and post- scripts be deleted
+      ### when deleting a pkg, should its pre- and post- scripts be kept?
       ###
       ### @param default[String] the default answer when user hits return
       ###
       ### @return [String] the users response
       ###
-      def get_delete_scripts (default = 'n')
+      def get_keep_scripts (default = 'n')
         desc = <<-END_DESC
-DELETE ASSOCIATED SCRIPTS?
+KEEP ASSOCIATED SCRIPTS IN CASPER?
 When deleting a package, should any associated scripts
-(pre-install, post-install, pre-remove, post-remove) also be deleted?
+(pre-install, post-install, pre-remove, post-remove) be kept in Casper?
 
 NOTE: If any other d3 packages or policies are using the scripts
-they won't be deleted, but the other users will be reported.
+they won't be deleted. The other users of the scripts will be reported.
 Enter 'y' or 'n'
         END_DESC
         prompt_for_data(desc: desc, prompt: "Delete Scripts? (y/n)", default: default, required: true)
@@ -874,8 +875,8 @@ Enter 'y' or 'n'
       ###
       def get_keep_in_jss (default = 'n')
         desc = <<-END_DESC
-KEEP THE PACKAGE IN THE JSS?
-When deleting a package, should it be kept as a JSS package
+KEEP THE PACKAGE IN CASPER?
+When deleting a package, should it be kept as a Casper package
 and only deleted from d3?
 Enter 'y' or 'n'
         END_DESC
@@ -970,4 +971,3 @@ END_DESC
     end # module
   end # module Admin
 end # module D3
-

data/lib/d3/admin/options.rb

@@ -348,14 +348,14 @@ module D3
           :unsetable => true,
           :validate => :validate_expiration
         },
-        expiration_path: {
+        expiration_paths: {
           :default => nil,
-          :cli => [ '--expiration-path', '-P', GetoptLong::REQUIRED_ARGUMENT ],
-          :label=> "Expiration Path",
-          :display_conversion => DISPLAY_DFT_NONE,
-          :get => :get_expiration_path,
+          :cli => [ '--expiration-path', '--expiration-paths', '-P', GetoptLong::REQUIRED_ARGUMENT ],
+          :label=> "Expiration Path(s)",
+          :display_conversion => D3::Database::ARRAY_OF_PATHNAMES_TO_COMMA_STRING ,
+          :get => :get_expiration_paths,
           :unsetable => true,
-          :validate => :validate_expiration_path
+          :validate => :validate_expiration_paths
         },
         description: {
           :default => '',
@@ -415,12 +415,12 @@ module D3
 
 
         # Delete
-        delete_scripts: {
+        keep_scripts: {
           :default => nil,
-          :cli => [ '--delete-scripts', GetoptLong::NO_ARGUMENT ],
-          :label => "Delete associated scripts",
+          :cli => [ '--keep-scripts', GetoptLong::NO_ARGUMENT ],
+          :label => "Keep associated scripts in Casper",
           :display_conversion => DISPLAY_TRUE_FALSE,
-          :get => :get_delete_scripts,
+          :get => :get_keep_scripts,
           :validate => :validate_yes_no
         },
         keep_in_jss: {

data/lib/d3/admin/report.rb

@@ -522,14 +522,33 @@ module D3
       ###### Data gathering
 
       ### Reconnect to both the API and DB with a much larger timeout, and
-      ### using an alternate DB server if one is defined.
+      ### using an alternate DB server if one is defined. Also connect with 
+      ### the read-only accts, since rw isn't needed, retrieving the pws
+      ### requires an admin keychain, which makes automated reporting 
+      ### unpleasant.
       ###
       ### @return [Hash<String>] the hostnames of the connected JSS & MySQL servers
       ###
       def connect_for_reports
-        api = D3::Admin::Auth.rw_credentials :jss
-        db = D3::Admin::Auth.rw_credentials :db
-        D3.connect_for_reports  api[:user], api[:password], db[:user], db[:password]
+        if JSS.superuser?
+          jss_user = D3::CONFIG.client_jss_ro_user
+          jss_user ||= JSS::CONFIG.api_username
+          jss_pw =  D3::Client.get_ro_pass(:jss)
+          
+          db_user = D3::CONFIG.client_db_ro_user
+          db_user ||= JSS::CONFIG.db_username
+          db_pw = D3::Client.get_ro_pass(:db)
+          
+        else
+          api = D3::Admin::Auth.rw_credentials :jss          
+          jss_user = api[:user]
+          jss_pw =  api[:password]
+
+          db = D3::Admin::Auth.rw_credentials :db
+          db_user = db[:user]
+          db_pw = db[:password]          
+        end
+        D3.connect_for_reports jss_user, jss_pw, db_user, db_pw
       end # connect for report
 
       ### Get the raw data for a client-install report, from the EA if available
@@ -541,8 +560,6 @@ module D3
       ### @return  [Array<Hash>] The data for doing client install reports
       ###
       def computer_receipts_data
-        puts "Querying Casper for receipt data..."
-
         the_data = computer_receipts_ea_data
         return the_data if the_data
         return computer_receipts_jamf_data

data/lib/d3/admin/validate.rb

@@ -397,6 +397,18 @@ module D3
         D3::Package::Validate.validate_expiration exp
       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)
+        D3::Package::Validate.validate_expiration_paths paths
+      end
+
       ### Confirm the validity of an expiration path.
       ### any string that starts with a / is valid.
       ###

data/lib/d3/basename.rb

@@ -121,7 +121,7 @@ module D3
     attr_reader :expiration
 
     # @return [String] the path to the executable that needs come to the foreground to prevent expiration
-    attr_reader :expiration_path
+    attr_reader :expiration_paths
 
 
     ################# Public Instance Methods #################
@@ -213,6 +213,21 @@ module D3
       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?
+    ###
+    ### This is generally used to compare two @expiration_paths
+    ### arrays for "equality"
+    ###
+    ### @param other_exp_paths[Array]  An array if Pathnames to compare to @expiration_paths
+    ###
+    ### @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
+      (@expiration_paths -  other_exp_paths).empty?
+    end
 
   end # module Basename
 end # module PixD3