depot3 3.0.9 → 3.0.11

data/lib/d3/client/auth.rb

@@ -42,8 +42,8 @@ module D3
       db_ro_user = D3::CONFIG.client_db_ro_user
       db_ro_user ||= JSS::CONFIG.db_username
 
-      JSS::DB_CNX.connect :server => JSS::CONFIG.db_server_name, :user => db_ro_user, :pw => D3::Client.get_ro_pass(:db), :connect_timeout => 10
-      JSS::API.connect :server => JSS::CONFIG.api_server_name, :user => jss_ro_user, :pw => D3::Client.get_ro_pass(:jss), :open_timeout => 10
+      JSS::DB_CNX.connect :server => JSS::CONFIG.db_server_name, :user => db_ro_user, :pw => D3::Client.get_ro_pass(:db)
+      JSS::API.connect :server => JSS::CONFIG.api_server_name, :user => jss_ro_user, :pw => D3::Client.get_ro_pass(:jss)
 
       D3::Database.check_schema_version
     end # connect

data/lib/d3/client/class_methods.rb

@@ -57,6 +57,10 @@ module D3
           raise JSS::NoSuchItemError, "No d3 package matching #{pkg_to_search}" unless desired_pkg
           raise D3::InstallError, "The package for #{desired_pkg.edition} is missing from the JSS" if desired_pkg.missing?
 
+          if options.custom_expiration
+            raise "Sorry #{desired_pkg.edition} is not expirable. A d3 admin needs to add an expiration path." if desired_pkg.expiration_paths.empty?
+          end
+
           curr_rcpt = D3::Client::Receipt.all[desired_pkg.basename]
 
           # many things can be forced
@@ -101,14 +105,13 @@ module D3
           D3.log "Finished installing #{desired_pkg.edition}(#{desired_pkg.status})", :info
 
         rescue JSS::MissingDataError, JSS::NoSuchItemError, JSS::InvalidDataError, D3::InstallError
-          D3.log "Skipping installation of #{pkg_to_search}:\n   #{$!}", :error
+          D3.log "Skipping installation of #{pkg_to_search}: #{$!}", :error
           D3.log_backtrace
         rescue D3::PreInstallError
-          D3.log "There was an error with the pre-install script for #{desired_pkg.edition}:\n   #{$!}", :error
+          D3.log "There was an error with the pre-install script for #{desired_pkg.edition}: #{$!}", :error
           D3.log_backtrace
         rescue D3::PostInstallError
-          D3.log "There was an error with the post-install script for #{desired_pkg.edition}:\n   #{$!}", :error
-          D3.log "   NOTE: it was installed, but may have problems.", :error
+          D3.log "There was an error with the post-install script for #{desired_pkg.edition}: #{$!} NOTE: it was installed, but may have problems.", :error
           D3.log_backtrace
         end # begin
       end # args.each
@@ -133,7 +136,7 @@ module D3
           D3.log "Finished uninstalling #{rcpt.edition}.", :info
 
         rescue JSS::MissingDataError, D3::UninstallError, JSS::InvalidDataError
-          D3.log "Skipping uninstall of #{rcpt_to_remove}:\n   #{$!}", :error
+          D3.log "Skipping uninstall of #{rcpt_to_remove}: #{$!}", :error
           D3.log_backtrace
           next
         end # begin
@@ -223,6 +226,13 @@ module D3
         # expirations
         do_expirations
 
+        # removie receipts w/ missing packages on the server
+        # This must happen AFTER update_installed_pkgs
+        # so that the basename gets any updates on the server
+        # before removing the recetip (which wouild prevent
+        # updates)
+        clean_missing_receipts
+
         D3.log "Finished sync", :warn
       ensure
         D3::Client.unset_env :sync
@@ -256,27 +266,35 @@ module D3
           rcpt.update
           next
         end
+        need_update = false
+
+        # Are we rolling back to a prev version?
+        # If the pkgdata[:status] is :pilot and the
+        # rcpt.status is NOT :pilot, then we are.
+        rolling_back = (pkgdata[:status] == :pilot) && (rcpt.status != :pilot)
 
         # status
