ruby-jss 1.1.0b3 → 1.1.0b5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93768b14659a35387a451d6b310ada61703377b15bd18336430a5ba22b092d0
-  data.tar.gz: 1fffb42782534b0cd38799d549911332da08363606864ef0a5e178f657b8f1a3
+  metadata.gz: e9337d6314a79881c726e5b816872dffb2bccdc0f538a6f7b6407075f5be684a
+  data.tar.gz: dd0d9d6210d1f8abab4bbf4046cc9ec59224e08e138e7b3d6a3122f13c4b2728
 SHA512:
-  metadata.gz: 565603a221d5e5b17595008b0ad385b5880930802897586d7276e22cb7abbcfd8bac24971e6842fc8ebf6d52434db6cdc61f05f4efdaa661e7338fc430379db6
-  data.tar.gz: ad6b0d25702b25e9058ee6201cde765b1f78944a6cd8f9be7cd43683939c5661a2a82daf04146787cf325f650de573f7c33f1fdd6dc371312ac966788152077c
+  metadata.gz: bf9e2ca6b9075436d09415eee9cf31c18f3fa88325f5c7c99ab4ca06f996fa0c8e1446b2a88d862dd1628b16b9a3a79676abcc118d07dd26b1fb553826255143
+  data.tar.gz: 15361910ba0e772eecf502bc1d2ce644673b6a55cad00df60c207e495894a48cc67b593d05f8da32789974950984982eea568874762187bd126bb7f8fe47be56

data/CHANGES.md

@@ -13,14 +13,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - ExtensionAttribute definitions when used by extendable classes
 - Implemented Ruby2.4's `String#casecmp?` in older Rubies
 - APIObject.fetch can take the search term `:random` and you'll get a randomly selected object. Example: `a_random_computer = JSS::Computer.fetch :random`
-- Keys of the hash returned by `Computer#hardware` are now available as instance methods on Computer objects. So instead of `a_computer.hardware[:total_ram]` you can also do `a_computer.total_ram`
+- Keys of the hash returned by `Computer#hardware` are now available as instance methods on Computer objects. So as well as `a_computer.hardware[:total_ram]` you can also do `a_computer.total_ram`
+- Policy now recognizes the frequency Symbol `:once_per_user_per_computer`
+- Attribute reader :management_status added to Computer class
+- Implemented some useful String methods from newer versions of Ruby into older Rubies: casecmp?, delete_prefix, & delete_suffix
 
 
 ### Fixed
 - Can't Modify Frozen Hash error when instantiating JSS::Scopbable::Scope. Thanks to @shahn for reporting this one.
 - MobileDeviceExtensionAttribute now handles empty `as_of` timestamp. Thanks @aurica!
-- A couple of typos. Thanks to @cybertunnel for finding one.
+- A few typos. Thanks to @cybertunnel for finding some.
 - A bug when parsing the `server_path` parameter to `API::Connection.new`
+- Bugs in handling blank values in Policy#search_by_path and Policy#printer_ids. Thanks @cybertunnel
+- Computer.management_data with a specified subset returned one level too high in the data structure
+- NetworkSegment.my_network_segment: error in number of params passed to other methods
+- Script#name= now works again, no longer uses a constant from an ancient version. Thanks @shahn
+- Computer#asset_tag= now accepts nil to erase the value
+- APIConnection.my_distribution_point & DistributionPoint.my_distribution_point now return the master_distribution_point object if there isn't one assigned to the current network segment.
 
 ### Changed
 - Monkey Patches are being moved to a better, more traceable technique, see https://www.justinweiss.com/articles/3-ways-to-monkey-patch-without-making-a-mess/
@@ -29,6 +38,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `APIObject.valid_id` is now case-insensitive
 - Removed deprecated VALID_DATA_KEYS constants from APIObject subclasses
 - Various changes in APIObject and its subclasses to try making `.fetch` and other lookup-methods faster.
+- All of the NetworkSegment-related methods in APIConnection have been moved back to NetworkSegment. The methods in APIConnection still work, but are marked deprecated and will go away eventually.
+
 
 ## \[1.0.4] - 2019-05-06
 ### Added

data/lib/jss/api_connection.rb

@@ -911,8 +911,12 @@ module JSS
       @my_distribution_point = nil if refresh
       return @my_distribution_point if @my_distribution_point
 
