ruby-jss 2.0.0a11 → 2.0.0b5

data/lib/jamf/api/classic/api_objects/computer.rb

@@ -158,6 +158,7 @@ module Jamf
     include Jamf::Sitable
     include Jamf::MDM
     include Jamf::ManagementHistory
+    include Jamf::MacOSManagedUpdates
 
     extend Jamf::Matchable
 
@@ -183,24 +184,20 @@ module Jamf
     # these keys,  as well as :id and :name, can be used to look up objects
     # of this class in the JSS
     #
-    # the weird alises mac_addresse and macaddresse
-    # are for proper pluralization of 'mac_address' and such
     OTHER_LOOKUP_KEYS = {
       udid: {
-        aliases: [:uuid, :guid],
+        aliases: %i[uuid guid],
         fetch_rsrc_key: :udid
       },
       serial_number: {
-        aliases: [:serialnumber, :sn],
+        aliases: %i[serialnumber sn],
         fetch_rsrc_key: :serialnumber
       },
       mac_address: {
-        aliases: [
-          :mac_address,
-          :mac_addresse,
-          :macaddress,
-          :macaddresse,
-          :macaddr
+        aliases: %i[
+          mac_address
+          macaddress
+          macaddr
         ],
         fetch_rsrc_key: :macaddress
       }
@@ -367,14 +364,14 @@ module Jamf
     def self.all_macbookpros(refresh = false, api: nil, cnx: Jamf.cnx)
       cnx = api if api
 
-      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookpro\d/i  }
+      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookpro\d/i }
     end
 
     # @return [Array<Hash>] all macbookairs in the jss
     def self.all_macbookairs(refresh = false, api: nil, cnx: Jamf.cnx)
       cnx = api if api
 
-      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookair\d/i  }
+      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookair\d/i }
     end
 
     # @return [Array<Hash>] all xserves in the jss
@@ -573,6 +570,7 @@ module Jamf
 
       id = valid_id ident, cnx: cnx
       raise "No computer matches identifier: #{ident}" unless id
+
       if subset
         management_data_subset id, subset: subset, only: only, cnx: cnx
       else
@@ -1007,6 +1005,7 @@ module Jamf
     #
     def filevault1_accounts
       return [] if filevault2_enabled?
+
       local_accounts.select { |a| a[:filevault_enabled] }
     end
 
@@ -1059,6 +1058,7 @@ module Jamf
     #
     def management_data(subset: nil, only: nil)
       raise Jamf::NoSuchItemError, 'Computer not yet saved in the JSS' unless @in_jss
+
       Jamf::Computer.management_data @id, subset: subset, only: only, cnx: @cnx
     end
 
@@ -1144,6 +1144,7 @@ module Jamf
     #
     def make_unmanaged
       return nil unless managed?
+
       set_management_to(nil, nil)
       @unmange_at_update = true
     end
@@ -1186,30 +1187,35 @@ module Jamf
 
     def ip_address=(new_val)
       return nil if @ip_address == new_val
+
       @ip_address = new_val.empty? ? new_val : Jamf::Validate.ip_address(new_val)
       @need_to_update = true
     end
 
     def mac_address=(new_val)
       return nil if new_val == @mac_address
+
       @mac_address =  new_val.empty? ? new_val : Jamf::Validate.mac_address(new_val)
       @need_to_update = true
     end
 
     def alt_mac_address=(new_val)
       return nil if new_val == @alt_mac_address
+
       @alt_mac_address = new_val.empty? ? new_val : Jamf::Validate.mac_address(new_val)
       @need_to_update = true
     end
 
     def serial_number=(new_val)
       return nil if new_val == @serial_number
+
       @serial_number =  new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(Jamf::Computer, :serial_number, new_val, cnx: cnx)
       @need_to_update = true
     end
 
     def udid=(new_val)
       return nil if new_val == @udid
+
       @udid = new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(Jamf::Computer, :udid, new_val, cnx: cnx)
       @need_to_update = true
     end
@@ -1269,9 +1275,6 @@ module Jamf
       @software = nil
     end # delete
 
-
-
-
     # aliases
     alias alt_macaddress alt_mac_address
     alias bar_code_1 barcode1

data/lib/jamf/api/classic/api_objects/computer_group.rb

@@ -57,6 +57,7 @@ module Jamf
     ### Mix-Ins
     #####################################
     include Jamf::MDM
+    include Jamf::MacOSManagedUpdates
 
     #####################################
     ### Class Methods