-        if rcpt.status != pkgdata[:status]
-          # update the status
-          rcpt.status = pkgdata[:status]
-          D3.log "Updating status for #{rcpt.edition} to #{pkgdata[:status]}", :info
-          rcpt.update
-        end # if
+        unless rolling_back
+          if rcpt.status != pkgdata[:status]
+            # update the status
+            rcpt.status = pkgdata[:status]
+            D3.log "Updating status for #{rcpt.edition} to #{pkgdata[:status]}", :info
+            need_update = true
+          end # if
+        end # unless
 
         # pre-remove script
         if rcpt.pre_remove_script_id != pkgdata[:pre_remove_script_id]
           rcpt.pre_remove_script_id = pkgdata[:pre_remove_script_id]
           D3.log "Updating pre-remove script for #{rcpt.edition}", :info
-          rcpt.update
+          need_update = true
         end # if
 
         # post-remove script
         if rcpt.post_remove_script_id != pkgdata[:post_remove_script_id]
           rcpt.post_remove_script_id = pkgdata[:post_remove_script_id]
           D3.log "Updating post-remove script for #{rcpt.edition}", :info
-          rcpt.update
+          need_update = true
         end # if
 
         # removability
@@ -287,22 +305,22 @@ module D3
             rcpt.expiration = 0
             D3.log "#{rcpt.edition} is not expirable now that it's not removable", :info
           end
-          rcpt.update
+          need_update = true
         end # if
 
         # expiration
         if rcpt.removable?
 
-          if rcpt.expiration_path.to_s != pkgdata[:expiration_path].to_s
-            rcpt.expiration_path = pkgdata[:expiration_path]
-            D3.log "Updating expiration path for #{rcpt.edition}", :info
-            rcpt.update
+          unless rcpt.expiration_paths_match? pkgdata[:expiration_paths]
+            rcpt.expiration_paths = pkgdata[:expiration_paths]
+            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
-            rcpt.update
+            need_update = true
           end # if
         end # if removable
 
@@ -310,18 +328,12 @@ module D3
         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
-          rcpt.update
+          need_update = true
         end # if
 
-        # last usage
-        # this will update the last_usage value stored in the rcpt (for reporting only)
-        # (expiration only looks at current usage data)
-        if rcpt.expiration_path
-          rcpt.last_usage
-          rcpt.update
-        end
 
-        end # each do basename, rcpt
+        rcpt.update if need_update
+      end # each do basename, rcpt
     end # update
 
     ### remove any invalid puppies from the queue
@@ -399,14 +411,13 @@ module D3
               )
               D3.log "Auto-installed #{new_pkg.basename}", :warn
             rescue JSS::MissingDataError, JSS::InvalidDataError, D3::InstallError
-              D3.log "Skipping auto-install of #{new_pkg.edition}:\n   #{$!}", :error
+              D3.log "Skipping auto-install of #{new_pkg.edition}: #{$!}", :error
               D3.log_backtrace
             rescue D3::PreInstallError
-              D3.log "There was an error with the pre-install script for #{new_pkg.edition}:\n   #{$!}", :error
+              D3.log "There was an error with the pre-install script for #{new_pkg.edition}: #{$!}", :error
               D3.log_backtrace
             rescue D3::PostInstallError
-              D3.log "There was an error with the post-install script for #{new_pkg.edition}:\n   #{$!}", :error
-              D3.log "   NOTE: #{new_pkg.edition} was installed, but may not work.", :error
+              D3.log "There was an error with the post-install script for #{new_pkg.edition}: #{$!} NOTE: #{new_pkg.edition} was installed, but may not work.", :error
               D3.log_backtrace
             end #begin
           end # live_ids_for_group.each do |live_id|
@@ -416,6 +427,18 @@ module D3
       end
     end
 
