ruby-jss 1.2.4a3 → 1.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGES.md +180 -1
- data/README.md +4 -2
- data/bin/cgrouper +1 -1
- data/bin/jamfHelperBackgrounder +1 -1
- data/bin/netseg-update +1 -1
- data/data/ruby-jss.conf.example +1 -1
- data/lib/jamf.rb +2 -1
- data/lib/jamf/api/abstract_classes/advanced_search.rb +1 -1
- data/lib/jamf/api/abstract_classes/collection_resource.rb +54 -38
- data/lib/jamf/api/abstract_classes/generic_reference.rb +1 -1
- data/lib/jamf/api/abstract_classes/json_object.rb +16 -10
- data/lib/jamf/api/abstract_classes/prestage.rb +111 -35
- data/lib/jamf/api/abstract_classes/prestage_skip_setup_items.rb +1 -1
- data/lib/jamf/api/abstract_classes/resource.rb +1 -1
- data/lib/jamf/api/abstract_classes/singleton_resource.rb +1 -1
- data/lib/jamf/api/attribute_classes/ip_address.rb +1 -1
- data/lib/jamf/api/attribute_classes/timestamp.rb +1 -1
- data/lib/jamf/api/connection.rb +166 -69
- data/lib/jamf/api/connection/api_error.rb +1 -1
- data/lib/jamf/api/connection/api_error_styleguide.rb +1 -1
- data/lib/jamf/api/connection/token.rb +87 -16
- data/lib/jamf/api/json_objects/account_prefs.rb +1 -1
- data/lib/jamf/api/json_objects/android_details.rb +1 -1
- data/lib/jamf/api/json_objects/appletv_details.rb +1 -1
- data/lib/jamf/api/json_objects/attachment.rb +1 -1
- data/lib/jamf/api/json_objects/cellular_network.rb +1 -1
- data/lib/jamf/api/json_objects/change_log_entry.rb +1 -1
- data/lib/jamf/api/json_objects/computer_prestage_skip_setup_items.rb +1 -1
- data/lib/jamf/api/json_objects/country.rb +1 -1
- data/lib/jamf/api/json_objects/criterion.rb +1 -1
- data/lib/jamf/api/json_objects/device_enrollment_device.rb +6 -4
- data/lib/jamf/api/json_objects/device_enrollment_sync_status.rb +1 -1
- data/lib/jamf/api/json_objects/extension_attribute_value.rb +1 -1
- data/lib/jamf/api/json_objects/installed_application.rb +1 -1
- data/lib/jamf/api/json_objects/installed_certificate.rb +1 -1
- data/lib/jamf/api/json_objects/installed_configuration_profile.rb +1 -1
- data/lib/jamf/api/json_objects/installed_ebook.rb +1 -1
- data/lib/jamf/api/json_objects/installed_provisioning_profile.rb +1 -1
- data/lib/jamf/api/json_objects/inventory_preload_extension_attribute.rb +1 -1
- data/lib/jamf/api/json_objects/ios_details.rb +1 -1
- data/lib/jamf/api/json_objects/location.rb +1 -1
- data/lib/jamf/api/json_objects/md_prestage_name.rb +1 -1
- data/lib/jamf/api/json_objects/md_prestage_names.rb +1 -1
- data/lib/jamf/api/json_objects/md_prestage_skip_setup_items.rb +1 -1
- data/lib/jamf/api/json_objects/mobile_device_details.rb +1 -1
- data/lib/jamf/api/json_objects/mobile_device_security.rb +1 -1
- data/lib/jamf/api/json_objects/prestage_assignment.rb +5 -3
- data/lib/jamf/api/json_objects/prestage_location.rb +1 -1
- data/lib/jamf/api/json_objects/prestage_purchasing_data.rb +1 -1
- data/lib/jamf/api/json_objects/prestage_scope.rb +1 -1
- data/lib/jamf/api/json_objects/prestage_sync_status.rb +1 -1
- data/lib/jamf/api/json_objects/purchasing_data.rb +1 -1
- data/lib/jamf/api/mixins/abstract.rb +1 -1
- data/lib/jamf/api/mixins/bulk_deletable.rb +1 -1
- data/lib/jamf/api/mixins/change_log.rb +3 -1
- data/lib/jamf/api/mixins/extendable.rb +1 -1
- data/lib/jamf/api/mixins/immutable.rb +1 -1
- data/lib/jamf/api/mixins/locatable.rb +1 -1
- data/lib/jamf/api/mixins/lockable.rb +1 -1
- data/lib/jamf/api/mixins/referable.rb +1 -1
- data/lib/jamf/api/mixins/searchable.rb +3 -3
- data/lib/jamf/api/mixins/uncreatable.rb +1 -1
- data/lib/jamf/api/mixins/undeletable.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/account.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/advanced_mobile_device_search.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/advanced_user_search.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/building.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/category.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/computer.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/computer_prestage.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/department.rb +2 -1
- data/lib/jamf/api/resources/collection_resources/device_enrollment.rb +110 -18
- data/lib/jamf/api/resources/collection_resources/extension_attribute.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/inventory_preload_record.rb +9 -2
- data/lib/jamf/api/resources/collection_resources/mobile_device.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/mobile_device_prestage.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/script.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/site.rb +1 -1
- data/lib/jamf/api/resources/collection_resources/time_zone.rb +119 -0
- data/lib/jamf/api/resources/singleton_resources/app_store_country_codes.rb +1 -1
- data/lib/jamf/api/resources/singleton_resources/authorization.rb +1 -1
- data/lib/jamf/api/resources/singleton_resources/client_checkin_settings.rb +1 -1
- data/lib/jamf/api/resources/singleton_resources/reenrollment_settings.rb +1 -1
- data/lib/jamf/client.rb +59 -4
- data/lib/jamf/client/jamf_binary.rb +1 -1
- data/lib/jamf/client/jamf_helper.rb +1 -1
- data/lib/jamf/client/management_action.rb +1 -1
- data/lib/jamf/compatibility.rb +1 -1
- data/lib/jamf/composer.rb +1 -1
- data/lib/jamf/configuration.rb +6 -8
- data/lib/jamf/exceptions.rb +6 -1
- data/lib/jamf/ruby_extensions.rb +2 -1
- data/lib/jamf/ruby_extensions/array.rb +2 -2
- data/lib/jamf/ruby_extensions/array/predicates.rb +1 -1
- data/lib/jamf/ruby_extensions/array/utils.rb +4 -3
- data/lib/jamf/ruby_extensions/dig.rb +52 -0
- data/lib/jamf/ruby_extensions/filetest.rb +1 -1
- data/lib/jamf/ruby_extensions/filetest/predicates.rb +1 -1
- data/lib/jamf/ruby_extensions/hash.rb +1 -1
- data/lib/jamf/ruby_extensions/hash/backports.rb +2 -2
- data/lib/jamf/ruby_extensions/ipaddr.rb +1 -1
- data/lib/jamf/ruby_extensions/ipaddr/utils.rb +1 -1
- data/lib/jamf/ruby_extensions/object.rb +1 -1
- data/lib/jamf/ruby_extensions/object/predicates.rb +1 -1
- data/lib/jamf/ruby_extensions/pathname.rb +1 -1
- data/lib/jamf/ruby_extensions/pathname/predicates.rb +1 -1
- data/lib/jamf/ruby_extensions/pathname/utils.rb +1 -1
- data/lib/jamf/ruby_extensions/string.rb +1 -1
- data/lib/jamf/ruby_extensions/string/backports.rb +1 -1
- data/lib/jamf/ruby_extensions/string/conversions.rb +1 -1
- data/lib/jamf/ruby_extensions/string/predicates.rb +14 -4
- data/lib/jamf/utility.rb +1 -1
- data/lib/jamf/validate.rb +1 -1
- data/lib/jamf/version.rb +2 -2
- data/lib/jpapi.rb +1 -1
- data/lib/jss-api.rb +1 -1
- data/lib/jss.rb +5 -2
- data/lib/jss/api_connection.rb +3 -30
- data/lib/jss/api_object.rb +16 -3
- data/lib/jss/api_object/account.rb +1 -1
- data/lib/jss/api_object/advanced_search.rb +1 -1
- data/lib/jss/api_object/advanced_search/advanced_computer_search.rb +1 -1
- data/lib/jss/api_object/advanced_search/advanced_mobile_device_search.rb +1 -1
- data/lib/jss/api_object/advanced_search/advanced_user_search.rb +1 -1
- data/lib/jss/api_object/building.rb +1 -1
- data/lib/jss/api_object/categorizable.rb +1 -1
- data/lib/jss/api_object/category.rb +1 -1
- data/lib/jss/api_object/computer.rb +12 -6
- data/lib/jss/api_object/computer/application_installs.rb +1 -1
- data/lib/jss/api_object/computer_invitation.rb +1 -1
- data/lib/jss/api_object/configuration_profile.rb +4 -2
- data/lib/jss/api_object/configuration_profile/mobile_device_configuration_profile.rb +1 -1
- data/lib/jss/api_object/configuration_profile/osx_configuration_profile.rb +1 -1
- data/lib/jss/api_object/creatable.rb +1 -1
- data/lib/jss/api_object/criteriable.rb +10 -5
- data/lib/jss/api_object/criteriable/criteria.rb +26 -10
- data/lib/jss/api_object/criteriable/criterion.rb +1 -1
- data/lib/jss/api_object/department.rb +1 -1
- data/lib/jss/api_object/directory_binding.rb +273 -0
- data/lib/jss/api_object/directory_binding_type.rb +90 -0
- data/lib/jss/api_object/directory_binding_type/active_directory.rb +502 -0
- data/lib/jss/api_object/directory_binding_type/admitmac.rb +525 -0
- data/lib/jss/api_object/directory_binding_type/centrify.rb +212 -0
- data/lib/jss/api_object/directory_binding_type/open_directory.rb +178 -0
- data/lib/jss/api_object/directory_binding_type/powerbroker_identity_services.rb +73 -0
- data/lib/jss/api_object/disk_encryption_configurations.rb +114 -0
- data/lib/jss/api_object/distribution_point.rb +96 -36
- data/lib/jss/api_object/dock_item.rb +137 -0
- data/lib/jss/api_object/ebook.rb +1 -1
- data/lib/jss/api_object/extendable.rb +67 -28
- data/lib/jss/api_object/extension_attribute.rb +1 -1
- data/lib/jss/api_object/extension_attribute/computer_extension_attribute.rb +1 -1
- data/lib/jss/api_object/extension_attribute/mobile_device_extension_attribute.rb +1 -1
- data/lib/jss/api_object/extension_attribute/user_extension_attribute.rb +1 -1
- data/lib/jss/api_object/group.rb +1 -1
- data/lib/jss/api_object/group/computer_group.rb +1 -1
- data/lib/jss/api_object/group/mobile_device_group.rb +1 -1
- data/lib/jss/api_object/group/user_group.rb +1 -1
- data/lib/jss/api_object/ibeacon.rb +1 -1
- data/lib/jss/api_object/ldap_server.rb +1 -1
- data/lib/jss/api_object/locatable.rb +1 -1
- data/lib/jss/api_object/mac_application.rb +1 -1
- data/lib/jss/api_object/management_history.rb +23 -22
- data/lib/jss/api_object/management_history/audit_event.rb +1 -1
- data/lib/jss/api_object/management_history/casper_imaging_log.rb +1 -1
- data/lib/jss/api_object/management_history/casper_remote_log.rb +1 -1
- data/lib/jss/api_object/management_history/computer_usage_log.rb +1 -1
- data/lib/jss/api_object/management_history/ebook.rb +1 -1
- data/lib/jss/api_object/management_history/hashlike.rb +1 -1
- data/lib/jss/api_object/management_history/mac_app_store_app.rb +1 -1
- data/lib/jss/api_object/management_history/mdm_command.rb +1 -1
- data/lib/jss/api_object/management_history/mobile_device_app.rb +1 -1
- data/lib/jss/api_object/management_history/policy_log.rb +1 -1
- data/lib/jss/api_object/management_history/screen_sharing_log.rb +1 -1
- data/lib/jss/api_object/management_history/user_location_change.rb +1 -1
- data/lib/jss/api_object/matchable.rb +1 -1
- data/lib/jss/api_object/mdm.rb +1 -1
- data/lib/jss/api_object/mobile_device.rb +29 -6
- data/lib/jss/api_object/mobile_device_application.rb +13 -1
- data/lib/jss/api_object/netboot_server.rb +1 -1
- data/lib/jss/api_object/network_segment.rb +153 -59
- data/lib/jss/api_object/package.rb +107 -42
- data/lib/jss/api_object/patch_policy.rb +1 -1
- data/lib/jss/api_object/patch_source.rb +1 -1
- data/lib/jss/api_object/patch_source/patch_external_source.rb +1 -1
- data/lib/jss/api_object/patch_source/patch_internal_source.rb +1 -1
- data/lib/jss/api_object/patch_title.rb +1 -1
- data/lib/jss/api_object/patch_title/version.rb +1 -1
- data/lib/jss/api_object/peripheral.rb +1 -1
- data/lib/jss/api_object/peripheral_type.rb +1 -1
- data/lib/jss/api_object/policy.rb +380 -5
- data/lib/jss/api_object/printer.rb +440 -0
- data/lib/jss/api_object/purchasable.rb +1 -1
- data/lib/jss/api_object/removable_macaddr.rb +1 -1
- data/lib/jss/api_object/restricted_software.rb +1 -1
- data/lib/jss/api_object/scopable.rb +1 -1
- data/lib/jss/api_object/scopable/scope.rb +257 -37
- data/lib/jss/api_object/script.rb +1 -1
- data/lib/jss/api_object/self_servable.rb +7 -7
- data/lib/jss/api_object/self_servable/icon.rb +1 -1
- data/lib/jss/api_object/sitable.rb +6 -2
- data/lib/jss/api_object/site.rb +1 -1
- data/lib/jss/api_object/software_update_server.rb +1 -1
- data/lib/jss/api_object/updatable.rb +1 -1
- data/lib/jss/api_object/uploadable.rb +1 -1
- data/lib/jss/api_object/user.rb +5 -3
- data/lib/jss/api_object/vppable.rb +1 -1
- data/lib/jss/api_object/webhook.rb +1 -1
- data/lib/jss/client.rb +1 -1
- data/lib/jss/client/jamf_binary.rb +1 -1
- data/lib/jss/client/jamf_helper.rb +1 -1
- data/lib/jss/client/management_action.rb +1 -1
- data/lib/jss/compatibility.rb +1 -1
- data/lib/jss/composer.rb +2 -2
- data/lib/jss/configuration.rb +1 -1
- data/lib/jss/db_connection.rb +1 -1
- data/lib/jss/exceptions.rb +1 -1
- data/lib/jss/ruby_extensions.rb +1 -1
- data/lib/jss/ruby_extensions/array.rb +1 -1
- data/lib/jss/ruby_extensions/filetest.rb +1 -1
- data/lib/jss/ruby_extensions/hash.rb +1 -1
- data/lib/jss/ruby_extensions/ipaddr.rb +1 -1
- data/lib/jss/ruby_extensions/pathname.rb +1 -1
- data/lib/jss/ruby_extensions/string.rb +1 -1
- data/lib/jss/ruby_extensions/string/backports.rb +1 -1
- data/lib/jss/ruby_extensions/string/conversions.rb +1 -1
- data/lib/jss/ruby_extensions/string/predicates.rb +14 -4
- data/lib/jss/ruby_extensions/time.rb +1 -1
- data/lib/jss/server.rb +1 -1
- data/lib/jss/utility.rb +9 -23
- data/lib/jss/validate.rb +1 -1
- data/lib/jss/version.rb +2 -2
- data/lib/jss/xml_workaround.rb +1 -1
- data/lib/ruby-jss.rb +1 -1
- data/test/bin/runtests +1 -1
- data/test/lib/testhelper.rb +1 -1
- data/test/lib/testhelper/auth.rb +1 -1
- data/test/lib/testhelper/patch_mgmt.rb +1 -1
- data/test/specs/api_connection_spec.rb +1 -1
- data/test/specs/patch01_source_spec.rb +1 -1
- data/test/specs/patch02_internal_source_spec.rb +1 -1
- data/test/specs/patch03_external_source_spec.rb +1 -1
- data/test/specs/patch04_titles_spec.rb +1 -1
- data/test/specs/patch05_policies_spec.rb +1 -1
- data/test/specs/patch06_cleanup_spec.rb +1 -1
- data/test/specs/policy_spec.rb +1 -1
- metadata +16 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright
|
|
1
|
+
# Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
#
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
# language governing permissions and limitations under the Apache License.
|
|
23
23
|
#
|
|
24
24
|
#
|
|
25
|
-
# Copyright
|
|
25
|
+
# Copyright 2020 Pixar
|
|
26
26
|
|
|
27
27
|
#
|
|
28
28
|
# Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright
|
|
1
|
+
# Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
#
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -29,10 +29,11 @@ module JamfRubyExtensions
|
|
|
29
29
|
|
|
30
30
|
module Predicates
|
|
31
31
|
|
|
32
|
-
INTEGER_RE = /\A[0-9]+\Z/.freeze
|
|
32
|
+
INTEGER_RE = /\A-?[0-9]+\Z/.freeze
|
|
33
|
+
FLOAT_RE = /\A-?[0-9]+\.[0-9]+\Z/.freeze
|
|
33
34
|
|
|
34
|
-
# Is this string also
|
|
35
|
-
# (i.e. it consists only of numberic digits)
|
|
35
|
+
# Is this string also an integer?
|
|
36
|
+
# (i.e. it consists only of numberic digits, maybe with a dash in front)
|
|
36
37
|
#
|
|
37
38
|
# @return [Boolean]
|
|
38
39
|
#
|
|
@@ -40,6 +41,15 @@ module JamfRubyExtensions
|
|
|
40
41
|
self =~ INTEGER_RE ? true : false
|
|
41
42
|
end
|
|
42
43
|
|
|
44
|
+
# Is this string also a floar?
|
|
45
|
+
# (i.e. it consists only of numberic digits)
|
|
46
|
+
#
|
|
47
|
+
# @return [Boolean]
|
|
48
|
+
#
|
|
49
|
+
def j_float?
|
|
50
|
+
self =~ FLOAT_RE ? true : false
|
|
51
|
+
end
|
|
52
|
+
|
|
43
53
|
end # module
|
|
44
54
|
|
|
45
55
|
end # module
|
data/lib/jamf/utility.rb
CHANGED
data/lib/jamf/validate.rb
CHANGED
data/lib/jamf/version.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
### Copyright
|
|
1
|
+
### Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
###
|
|
4
4
|
### Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -27,6 +27,6 @@
|
|
|
27
27
|
module Jamf
|
|
28
28
|
|
|
29
29
|
### The version of the Jamf module
|
|
30
|
-
VERSION = '0.0.
|
|
30
|
+
VERSION = '0.0.1'.freeze
|
|
31
31
|
|
|
32
32
|
end # module
|
data/lib/jpapi.rb
CHANGED
data/lib/jss-api.rb
CHANGED
data/lib/jss.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
### Copyright
|
|
1
|
+
### Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
###
|
|
4
4
|
### Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -194,9 +194,12 @@ module JSS
|
|
|
194
194
|
class Category < JSS::APIObject; end
|
|
195
195
|
class Computer < JSS::APIObject; end
|
|
196
196
|
class Department < JSS::APIObject; end
|
|
197
|
-
class EBook < JSS::APIObject; end
|
|
198
197
|
class DistributionPoint < JSS::APIObject; end
|
|
198
|
+
class EBook < JSS::APIObject; end
|
|
199
|
+
class IBeacon < JSS::APIObject; end
|
|
200
|
+
class DockItem < JSS::APIObject; end
|
|
199
201
|
class LDAPServer < JSS::APIObject; end
|
|
202
|
+
class DirectoryBinding < JSS::APIObject; end
|
|
200
203
|
class MacApplication < JSS::APIObject; end
|
|
201
204
|
class MobileDevice < JSS::APIObject; end
|
|
202
205
|
class MobileDeviceApplication < JSS::APIObject; end
|
data/lib/jss/api_connection.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
### Copyright
|
|
1
|
+
### Copyright 2020 Pixar
|
|
2
2
|
###
|
|
3
3
|
### Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
4
4
|
### with the following modification; you may not use this file except in
|
|
@@ -896,22 +896,7 @@ module JSS
|
|
|
896
896
|
# @return [JSS::DistributionPoint]
|
|
897
897
|
#
|
|
898
898
|
def master_distribution_point(refresh = false)
|
|
899
|
-
|
|
900
|
-
return @master_distribution_point if @master_distribution_point
|
|
901
|
-
|
|
902
|
-
JSS::DistributionPoint.all_ids.each do |dp_id|
|
|
903
|
-
dp = JSS::DistributionPoint.fetch id: dp_id, api: self
|
|
904
|
-
if dp.master?
|
|
905
|
-
@master_distribution_point = dp
|
|
906
|
-
break
|
|
907
|
-
end
|
|
908
|
-
end
|
|
909
|
-
|
|
910
|
-
return @master_distribution_point if @master_distribution_point
|
|
911
|
-
|
|
912
|
-
# If we're here, the Cloud DP might be master, but there's no
|
|
913
|
-
# access to it in the API :/
|
|
914
|
-
raise JSS::NoSuchItemError, 'No Master Distribtion Point defined. It could be the Cloud Dist Point, which is not available in the classic API'
|
|
899
|
+
JSS::DistributionPoint.master_distribution_point refresh, api: self
|
|
915
900
|
end
|
|
916
901
|
|
|
917
902
|
# Get the DistributionPoint instance for the machine running
|
|
@@ -923,19 +908,7 @@ module JSS
|
|
|
923
908
|
# @return [JSS::DistributionPoint]
|
|
924
909
|
#
|
|
925
910
|
def my_distribution_point(refresh = false)
|
|
926
|
-
|
|
927
|
-
return @my_distribution_point if @my_distribution_point
|
|
928
|
-
|
|
929
|
-
my_net_seg_id = my_network_segments[0]
|
|
930
|
-
|
|
931
|
-
if my_net_seg_id
|
|
932
|
-
my_net_seg = JSS::NetworkSegment.fetch(id: my_net_seg_id, api: self)
|
|
933
|
-
my_dp_name = my_net_seg.distribution_point
|
|
934
|
-
@my_distribution_point = JSS::DistributionPoint.fetch(name: my_dp_name) if my_dp_name
|
|
935
|
-
end # if my_net_seg_id
|
|
936
|
-
|
|
937
|
-
@my_distribution_point ||= master_distribution_point refresh
|
|
938
|
-
@my_distribution_point
|
|
911
|
+
JSS::DistributionPoint.my_distribution_point refresh, api: self
|
|
939
912
|
end
|
|
940
913
|
|
|
941
914
|
# @deprecated
|
data/lib/jss/api_object.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
### Copyright
|
|
1
|
+
### Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
###
|
|
4
4
|
### Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -1222,8 +1222,16 @@ module JSS
|
|
|
1222
1222
|
# @return [void]
|
|
1223
1223
|
#
|
|
1224
1224
|
def delete
|
|
1225
|
-
return
|
|
1226
|
-
|
|
1225
|
+
return unless @in_jss
|
|
1226
|
+
begin
|
|
1227
|
+
@api.delete_rsrc @rest_rsrc
|
|
1228
|
+
rescue RestClient::NotFound, RestClient::ResourceNotFound
|
|
1229
|
+
# over slow connections (?) or more likely
|
|
1230
|
+
# split-tunnel VPN connections, sometimes the thing gets deleted
|
|
1231
|
+
# the call gets a 404 anyway
|
|
1232
|
+
nil
|
|
1233
|
+
end
|
|
1234
|
+
|
|
1227
1235
|
@rest_rsrc = "#{self.class::RSRC_BASE}/name/#{CGI.escape @name.to_s}"
|
|
1228
1236
|
@id = nil
|
|
1229
1237
|
@in_jss = false
|
|
@@ -1655,9 +1663,13 @@ require 'jss/api_object/category'
|
|
|
1655
1663
|
require 'jss/api_object/computer'
|
|
1656
1664
|
require 'jss/api_object/computer_invitation'
|
|
1657
1665
|
require 'jss/api_object/department'
|
|
1666
|
+
require 'jss/api_object/disk_encryption_configurations'
|
|
1667
|
+
require "jss/api_object/directory_binding_type"
|
|
1668
|
+
require 'jss/api_object/directory_binding'
|
|
1658
1669
|
require 'jss/api_object/distribution_point'
|
|
1659
1670
|
require 'jss/api_object/ebook'
|
|
1660
1671
|
require 'jss/api_object/ibeacon'
|
|
1672
|
+
require 'jss/api_object/dock_item'
|
|
1661
1673
|
require 'jss/api_object/ldap_server'
|
|
1662
1674
|
require 'jss/api_object/mac_application'
|
|
1663
1675
|
require 'jss/api_object/mobile_device'
|
|
@@ -1677,5 +1689,6 @@ require 'jss/api_object/site'
|
|
|
1677
1689
|
require 'jss/api_object/software_update_server'
|
|
1678
1690
|
require 'jss/api_object/user'
|
|
1679
1691
|
require 'jss/api_object/webhook'
|
|
1692
|
+
require 'jss/api_object/printer'
|
|
1680
1693
|
|
|
1681
1694
|
JSS::APIObject.define_identifier_list_methods
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
### Copyright
|
|
1
|
+
### Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
###
|
|
4
4
|
### Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -529,9 +529,12 @@ module JSS
|
|
|
529
529
|
# @return [Time] when was it added to the JSS
|
|
530
530
|
attr_reader :initial_entry_date
|
|
531
531
|
|
|
532
|
-
# @return [IPAddr] the last known IP address
|
|
532
|
+
# @return [IPAddr] the last known IP address from the server's perspective
|
|
533
533
|
attr_reader :ip_address
|
|
534
534
|
|
|
535
|
+
# @return [IPAddr] the last known IP address from the client's perspecive
|
|
536
|
+
attr_reader :reported_ip_address
|
|
537
|
+
|
|
535
538
|
# @return [Boolean]
|
|
536
539
|
attr_reader :itunes_store_account_is_active
|
|
537
540
|
|
|
@@ -784,6 +787,7 @@ module JSS
|
|
|
784
787
|
@initial_entry_date = JSS.epoch_to_time @init_data[:general][:initial_entry_date_epoch]
|
|
785
788
|
@last_enrolled = JSS.epoch_to_time @init_data[:general][:last_enrolled_date_epoch]
|
|
786
789
|
@ip_address = @init_data[:general][:ip_address]
|
|
790
|
+
@reported_ip_address = @init_data[:general][:last_reported_ip]
|
|
787
791
|
@itunes_store_account_is_active = @init_data[:general][:itunes_store_account_is_active]
|
|
788
792
|
@jamf_version = @init_data[:general][:jamf_version]
|
|
789
793
|
@last_contact_time = JSS.epoch_to_time @init_data[:general][:last_contact_time_epoch]
|
|
@@ -1035,23 +1039,25 @@ module JSS
|
|
|
1035
1039
|
end
|
|
1036
1040
|
|
|
1037
1041
|
def asset_tag=(new_val)
|
|
1038
|
-
new_val =
|
|
1042
|
+
new_val = new_val.to_s.strip
|
|
1039
1043
|
return nil if @asset_tag.to_s == new_val
|
|
1040
|
-
|
|
1044
|
+
|
|
1041
1045
|
@asset_tag = new_val
|
|
1042
1046
|
@need_to_update = true
|
|
1043
1047
|
end
|
|
1044
1048
|
|
|
1045
1049
|
def barcode1=(new_val)
|
|
1050
|
+
new_val = new_val.strip
|
|
1046
1051
|
return nil if @barcode1 == new_val
|
|
1047
|
-
|
|
1052
|
+
|
|
1048
1053
|
@barcode1 = new_val
|
|
1049
1054
|
@need_to_update = true
|
|
1050
1055
|
end
|
|
1051
1056
|
|
|
1052
1057
|
def barcode2=(new_val)
|
|
1058
|
+
new_val = new_val.strip
|
|
1053
1059
|
return nil if @barcode2 == new_val
|
|
1054
|
-
|
|
1060
|
+
|
|
1055
1061
|
@barcode2 = new_val
|
|
1056
1062
|
@need_to_update = true
|
|
1057
1063
|
end
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright
|
|
1
|
+
# Copyright 2020 Pixar
|
|
2
2
|
|
|
3
3
|
#
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
@@ -105,8 +105,10 @@ module JSS
|
|
|
105
105
|
# @return [void]
|
|
106
106
|
#
|
|
107
107
|
def description=(new_val)
|
|
108
|
+
new_val = new_val.strip
|
|
108
109
|
return nil if @self_service_description == new_val
|
|
109
|
-
|
|
110
|
+
|
|
111
|
+
@description = new_val
|
|
110
112
|
@need_to_update = true
|
|
111
113
|
end # @param new_val[String] how should this be distributed to clients?
|
|
112
114
|
|