data/lib/jamf/api/classic/api_objects/criteriable.rb

@@ -153,7 +153,7 @@ module Jamf
     #
     def parse_criteria
       @criteria = Jamf::Criteriable::Criteria.new
-      @criteria.criteria = @init_data[:criteria].map { |c| Jamf::Criteriable::Criterion.new **c } if @init_data[:criteria]
+      @criteria.criteria = @init_data[:criteria].map { |c| Jamf::Criteriable::Criterion.new(**c) } if @init_data[:criteria]
 
       @criteria.container = self
     end

data/lib/jamf/api/classic/api_objects/distribution_point.rb

@@ -107,27 +107,18 @@ module Jamf
     def self.master_distribution_point(refresh = false, default: nil, api: nil, cnx: Jamf.cnx)
       cnx = api if api
 
-      @master_distribution_point = nil if refresh
-      return @master_distribution_point if @master_distribution_point
-
       all_ids(refresh, cnx: cnx).each do |dp_id|
         dp = fetch id: dp_id, cnx: cnx
-        if dp.master?
-          @master_distribution_point = dp
-          break
-        end
+        return dp if dp.master?
       end
 
-      # If we're here, the Cloud DP might be master, but there's no
-      # access to it in the API :/
-      raise Jamf::NoSuchItemError, 'No Master FileShare Distribtion Point. Use the default: parameter if needed.' unless @master_distribution_point || default
-
-      if @master_distribution_point
-        @master_distribution_point
-      elsif default == :random
-        @master_distribution_point = fetch(id: all_ids.sample, cnx: cnx)
+      case default
+      when :random
+        fetch id: all_ids.sample, cnx: cnx
+      when nil
+        raise Jamf::NoSuchItemError, 'No Master FileShare Distribtion Point. Use the default: parameter if needed.'
       else
-        @master_distribution_point = fetch(default, cnx: cnx)
+        fetch default, cnx: cnx
       end
     end
 
@@ -267,38 +258,9 @@ module Jamf
     # @return [String] the ssh password as a SHA256 digest
     attr_reader :ssh_password_sha256
 
-    # As well as the standard :id, :name, and :data, you can
-    # instantiate this class with :id => :master, in which case you'll
-    # get the Master Distribution Point as defined in the JSS.
-    # An error will be raised if one hasn't been defined.
-    #
-    # You can also do this more easily by calling JSS.master_distribution_point
-    #
     def initialize(**args)
-      # TODO: this looks redundant with super....
-      args[:cnx] ||= args[:api]
-      args[:cnx] ||= Jamf.cnx
-
-      @cnx = args[:cnx]
-
-      @init_data = nil
-
-      # looking for master?
-      if args[:id] == :master
-
-        self.class.all_ids(cnx: @cnx).each do |id|
-          @init_data = @cnx.c_get("#{RSRC_BASE}/id/#{id}")[RSRC_OBJECT_KEY]
-          if @init_data[:is_master]
-            @id = @init_data[:id]
-            @name = @init_data[:name]
-            break
-          end # if data is master
-          @init_data = nil
-        end # each id
-      end # if args is master
-
-      super(args) if @init_data.nil?
-
+      super 
+      
       @ip_address = @init_data[:ip_address]
       @local_path = @init_data[:local_path]
       @enable_load_balancing = @init_data[:enable_load_balancing]
@@ -365,7 +327,7 @@ module Jamf
                when :ro then @read_only_password_sha256
                when :http then @http_password_sha256
                when :ssh then @ssh_password_sha256
-      end # case
+               end # case
 
       return nil if sha256 == EMPTY_PW_256
 
@@ -449,7 +411,7 @@ module Jamf
                    JSS.stdin line
                  else
                    pw
-      end
+                 end
 
       pwok = check_pw(access, password)
       unless pwok
@@ -466,7 +428,7 @@ module Jamf
                  when 'smb' then '/sbin/mount_smbfs'
                  when 'afp' then '/sbin/mount_afp'
                  else raise "Can't mount distribution point #{@name}: no known connection type."
-      end
+                 end
 
       @mountpoint.mkpath
 

data/lib/jamf/api/classic/api_objects/mdm.rb

@@ -442,7 +442,7 @@ module Jamf
       #
       # @return [Array<Integer>] The ids of the target devices for a command
       #
-      def raw_targets_to_ids(targets, expand_groups: true, api: nil, cnx: Jamf.cnx)
+      def raw_targets_to_ids(targets, expand_groups: true, unmanaged_ok: false, api: nil, cnx: Jamf.cnx)
         cnx = api if api
 
         targets = targets.is_a?(Array) ? targets : [targets]