+    ### remove any receipts for packages that are missing from the server
+    ###
+    ###
+    def self.clean_missing_receipts
+      D3.log "Checking for receipts no longer in d3", :warn
+      D3::Client::Receipt.all.values.select{|r| r.status == :missing}.each do |mrcpt|
+        D3.log "Removing receipt for missing edition #{mrcpt.edition}", :info
+        D3::Client::Receipt.remove_receipt mrcpt.basename
+        D3.log "Removed receipt for missing edition #{mrcpt.edition}", :info
+      end
+    end
+
     ### Update any currently installed basenames to the currently live one
     ### skipping any basenames currently frozen
     ###
@@ -480,7 +503,9 @@ module D3
 
           # mention rollbacks
           if rollback
-            D3.log "Rolling back #{rcpt.edition} (#{rcpt.status}) to older live #{ live_pkg_data[:edition]}.", :warn
+            D3.log "Rolling back #{rcpt.edition} (#{rcpt.status}) to older live #{live_pkg_data[:edition]}.", :warn
+          else
+            D3.log "Updating #{rcpt.edition} (#{rcpt.status}) to #{live_pkg_data[:edition]} (#{live_pkg_data[:status]})", :warn
           end
 
           # are we bringing over a custom expiration period?
@@ -488,7 +513,6 @@ module D3
 
           # heres the pkg
           live_pkg = D3::Package.new :id => live_basenames_to_ids[rcpt.basename]
-          D3.log "Updating #{rcpt.edition} (#{rcpt.status}) to #{live_pkg.edition} (#{live_pkg.status})", :warn
 
           begin
             live_pkg.install(
@@ -501,14 +525,13 @@ module D3
               )
             D3.log "Done updating #{rcpt.edition} (#{rcpt.status}) to #{live_pkg.edition} (#{live_pkg.status})", :info
           rescue JSS::MissingDataError, JSS::InvalidDataError, D3::InstallError
-            D3.log "Skipping update of #{rcpt.edition} to #{live_pkg.edition}:\n   #{$!}", :error
+            D3.log "Skipping update of #{rcpt.edition} to #{live_pkg.edition}: #{$!}", :error
             D3.log_backtrace
           rescue D3::PreInstallError
-            D3.log "There was an error with the pre-install script for #{live_pkg.edition}:\n   #{$!}", :error
+            D3.log "There was an error with the pre-install script for #{live_pkg.edition}: #{$!}", :error
             D3.log_backtrace
           rescue D3::PostInstallError
-            D3.log "There was an error with the post-install script for #{live_pkg.edition}:\n   #{$!}", :error
-            D3.log "   NOTE: #{live_pkg.edition} was installed, but may not work.", :error
+            D3.log "There was an error with the post-install script for #{live_pkg.edition}: #{$!} NOTE: #{live_pkg.edition} was installed, but may not work.", :error
             D3.log_backtrace
           end # begin
         end # D3::Client::Receipt.all.values.each
@@ -555,7 +578,23 @@ module D3
         rcpt.update
         D3.log "Thawing receipt for #{rcpt.edition}, will resume auto-update during sync", :warn
       end
-    end # freeze receipts
+    end # thaw_receipts
+
+    ### forget one or more receipts, and their matching apple pkg receipts
+    ###
+    ### @param basenames[Array] the basenames of the rcpts to forget
+    ###
+    ### @return [void]
+    ###
+    def self.forget_receipts (basenames)
+      basenames.each do |bn|
+        rcpt = D3::Client::Receipt.all[bn]
+        next unless rcpt
+        rcpt.apple_pkg_ids.each{|ar| system "/usr/sbin/pkgutil --forget '#{ar}'" }
+        D3::Client::Receipt.remove_receipt bn
+        D3.log "Receipt for #{rcpt.edition} has been forgotten", :warn
+      end
+    end # thaw_receipts
 
     ### Do any pending puppy installs right now, because we're
     ### syncing and --puppies option was given
@@ -583,14 +622,13 @@ module D3
           D3.log_backtrace
           D3::PUPPY_Q - puppy
         rescue JSS::MissingDataError, JSS::InvalidDataError, D3::InstallError
