ruby-jss 1.4.1 → 1.5.1

data/lib/jss/api_object/patch_source.rb

@@ -120,30 +120,31 @@ module JSS
 
     # Fetch either an internal or external patch source
     #
-    # BUG: there's an API bug: fetching a non-existent ids
+    # BUG: there's an API bug: fetching a non-existent
     # which is why we rescue internal server errors.
     #
     # @see APIObject.fetch
     #
-    def self.fetch(arg, api: JSS.api)
+    def self.fetch(searchterm = nil, **args)
       if self == JSS::PatchSource
         begin
-          fetched = JSS::PatchInternalSource.fetch arg, api: api
-        rescue RestClient::ResourceNotFound, RestClient::InternalServerError, JSS::NoSuchItemError
+          fetched = JSS::PatchInternalSource.fetch searchterm, **args
+        rescue
           fetched = nil
         end
         unless fetched
           begin
-            fetched = JSS::PatchExternalSource.fetch arg, api: api
-          rescue RestClient::ResourceNotFound, RestClient::InternalServerError, JSS::NoSuchItemError
+            fetched = JSS::PatchExternalSource.fetch searchterm, **args
+          rescue
             raise JSS::NoSuchItemError, 'No matching PatchSource found'
           end
         end
         return fetched
       end # if self == JSS::PatchSource
+
       begin
-        super
-      rescue RestClient::ResourceNotFound, RestClient::InternalServerError, JSS::NoSuchItemError
+        super searchterm, **args
+      rescue JSS::NoSuchItemError
         raise JSS::NoSuchItemError, "No matching #{self::RSRC_OBJECT_KEY} found"
       end
     end
@@ -211,7 +212,7 @@ module JSS
       begin
         # TODO: remove this and adjust parsing when jamf fixes the JSON
         raw = JSS::XMLWorkaround.data_via_xml(rsrc, AVAILABLE_TITLES_DATA_MAP, api)
-      rescue RestClient::ResourceNotFound
+      rescue JSS::NoSuchItemError
         return []
       end
 

data/lib/jss/api_object/printer.rb

@@ -376,9 +376,9 @@ module JSS
         #
         # @author Tyler Morgan
         #
-        # @param newvalue [String]
+        # @param newvalue [String, Float, Array[String], Array[Float]]
         #
-        # @raise [JSS::InvalidDataError] If newvalue is not a String
+        # @raise [JSS::InvalidDataError] If newvalue is not a String, Float, Array containing Strings, or Array containing Floats.
         #
         # @example Limit Printer object to only High Sierra devices and Mojave 10.14.5 OS versions
         #   printer.os_requirements = "10.13.x, 10.14.5"
@@ -386,8 +386,14 @@ module JSS
         # @return [void]
         def os_requirements=(newvalue)
 
-            raise JSS::InvalidDataError, "os_requirements must be a string." unless newvalue.is_a? String
-
+            if newvalue.is_a? Array
+                # Parse Array
+                raise JSS::InvalidDataError, "If setting os_requirements with an array, it must contain strings or floats." unless newvalue[0].is_a?(String) || newvalue[0].is_a?(Float)
+                newvalue = newvalue.map { |x| x.to_s }.join(',')
+            else
+                raise JSS::InvalidDataError, "os_requirements must either be a string, float, or an array containing strings or floats." unless (newvalue.is_a?(String) || newvalue.is_a?(Float)) && !newvalue.nil?
+            end
+                
             @os_requirements = newvalue
 
             @need_to_update = true

data/lib/jss/api_object/scopable.rb

@@ -100,22 +100,17 @@ module JSS
       @need_to_update = true if @in_jss
     end
 
-
-    ### A wrapper around the update method, to try catching RestClient::Conflict
-    ### 409 errors when we couldn't verify all ldap users/groups due to lack of ldap connections
-    ###
+    # A wrapper around the update method, to try catching 409 conflict errors
+    # when we couldn't verify all ldap users/groups due to lack of ldap connections
+    #
     def update
-      begin
-        super
-
-      rescue RestClient::Conflict => conflict
-        if  self.scope.unable_to_verify_ldap_entries == true
-          raise JSS::InvalidDataError, "Potentially non-existant LDAP user or group in new scope values."
-        else
-          raise conflict
-        end
-
-      end # begin
+      super
+    rescue JSS::ConflictError => conflict
+      if scope.unable_to_verify_ldap_entries == true
+        raise JSS::InvalidDataError, "Potentially non-existant LDAP user or group in new scope values."
+      else
+        raise conflict
+      end
     end # update
 
   end # module Scopable

data/lib/jss/exceptions.rb

@@ -87,6 +87,9 @@ module JSS
   ###
   class AuthenticationError < RuntimeError; end
 
+  ###
+  class AuthorizationError < RuntimeError ; end
+
   ### ConflictError - raise this when
   ### attempts to PUT or PUSH to the API
   ### result in a 409 Conflict http error.

data/lib/jss/server.rb

@@ -110,6 +110,21 @@ module JSS
       @act_code_data[:code]
     end
 
