ruby-jss 1.6.4 → 2.0.0b1

data/lib/{jss/api_object → jamf/api/classic/api_objects}/package.rb

@@ -1,4 +1,4 @@
-# Copyright 2020 Pixar
+# Copyright 2022 Pixar
 
 #
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -26,7 +26,7 @@
 # TEMPPORARY
 require 'digest'
 
-module JSS
+module Jamf
 
   # Classes
   #####################################
@@ -36,14 +36,14 @@ module JSS
   # Also the API provides no access to the package's
   # file list (index), so indexing must be done separately (usually via Casper Admin)
   #
-  class Package < JSS::APIObject
+  class Package < Jamf::APIObject
 
     # Mix-Ins
     #####################################
 
-    include JSS::Categorizable
-    include JSS::Creatable
-    include JSS::Updatable
+    include Jamf::Categorizable
+    include Jamf::Creatable
+    include Jamf::Updatable
 
     # Class Methods
     #####################################
@@ -115,13 +115,14 @@ module JSS
     #
     # Slow cuz we have to instantiate every pkg
     #
-    # @param api[JSS::APIConnection] an API connection to use
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
+    # @param cnx [Jamf::Connection] an API connection to use
+    #   Defaults to the corrently active API. See {Jamf::Connection}
     #
     # @return [Array<String>] The current file names
     #