-          D3.log "Skipping install of #{new_pkg.edition} from queue:\n   #{$!}", :error
+          D3.log "Skipping install of #{new_pkg.edition} from queue: #{$!}", :error
           D3.log_backtrace
         rescue D3::PreInstallError
-          D3.log "There was an error with the pre-install script for #{new_pkg.edition}:\n   #{$!}", :error
+          D3.log "There was an error with the pre-install script for #{new_pkg.edition}: #{$!}", :error
           D3.log_backtrace
         rescue D3::PostInstallError
-          D3.log "There was an error with the post-install script for #{new_pkg.edition}:\n   #{$!}", :error
-          D3.log "   NOTE: #{new_pkg.edition} was installed, but may not work.", :error
+          D3.log "There was an error with the post-install script for #{new_pkg.edition}: #{$!} NOTE: #{new_pkg.edition} was installed, but may not work.", :error
           D3.log_backtrace
           D3::PUPPY_Q - puppy
         end # begin
@@ -634,7 +672,7 @@ module D3
           expired_edition = rcpt.expire verbose, force
           @@editions_expired << expired_edition if expired_edition
         rescue
-          D3.log "There was an error expiring #{rcpt.edition}:\n   #{$!}", :error
+          D3.log "There was an error expiring #{rcpt.edition}: #{$!}", :error
           D3.log_backtrace
         end
       end

data/lib/d3/client/cli.rb

@@ -67,6 +67,12 @@ module D3
           :needs_connection => false,
           :arg => :basename
         },
+        forget: {
+          :aka => :fg,
+          :help => "Remove receipt but don't try uninstalling.",
+          :needs_connection => false,
+          :arg => :basename
+        },
         list_available: {
           :aka => :la,
           :help => "list all available live installers on the server",
@@ -97,6 +103,11 @@ module D3
           :help => "list any queued pkgs awaiting puppytime at logout",
           :needs_root => false
         },
+        list_queue: {
+          :aka => :lq,
+          :help => "list any queued pkgs awaiting puppytime at logout",
+          :needs_root => false
+        },
         list_details: {
           :aka => :ld,
           :help => "show detailed info about packages in d3",

data/lib/d3/client/help.rb

@@ -58,6 +58,7 @@ Actions:
   uninstall u  <basename>               - Uninstall packages
   freeze    f  <basename>               - Stop auto-updates of this basename
   thaw      t  <basename>               - Resume auto-updates of this basename
+  forget    fg <basename>               - Remove receipt without uninstalling
   dequeue   dq <basename>               - Remove a pending logout install
   sync      s                           - Update receipt data, do auto-installs
                                           update installed software & uninstall

data/lib/d3/client/receipt.rb

@@ -105,7 +105,7 @@ module D3
         :pre_remove_script_id,
         :post_remove_script_id,
         :expiration,
-        :expiration_path,
+        :expiration_paths,
         :prohibiting_process
       ]
 
@@ -148,6 +148,7 @@ module D3
         self.get_datastore_lock(lock_timeout) if rw
 
         @@installed_rcpts = DATASTORE.file? ? YAML.load(DATASTORE.read) : {}
+        @@installed_rcpts ||= {}
 
         D3.log "Receipts loaded", :debug
       end # seld.load_receipts
@@ -162,7 +163,7 @@ module D3
       ###
       ### @return [void]
       ###
-      def self.reload_receipts(rw = false, lock_timeout = DATASTORE_LOCK_TIMEOUT)
+      def self.reload_receipts (rw = false, lock_timeout = DATASTORE_LOCK_TIMEOUT)
 
         # if we  haven't loaded them at all yet, just do that.
         unless @@installed_rcpts
@@ -183,6 +184,7 @@ module D3
 
         # reload it
         @@installed_rcpts = DATASTORE.file? ? YAML.load(DATASTORE.read) : {}
+        @@installed_rcpts ||= {}
         D3.log "Receipts reloaded", :debug
       end # self.reload_receipts
 
