ruby-jss 1.1.0b2 → 1.1.0b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50ff471b21545912900e60e06df0db44afb07369e140af205f13c3cc2bfad40
-  data.tar.gz: 699823c8d74f492ee99f4c1cd742783c9a033de3457ac4f6740aa777301aafd4
+  metadata.gz: c93768b14659a35387a451d6b310ada61703377b15bd18336430a5ba22b092d0
+  data.tar.gz: 1fffb42782534b0cd38799d549911332da08363606864ef0a5e178f657b8f1a3
 SHA512:
-  metadata.gz: a8af9b0bb6b77cfc377bbd0d83759e8d4ada3868b2f13a72c4cc9820d22a7582e82e4fe118217f6bc251eb386c2a3ddbd2434e4fd9f95e06ae2a4492c5edab99
-  data.tar.gz: f428d23ab93e6dc3d6f279353d90299b1d64fc41093bcaeaf06d15baffa6abf931e6b76c2491ae4d53eb0747ecbdcd1a60e9b670a6f91d9e33493838c038e593
+  metadata.gz: 565603a221d5e5b17595008b0ad385b5880930802897586d7276e22cb7abbcfd8bac24971e6842fc8ebf6d52434db6cdc61f05f4efdaa661e7338fc430379db6
+  data.tar.gz: ad6b0d25702b25e9058ee6201cde765b1f78944a6cd8f9be7cd43683939c5661a2a82daf04146787cf325f650de573f7c33f1fdd6dc371312ac966788152077c

data/lib/jss/api_connection.rb

@@ -917,49 +917,25 @@ module JSS
       @my_distribution_point
     end
 
-    # All NetworkSegments in this jss as IPAddr object Ranges representing the
-    # Segment, e.g. with starting = 10.24.9.1 and ending = 10.24.15.254
-    # the range looks like:
-    #   <IPAddr: IPv4:10.24.9.1/255.255.255.255>..#<IPAddr: IPv4:10.24.15.254/255.255.255.255>
+    # @deprecated
     #
-    # Using the #include? method on those Ranges is very useful.
-    #
-    # @param refresh[Boolean] should the data be re-queried?
-    #
-    # @return [Hash{Integer => Range}] the network segments as IPv4 address Ranges
+    # @see {JSS::NetworkSegment.network_ranges}
     #
     def network_ranges(refresh = false)
-      @network_ranges = nil if refresh
-      return @network_ranges if @network_ranges
-      @network_ranges = {}
-      JSS::NetworkSegment.all(refresh, api: self).each do |ns|
-        @network_ranges[ns[:id]] = IPAddr.new(ns[:starting_address])..IPAddr.new(ns[:ending_address])
-      end
-      @network_ranges
+      JSS::NetworkSegment.network_ranges refresh, api: self
     end # def network_segments
 
-    # Find the ids of the network segments that contain a given IP address.
-    #
-    # Even tho IPAddr.include? will take a String or an IPAddr
-    # I convert the ip to an IPAddr so that an exception will be raised if
-    # the ip isn't a valid ip.
-    #
-    # @param ip[String, IPAddr] the IP address to locate
-    #
-    # @param refresh[Boolean] should the data be re-queried?
+    # @deprecated
     #
-    # @return [Array<Integer>] the ids of the NetworkSegments containing the given ip
+    # @see {JSS::NetworkSegment.network_segments_for_ip}
     #
-    def network_segments_for_ip(ip)
-      ok_ip = IPAddr.new(ip)
-      matches = []
-      network_ranges.each { |id, subnet| matches << id if subnet.include?(ok_ip) }
-      matches
+    def network_segments_for_ip(ip, refresh = false)
+      JSS::NetworkSegment.network_segments_for_ip ip, refresh, api: self
     end
 
-    # Find the current network segment ids for the machine running this code
+    # @deprecated
     #
-    # @return [Array<Integer>]  the NetworkSegment ids for this machine right now.
+    # @see {JSS::NetworkSegment.my_network_segments}
     #
     def my_network_segments
       network_segments_for_ip JSS::Client.my_ip_address

data/lib/jss/api_object/computer.rb

@@ -503,8 +503,8 @@ module JSS
       raise "Subset must be one of :#{MGMT_DATA_SUBSETS.join ', :'}" unless MGMT_DATA_SUBSETS.include? subset
       subset_rsrc = MGMT_DATA_RSRC + "/id/#{id}/subset/#{subset}"
       subset_data = api.get_rsrc(subset_rsrc)[MGMT_DATA_KEY]
-      return subset_data unless only
-      subset_data.map { |d| d[only] }
+      return subset_data[subset] unless only
+      subset_data[subset].map { |d| d[only] }
     end
     private_class_method :management_data_subset
 
@@ -556,6 +556,9 @@ module JSS
     # @return [Boolean] doesit support MDM?
     attr_reader :mdm_capable
 
+    # @return [Hash] some MDM status details in general
+    attr_reader :management_status
+
     # @return [Array] user accts that support MDM?
     #  NOTE: This suffers from the JSON-Hash-treated-like_XML-Array-loses-data
     #  bug and only shows the last listed user, cuz it comes from the API
@@ -793,6 +796,8 @@ module JSS
 
         @configuration_profiles = @init_data[:configuration_profiles]
 
+        @management_status = @init_data[:general][:management_status]
+
         @groups_accounts = @init_data[:groups_accounts]
         @hardware = @init_data[:hardware]
         @peripherals = @init_data[:peripherals]