-      my_net_seg = my_network_segments[0]
-      @my_distribution_point = JSS::NetworkSegment.fetch(id: my_net_seg, api: self).distribution_point if my_net_seg
+      my_net_seg_id = my_network_segments[0]
+      if my_net_seg_id
+        my_net_seg = JSS::NetworkSegment.fetch(id: my_net_seg_id, api: self)
+        @my_distribution_point = JSS::DistributionPoint.fetch(name: my_net_seg.distribution_point)
+      end # if my_net_seg_id
+
       @my_distribution_point ||= master_distribution_point refresh
       @my_distribution_point
     end

data/lib/jss/api_object/computer.rb

@@ -1035,7 +1035,8 @@ module JSS
     end
 
     def asset_tag=(new_val)
-      return nil if @asset_tag == new_val
+      new_val = '' if new_val.nil?
+      return nil if @asset_tag.to_s == new_val
       new_val.strip!
       @asset_tag = new_val
       @need_to_update = true

data/lib/jss/api_object/distribution_point.rb

@@ -1,233 +1,222 @@
-### Copyright 2019 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
-
-###
+# Copyright 2019 Pixar
+
+#    Licensed under the Apache License, Version 2.0 (the "Apache License")
+#    with the following modification; you may not use this file except in
+#    compliance with the Apache License and the following modification to it:
+#    Section 6. Trademarks. is deleted and replaced with:
+#
+#    6. Trademarks. This License does not grant permission to use the trade
+#       names, trademarks, service marks, or product names of the Licensor
+#       and its affiliates, except as required to comply with Section 4(c) of
+#       the License and to reproduce the content of the NOTICE file.
+#
+#    You may obtain a copy of the Apache License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the Apache License with the above modification is
+#    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the Apache License for the specific
+#    language governing permissions and limitations under the Apache License.
+#
+#
+
 module JSS
 
+  # Module Methods
   #####################################
-  ### Module Methods
-  #####################################
-
-
-  ###
-  ### A Distribution Point in the JSS
-  ###
-  ### As well as the normal Class and Instance methods for {APIObject} subclasses, the
-  ### DistributionPoint class provides more interaction with other parts of the API.
-  ###
-  ### Beyond the standard listing methods DistributionPoint.all, .all_ids, etc, every JSS
-  ### has a single "master" distribution point.  The Class method {DistributionPoint.master_distribution_point} will
-  ### return the JSS::DistributionPoint object for that master.
-  ###
-  ### Also, some network segments have specific DistributionPoints assigned to them. Calling the Class method
-  ### {DistributionPoint.my_distribution_point} will return a JSS::DistributionPoint object for your local IP address.
-  ###
-  ### Once you have an instance of JSS::DistributionPoint, you can mount it (on a Mac) by calling its {#mount} method
-  ### and unmount it with {#unmount}. The {JSS::Package} and possibly {JSS::Script} classes use this to upload
-  ### items to the master.
-  ###
-  ### @see JSS::APIObject
-  ###
-  class DistributionPoint  < JSS::APIObject
-
-    #####################################
-    ### Mix-Ins
-    #####################################
 
-    #####################################
-    ### Class Constants
+  # A Distribution Point in the JSS
+  #
+  # As well as the normal Class and Instance methods for {APIObject} subclasses, the
+  # DistributionPoint class provides more interaction with other parts of the API.
+  #
+  # Beyond the standard listing methods DistributionPoint.all, .all_ids, etc, every JSS
+  # has a single "master" distribution point.  The Class method {DistributionPoint.master_distribution_point} will
+  # return the JSS::DistributionPoint object for that master.
+  #
+  # Also, some network segments have specific DistributionPoints assigned to them. Calling the Class method
+  # {DistributionPoint.my_distribution_point} will return a JSS::DistributionPoint object for your local IP address.
+  #
+  # Once you have an instance of JSS::DistributionPoint, you can mount it (on a Mac) by calling its {#mount} method
+  # and unmount it with {#unmount}. The {JSS::Package} and possibly {JSS::Script} classes use this to upload
+  # items to the master.
+  #
+  # @see JSS::APIObject
+  #
+  class DistributionPoint < JSS::APIObject
+
+    # Class Constants
     #####################################
 
