ruby-jss 0.10.1 → 0.10.2a4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8413ec0bad98adf45203344dd416bdab4335115
-  data.tar.gz: 0f0c67258554cfb27981d355ea0157162402bb90
+  metadata.gz: f25ffb3a1553a71ea08f5bf89c6309c5d063f8f0
+  data.tar.gz: 946e930c5a5bafa01cda0e5e49239dd5ebd859e3
 SHA512:
-  metadata.gz: 4f7d893c3ad2796308371fa92271e2efeee409159ae1e7963021d21a5490f0efd5d317260413eadaeee8785aa51f41d3c52aa6257037f501c0bfc54783873aa6
-  data.tar.gz: fc90421670c65f21ec4d22c0bf50573fb88b4c43ff200cb89082027ef4b91a97d22eba38e104283d818458a94cb68bbfcc06874c9499d1d68afb4fc85d0e26a4
+  metadata.gz: 053fe33b81de846bfa1336bf9dd3dcf95eb03d5c92045374187e28eae6d453e5f781a89dfd75c927b699d60685c78e6959d922b9730893fc46dc7b4b759075d0
+  data.tar.gz: fe286d6719bc538bf119c0d6c291d5733d4146e86f91c4f9b7b205f5d774d49a656fa24e2e2359b49c2e96252075f16dc4b94b6a42b55e7bd3416346e8adbf71

data/lib/jss/api_connection.rb

@@ -237,11 +237,13 @@ module JSS
   #   prod2_victim_md = production_api2.fetch :MobileDevice, id: 832
   #
   # Here are the API calls you can make directly from an APIConnection object.
-  # Most of them behave identically to the same methods in the APIObject classes
+  # They behave practically identically to the same methods in the APIObject
+  # subclasses, since they just call those methods, passing themselves in as the
+  # APIConnection to use.
   #
   # - {#all}  The 'list' methods of the various APIObject classes. Use the 'only:'
   #   parameter to specify one of the sub-list-methods, like #all_ids or
-  #   #all_laptops
+  #   #all_laptops, e.g. `my_connection.all :computers, only: :id`
   # - {#map_all_ids} the equivalent of #map_all_ids_to in the APIObject classes
   # - {#valid_id} given a class and an identifier (like macaddress or udid)
   #   return a valid id or nil
@@ -254,6 +256,9 @@ module JSS
   # - {#send_computer_mdm_command} same as {Computer.send_mdm_command}
   # - {#computer_checkin_settings} same as {Computer.checkin_settings}
   # - {#computer_inventory_collection_settings} same as {Computer.inventory_collection_settings}
+  # - {#computer_application_usage} same as {Computer.application_usage}
+  # - {#computer_management_data} same as {Computer.management_data}
+  # - {#computer_history} same as {Computer.history}
   # - {#send_mobiledevice_mdm_command} same as {MobileDevice.send_mdm_command}
   # - {#master_distribution_point} same as {DistributionPoint.master_distribution_point}
   # - {#my_distribution_point} same as {DistributionPoint.my_distribution_point}
@@ -739,25 +744,48 @@ module JSS
       the_class.make args
     end
 
-    # Call {JSS::Computer.checkin_settings} passing this API
+    # Call {JSS::Computer.checkin_settings} q.v.,  passing this API
     # connection
     #
-    # @return (see JSS::Computer.checkin_settings)
-    #
     def computer_checkin_settings
       JSS::Computer.checkin_settings api: self
     end
 
-
-    # Call {JSS::Computer.inventory_collection_settings} passing this API
+    # Call {JSS::Computer.inventory_collection_settings} q.v., passing this API
     # connection
     #
-    # @return (see JSS::Computer.checkin_settings)
-    #
     def computer_inventory_collection_settings
       JSS::Computer.inventory_collection_settings api: self
     end
 
+    # Call {JSS::Computer.application_usage} q.v., passing this API
+    # connection
+    #
+    def computer_application_usage(ident, start_date, end_date = nil)
+      JSS::Computer.application_usage ident, start_date, end_date, api: self
+    end
+
+    # Call {JSS::Computer.management_data} q.v., passing this API
+    # connection
+    #
+    def computer_management_data(ident, subset: nil, only: nil)
+      JSS::Computer.management_data ident, subset: subset, only: only, api: self
+    end
+
+    # Call {JSS::Computer.history} q.v., passing this API
+    # connection
+    #
+    def computer_history(ident, subset: nil)
+      JSS::Computer.history ident, subset: subset, api: self
+    end
+
+    # Call {JSS::Computer.send_mdm_command} q.v.,  passing this API
+    # connection
+    #
+    def send_computer_mdm_command(targets, command, passcode = nil)
+      JSS::Computer.send_mdm_command targets, command, passcode, api: self
+    end
+
     # Get the DistributionPoint instance for the master
     # distribution point in the JSS. If there's only one
     # in the JSS, return it even if not marked as master.
@@ -834,7 +862,7 @@ module JSS
     #
     # @return [Array<Integer>] the ids of the NetworkSegments containing the given ip
     #
-    def network_segments_for_ip(ip, refresh = false)
+    def network_segments_for_ip(ip)
       ok_ip = IPAddr.new(ip)
       matches = []
       network_ranges.each { |id, subnet| matches << id if subnet.include?(ok_ip) }
@@ -849,15 +877,6 @@ module JSS
       network_segments_for_ip JSS::Client.my_ip_address
     end
 
-    # Send an MDM command to one or more computers managed by
-    # this JSS
-    #
-    # see {JSS::Computer.send_mdm_command}
-    #
-    def send_computer_mdm_command(targets, command, passcode = nil)
-      JSS::Computer.send_mdm_command(targets, command, passcode, api: self)
-    end
-
     # Send an MDM command to one or more mobile devices managed by
     # this JSS
     #

data/lib/jss/api_object/advanced_search.rb

@@ -60,12 +60,16 @@ module JSS
     include JSS::Creatable
     include JSS::Updatable
     include JSS::Criteriable
+    include JSS::Sitable
 
     # Class Constants
     #####################################
 
     EXPORT_FORMATS = [:csv, :tab, :xml].freeze
 
+    # Where is site data located in the API JSON?
+    SITE_SUBSET = :top
+
     # Attributes
     #####################################
 
@@ -342,7 +346,7 @@ module JSS
 
       df = acs.add_element('display_fields')
       @display_fields.each { |f| df.add_element('display_field').add_element('name').text = f }
-
+      add_site_to_xml(doc)
       doc.to_s
     end # rest xml