@@ -454,6 +454,7 @@ module Jamf
         targets.map! do |md|
           id = valid_id md, cnx: cnx
           raise Jamf::NoSuchItemError, "No #{self} matches identifier: #{md}" unless id
+
           id
         end # map!
 
@@ -465,13 +466,17 @@ module Jamf
         end
 
         # make sure all of them are managed, or else the API will raise a 400
-        # 'Bad Request' when sending the command to an unmanaged target
-        all_mgd = map_all_ids_to(:managed, cnx: cnx).select { |_id, mgd| mgd }.keys
-
-        targets.each do |target_id|
-          raise Jamf::UnmanagedError, "#{self} with id #{target_id} is not managed. Cannot send command." unless all_mgd.include? target_id
-        end
-
+        # 'Bad Request' when sending the command to an unmanaged target.
+        # Some actions, like flushing MDM commands (see .flush_mdm_commands)
+        # are OK on unmanaged machines, so they will specify 'unmanaged_ok'
+        unless unmanaged_ok
+          all_mgd = map_all_ids_to(:managed, cnx: cnx).select { |_id, mgd| mgd }.keys
+
+          targets.each do |target_id|
+            raise Jamf::UnmanagedError, "#{self} with id #{target_id} is not managed. Cannot send command." unless all_mgd.include? target_id
+          end
+        end # unles
+        
         targets
       end
 
@@ -535,9 +540,11 @@ module Jamf
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           return command if COMPUTER_COMMANDS.include? command
+
           raise Jamf::UnsupportedError, "'#{command}' cannot be sent to computers or computer groups"
         when *DEVICE_TARGETS
           return command if DEVICE_COMMANDS.include? command
+
           raise Jamf::UnsupportedError, "'#{command}' cannot be sent to mobile devices or mobile device groups"
         end
 
@@ -585,6 +592,7 @@ module Jamf
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           raise Jamf::InvalidDataError, 'Locking computers requires a 6-character String passcode' unless passcode.size == 6
+
           opts = { passcode: passcode }
         when *DEVICE_TARGETS
           opts = {}
@@ -613,6 +621,7 @@ module Jamf
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           raise Jamf::InvalidDataError, 'Erasing computers requires a 6-character String passcode' unless passcode.size == 6
+
           opts = { passcode: passcode }
         when *DEVICE_TARGETS
           opts = {}
@@ -850,13 +859,17 @@ module Jamf
       def wallpaper(targets, wallpaper_setting: nil, wallpaper_content: nil, wallpaper_id: nil, api: nil, cnx: Jamf.cnx)
         cnx = api if api
 
-        raise ArgumentError, "wallpaper_setting must be one of: :#{WALLPAPER_LOCATIONS.keys.join ', :'}" unless WALLPAPER_LOCATIONS.keys.include? wallpaper_setting
+        unless WALLPAPER_LOCATIONS.keys.include? wallpaper_setting
+          raise ArgumentError, 
+                "wallpaper_setting must be one of: :#{WALLPAPER_LOCATIONS.keys.join ', :'}"
+        end
 
         opts = { wallpaper_setting: WALLPAPER_LOCATIONS[wallpaper_setting] }
 
         if wallpaper_content
           file = Pathname.new wallpaper_content
           raise Jamf::NoSuchItemError, "Not a file: #{file}" unless file.file?
+
           opts[:wallpaper_content] = Base64.encode64 file.read
         elsif wallpaper_id
           opts[:wallpaper_id] = wallpaper_id
@@ -993,18 +1006,19 @@ module Jamf
       # @return (see .send_mdm_command)
       #
       def enable_lost_mode(
-            targets,
-            message: nil,
-            phone: nil,
-            footnote: nil,
-            play_sound: false,
-            enforce_lost_mode: true,
-            api: nil,
-            cnx: Jamf.cnx
-          )
+        targets,
+        message: nil,
+        phone: nil,
+        footnote: nil,
+        play_sound: false,
+        enforce_lost_mode: true,
+        api: nil,
+        cnx: Jamf.cnx
+      )
         cnx = api if api
 
         raise ArgumentError, 'Either message: or phone_number: must be provided' unless message || phone
+
         opts = { always_enforce_lost_mode: enforce_lost_mode }
         opts[:lost_mode_message] = message if message
         opts[:lost_mode_phone] = phone if phone