-    ### The base for REST resources of this class
-    RSRC_BASE = "distributionpoints"
+    # The base for REST resources of this class
+    RSRC_BASE = 'distributionpoints'.freeze
 
-    ### the hash key used for the JSON list output of all objects in the JSS
-    ### its also used in various error messages
+    # the hash key used for the JSON list output of all objects in the JSS
+    # its also used in various error messages
     RSRC_LIST_KEY = :distribution_points
 
-    ### The hash key used for the JSON object output.
-    ### It's also used in various error messages
+    # The hash key used for the JSON object output.
+    # It's also used in various error messages
     RSRC_OBJECT_KEY = :distribution_point
 
-    ### what  are the mount options? these are comma-separated, and are passed with -o
-    MOUNT_OPTIONS = 'nobrowse'
+    # what  are the mount options? these are comma-separated, and are passed with -o
+    MOUNT_OPTIONS = 'nobrowse'.freeze
 
-    ### An empty SHA256 digest
-    EMPTY_PW_256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    # An empty SHA256 digest
+    EMPTY_PW_256 = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'.freeze
 
-    ### Set default local mount for distribution point
-    DEFAULT_MOUNTPOINT_DIR = Pathname.new "/tmp"
+    # Set default local mount for distribution point
+    DEFAULT_MOUNTPOINT_DIR = Pathname.new '/tmp'
 
-    DEFAULT_MOUNTPOINT_PREFIX = "CasperDistribution-id"
+    DEFAULT_MOUNTPOINT_PREFIX = 'CasperDistribution-id'.freeze
 
     # the object type for this object in
     # the object history table.
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 76
 
-    ### Class Methods
+    # Class Methods
     #####################################
 
-    ### 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.
-    ###
-    ### @param refresh[Boolean] should the distribution point be re-queried?
-    ###
-    ### @param api[JSS::APIConnection] which API connection should we query?
-    ###
-    ### @return [JSS::DistributionPoint]
-    ###
+    # 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.
+    #
+    # @param refresh[Boolean] should the distribution point be re-queried?
+    #
+    # @param api[JSS::APIConnection] which API connection should we query?
+    #
+    # @return [JSS::DistributionPoint]
+    #
     def self.master_distribution_point(refresh = false, api: JSS.api)
       api.master_distribution_point refresh
     end
 
-    ### Get the DistributionPoint instance for the machine running
-    ### this code, based on its IP address. If none is defined for this IP address,
-    ### use the result of master_distribution_point
-    ###
-    ### @param refresh[Boolean] should the distribution point be re-queried?
-    ###
-    ### @param api[JSS::APIConnection] which API connection should we query?
-    ###
-    ### @return [JSS::DistributionPoint]
-    ###
+    # Get the DistributionPoint instance for the machine running
+    # this code, based on its IP address. If none is defined for this IP address,
+    # use the result of master_distribution_point
+    #
+    # @param refresh[Boolean] should the distribution point be re-queried?
+    #
+    # @param api[JSS::APIConnection] which API connection should we query?
+    #
+    # @return [JSS::DistributionPoint]
+    #
     def self.my_distribution_point(refresh = false, api: JSS.api)
       api.my_distribution_point refresh
     end
 
-    #####################################
-    ### Class Attributes
+    # Class Attributes
     #####################################
 
-    ### @return [String] the hostname of this DP
+    # @return [String] the hostname of this DP
     attr_reader :ip_address
 
-    ### @return [String] the local path on the server to the distribution point directory
+    # @return [String] the local path on the server to the distribution point directory
     attr_reader :local_path
 
-    ### @return [String] load balanacing enabled?
+    # @return [String] load balanacing enabled?
     attr_reader :enable_load_balancing
 
-    ### @return [Integer] the id of the DP to use for failover
+    # @return [Integer] the id of the DP to use for failover
     attr_reader :failover_point
 
-    ### @return [Boolean] is this the master DP?
+    # @return [Boolean] is this the master DP?
     attr_reader :is_master
 
-    ### FileService Access
+    # FileService Access
 
-    ### @return [String] Protocol for fileservice access (e.g. AFP, SMB)
+    # @return [String] Protocol for fileservice access (e.g. AFP, SMB)
     attr_reader :connection_type
 
-    ### @return [Integer] the port for fileservice access
+    # @return [Integer] the port for fileservice access
     attr_reader :share_port
 