@@ -470,8 +472,8 @@ module D3
             :removable => d3_pkg.removable,
             :pre_remove_script_id => d3_pkg.pre_remove_script_id,
             :post_remove_script_id => d3_pkg.post_remove_script_id,
-            :expiraation => d3_pkg.expiraation,
-            :expiraation_path => d3_pkg.expiraation_path
+            :expiration => d3_pkg.expiration,
+            :expiration_paths => d3_pkg.expiration_paths
           )
 
         end # .each do |d3_pkg|
@@ -519,11 +521,11 @@ module D3
       attr_accessor :frozen
 
       # @return [Time, nil] When was this app last used.
-      #   nil if never checked, or no @expiration_path
+      #   nil if never checked, or no @expiration_paths
       attr_reader :last_usage
 
       # @return [Time, nil] When was @last_usage updated?
-      #   nil if never checked, or no @expiration_path
+      #   nil if never checked, or no @expiration_paths
       attr_reader :last_usage_as_of
 
       ################# Constructor #################
@@ -579,7 +581,7 @@ module D3
         @post_remove_script_id = args[:post_remove_script_id]
 
         @expiration = args[:expiration].to_i
-        @expiration_path = args[:expiration_path]
+        @expiration_paths = args[:expiration_paths]
         @custom_expiration = args[:custom_expiration]
 
         @manually_installed = (@admin != D3::AUTO_INSTALL_ADMIN)
@@ -807,7 +809,7 @@ module D3
         @manually_installed = (@admin != D3::AUTO_INSTALL_ADMIN)
         @package_type = @jamf_rcpt_file.end_with?(".dmg") ? :dmg : :pkg
         @expiration = d3_pkg.expiration
-        @expiration_path = d3_pkg.expiration_path
+        @expiration_paths = d3_pkg.expiration_paths
 
       end # repair rcpt
 
@@ -860,8 +862,8 @@ module D3
       ###
       ### @return [void]
       ###
-      def expiration_path= (new_val)
-        @expiration_path = Pathname.new new_val
+      def expiration_paths= (new_val)
+        @expiration_paths = new_val
       end
 
       ### Set a new prohibiting process
@@ -930,7 +932,7 @@ Post-remove script: #{post_name}
 Apple.pkg ids: #{@apple_pkg_ids.join(', ')}
           END_DEETS
         end
-        if @expiration_path
+        if @expiration_paths
           if @expiration.to_i > 0
             lu = last_usage
             if lu.nil?
@@ -943,7 +945,7 @@ Apple.pkg ids: #{@apple_pkg_ids.join(', ')}
 
             deets += <<-END_DEETS
 Expiration period: #{@expiration} days#{@custom_expiration ? ' (custom)' : ''}
-Expiration path: #{@expiration_path}
+Expiration path(s): #{D3::Database::ARRAY_OF_PATHNAMES_TO_COMMA_STRING.call @expiration_paths}
 Last brought to foreground: #{last_usage_display}
             END_DEETS
           end # if exp > 0
@@ -970,8 +972,8 @@ Last brought to foreground: #{last_usage_display}
         return false if @expiration.nil? or @expiration == 0
 
         # gotta have an expiration path
-        unless @expiration_path
-          D3.log "Not expiring #{edition} because: No Expiration Path for #{edition}", :debug
+        if @expiration_paths.empty?
+          D3.log "Not expiring #{edition} because: No Expiration Path(s) for #{edition}", :debug
           return false
         end
 
@@ -1048,7 +1050,7 @@ Last brought to foreground: #{last_usage_display}
         return deleted? ? edition : nil
       end # expire
 
-      ### Return the number of days since the last usage for the @expiration_path
+      ### Return the number of days since the last usage for the @expiration_paths
       ### for this receipt
       ###s
       ### Returns nil if last_usage is nil
@@ -1079,19 +1081,19 @@ Last brought to foreground: #{last_usage_display}
       ###    expiration path or the data wasn't retrievable.
       ###
       def last_usage
-        return nil unless @expiration_path
+        return nil unless @expiration_paths
 
         now = Time.now
 
         # if it's in the foreground right now, return [now, 0]
         fgnd_path = D3::Client.foreground_executable_path
         if fgnd_path