@@ -1067,7 +1081,9 @@ module Jamf
 
         status = FLUSHABLE_STATUSES[status]
 
-        target_ids = raw_targets_to_ids targets, cnx: cnx, expand_groups: false
+        # TODO: add 'unmanaged_ok:' param to raw_targets_to_ids method, so that we can 
+        # use this to flush commands for unmanaged machines.
+        target_ids = raw_targets_to_ids targets, cnx: cnx, expand_groups: false, unmanaged_ok: true
 
         command_flush_rsrc = "commandflush/#{self::MDM_COMMAND_TARGET}/id"
 
@@ -1367,11 +1383,11 @@ module Jamf
     # @return (see .send_mdm_command)
     #
     def enable_lost_mode(
-          message: nil,
-          phone_number: nil,
-          footnote: nil,
-          enforce_lost_mode: true,
-          play_sound: false
+      message: nil,
+      phone_number: nil,
+      footnote: nil,
+      enforce_lost_mode: true,
+      play_sound: false
     )
       self.class.enable_lost_mode(
         @id,

data/lib/jamf/api/classic/api_objects/mobile_device.rb

@@ -106,21 +106,18 @@ module Jamf
     # are for proper pluralization of 'mac_address' and such
     OTHER_LOOKUP_KEYS = {
       udid: {
-        aliases: [:uuid, :guid],
+        aliases: %i[uuid guid],
         fetch_rsrc_key: :udid
       },
       serial_number: {
-        aliases: [:serialnumber, :sn],
+        aliases: %i[serialnumber sn],
         fetch_rsrc_key: :serialnumber
       },
       wifi_mac_address: {
-        aliases: [
-          :wifi_mac_addresse,
-          :mac_address,
-          :mac_addresse,
-          :macaddress,
-          :macaddresse,
-          :macaddr
+        aliases: %i[
+          wifi_macaddr
+          mac_address
+          macaddr
         ],
         fetch_rsrc_key: :macaddress
       }
@@ -530,21 +527,20 @@ module Jamf
       @needs_mdm_name_change = true if managed? && supervised?
     end
 
-    #
     def serial_number=(new_val)
       return nil if new_val == @serial_number
+
       @serial_number =  new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(self.class, :serial_number, new_val, cnx: cnx)
       @need_to_update = true
     end
 
-    #
     def udid=(new_val)
       return nil if new_val == @udid
+
       @udid = new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(self.class, :udid, new_val, cnx: cnx)
       @need_to_update = true
     end
 
-    #
     def asset_tag=(new_val)
       new_val = new_val.strip
       return nil if @asset_tag == new_val

data/lib/jamf/api/classic/api_objects/mobile_device_application.rb

@@ -50,7 +50,6 @@ module Jamf
     include Jamf::VPPable
     include Jamf::Sitable
 
-
     # Class Methods
     #####################################
 
@@ -162,6 +161,10 @@ module Jamf
     #   does its backups (to icloud or itunes)?
     attr_reader :prevent_backup_of_app_data
 
+    # @return [Boolean] Should this app auto-update on devices?
+    attr_reader :keep_app_updated_on_devices
+    alias auto_update? keep_app_updated_on_devices
+
     # @return [Boolean] should the JSS update the icon and description from the app
     #   source?
     attr_reader :keep_description_and_icon_up_to_date
@@ -185,7 +188,6 @@ module Jamf
     #   which contains a plist <dict> element with config data.
     attr_reader :configuration_prefs
 
-
     # Constructor
     #####################################
 
@@ -208,6 +210,7 @@ module Jamf
       @itunes_country_region = general[:itunes_country_region]
       @itunes_sync_time = general[:itunes_sync_time]
       @deploy_as_managed_app = general[:deploy_as_managed_app]
+      @keep_app_updated_on_devices = general[:keep_app_updated_on_devices]
       @remove_app_when_mdm_profile_is_removed = general[:remove_app_when_mdm_profile_is_removed]
       @prevent_backup_of_app_data = general[:prevent_backup_of_app_data]
       @keep_description_and_icon_up_to_date = general[:keep_description_and_icon_up_to_date]
@@ -232,6 +235,7 @@ module Jamf
     #
     def display_name=(new_val)
       return nil if new_val.to_s == @display_name
+
       @display_name = new_val.to_s
       @need_to_update = true
     end
@@ -274,6 +278,7 @@ module Jamf
     #
     def url=(new_val)
       return nil if new_val == @url
+
       @url = new_val
       @need_to_update = true
     end
@@ -288,6 +293,7 @@ module Jamf
     def make_available_after_install=(new_val)
       return nil if new_val == @make_available_after_install
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @make_available_after_install = new_val
       @need_to_update = true
     end
@@ -302,10 +308,25 @@ module Jamf
     def deploy_as_managed_app=(new_val)
       return nil if new_val == @deploy_as_managed_app
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @deploy_as_managed_app = new_val
       @need_to_update = true
     end
 
+    # Set whether or not this app should be auto-updated on devices
+    #
+    # @param new_val[Boolean] The new value
+    #
+    # @return [void]
+    #
+    def keep_app_updated_on_devices=(new_val)
+      return nil if new_val == @keep_app_updated_on_devices
+      raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
+      @keep_app_updated_on_devices = new_val
+      @need_to_update = true
+    end
+    alias auto_update= keep_app_updated_on_devices=
 
     # Set whether or not this app should be removed when
     # the device is unmanaged
@@ -317,6 +338,7 @@ module Jamf
     def remove_app_when_mdm_profile_is_removed=(new_val)
       return nil if new_val == @remove_app_when_mdm_profile_is_removed
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @remove_app_when_mdm_profile_is_removed = new_val
       @need_to_update = true
     end
@@ -330,11 +352,11 @@ module Jamf
     def prevent_backup_of_app_data=(new_val)
       return nil if new_val == @prevent_backup_of_app_data
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @prevent_backup_of_app_data = new_val
       @need_to_update = true
     end
 
-
     # Set whether or not the jss should update info about this app from the app store
     #
     # @param new_val[Boolean] The new value
@@ -344,6 +366,7 @@ module Jamf
     def keep_description_and_icon_up_to_date=(new_val)
       return nil if new_val == @keep_description_and_icon_up_to_date
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @keep_description_and_icon_up_to_date = new_val
       @need_to_update = true
     end
@@ -357,6 +380,7 @@ module Jamf
     def free=(new_val)
       return nil if new_val == @free
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @free = new_val
       @need_to_update = true
     end
@@ -371,6 +395,7 @@ module Jamf
     def take_over_management=(new_val)
       return nil if new_val == @take_over_management
       raise Jamf::InvalidDataError, 'New value must be true or false' unless new_val.jss_boolean?
+
       @take_over_management = new_val
       @need_to_update = true
     end
@@ -432,6 +457,7 @@ module Jamf
     #
     def external_url=(new_val)
       return nil if new_val == @external_url
+
       @external_url = new_val
       @need_to_update = true
     end
@@ -445,11 +471,11 @@ module Jamf
     #
     def configuration_prefs=(new_val)
       return nil if new_val == @configuration_prefs
+
       @configuration_prefs = new_val
       @need_to_update = true
     end
 
-
     # Save the application to a file.
     #
     # @param path[Pathname, String] The path to which the file should be saved.
@@ -462,10 +488,12 @@ module Jamf
     #
     def save_ipa(path, overwrite = false)
       return nil unless @ipa[:data]
+
       path = Pathname.new path
-      path = path + @ipa[:name] if path.directory? && @ipa[:name]
+      path += @ipa[:name] if path.directory? && @ipa[:name]
 
       raise Jamf::AlreadyExistsError, "The file #{path} already exists" if path.exist? && !overwrite
+
       path.delete if path.exist?
       path.jss_save Base64.decode64(@ipa[:data])
     end
@@ -507,6 +535,7 @@ module Jamf
     #
     def refresh_ipa
       return nil unless @in_jss
+
       fresh_data = @cnx.c_get(@rest_rsrc)[self.class::RSRC_OBJECT_KEY]
       @ipa = fresh_data[:general][:ipa]
     end
@@ -523,6 +552,7 @@ module Jamf
       gen.add_element('deploy_as_managed_app').text = @deploy_as_managed_app
       gen.add_element('remove_app_when_mdm_profile_is_removed').text = @remove_app_when_mdm_profile_is_removed
       gen.add_element('prevent_backup_of_app_data').text = @prevent_backup_of_app_data
+      gen.add_element('keep_app_updated_on_devices').text = @keep_app_updated_on_devices
       gen.add_element('keep_description_and_icon_up_to_date').text = @keep_description_and_icon_up_to_date
       gen.add_element('free').text = @free
       gen.add_element('take_over_management').text = @take_over_management
@@ -540,7 +570,6 @@ module Jamf
       doc.to_s
     end
 
-
   end # class removable_macaddr
 
 end # module