-    ### @return [String]  the name of the fileservice sharepoint
+    # @return [String]  the name of the fileservice sharepoint
     attr_reader :share_name
 
-    ### @return [String] the read-write username for fileservice access
+    # @return [String] the read-write username for fileservice access
     attr_reader :read_write_username
 
-    ### @return [String] the read-write password as a SHA256 digest
+    # @return [String] the read-write password as a SHA256 digest
     attr_reader :read_write_password_sha256
 
-    ### @return [String] read-only username for fileservice
+    # @return [String] read-only username for fileservice
     attr_reader :read_only_username
 
-    ### @return [String] read-only password as a SHA256 digest
+    # @return [String] read-only password as a SHA256 digest
     attr_reader :read_only_password_sha256
 
-    ### @return [String] work group or domain for SMB
+    # @return [String] work group or domain for SMB
     attr_reader :workgroup_or_domain
 
-    ### http(s) access
+    # http(s) access
 
-    ### @return [Boolean] are http downloads available from this DP?
+    # @return [Boolean] are http downloads available from this DP?
     attr_reader :http_downloads_enabled
 
-    ### @return [String] the protocol to use for http downloads (http/https)
+    # @return [String] the protocol to use for http downloads (http/https)
     attr_reader :protocol
 
-    ### @return [Integer] the port for http access
+    # @return [Integer] the port for http access
     attr_reader :port
 
-    ### @return [String] the "context" for http downloads (what goes after the hostname part of the URL)
+    # @return [String] the "context" for http downloads (what goes after the hostname part of the URL)
     attr_reader :context
 
-    ### @return [Boolean] do http downloads work without auth?
+    # @return [Boolean] do http downloads work without auth?
     attr_reader :no_authentication_required
 
-    ### @return [Boolean] do http downloads use cert. authentication?
+    # @return [Boolean] do http downloads use cert. authentication?
     attr_reader :certificate_required
 
-    ### @return [Boolean] do http downloads use user/pw auth?
+    # @return [Boolean] do http downloads use user/pw auth?
     attr_reader :username_password_required
 
-    ### @return [String] the username to use for http downloads if needed for user/pw auth
+    # @return [String] the username to use for http downloads if needed for user/pw auth
     attr_reader :http_username
 
-    ### @return [String] the password for http downloads, if needed, as a SHA256 digest
+    # @return [String] the password for http downloads, if needed, as a SHA256 digest
     attr_reader :http_password_sha256
 
-    ### @return [String] the name of the cert. used for http cert. auth.
+    # @return [String] the name of the cert. used for http cert. auth.
     attr_reader :certificate
 
-    ### @return [String] the URL for http downloads
+    # @return [String] the URL for http downloads
     attr_reader :http_url
 
-    ### @return [String] the URL to use if this one doesn't work
+    # @return [String] the URL to use if this one doesn't work
     attr_reader :failover_point_url
 
-    ### ssh (scp, rsync, sftp) access
+    # ssh (scp, rsync, sftp) access
 
-    ### @return [String] ssh username
+    # @return [String] ssh username
     attr_reader :ssh_username
 
-    ### @return [String] the ssh password as a SHA256 digest
+    # @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
-    ###
+    # 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....
+      # TODO: this looks redundant with super....
       args[:api] ||= JSS.api
       @api = args[:api]
 
       @init_data = nil
 
-      ### looking for master?
+      # looking for master?
       if args[:id] == :master
 
         self.class.all_ids(api: @api).each do |id|
-          @init_data  = @api.get_rsrc("#{RSRC_BASE}/id/#{id}")[RSRC_OBJECT_KEY]
+          @init_data = @api.get_rsrc("#{RSRC_BASE}/id/#{id}")[RSRC_OBJECT_KEY]
           if @init_data[:is_master]
             @id = @init_data[:id]
             @name = @init_data[:name]
@@ -237,9 +226,7 @@ module JSS
         end # each id
       end # if args is master
 
-      if @init_data.nil?
-        super(args)
-      end
+      super(args) if @init_data.nil?
 
       @ip_address = @init_data[:ip_address]
       @local_path = @init_data[:local_path]
@@ -261,7 +248,6 @@ module JSS
       @http_username = @init_data[:http_username]
       @http_password_sha256 = @init_data[:http_password_sha256]
 