+    # Update the activation code and organization name for this server
+    #
+    # @param org: [String] the organization to which the server is licensed
+    # @param code: [String ]  the activation code for the server licence
+    #
+    # @return [void]
+    def update_activation_code(org:, code:)
+      xml = REXML::Document.new JSS::APIConnection::XML_HEADER
+      acode = xml.add_element ACTIVATION_CODE_KEY.to_s
+      acode.add_element('organization_name').text = org
+      acode.add_element('code').text = code
+
+      @api.put_rsrc ACTIVATION_CODE_RSRC, xml.to_s
+    end
+
     # Remove the api object from
     # the instance_variables used to create
     # pretty-print (pp) output.

data/lib/jss/version.rb

@@ -27,6 +27,6 @@
 module JSS
 
   ### The version of ruby-jss
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.5.1'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -46,39 +46,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.9.12
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
+        version: 1.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
+        version: 1.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: immutable-struct
   requirement: !ruby/object:Gem::Requirement
@@ -120,11 +126,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |2
-      The ruby-jss gem provides the JSS module, a framework for interacting with the REST API
-      of the Jamf Software Server (JSS), the core of Jamf Pro, an enterprise/education
-      tool for managing Apple devices, from Jamf Software LLC.
-      JSS API objects are implemented as Ruby classes, and interact with each oher to
-      allow simpler automation of Jamf-related tasks. For details see the README file."
+      The ruby-jss gem provides native ruby access to the REST APIs of Jamf Pro,
+      an enterprise/education tool for managing Apple devices, from jamf.com.
+      The JSS module provides access to the 'Classic' API, while the Jamf module
+      provides access to the more modern 'Jamf Pro' API. Jamf Pro objects are
+      implemented as classes and, within each module, can interact with each other.
+      The underlying data transfer using JSON or XML is handled automatically
+      under the hood to allow simpler, intuitive automation of Jamf-related Tasks.
 email: ruby-jss@pixar.com
 executables:
 - cgrouper
@@ -171,6 +179,7 @@ files:
 - lib/jamf/api/json_objects/country.rb
 - lib/jamf/api/json_objects/criterion.rb
 - lib/jamf/api/json_objects/device_enrollment_device.rb
+- lib/jamf/api/json_objects/device_enrollment_device_sync_state.rb
 - lib/jamf/api/json_objects/device_enrollment_sync_status.rb
 - lib/jamf/api/json_objects/extension_attribute_value.rb
 - lib/jamf/api/json_objects/installed_application.rb
@@ -180,6 +189,7 @@ files:
 - lib/jamf/api/json_objects/installed_provisioning_profile.rb
 - lib/jamf/api/json_objects/inventory_preload_extension_attribute.rb
 - lib/jamf/api/json_objects/ios_details.rb
+- lib/jamf/api/json_objects/locale.rb
 - lib/jamf/api/json_objects/location.rb
 - lib/jamf/api/json_objects/md_prestage_name.rb
 - lib/jamf/api/json_objects/md_prestage_names.rb
@@ -192,15 +202,19 @@ files:
 - lib/jamf/api/json_objects/prestage_scope.rb
 - lib/jamf/api/json_objects/prestage_sync_status.rb
 - lib/jamf/api/json_objects/purchasing_data.rb
+- lib/jamf/api/json_objects/time_zone.rb
 - lib/jamf/api/mixins/abstract.rb
 - lib/jamf/api/mixins/bulk_deletable.rb
 - lib/jamf/api/mixins/change_log.rb
 - lib/jamf/api/mixins/extendable.rb
+- lib/jamf/api/mixins/filterable.rb
 - lib/jamf/api/mixins/immutable.rb
 - lib/jamf/api/mixins/locatable.rb
 - lib/jamf/api/mixins/lockable.rb
+- lib/jamf/api/mixins/pageable.rb
 - lib/jamf/api/mixins/referable.rb
 - lib/jamf/api/mixins/searchable.rb
+- lib/jamf/api/mixins/sortable.rb
 - lib/jamf/api/mixins/uncreatable.rb
 - lib/jamf/api/mixins/undeletable.rb
 - lib/jamf/api/resources/collection_resources/account.rb
@@ -218,11 +232,12 @@ files:
 - lib/jamf/api/resources/collection_resources/mobile_device_prestage.rb
 - lib/jamf/api/resources/collection_resources/script.rb
 - lib/jamf/api/resources/collection_resources/site.rb
-- lib/jamf/api/resources/collection_resources/time_zone.rb
 - lib/jamf/api/resources/singleton_resources/app_store_country_codes.rb
 - lib/jamf/api/resources/singleton_resources/authorization.rb
 - lib/jamf/api/resources/singleton_resources/client_checkin_settings.rb
+- lib/jamf/api/resources/singleton_resources/locales.rb
 - lib/jamf/api/resources/singleton_resources/reenrollment_settings.rb
+- lib/jamf/api/resources/singleton_resources/time_zones.rb
 - lib/jamf/client.rb
 - lib/jamf/client/jamf_binary.rb
 - lib/jamf/client/jamf_helper.rb
@@ -407,7 +422,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -417,5 +432,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A Ruby interface to the Jamf Pro REST API
+summary: A Ruby interface to the Jamf Pro REST APIs
 test_files: []