-    def self.all_filenames(api: JSS.api)
-      all_filenames_by(:id, api: api).values
+    def self.all_filenames(api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+      all_filenames_by(:id, cnx: cnx).values
     end
 
     # A Hash of all dist-point filenames used by all JSS packages, keyed by
@@ -131,17 +132,19 @@ module JSS
     #
     # @param key[Symbol] either :id, or :name
     #
-    # @param api[JSS::APIConnection] an API connection to use
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
+    # @param cnx [Jamf::Connection] an API connection to use
+    #   Defaults to the corrently active API. See {Jamf::Connection}
     #
     # @return [Hash{Ingeter,String => String}] The current file names by key
     #
-    def self.all_filenames_by(key, api: JSS.api)
+    def self.all_filenames_by(key, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
       raise ArgumentError, 'key must be :id or :name' unless %i[id name].include? key
 
       files_in_use = {}
-      all_ids(:refresh).each do |pkg_id|
-        pkg = fetch id: pkg_id, api: api
+      all_ids(:refresh, cnx: cnx).each do |pkg_id|
+        pkg = fetch id: pkg_id, cnx: cnx
         files_in_use[pkg.send(key)] = pkg.filename
       end
 
@@ -149,7 +152,7 @@ module JSS
     end
 
     # An array of String filenames for all files DIST_POINT_PKGS_FOLDER
-    # that aren't used by a JSS::Package
+    # that aren't used by a Jamf::Package
     #
     # Slow cuz we have to instantiate every pkg
     #
@@ -159,24 +162,26 @@ module JSS
     # @param unmount[Boolean] whether or not ot unount the
     #   distribution point when finished.
     #
-    # @param api[JSS::APIConnection] an API connection to use
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
+    # @param cnx [Jamf::Connection] an API connection to use
+    #   Defaults to the corrently active API. See {Jamf::Connection}
     #
     # @param dist_point [String,Integer] the name or id of the distribution
     #   point to use. Defaults to the Master Dist. Point
     #
     # @return [Array<String>] The orphaned files
     #
-    def self.orphaned_files(ro_pw, unmount = true, api: JSS.api, dist_point: nil)
-      dp = fetch_dist_point(dist_point, api: api)
+    def self.orphaned_files(ro_pw, unmount = true, dist_point: nil, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      dp = fetch_dist_point(dist_point, cnx: cnx)
       pkgs_dir = dp.mount(ro_pw, :ro) + DIST_POINT_PKGS_FOLDER
       files_on_dp = pkgs_dir.children.map { |f| f.basename.to_s }
       dp.unmount if unmount
-      files_on_dp - all_filenames(api: api)
+      files_on_dp - all_filenames(cnx: cnx)
     end
 
     # An array of String filenames for all filenames in any
-    # JSS::Package that don't exist on DIST_POINT_PKGS_FOLDER
+    # Jamf::Package that don't exist on DIST_POINT_PKGS_FOLDER
     #
     # Slow cuz we have to instantiate every pkg
     #
@@ -186,8 +191,8 @@ module JSS
     # @param unmount[Boolean] whether or not ot unount the
     #   distribution point when finished.
     #
-    # @param api[JSS::APIConnection] an API connection to use
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
+    # @param cnx [Jamf::Connection] an API connection to use
+    #   Defaults to the corrently active API. See {Jamf::Connection}
     #
     # @param dist_point [String,Integer] the name or id of the distribution
     #   point to use. Defaults to the Master Dist. Point
@@ -195,12 +200,14 @@ module JSS
     #
     # @return [Array<String>] The orphaned files
     #
-    def self.missing_files(ro_pw, unmount = true, api: JSS.api, dist_point: nil)
-      dp = fetch_dist_point(dist_point, api: api)
+    def self.missing_files(ro_pw, unmount = true, dist_point: nil, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      dp = fetch_dist_point(dist_point, cnx: cnx)
       pkgs_dir = dp.mount(ro_pw, :ro) + DIST_POINT_PKGS_FOLDER
       files_on_dp = pkgs_dir.children.map { |f| f.basename.to_s }
       dp.unmount if unmount
-      all_filenames(api: api) - files_on_dp
+      all_filenames(cnx: cnx) - files_on_dp
     end
 
     # Given a file path, and hash type, generate the checksum for an arbitrary
@@ -221,12 +228,14 @@ module JSS
     # @param dist_point [String,Integer] the name or id of the distribution
     #   point to use. Defaults to the Master Dist. Point
     #
-    # @return [JSS::DistributionPoint]
-    def self.fetch_dist_point(dist_point, api: JSS.api)
+    # @return [Jamf::DistributionPoint]
+    def self.fetch_dist_point(dist_point, api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
       if dist_point
-        JSS::DistributionPoint.fetch dist_point, api: api
+        Jamf::DistributionPoint.fetch dist_point, cnx: cnx
       else
-        JSS::DistributionPoint.master_distribution_point api: api
+        Jamf::DistributionPoint.master_distribution_point cnx: cnx
       end
     end
 
@@ -286,9 +295,9 @@ module JSS
     #   dist. point, if it's been calculated.
     attr_reader :checksum
 
-    # @see JSS::APIObject#initialize
+    # @see Jamf::APIObject#initialize
     #
-    def initialize(args = {})
+    def initialize(**args)
       super
 
       # now we have pkg_data with something in it, so fill out the instance vars
@@ -315,7 +324,7 @@ module JSS
 
 
       # the receipt is the filename with any .zip extension removed.
-      @receipt = @filename ? (JSS::Client::RECEIPTS_FOLDER + @filename.to_s.sub(/.zip$/, '')) : nil
+      @receipt = @filename ? (Jamf::Client::RECEIPTS_FOLDER + @filename.to_s.sub(/.zip$/, '')) : nil
     end # init
 
     # Change the 'allow to be uninstalled' field in the JSS
@@ -334,7 +343,7 @@ module JSS
       # dangerous to do on things like OS updates, so it must be turned on explicitly.
       # packages must be indexed with Casper Admin in order to be uninstalled.
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, "allow_uninstalled must be boolean 'true' or 'false'" unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, "allow_uninstalled must be boolean 'true' or 'false'" unless Jamf::TRUE_FALSE.include? new_val
 
       @allow_uninstalled = new_val
       @need_to_update = true
@@ -349,7 +358,7 @@ module JSS
     def boot_volume_required=(new_val)
       return nil if new_val == @boot_volume_required
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, 'install_if_reported_available must be boolean true or false' unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, 'install_if_reported_available must be boolean true or false' unless Jamf::TRUE_FALSE.include? new_val
       @boot_volume_required = new_val
       @need_to_update = true
     end
@@ -379,7 +388,7 @@ module JSS
     def fill_existing_users=(new_val)
       return nil if new_val == @fill_existing_users
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, "fill_existing_users must be boolean 'true' or 'false'" unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, "fill_existing_users must be boolean 'true' or 'false'" unless Jamf::TRUE_FALSE.include? new_val
       @fill_existing_users = new_val
       @need_to_update = true
     end
@@ -393,7 +402,7 @@ module JSS
     def fill_user_template=(new_val)
       return nil if new_val == @fill_user_template
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, "fill_user_template must be boolean 'true' or 'false'" unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, "fill_user_template must be boolean 'true' or 'false'" unless Jamf::TRUE_FALSE.include? new_val
       @fill_user_template = new_val
       @need_to_update = true
     end
@@ -421,7 +430,7 @@ module JSS
     def install_if_reported_available=(new_val)
       return nil if new_val == @install_if_reported_available
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, 'install_if_reported_available must be boolean true or false' unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, 'install_if_reported_available must be boolean true or false' unless Jamf::TRUE_FALSE.include? new_val
       @install_if_reported_available = new_val
       @need_to_update = true
     end
@@ -449,7 +458,7 @@ module JSS
     #
     def checksum_type=(new_val)
       return if new_val == @checksum_type
-      raise JSS::InvalidDataError, "Checksum type must be one of: #{CHECKSUM_HASH_TYPES.keys.join ', '} " unless CHECKSUM_HASH_TYPES.key? new_val
+      raise Jamf::InvalidDataError, "Checksum type must be one of: #{CHECKSUM_HASH_TYPES.keys.join ', '} " unless CHECKSUM_HASH_TYPES.key? new_val
 
       @checksum_type = new_val
       @need_to_update = true
@@ -463,7 +472,7 @@ module JSS
     #
     def checksum=(new_val)
       return if new_val == @checksum
-      raise JSS::InvalidDataError, 'Checksum must be a String or nil' unless new_val.is_a?(String) || new_val.nil?
+      raise Jamf::InvalidDataError, 'Checksum must be a String or nil' unless new_val.is_a?(String) || new_val.nil?
 
       @checksum = new_val
       @need_to_update = true
@@ -494,7 +503,7 @@ module JSS
         new_val.flatten!
         new_val.uniq!
       else
-        raise JSS::InvalidDataError, 'os_requirements must be a String or an Array of strings'
+        raise Jamf::InvalidDataError, 'os_requirements must be a String or an Array of strings'
       end
       # get the array version
       @os_requirements = JSS.to_s_and_a(new_val)[:arrayform]
@@ -523,7 +532,7 @@ module JSS
     def priority=(new_val)
       return nil if new_val == @priority
       new_val = DEFAULT_PRIORITY if new_val.to_s.empty?
-      raise JSS::InvalidDataError, ':priority must be an integer from 1-20' unless PRIORITIES.include? new_val
+      raise Jamf::InvalidDataError, ':priority must be an integer from 1-20' unless PRIORITIES.include? new_val
       @priority = new_val
       @need_to_update = true
     end
@@ -537,7 +546,7 @@ module JSS
     def reboot_required=(new_val)
       return nil if new_val == @reboot_required
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, "reboot must be boolean 'true' or 'false'" unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, "reboot must be boolean 'true' or 'false'" unless Jamf::TRUE_FALSE.include? new_val
       @reboot_required = new_val
       @need_to_update = true
     end
@@ -552,7 +561,7 @@ module JSS
       return nil if new_val == @required_processor
 
       new_val = DEFAULT_PROCESSOR if new_val.to_s.empty?
-      raise JSS::InvalidDataError, "Required_processor must be one of: #{CPU_TYPES.join ', '}" unless CPU_TYPES.include? new_val
+      raise Jamf::InvalidDataError, "Required_processor must be one of: #{CPU_TYPES.join ', '}" unless CPU_TYPES.include? new_val
 
       @required_processor = new_val
       @need_to_update = true
@@ -580,7 +589,7 @@ module JSS
     def send_notification=(new_val)
       return nil if new_val == @send_notification
       new_val = false if new_val.to_s.empty?
-      raise JSS::InvalidDataError, 'send_notification must be boolean true or false' unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, 'send_notification must be boolean true or false' unless Jamf::TRUE_FALSE.include? new_val
       @send_notification = new_val
       @need_to_update = true
     end
@@ -595,7 +604,7 @@ module JSS
       return nil if new_val == @switch_with_package
       new_val = nil if new_val.to_s.empty?
 
-      raise JSS::NoSuchItemError, "No package named '#{new_val}' exists in the JSS" if new_val && (!self.class.all_names(api: @api).include? new_val)
+      raise Jamf::NoSuchItemError, "No package named '#{new_val}' exists in the JSS" if new_val && (!self.class.all_names(cnx: @cnx).include? new_val)
 
       new_val ||= DO_NOT_INSTALL
       @switch_with_package = new_val
@@ -619,12 +628,12 @@ module JSS
     # use the @filename (possibly with .zip)
     #
     # If you'll be uploading several files you can specify unmount as false, and do it manually when all
-    # are finished with JSS::DistributionPoint.master_distribution_point.unmount
+    # are finished with Jamf::DistributionPoint.master_distribution_point.unmount
     #
     # @param local_file_path[String,Pathname] the local path to the file to be uploaded
     #
     # @param rw_pw[String,Symbol] the password for the read/write account on the master Distribution Point,
-    #   or :prompt, or :stdin# where # is the line of stdin containing the password See {JSS::DistributionPoint#mount}
+    #   or :prompt, or :stdin# where # is the line of stdin containing the password See {Jamf::DistributionPoint#mount}
     #
     # @param unmount[Boolean] whether or not ot unount the distribution point when finished.
     #
@@ -637,14 +646,14 @@ module JSS
     # @return [void]
     #
     def upload_master_file(local_file_path, rw_pw, unmount = true, chksum: DEFAULT_CHECKSUM_HASH_TYPE, dist_point: nil)
-      raise JSS::NoSuchItemError, 'Please create this package in the JSS before uploading it.' unless @in_jss
+      raise Jamf::NoSuchItemError, 'Please create this package in the JSS before uploading it.' unless @in_jss
 
-      dp = self.class.fetch_dist_point(dist_point, api: @api)
+      dp = self.class.fetch_dist_point(dist_point, cnx: @cnx)
 
       destination = dp.mount(rw_pw, :rw) + "#{DIST_POINT_PKGS_FOLDER}/#{@filename}"
 
       local_path = Pathname.new local_file_path
-      raise JSS::NoSuchItemError, "Local file '#{@local_file}' doesn't exist" unless local_path.exist?
+      raise Jamf::NoSuchItemError, "Local file '#{@local_file}' doesn't exist" unless local_path.exist?
 
       # should we zip it?
       if local_path.directory?
@@ -747,7 +756,7 @@ module JSS
     #
     def calculate_checksum(type: nil, local_file: nil, rw_pw: nil, ro_pw: nil, unmount: true, dist_point: nil )
       type ||= DEFAULT_CHECKSUM_HASH_TYPE
-      dp = self.class.fetch_dist_point(dist_point, api: @api)
+      dp = self.class.fetch_dist_point(dist_point, cnx: @cnx)
 
       if local_file
         file_to_calc = local_file
@@ -811,7 +820,7 @@ module JSS
     # @param unmount[Boolean] whether or not ot unount the distribution point when finished.
     #
     # @param rw_pw[String,Symbol] the password for the read/write account on the master Distribution Point,
-    #   or :prompt, or :stdin# where # is the line of stdin containing the password See {JSS::DistributionPoint#mount}
+    #   or :prompt, or :stdin# where # is the line of stdin containing the password See {Jamf::DistributionPoint#mount}
     #
     # @param dist_point [String,Integer] the name or id of the distribution
     #   point to use. Defaults to the Master Dist. Point
@@ -819,12 +828,12 @@ module JSS
     # @return [nil]
     #
     def update_master_filename(old_file_name, new_file_name, rw_pw, unmount = true, dist_point: nil)
-      raise JSS::NoSuchItemError, "#{old_file_name} does not exist in the jss." unless @in_jss
-      dp = self.class.fetch_dist_point(dist_point, api: @api)
+      raise Jamf::NoSuchItemError, "#{old_file_name} does not exist in the jss." unless @in_jss
+      dp = self.class.fetch_dist_point(dist_point, cnx: @cnx)
 
       pkgs_dir = dp.mount(rw_pw, :rw) + DIST_POINT_PKGS_FOLDER.to_s
       old_file = pkgs_dir + old_file_name
-      raise JSS::NoSuchItemError, "File not found on the master distribution point at #{DIST_POINT_PKGS_FOLDER}/#{old_file_name}." unless \
+      raise Jamf::NoSuchItemError, "File not found on the master distribution point at #{DIST_POINT_PKGS_FOLDER}/#{old_file_name}." unless \
         old_file.exist?
 
       new_file = pkgs_dir + new_file_name
@@ -844,7 +853,7 @@ module JSS
     # are finished.
     #
     # @param rw_pw[String] the password for the read/write account on the master Distribution Point
-    #   or :prompt, or :stdin# where # is the line of stdin containing the password. See {JSS::DistributionPoint#mount}
+    #   or :prompt, or :stdin# where # is the line of stdin containing the password. See {Jamf::DistributionPoint#mount}
     #
     # @param unmount[Boolean] whether or not ot unount the distribution point when finished.
     #
@@ -854,7 +863,7 @@ module JSS
     # @return [Boolean] was the file deleted?
     #
     def delete_master_file(rw_pw, unmount = true, dist_point: nil)
-      dp = self.class.fetch_dist_point(dist_point, api: @api)
+      dp = self.class.fetch_dist_point(dist_point, cnx: @cnx)
       file = dp.mount(rw_pw, :rw) + "#{DIST_POINT_PKGS_FOLDER}/#{@filename}"
       if file.exist?
         file.delete
@@ -872,7 +881,7 @@ module JSS
     # @param delete_file[Boolean] should the master dist point file be deleted?
     #
     # @param rw_pw[String] the password for the read/write account on the master Distribution Point
-    #   or :prompt, or :stdin# where # is the line of stdin containing the password. See {JSS::DistributionPoint#mount}
+    #   or :prompt, or :stdin# where # is the line of stdin containing the password. See {Jamf::DistributionPoint#mount}
     #
     # @param unmount[Boolean] whether or not ot unount the distribution point when finished.
     #
@@ -887,7 +896,7 @@ module JSS
 
     # Install this package via the jamf binary 'install' command from the
     # distribution point for this machine.
-    # See {JSS::DistributionPoint.my_distribution_point}
+    # See {Jamf::DistributionPoint.my_distribution_point}
     #
     # @note This code must be run as root to install packages
     #
@@ -925,8 +934,8 @@ module JSS
     #
     # @todo deal with cert-based https authentication in dist points
     #
-    def install(args = {})
-      raise JSS::UnsupportedError, 'You must have root privileges to install packages' unless JSS.superuser?
+    def install(**args)
+      raise Jamf::UnsupportedError, 'You must have root privileges to install packages' unless JSS.superuser?
 
       args[:target] ||= '/'
 
@@ -941,7 +950,7 @@ module JSS
       #    in >=9.72:  jamf install  -package foo.pkg -path http://mycasper.myorg.edu/CasperShare/Packages/foo.pkg
       #
       append_at_vers = JSS.parse_jss_version('9.72')[:version]
-      our_vers = JSS.parse_jss_version(@api.server.raw_version)[:version]
+      our_vers = JSS.parse_jss_version(@cnx.server.raw_version)[:version]
       no_filename_in_url = (our_vers < append_at_vers)
 
       # use a provided alternative url for an http download
@@ -952,15 +961,15 @@ module JSS
         using_http = true
       # use our appropriate dist. point for download
       else
-        mdp = JSS::DistributionPoint.my_distribution_point api: @api
+        mdp = Jamf::DistributionPoint.my_distribution_point cnx: @cnx
 
         # how do we access our dist. point? with http?
         if mdp.http_downloads_enabled && !(args[:no_http])
           using_http = true
           src_path = mdp.http_url
           if mdp.username_password_required
-            raise JSS::MissingDataError, 'No password provided for http download' unless ro_pw
-            raise JSS::InvaldDatatError, 'Incorrect password for http access to distribution point.' unless mdp.check_pw(:http, ro_pw)
+            raise Jamf::MissingDataError, 'No password provided for http download' unless ro_pw
+            raise Jamf::InvaldDatatError, 'Incorrect password for http access to distribution point.' unless mdp.check_pw(:http, ro_pw)
             # insert the name and pw into the uri
             # reserved_chars = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}]") # we'll escape all the chars that aren't unreserved
             src_path = src_path.sub(%r{(https?://)(\S)}, "#{Regexp.last_match(1)}#{CGI.escape mdp.http_username.to_s}:#{CGI.escape ro_pw.to_s}@#{Regexp.last_match(2)}")
@@ -988,7 +997,7 @@ module JSS
       command_args = "-package '#{@filename}' -path '#{src_path}'  -target '#{args[:target]}' #{do_feu} #{do_fut} -showProgress -verbose"
 
       # run it via a client cmd
-      install_out = JSS::Client.run_jamf :install, command_args, args[:verbose]
+      install_out = Jamf::Client.run_jamf :install, command_args, args[:verbose]
 
       install_out =~ %r{<exitCode>(\d+)</exitCode>}
       install_exit = Regexp.last_match(1) ? Regexp.last_match(1).to_i : nil
@@ -1017,12 +1026,12 @@ module JSS
     #
     # @note This code must be run as root to uninstall packages
     #
-    def uninstall(args = {})
+    def uninstall(**args)
       unless removable?
-        raise JSS::UnsupportedError, \
+        raise Jamf::UnsupportedError, \
               'This package cannot be uninstalled. Please use CasperAdmin to index it and allow uninstalls'
       end
-      raise JSS::UnsupportedError, 'You must have root privileges to uninstall packages' unless JSS.superuser?
+      raise Jamf::UnsupportedError, 'You must have root privileges to uninstall packages' unless JSS.superuser?
       args[:target] ||= '/'
 
       # are we doing "fill existing users" or "fill user template"?
@@ -1033,7 +1042,7 @@ module JSS
       jamf_opts = "-target '#{args[:target]}' -id '#{@id}' #{do_feu} #{do_fut}"
 
       # run it via a client
-      JSS::Client.run_jamf 'uninstall', jamf_opts, args[:verbose]
+      Jamf::Client.run_jamf 'uninstall', jamf_opts, args[:verbose]
 
       $CHILD_STATUS
     end
@@ -1090,7 +1099,7 @@ module JSS
     # for saving or updating
     #
     def rest_xml
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       pkg = doc.add_element 'package'
       pkg.add_element('allow_uninstalled').text = @allow_uninstalled
       pkg.add_element('boot_volume_required').text = @boot_volume_required
@@ -1117,4 +1126,4 @@ module JSS
 
   end # class Package
 
-end # module jss
+end # module Jamf

data/lib/{jss/api_object/patch_source → jamf/api/classic/api_objects}/patch_external_source.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,16 +24,16 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   # An 'External' patch source. These sources are defined by Jamf Admins
   # and can be created, modified or deleted.
   #
-  # @see JSS::APIObject
+  # @see Jamf::APIObject
   #
-  class PatchExternalSource < JSS::PatchSource
+  class PatchExternalSource < Jamf::PatchSource
 
-    include JSS::Creatable
+    include Jamf::Creatable
 
     # Constants
     #####################################
@@ -77,7 +77,7 @@ module JSS
     #
     def host_name=(newname)
       return if newname == host_name
-      raise JSS::InvalidDataError, 'names must be String' unless name.is_a? String
+      raise Jamf::InvalidDataError, 'names must be String' unless name.is_a? String
       @host_name = name
       @need_to_update = true
     end
@@ -88,7 +88,7 @@ module JSS
     #
     def port=(new_port)
       return if new_port == port
-      raise JSS::InvalidDataError, 'ports must be Integers' unless port.is_a? Integer
+      raise Jamf::InvalidDataError, 'ports must be Integers' unless port.is_a? Integer
       @port = new_port
       @need_to_update = true
     end
@@ -135,7 +135,7 @@ module JSS
     # @return [void]
     #
     def validate_host_port(action)
-      raise JSS::UnsupportedError, "Cannot #{action} without first setting a host_name and port" if host_name.to_s.empty? || port.to_s.empty?
+      raise Jamf::UnsupportedError, "Cannot #{action} without first setting a host_name and port" if host_name.to_s.empty? || port.to_s.empty?
     end
 
     def rest_xml
@@ -151,4 +151,4 @@ module JSS
 
   end # class PatchInternalSource
 
-end # module JSS
+end # module Jamf

data/lib/{jss/api_object/patch_source → jamf/api/classic/api_objects}/patch_internal_source.rb

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,15 +24,15 @@
 ###
 
 ###
-module JSS
+module Jamf
 
   # An 'Internal' patch source. These sources are defined by
   # Jamf themselves, as a part of the JSS, and cannot be created, modified
   #  or deleted.
   #
-  # @see JSS::APIObject
+  # @see Jamf::APIObject
   #
-  class PatchInternalSource < JSS::PatchSource
+  class PatchInternalSource < Jamf::PatchSource
 
     # Constants
     #####################################
@@ -49,4 +49,4 @@ module JSS
 
   end # class PatchInternalSource
 
-end # module JSS
+end # module Jamf