-
       @http_downloads_enabled = @init_data[:http_downloads_enabled]
       @protocol = @init_data[:protocol]
       @port = @init_data[:port]
@@ -273,44 +259,41 @@ module JSS
       @http_url = @init_data[:http_url]
       @failover_point_url = @init_data[:failover_point_url]
 
-
       @port = @init_data[:ssh_password]
 
-      ### Note, as of Casper 9.3:
-      ### :management_password_md5=>"xxxxx"
-      ### and
-      ### :management_password_sha256=> "xxxxxxxxxx"
-      ### Are the read/write password
-      ###
-      ### An empty passwd is
-      ### MD5 = d41d8cd98f00b204e9800998ecf8427e
-      ### SHA256 = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-      ###
-      ### Seemms the read-only pw isn't available in the API
-
-
-      ### if we mount for fileservice, where's the mountpoint?
+      # Note, as of Casper 9.3:
+      # :management_password_md5=>"xxxxx"
+      # and
+      # :management_password_sha256=> "xxxxxxxxxx"
+      # Are the read/write password
+      #
+      # An empty passwd is
+      # MD5 = d41d8cd98f00b204e9800998ecf8427e
+      # SHA256 = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+      #
+      # Seemms the read-only pw isn't available in the API
+
+      # if we mount for fileservice, where's the mountpoint?
       @mountpoint = Pathname.new "/#{DEFAULT_MOUNTPOINT_DIR}/#{DEFAULT_MOUNTPOINT_PREFIX}#{@id}"
-
-    end #init
-
-    ###
-    ### Check the validity of a password.
-    ###
-    ### @param user[Symbol] one of :ro, :rw, :ssh, :http
-    ###
-    ### @param pw[String] the password to check for the given user
-    ###
-    ### @return [Boolean,Nil] was the password correct?
-    ###   nil is returned if there is no password set in the JSS.
-    ###
+    end # init
+
+    # Check the validity of a password.
+    #
+    # @param user[Symbol] one of :ro, :rw, :ssh, :http
+    #
+    # @param pw[String] the password to check for the given user
+    #
+    # @return [Boolean,Nil] was the password correct?
+    #   nil is returned if there is no password set in the JSS.
+    #
     def check_pw(user, pw)
-      raise JSS::InvalidDataError, "The first parameter must be one of :ro, :rw, :ssh, :http" unless [:ro, :rw, :ssh, :http].include? user
+      raise JSS::InvalidDataError, 'The first parameter must be one of :ro, :rw, :ssh, :http' unless %i[ro rw ssh http].include? user
+
       sha256 = case user
-        when :rw then @read_write_password_sha256
-        when :ro then @read_only_password_sha256
-        when :http then @http_password_sha256
-        when :ssh then @ssh_password_sha256
+               when :rw then @read_write_password_sha256
+               when :ro then @read_only_password_sha256
+               when :http then @http_password_sha256
+               when :ssh then @ssh_password_sha256
       end # case
 
       return nil if sha256 == EMPTY_PW_256
@@ -318,28 +301,28 @@ module JSS
       sha256 == Digest::SHA2.new(256).update(pw).to_s
     end
 
-    ### Check to see if this dist point is reachable for downloads (read-only)
-    ### via either http, if available, or filesharing.
-    ###
-    ### @param pw[String] the read-only password to use for checking the connection
-    ###   If http downloads are enabled, and no http password is required
-    ###   this can be omitted.
-    ###
-    ### @param check_http[Boolean] should we try the http download first, if enabled?
-    ###   If you're intentionally using the ro password for filesharing, and want to check
-    ###   only filesharing, then set this to false.
-    ###
-    ### @return [FalseClass, Symbol] false if not reachable, otherwise :http or :mountable
-    ###
-    def reachable_for_download? (pw = '', check_http = true)
+    # Check to see if this dist point is reachable for downloads (read-only)
+    # via either http, if available, or filesharing.
+    #
+    # @param pw[String] the read-only password to use for checking the connection
+    #   If http downloads are enabled, and no http password is required
+    #   this can be omitted.
+    #
+    # @param check_http[Boolean] should we try the http download first, if enabled?
+    #   If you're intentionally using the ro password for filesharing, and want to check
+    #   only filesharing, then set this to false.
+    #
+    # @return [FalseClass, Symbol] false if not reachable, otherwise :http or :mountable
+    #
+    def reachable_for_download?(pw = '', check_http = true)
       pw ||= ''
-      http_checked = ""
+      http_checked = ''
       if check_http && http_downloads_enabled
         if @username_password_required
           # we don't check the pw here, because if the connection fails, we'll
           # drop down below to try the password for mounting.
           # we'll escape all the chars that aren't unreserved
-          #reserved_chars = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}]")
+          # reserved_chars = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}]")
           user_pass = "#{CGI.escape @http_username}:#{CGI.escape ro_pw}@"
           url = @http_url.sub "://#{@ip_address}", "://#{user_pass}#{@ip_address}"
         else
@@ -350,13 +333,13 @@ module JSS
           open(url).read
           return :http
         rescue
-          http_checked = "http and "
+          http_checked = 'http and '
         end
       end # if  check_http && http_downloads_enabled
 
       return :mountable if mounted?
 
-      return false unless check_pw :ro , pw
+      return false unless check_pw :ro, pw
 
       begin
         mount pw, :ro
@@ -368,16 +351,17 @@ module JSS
       end
     end
 
-    ### Check to see if this dist point is reachable for uploads (read-write)
-    ### via filesharing.
-    ###
-    ### @param pw[String] the read-write password to use for checking the connection
-    ###
-    ### @return [FalseClass, Symbol] false if not reachable, otherwise :mountable
-    ###
-    def reachable_for_upload? (pw)
+    # Check to see if this dist point is reachable for uploads (read-write)
+    # via filesharing.
+    #
+    # @param pw[String] the read-write password to use for checking the connection
+    #
+    # @return [FalseClass, Symbol] false if not reachable, otherwise :mountable
+    #
+    def reachable_for_upload?(pw)
       return :mountable if mounted?
-      return false unless check_pw :rw , pw
+      return false unless check_pw :rw, pw
+
       begin
         mount pw, :rw
         return :mountable
@@ -388,36 +372,34 @@ module JSS
       end
     end
 
-
-
-
-    ###
-    ### Mount this distribution point locally.
-    ###
-    ### @param pw[String,Symbol] the read-only or read-write password for this DistributionPoint
-    ###   If :prompt, the user is promted on the commandline to enter the password for the :user.
-    ###   If :stdin#, the password is read from a line of std in represented by the digits at #,
-    ###   so :stdin3 reads the passwd from the third line of standard input. defaults to line 2,
-    ###   if no digit is supplied. see {JSS.stdin}
-    ###
-    ### @param access[Symbol] how to mount the DistributionPoint, and which password to expect.
-    ###  :ro (or anything else) = read-only, :rw = read-write
-    ###
-    ### @return [Pathname] the mountpoint.
-    ###
+    #
+    # Mount this distribution point locally.
+    #
+    # @param pw[String,Symbol] the read-only or read-write password for this DistributionPoint
+    #   If :prompt, the user is promted on the commandline to enter the password for the :user.
+    #   If :stdin#, the password is read from a line of std in represented by the digits at #,
+    #   so :stdin3 reads the passwd from the third line of standard input. defaults to line 2,
+    #   if no digit is supplied. see {JSS.stdin}
+    #
+    # @param access[Symbol] how to mount the DistributionPoint, and which password to expect.
+    #  :ro (or anything else) = read-only, :rw = read-write
+    #
+    # @return [Pathname] the mountpoint.
+    #
     def mount(pw = nil, access = :ro)
       return @mountpoint if mounted?
+
       access = :ro unless access == :rw
 
       password = if pw == :prompt
-        JSS.prompt_for_password "Enter the password for the #{access} user '#{access == :ro ? @read_only_username : @read_write_username }':"
-      elsif pw.is_a?(Symbol) and pw.to_s.start_with?('stdin')
-        pw.to_s =~ /^stdin(\d+)$/
-        line = $1
-        line ||= 2
-        JSS.stdin line
-      else
-        pw
+                   JSS.prompt_for_password "Enter the password for the #{access} user '#{access == :ro ? @read_only_username : @read_write_username}':"
+                 elsif pw.is_a?(Symbol) && pw.to_s.start_with?('stdin')
+                   pw.to_s =~ /^stdin(\d+)$/
+                   line = Regexp.last_match(1)
+                   line ||= 2
+                   JSS.stdin line
+                 else
+                   pw
       end
 
       pwok = check_pw(access, password)
@@ -432,74 +414,69 @@ module JSS
 
       @mount_url = "#{@connection_type.downcase}://#{username}:#{safe_pw}@#{@ip_address}/#{@share_name}"
       @mnt_cmd = case @connection_type.downcase
-        when 'smb' then '/sbin/mount_smbfs'
-        when 'afp' then '/sbin/mount_afp'
-        else raise "Can't mount distribution point #{@name}: no known connection type."
+                 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
 
       @mountpoint.mkpath
 
       mount_out = `#{@mnt_cmd} -o '#{MOUNT_OPTIONS}' '#{@mount_url}' '#{@mountpoint}' 2>&1`
-      if $?.exitstatus == 0 and @mountpoint.mountpoint?
-      #if system @mnt_cmd.to_s, *['-o', MOUNT_OPTIONS, @mount_url, @mountpoint.to_s]
+      if ($CHILD_STATUS.exitstatus == 0) && @mountpoint.mountpoint?
+        # if system @mnt_cmd.to_s, *['-o', MOUNT_OPTIONS, @mount_url, @mountpoint.to_s]
         @mounted = access
       else
         @mountpoint.rmdir if @mountpoint.directory?
         @mounted = nil
         raise JSS::FileServiceError, "Can't mount #{@ip_address}: #{mount_out}"
       end
-      return @mountpoint
+      @mountpoint
     end # mount
 
-    ###
-    ### Unmount the distribution point.
-    ###
-    ### Does nothing if it wasn't mounted with #mount.
-    ###
-    ### @return [void]
-    ###
+    # Unmount the distribution point.
+    #
+    # Does nothing if it wasn't mounted with #mount.
+    #
+    # @return [void]
+    #
     def unmount
       return nil unless mounted?
+
       if system "/sbin/umount '#{@mountpoint}'"
         sleep 1 # the umount takes time.
-        @mountpoint.rmdir if @mountpoint.directory? and (not @mountpoint.mountpoint?)
+        @mountpoint.rmdir if @mountpoint.directory? && !@mountpoint.mountpoint?
         @mounted = false
       else
-        raise  JSS::FileServiceError ,"There was a problem unmounting #{@mountpoint}"
+        raise JSS::FileServiceError, "There was a problem unmounting #{@mountpoint}"
       end
       nil
     end # unmount
 
-
-    ###
-    ### Is this thing mounted right now?
-    ###
-    ### @return [Boolean]
-    ###
+    # Is this thing mounted right now?
+    #
+    # @return [Boolean]
+    #
     def mounted?
-      @mountpoint.directory? and  @mountpoint.mountpoint?
+      @mountpoint.directory? && @mountpoint.mountpoint?
     end
 
-
     #### aliases
     alias hostname ip_address
     alias umount unmount
 
-    ######################################
-    ### Private Instance Methods
+    # Private Instance Methods
     ######################################
     private
 
-    ###
-    ### Unused - until I get around to making DP's updatable
-    ###
-    ### the XML representation of the current state of this object,
-    ### for POSTing or PUTting back to the JSS via the API
-    ### Will be supported for Dist Points some day, I'm sure.
-    ###
+    # Unused - until I get around to making DP's updatable
+    #
+    # the XML representation of the current state of this object,
+    # for POSTing or PUTting back to the JSS via the API
+    # Will be supported for Dist Points some day, I'm sure.
+    #
     def rest_xml
       doc = REXML::Document.new
-      dp = doc.add_element "distribution_point"
+      dp = doc.add_element 'distribution_point'
       dp.add_element(:name.to_s).text = @name
       dp.add_element(:ip_address.to_s).text = @ip_address
       dp.add_element(:local_path.to_s).text = @local_path
@@ -531,8 +508,9 @@ module JSS
       dp.add_element(:ssh_username.to_s).text = @ssh_username
       dp.add_element(:ssh_password.to_s).text = @ssh_password if @ssh_password
 
-      return doc.to_s
-    end #rest_xml
+      doc.to_s
+    end # rest_xml
 
   end # class
+
 end # module

data/lib/jss/api_object/network_segment.rb

@@ -198,7 +198,7 @@ module JSS
     def self.network_segments_for_ip(ip, refresh = false, api: JSS.api)
       ok_ip = IPAddr.new(ip)
       matches = []
-      network_ranges.each { |id, subnet| matches << id if subnet.include?(ok_ip) }
+      network_ranges(refresh, api: api).each { |id, subnet| matches << id if subnet.include?(ok_ip) }
       matches
     end
 
@@ -226,7 +226,7 @@ module JSS
       my_network_segments api: api
     end
 
-    # All NetworkSegments in this jss as IPAddr object Ranges representing the
+    # All NetworkSegments in the given API 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>

data/lib/jss/api_object/script.rb

@@ -173,12 +173,13 @@ module JSS
     ### @return [void]
     ###
     def name=(new_val)
-      return nil if new_val == @name
-      new_val = nil if new_val == ''
-      raise JSS::MissingDataError, "Name can't be empty" unless new_val
-      raise JSS::AlreadyExistsError, "A #{RSRC_OBJECT_KEY} already exists with the name '#{args[:name]}'" if JSS.send(LIST_METHOD).values.include?
+      new_val = new_val.to_s
+      return if new_val == @name
+
+      raise JSS::MissingDataError, "Name can't be empty" if new_val.empty?
+      raise JSS::AlreadyExistsError, "A script already exists with the name '#{new_val}'" if JSS::Script.all_names.include? new_val
 
-      ### if the filename is the same, keep it the same
+      ### if the filename matches the name, change that too.
       @filename = new_val if @filename == @name
       @name = new_val
 

data/lib/jss/ruby_extensions/string.rb

@@ -24,6 +24,8 @@
 
 require 'jss/ruby_extensions/string/conversions.rb'
 require 'jss/ruby_extensions/string/predicates.rb'
+require 'jss/ruby_extensions/string/backports.rb'
 
 String.include JSSRubyExtensions::String::Predicates
 String.include JSSRubyExtensions::String::Conversions
+String.include JSSRubyExtensions::String::BackPorts

data/lib/jss/ruby_extensions/string/backports.rb

@@ -0,0 +1,68 @@
+# Copyright 2019 Pixar
+
+#
+#    Licensed under the Apache License, Version 2.0 (the "Apache License")
+#    with the following modification; you may not use this file except in
+#    compliance with the Apache License and the following modification to it:
+#    Section 6. Trademarks. is deleted and replaced with:
+#
+#    6. Trademarks. This License does not grant permission to use the trade
+#       names, trademarks, service marks, or product names of the Licensor
+#       and its affiliates, except as required to comply with Section 4(c) of
+#       the License and to reproduce the content of the NOTICE file.
+#
+#    You may obtain a copy of the Apache License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the Apache License with the above modification is
+#    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the Apache License for the specific
+#    language governing permissions and limitations under the Apache License.
+
+module JSSRubyExtensions
+
+  module String
+
+    module BackPorts
+
+      BLANK = ''.freeze
+
+      # Ruby 2.5 + has these handy delete_* methods
+      unless BLANK.respond_to? :delete_prefix
+
+        def delete_prefix(pfx)
+          sub /\A#{pfx}/, BLANK
+        end
+
+        def delete_prefix!(pfx)
+          sub! /\A#{pfx}/, BLANK
+        end
+
+        def delete_suffix(sfx)
+          sub /#{sfx}\z/, BLANK
+        end
+
+        def delete_suffix!(sfx)
+          sub! /#{sfx}\z/, BLANK
+        end
+
+      end # unless
+
+      # String#casecmp? - its in Ruby 2.4+
+      unless BLANK.respond_to? :casecmp?
+
+        def casecmp?(other)
+          return nil unless other.is_a? String
+
+          casecmp(other).zero?
+        end
+
+      end # unless
+
+    end # module
+
+  end # module
+
+end # module

data/lib/jss/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.1.0b3
+  version: 1.1.0b5
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -245,6 +245,7 @@ files:
 - lib/jss/ruby_extensions/object.rb
 - lib/jss/ruby_extensions/pathname.rb
 - lib/jss/ruby_extensions/string.rb
+- lib/jss/ruby_extensions/string/backports.rb
 - lib/jss/ruby_extensions/string/conversions.rb
 - lib/jss/ruby_extensions/string/predicates.rb
 - lib/jss/ruby_extensions/time.rb