-          now_in_forground = (fgnd_path.to_s ==  @expiration_path.to_s.chomp('/'))
+          now_in_foreground = @expiration_paths.select{|p| fgnd_path == p}.length > 0
         else
-          now_in_forground = nil
+          now_in_foreground = nil
         end
 
-        if now_in_forground
+        if now_in_foreground
           @last_usage = now
           @last_usage_as_of = now
           return @last_usage
@@ -1117,13 +1119,14 @@ Last brought to foreground: #{last_usage_display}
             return nil
           end
 
-          # loop through the plists, get the newest usage time for this
+         # loop through the plists, get the newest usage time for this
           # expiration path, and append it to all_usages
           all_usages = []
           plists.each do |plist|
             usage_times = D3.parse_plist plist
-            my_usage_keys = usage_times.keys.select{|k| k.start_with? @expiration_path.to_s }
-            all_usages << my_usage_keys.map{|k| usage_times[k].to_time }.max
+            my_usage_keys = usage_times.keys.map{|p| Pathname.new(p)}
+            exp_paths_with_usage = @expiration_paths & my_usage_keys
+            exp_paths_with_usage.each{|p| all_usages <<  usage_times[p] }
           end # do plist
 
           @last_usage = all_usages.compact.max

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.82"
+    MAX_SCHEMA_VERSION = "9.93"
 
     ### these Proc objects allow us to encapsulate and pass around various
     ### blocks of code more easily for converting data between their mysql
@@ -59,6 +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(", ")}
 
     ### 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] }
@@ -325,12 +329,12 @@ module D3
           :to_ruby => STRING_TO_INT
         },
 
-        :expiration_path => {
+        :expiration_paths => {
           :field_name => "expiration_app_path",
           :sql_type => 'varchar(300)',
           :index => nil,
-          :to_sql => PATHNAME_TO_STRING,
-          :to_ruby => STRING_TO_PATHNAME
+          :to_sql => ARRAY_OF_PATHNAMES_TO_COMMA_STRING,
+          :to_ruby => COMMA_STRING_TO_ARRAY_OF_PATHNAMES
         }
       },
 
@@ -404,7 +408,8 @@ module D3
     ### Raise an exception if JSS schema is to old or too new
     def self.check_schema_version
       raw = JSS::DB_CNX.db.query("SELECT version FROM #{SCHEMA_TABLE}").fetch[0]
-      current = JSS.parse_jss_version(raw)[:version]
+      simmered = raw.split('.')[0..1].join('.')
+      current = JSS.parse_jss_version(simmered)[:version]
       min = JSS.parse_jss_version(MIN_SCHEMA_VERSION)[:version]
       max = JSS.parse_jss_version(MAX_SCHEMA_VERSION)[:version]
       raise JSS::InvalidConnectionError, "Invalid JSS database schema version: #{raw}, min: #{MIN_SCHEMA_VERSION}, max: #{MAX_SCHEMA_VERSION}" if current < min or current > max

data/lib/d3/log.rb

@@ -28,13 +28,16 @@ module D3
 
   ### Log a message to the d3 log, possibly sending it to stderr as well.
   ###
-  ### The message will appear in the log based upon its severity level,
-  ### and the current D3::Log.level. Any message more severe than the log level
-  ### will be logged.
+  ### The message will appear in the log:
+  ###   - if the log is writable by the current user
+  ###   - based upon its severity level, and the current D3::Log.level.
+  ###     Any message more severe than the log level will be logged.
   ###
-  ### The message will appear on stderr if the message severity is
-  ### at or higher than the current @@verbosity. If the @@verbosity is :debug
-  ### the messages to stderr will be prefixed with the message severity.
+  ### The message will also appear on stderr if the message severity is
+  ### at or higher than the current @@verbosity.
+  ###
+  ### If the @@verbosity is :debug the messages to stderr will be prefixed with
+  ### the message severity.
   ###
   ### In the d3 command, @@verbosity is controlled with the -v, -q and -d
   ### options