data/lib/jss/api_object/network_segment.rb

@@ -177,6 +177,7 @@ module JSS
     ###
     def self.validate_ip_range(startip, endip)
       return nil if IPAddr.new(startip.to_s) <= IPAddr.new(endip.to_s)
+
       raise JSS::InvalidDataError, "Starting IP #{startip} is higher than ending ip #{endip} "
     end
 
@@ -195,29 +196,60 @@ module JSS
     ### @return [Array<Integer>] the ids of the NetworkSegments containing the given ip
     ###
     def self.network_segments_for_ip(ip, refresh = false, api: JSS.api)
-      api.network_segments_for_ip ip, refresh
+      ok_ip = IPAddr.new(ip)
+      matches = []
+      network_ranges.each { |id, subnet| matches << id if subnet.include?(ok_ip) }
+      matches
     end
 
     # @deprecated use network_segments_for_ip
-    # Backward compatibility
+    # Here for Backward compatibility
     def self.network_segment_for_ip(ip, api: JSS.api)
       network_segments_for_ip(ip, api: api)
     end
 
     ### Find the current network segment ids for the machine running this code
     ###
-    ### @return [Array<Integer>]  the NetworkSegment ids for this machine right now.
+    ### @return [Array<Integer>] the NetworkSegment ids for this machine right now.
     ###
-    def self.my_network_segments(api: JSS.api)
-      network_segment_for_ip JSS::Client.my_ip_address, api: api
+    def self.my_network_segments(refresh = false, names: false, api: JSS.api)
+      ids = network_segments_for_ip JSS::Client.my_ip_address, refresh, api: api
+      return ids unless names
+
+      ids_to_names = map_all_ids_to :name
+      ids.map { |id| ids_to_names[id] }
     end
 
     # @deprecated use my_network_segments
-    # Backward compatibility
+    # Here for backward compatibility
     def self.my_network_segment(api: JSS.api)
       my_network_segments api: api
     end
 
+    # All NetworkSegments in this jss as IPAddr object Ranges representing the
+    # Segment, e.g. with starting = 10.24.9.1 and ending = 10.24.15.254
+    # the range looks like:
+    #   <IPAddr: IPv4:10.24.9.1/255.255.255.255>..#<IPAddr: IPv4:10.24.15.254/255.255.255.255>
+    #
+    # Using the #include? method on those Ranges is very useful.
+    #
+    # @param refresh[Boolean] should the data be re-queried?
+    #
+    # @param api[JSS::APIConnection] the API to query
+    #
+    # @return [Hash{Integer => Range}] the network segments as IPv4 address Ranges
+    #   keyed by id
+    #
+    def self.network_ranges(refresh = false, api: JSS.api)
+      @network_ranges = nil if refresh
+      return @network_ranges if @network_ranges
+      @network_ranges = {}
+      all(refresh, api: api).each do |ns|
+        @network_ranges[ns[:id]] = IPAddr.new(ns[:starting_address])..IPAddr.new(ns[:ending_address])
+      end
+      @network_ranges
+    end # def network_segments
+
     ### Attributes
     #####################################
 

data/lib/jss/api_object/patch_title.rb

@@ -307,7 +307,8 @@ module JSS
       params[:source_id] ||= params[:source]
 
       # if given a source name, this converts it to an id
-      params[:source_id] = JSS::PatchSource.valid_id params[:source_id]
+      params[:source_id] = JSS::PatchInternalSource.valid_id params[:source_id]
+      params[:source_id] ||= JSS::PatchExternalSource.valid_id params[:source_id]
 
       # build a possible source_name_id
       params[:source_name_id] ||= "#{params[:source_id]}-#{params[:name_id]}"

data/lib/jss/api_object/policy.rb

@@ -191,7 +191,7 @@ module JSS
       after: 'After'
     }.freeze
 
-    PRINTER_ACTIIONS = {
+    PRINTER_ACTIONS = {
       map: 'install',
       unmap: 'uninstall'
     }.freeze
@@ -1051,7 +1051,11 @@ module JSS
     # @return [Pathname] The path to search for
     #
     def search_by_path
-      Pathname.new @files_processes[:search_by_path]
+      if @files_processes[:search_by_path].nil?
+        return nil
+      else
+        Pathname.new @files_processes[:search_by_path]
+      end
     end
 
     # @return [Boolean] Should the searched-for path be deleted if found?
@@ -1300,16 +1304,22 @@ module JSS
       @dock_items.map { |p| p[:name] }
     end
 
-    ###### Printers
-
     # @return [Array] the id's of the printers handled by the policy
     def printer_ids
-      @printers.map { |p| p[:id] }
+        begin
+            @printers.map { |p| p[:id] }
+            rescue TypeError
+            return []
+        end
     end
-
+    
     # @return [Array] the names of the printers handled by the policy
     def printer_names
-      @printers.map { |p| p[:name] }
+        begin
+            @printers.map { |p| p[:name] }
+            rescue TypeError
+            return []
+        end
     end
 
     ###### Actions

data/lib/jss/version.rb

@@ -26,7 +26,7 @@
 ###
 module JSS
 
-  ### The version of the JSS ruby gem
-  VERSION = '1.1.0b2'.freeze
+  ### The version of ruby-jss
+  VERSION = '1.1.0b3'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.1.0b2
+  version: 1.1.0b3
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist