ruby-jss 0.6.4 → 0.6.5

data/lib/jss/api_object/creatable.rb

@@ -1,25 +1,25 @@
 ### Copyright 2016 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.
-### 
+###
 ###
 
 ###
@@ -86,6 +86,7 @@ module JSS
       raise JSS::UnsupportedError, "Creating or editing #{self.class::RSRC_LIST_KEY} isn't yet supported. Please use other Casper workflows." unless CREATABLE
       raise AlreadyExistsError, "This #{self.class::RSRC_OBJECT_KEY} already exists. Use #update to make changes." if @in_jss
       JSS::API.post_rsrc( @rest_rsrc, rest_xml) =~ /><id>(\d+)<\/id></
+
       @id = $1.to_i
       @in_jss = true
       @need_to_update = false

data/lib/jss/api_object/distribution_point.rb

@@ -118,10 +118,11 @@ module JSS
         when 0
           raise JSS::NoSuchItemError, "No distribution points defined"
         when 1
-          self.new :id => self.all_ids[0]
+          @@master_distribution_point = self.new :id => self.all_ids[0]
         else
-          self.new :id => :master
+          @@master_distribution_point = self.new :id => :master
         end
+        @@master_distribution_point
     end
 
     ### Get the DistributionPoint instance for the machine running
@@ -142,7 +143,8 @@ module JSS
       else
         nil
       end
-      return specific ? self.new(:name => specific) : self.master_distribution_point
+      @@my_distribution_point = specific ? self.new(:name => specific) : self.master_distribution_point
+      @@my_distribution_point
     end
 
     #####################################
@@ -364,8 +366,8 @@ module JSS
           # 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}]")
-          user_pass = "#{URI.escape @http_username,reserved_chars}:#{URI.escape ro_pw, reserved_chars}@"
+          #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
           url = @http_url
@@ -414,6 +416,8 @@ module JSS
     end
 
 
+
+
     ###
     ### Mount this distribution point locally.
     ###
@@ -451,7 +455,7 @@ module JSS
 
       username = access == :ro ? @read_only_username : @read_write_username
 
-      safe_pw = URI.escape password, /[^a-zA-Z\d]/
+      safe_pw = CGI.escape password
 
       @mount_url = "#{@connection_type.downcase}://#{username}:#{safe_pw}@#{@ip_address}/#{@share_name}"
       @mnt_cmd = case @connection_type.downcase
@@ -484,6 +488,7 @@ module JSS
     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?)
         @mounted = false
       else

data/lib/jss/api_object/group.rb

@@ -1,25 +1,25 @@
 ### Copyright 2016 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.
-### 
+###
 ###
 
 ###
@@ -120,7 +120,7 @@ module JSS
 
     ### @return [Boolean] does this group send notifications when it changes?
     attr_reader :notify_on_change
-    
+
 
     ### @return [String] the :name of the site for this group
     attr_reader :site
@@ -213,7 +213,7 @@ module JSS
     def size
       @members.count
     end
-    
+
 
     ###
     ### @return [Array<String>] the names of the group members
@@ -321,14 +321,14 @@ module JSS
       @need_to_update = true
     end
 
-    
+
     ### aliases
-    
+
     alias smart? is_smart
     alias notify_on_change? notify_on_change
     alias notify? notify_on_change
     alias count size
-    
+
     #####################################
     ### Public Instance Methods
     #####################################
@@ -343,8 +343,8 @@ module JSS
     ###
     def check_member(m)
       potential_members = self.class::MEMBER_CLASS.map_all_ids_to(:name)
-      if m.to_s =~ /\d+/ 
-        return {:id=>m.to_i, :name=> potential_members[m]} if potential_members.keys.include? m.to_i 
+      if m.to_s =~ /^\d+$/
+        return {:id=>m.to_i, :name=> potential_members[m]} if potential_members.keys.include? m.to_i
       else
         return {:name=>m, :id=> potential_members.invert[m]} if potential_members.values.include? m
       end

data/lib/jss/api_object/osx_configuration_profile.rb

@@ -1,30 +1,30 @@
 ### Copyright 2016 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 Variables
   #####################################
@@ -33,103 +33,106 @@ module JSS
   ### Module Methods
   #####################################
 
-  
   #####################################
   ### Classes
   #####################################
 
-  ### 
+  ###
   ### An OS X Configuration Profile in the JSS.
   ###
   ### Note that the profile payloads and the profile UUID cannot be edited or updated with this via this class.
   ### Use the web UI.
   ###
   ### @see JSS::APIObject
-  ### 
+  ###
   class OSXConfigurationProfile < JSS::APIObject
-    
+
     #####################################
     ### Mix-Ins
     #####################################
     include JSS::Updatable
     include JSS::Scopable
     include JSS::SelfServable
-    
+
+    #####################################
+    ### Class Variables
+    #####################################
+
     #####################################
     ### Class Methods
     #####################################
-         
+
     #####################################
     ### Class Constants
     #####################################
-    
+
     ### The base for REST resources of this class
     RSRC_BASE = "osxconfigurationprofiles"
-    
+
     ### the hash key used for the JSON list output of all objects in the JSS
     RSRC_LIST_KEY = :os_x_configuration_profiles
-    
+
     ### The hash key used for the JSON object output.
     ### It's also used in various error messages
     RSRC_OBJECT_KEY = :os_x_configuration_profile
-    
+
     ### these keys, as well as :id and :name,  are present in valid API JSON data for this class
     VALID_DATA_KEYS = [:distribution_method, :scope, :redeploy_on_update]
-    
+
     ### Our scopes deal with computers
     SCOPE_TARGET_KEY = :computers
-    
+
     ### Our SelfService happens on OSX
     SELF_SERVICE_TARGET = :osx
-    
+
     ### Our SelfService deploys profiles
     SELF_SERVICE_PAYLOAD = :profile
-    
+
     ### The possible values for the :distribution_method
     DISTRIBUTION_METHODS = ["Install Automatically", "Make Available in Self Service"]
-    
+
     SELF_SERVICE_DIST_METHOD = "Make Available in Self Service"
-    
+
     ### The possible values for :level
     LEVELS = ["user", "computer"]
-    
-    
+
+
     #####################################
     ### Attributes
     #####################################
-    
+
     ### @return [String] the description of this profile
     attr_reader :description
-    
+
     ### @return [String] the distribution_method of this profile
     attr_reader :distribution_method
-    
+
     ### @return [Boolean] can the user remove this profile
     attr_reader :user_removable
-    
+
     ### @return [String] the level (user/computer) of this profile
     attr_reader :level
-    
+
     ### @return [String] the uuid of this profile. NOT Updatable
     attr_reader :uuid
-    
+
     ### @return [Boolean] Should this profile be redeployed when an inventory update happens?
     attr_reader :redeploy_on_update
-    
+
     ### @return [String] the plist containing the payloads for this profile. NOT Updatable
     attr_reader :payloads
-    
+
     #####################################
-    ### Constructor 
+    ### Constructor
     #####################################
-    
+
     ###
     ### See JSS::APIObject#initialize
     ###
     def initialize (args = {})
-      
+
       super
-      
+
       @description = @main_subset[:description]
       @distribution_method = @main_subset[:distribution_method]
       @user_removable = @main_subset[:user_removable]
@@ -137,10 +140,9 @@ module JSS
       @uuid = @main_subset[:uuid]
       @redeploy_on_update = @main_subset[:redeploy_on_update]
       @payloads = @main_subset[:payloads]
-      
+
       self.parse_scope
       self.parse_self_service
-      
     end
 
     #####################################
@@ -157,8 +159,8 @@ module JSS
       @description = new_val.strip!
       @need_to_update = true
     end
-    
-    
+
+
     ###
     ### @param new_val[String] how should this be distributed to clients?
     ###
@@ -170,7 +172,7 @@ module JSS
       @distribution_method = new_val
       @need_to_update = true
     end
-    
+
     ###
     ### @param new_val[Boolean] should the user be able to remove this?
     ###
@@ -183,7 +185,7 @@ module JSS
       @user_removable = new_val
       @need_to_update = true
     end
-    
+
     ###
     ### @param new_val[String] the new level for this profile (user/computer)
     ###
@@ -195,53 +197,53 @@ module JSS
       @level = new_val
       @need_to_update = true
     end
-    
-    
+
+
     ###
     ### @return [Boolean] is this profile available in Self Service?
     ###
     def in_self_service?
       @distribution_method == SELF_SERVICE_DIST_METHOD
     end
-    
-    
+
+
     ###
     ### @return [Boolean] is this profile removable by the user?
     ###
     def user_removable?
       @user_removable
     end
-    
-    
-    ### 
+
+
+    ###
     ### @return [Hash] The payload plist parsed into a Ruby hash
     ###
     def parsed_payloads
       Plist.parse_xml @payloads
     end
-    
+
     ###
     ### @return [Array<Hash>] the individual payloads from the payload Plist
     ###
     def payload_content
       parsed_payloads['PayloadContent']
     end
-    
+
     ###
     ### @return [Array<String>] the PayloadType of each payload (e.g. com.apple.caldav.account)
     ###
     def payload_types
       payload_content.map{|p| p['PayloadType'] }
     end
-    
+
     #####################################
     ### Private Instance Methods
     #####################################
     private
-    
+
     def rest_xml
       doc = REXML::Document.new
-      
+
       obj = doc.add_element RSRC_OBJECT_KEY.to_s
       gen = obj.add_element('general')
       gen.add_element('description').text = @description
@@ -249,13 +251,13 @@ module JSS
       gen.add_element('user_removable').text = @user_removable
       gen.add_element('level').text = @level
       gen.add_element('redeploy_on_update').text = @redeploy_on_update
-      
+
       obj << @scope.scope_xml
       obj << self_service_xml
-      
+
       return doc.to_s
     end
-    
+
   end # class OSXConfigurationProfile
-  
+
 end # module