@@ -62,12 +65,8 @@ module D3
       end
     end #
 
-    # can't write to the log unless we're super user
-    return unless  JSS.superuser?
-
     # send to the logger
     D3::Log.instance.log msg, severity
-
   end
 
   ### Log the lines of backtrace from the most recent exception
@@ -173,31 +172,25 @@ module D3
       @level = D3::CONFIG.log_level if D3::CONFIG.log_level
       @timestamp_format = D3::CONFIG.log_timestamp_format if D3::CONFIG.log_timestamp_format
 
-      # the logger will be created when it's needed
-      @logger = nil
-
+      # the logger will be created if the file is writable
+      writable =  if @log_file.file?
+                    @log_file.writable?
+                  else
+                    @log_file.parent.writable?
+                  end
 
+      if writable
+        @logger = Logger.new @log_file
+        @logger.level = D3::Log.check_level(@level)
+        set_format
+      else
+        @logger = nil
+      end
 
     end # init
 
     ################# Public Instance Methods #################
 
-    ### Access the logger, creating it if needed.
-    ### We don't make it when the instance is created because it
-    ### might want to write to a place we don't have permissions.
-    ### So anything that uses it will call this to create it when
-    ### its needed.
-    def the_logger
-      return @logger if @logger
-      # make logger if needed
-      unless @logger
-        @logger = Logger.new @log_file
-        set_format
-      end
-      @logger.level = D3::Log.check_level @level
-      return @logger
-    end
-
     ### Send a message to be logged
     ### If the severity is less severe than the current level,
     ### the message won't be written to the log.
@@ -215,7 +208,8 @@ module D3
     ### @return [Boolean] the message was handled appropriately, or not
     ###
     def log (msg, severity = DFT_LOG_LEVEL)
-      the_logger.add(D3::Log.check_level(severity), msg, @progname)
+      return nil unless @logger
+      @logger.add(D3::Log.check_level(severity), msg, @progname)
     end
 
     ### Set a new severity-level for logging.
@@ -226,8 +220,9 @@ module D3
     ### @return [void]
     ###
     def level= (new_level)
-      the_logger.level = D3::Log.check_level(new_level)
-      @level = new_level
+      return nil unless @logger
+      @level = D3::Log.check_level(new_level)
+      @logger.level = @level
     end
 
 
@@ -250,20 +245,21 @@ module D3
     ### @return [void]
     ###
     def timestamp_format= (new_format)
-      new_format = new_format.to_s
-      the_logger.datetime_format = new_format
-      @timestamp_format = new_format
+      return nil unless @logger
+      @timestamp_format = new_format.to_s
+      @logger.datetime_format = @timestamp_format
     end # timestamp_format=
 
     private
 
     ### set up the log line format
     def set_format
-      # set the line format
-      the_logger.formatter = proc do |severity, datetime, progname, msg|
+      return nil unless @logger
+      @logger.formatter = proc do |severity, datetime, progname, msg|
         "#{datetime.strftime @timestamp_format} #{progname} [#{$$}]: #{severity}: #{msg}\n"
       end #
-    end
+    end # set format
+
   end # class Log
 
   # the singleton instance of our logger

data/lib/d3/package/constructor.rb

@@ -167,7 +167,7 @@ module D3
 
           # if we have a setter method for this key, call it to set the attribute.
           setter = "#{fld_key}=".to_sym
-          send(setter, fld_val) if self.respond_to?(setter, true)  # the 'true' makes respond_to? look at private methods also
+          self.send(setter, fld_val) if self.respond_to?(setter, true)  # the 'true' makes respond_to? look at private methods also
 
         end # PFIELDS.each
       end # if d3pkg_data
@@ -175,6 +175,9 @@ module D3
       # some nil-values shouldn't be nil
       @auto_groups ||= []
       @excluded_groups ||= []
+      
+      # expiration_paths should always be an array
+      @expiration_paths ||= []
 
       # these don't come from the table def.
       @admin = args[:admin]