ruby-jss 0.10.2a5 → 0.10.2

data/lib/jss/api_object/self_servable.rb

@@ -61,7 +61,7 @@ module JSS
   #
   #
   # Classes including this module *MUST*:
-  # - call {#add_self_service_xml(xmldoc)} in their #rest_xml method
+  # - call {#add_self_service_xml()} in their #rest_xml method
   #
   # IMPORTANT: Since SelfServable also includes #{JSS::Updatable}, for uploading icons,
   # see that module for its requirements.
@@ -85,8 +85,6 @@ module JSS
     MAKE_AVAILABLE = 'Make Available in Self Service'.freeze
     AUTO_INSTALL = 'Install Automatically'.freeze
     AUTO_INSTALL_OR_PROMPT = 'Install Automatically/Prompt Users to Install'.freeze
-    PATCHPOL_SELF_SERVICE = 'selfservice'.freeze # 'Make Available in Self Service' in the UI
-    PATCHPOL_AUTO = 'prompt'.freeze # 'Install Automatically' in the UI
 
     DEFAULT_INSTALL_BUTTON_TEXT = 'Install'.freeze
 
@@ -100,15 +98,6 @@ module JSS
         can_display_in_categories: true,
         can_feature_in_categories: true
       },
-      JSS::PatchPolicy => {
-        in_self_service_data_path: [:general, :distribution_method],
-        in_self_service: PATCHPOL_SELF_SERVICE,
-        not_in_self_service: PATCHPOL_AUTO,
-        targets: [:macos],
-        payload: :patchpolicy,
-        can_display_in_categories: false,
-        can_feature_in_categories: false
-      },
       JSS::MacApplication => { # TODO: add the correct values when Jamf fixes this bug
         in_self_service_data_path: nil, # [:general, :distribution_method],
         in_self_service: nil, # MAKE_AVAILABLE,
@@ -482,10 +471,10 @@ module JSS
     end
 
     def validate_icon(id)
-      return nil unless JSS::DB_CNX.connected?
-      raise JSS::NoSuchItemError, "No icon with id #{new_icon}" unless JSS::Icon.all_ids.include? id
+      if JSS::DB_CNX.connected?
+        raise JSS::NoSuchItemError, "No icon with id #{new_icon}" unless JSS::Icon.all_ids.include? id
+      end
     end
-
     # Re-read the icon data for this object from the API
     # Generally done after uploading a new icon via {#icon=}
     #

data/lib/jss/api_object/site.rb

@@ -1,68 +1,99 @@
-# Copyright 2017 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 2017 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
 
-  # Classes
-  ###################################
+  #####################################
+  ### Module Variables
+  #####################################
+
+  #####################################
+  ### Module Methods
+  #####################################
 
-  # A Site in the JSS.
-  #
-  # These are simple, in that they only have an ID and a name.
-  #
-  # @see JSS::APIObject
-  #
+
+  #####################################
+  ### Classes
+  #####################################
+
+  ###
+  ### A Site in the JSS.
+  ###
+  ### These are simple, in that they only have an ID and a name.
+  ###
+  ### @see JSS::APIObject
+  ###
   class Site < JSS::APIObject
 
-    # Mix-Ins
-    ###################################
+    #####################################
+    ### Mix-Ins
+    #####################################
     include JSS::Creatable
     include JSS::Updatable
 
-    # Class Constants
-    ###################################
+    #####################################
+    ### Class Methods
+    #####################################
+
+    #####################################
+    ### Class Constants
+    #####################################
 
-    # The base for REST resources of this class
-    RSRC_BASE = 'sites'.freeze
+    ### The base for REST resources of this class
+    RSRC_BASE = "sites"
 
-    # the hash key used for the JSON list output of all objects in the JSS
+    ### the hash key used for the JSON list output of all objects in the JSS
     RSRC_LIST_KEY = :sites
 
-    # 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 = :site
 
-    # these keys, as well as :id and :name,  are present in valid API JSON data for this class
-    VALID_DATA_KEYS = [].freeze
+    ### these keys, as well as :id and :name,  are present in valid API JSON data for this class
+    VALID_DATA_KEYS = []
 
     # the object type for this object in
     # the object history table.
     # See {APIObject#add_object_history_entry}
     OBJECT_HISTORY_OBJECT_TYPE = 44
 
+    #####################################
+    ### Attributes
+    #####################################
+
+    #####################################
+    ### Constructor
+    #####################################
+
+
+    #####################################
+    ### Public Instance Methods
+    #####################################
+
+
   end # class site
 
 end # module

data/lib/jss/api_object/user.rb

@@ -106,13 +106,9 @@ module JSS
 
     ### @return [Array<Hash>]
     ###
-    ### Unlike every other Sitable object, Users
-    ### can be in multiple sites, so we don't use
-    ### the Sitable mixin module. Instead we'll
-    ### we'll store them in this Array, as they come
-    ### from the API.
+    ### The sites associated with this user
     ###
-    ### Each Hash has the :id and :name for one site
+    ### Each Hash has then :id and :name for one site
     ###
     attr_reader :sites
 
@@ -271,7 +267,7 @@ module JSS
 
       user << JSS::Site.xml_list(@sites)
 
-      user << ext_attr_xml
+      user << ext_attr_xml if @changed_eas && !@changed_eas.empty?
 
       return doc.to_s
     end

data/lib/jss/api_object.rb

@@ -483,47 +483,6 @@ module JSS
       new args
     end
 
-
-    # Delete one or more API objects by jss_id without instantiating them.
-    # Non-existent id's are skipped and an array of skipped ids is returned.
-    #
-    # If an Array is provided, it is passed through #uniq! before being processed.
-    #
-    # @param victims[Integer,Array<Integer>] An object id or an array of them
-    #   to be deleted
-    #
-    # @param api[JSS::APIConnection] the API connection to use.
-    #   Defaults to the corrently active API. See {JSS::APIConnection}
-    #
-    # @return [Array<Integer>] The id's that didn't exist when we tried to
-    #   delete them.
-    #
-    def self.delete(victims, api: JSS.api)
-      raise JSS::UnsupportedError, '.delete can only be called on subclasses of JSS::APIObject' if self == JSS::APIObject
-      raise JSS::InvalidDataError, 'Parameter must be an Integer ID or an Array of them' unless victims.is_a?(Integer) || victims.is_a?(Array)
-
-      case victims
-      when Integer
-        victims = [victims]
-      when Fixnum
-        victims = [victims]
-      when Array
-        victims.uniq!
-      end
-
-      skipped = []
-      current_ids = all_ids :refresh, api: api
-      victims.each do |vid|
-        if current_ids.include? vid
-          api.delete_rsrc "#{self::RSRC_BASE}/id/#{vid}"
-        else
-          skipped << vid
-        end # if current_ids include v
-      end # each victim
-
-      skipped
-    end # self.delete
-
     ### Class Constants
     #####################################
 
@@ -695,16 +654,11 @@ module JSS
       defined? self.class::SELF_SERVABLE
     end
 
-    # @return [Boolean] See {JSS::Criteriable}
+    # @return [Boolean] See {JSS::criteriable}
     def criterable?
       defined? self.class::CRITERIABLE
     end
 
-    # @return [Boolean] See {JSS::Sitable}
-    def sitable?
-      defined? self.class::SITABLE
-    end
-
     # @return [Boolean] See {JSS::extendable}
     def extendable?
       defined? self.class::EXTENDABLE
@@ -737,8 +691,8 @@ module JSS
 
     # Delete this item from the JSS.
     #
-    # @seealso {APIObject.delete} for deleting
-    # one or more objects by id without needing to instantiate
+    # TODO: Make a class method for mass deletion
+    # without instantiating, then call it from this method.
     #
     # Subclasses may want to redefine this method,
     # first calling super, then setting other attributes to
@@ -861,17 +815,6 @@ module JSS
       history
     end
 
-    # Print the rest_xml value of the object to stdout,
-    # with indentation. Useful for debugging.
-    #
-    # @return [void]
-    #
-    def ppx
-      return nil unless creatable? || updatable?
-      REXML::Document.new(rest_xml).write $stdout, 2
-      puts
-    end
-
     # Private Instance Methods
     #####################################
     private
@@ -977,11 +920,10 @@ module JSS
       # many things have  a :site
       # TODO: Implement a Sitable mixin module
       #
-      # @site = JSS::APIObject.get_name(@main_subset[:site]) if @main_subset[:site]
+      @site = JSS::APIObject.get_name(@main_subset[:site]) if @main_subset[:site]
 
       ##### Handle Mix-ins
       initialize_category
-      initialize_site
       initialize_location
       initialize_purchasing
       initialize_scope
@@ -1017,14 +959,6 @@ module JSS
       parse_category if categorizable?
     end
 
-    # parse site data during initialization
-    #
-    # @return [void]
-    #
-    def initialize_site
-      parse_site if sitable?
-    end
-
     # parse location data during initialization
     #
     # @return [void]
@@ -1129,8 +1063,6 @@ require 'jss/api_object/extendable'
 require 'jss/api_object/self_servable'
 require 'jss/api_object/categorizable'
 require 'jss/api_object/vppable'
-require 'jss/api_object/sitable'
-require 'jss/api_object/mdm'
 
 ### Mix-in Sub Modules with Classes
 require 'jss/api_object/criteriable'
@@ -1159,8 +1091,6 @@ require 'jss/api_object/netboot_server'
 require 'jss/api_object/network_segment'
 require 'jss/api_object/osx_configuration_profile'
 require 'jss/api_object/package'
-require 'jss/api_object/patch'
-require 'jss/api_object/patch_policy'
 require 'jss/api_object/peripheral_type'
 require 'jss/api_object/peripheral'
 require 'jss/api_object/policy'

data/lib/jss/utility.rb

@@ -558,25 +558,4 @@ module JSS
     pw
   end
 
-  # un/set devmode mode.
-  # Useful when coding - methods can call JSS.devmode? and then
-  # e.g. spit out something instead of performing some action.
-  #
-  # @param [Symbol] Set devmode :on or :off
-  #
-  # @return [Boolean] The new state of devmode
-  #
-  def self.devmode(setting)
-    @devmode = setting == :on ? true : false
-  end
-
-
-  # is devmode currently on?
-  #
-  # @return [Boolean]
-  #
-  def self.devmode?
-    @devmode
-  end
-
 end # module

data/lib/jss/version.rb

@@ -27,6 +27,6 @@
 module JSS
 
   ### The version of the JSS ruby gem
-  VERSION = '0.10.2a5'.freeze
+  VERSION = '0.10.2'.freeze
 
 end # module

data/lib/jss.rb

@@ -160,8 +160,6 @@ module JSS
   class NetworkSegment < JSS::APIObject; end
   class OSXConfigurationProfile < JSS::APIObject; end
   class Package < JSS::APIObject; end
-  class Patch < JSS::APIObject; end
-  class PatchPolicy < JSS::APIObject; end
   class PeripheralType < JSS::APIObject; end
   class Peripheral < JSS::APIObject; end
   class Policy < JSS::APIObject; end
@@ -185,8 +183,6 @@ module JSS
   module SelfServable; end
   module Categorizable; end
   module VPPable; end
-  module Sitable; end
-  module MDM; end
 
 end # module JSS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 0.10.2a5
+  version: 0.10.2
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.8'
 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
@@ -140,7 +140,6 @@ files:
 - lib/jss/api_object/locatable.rb
 - lib/jss/api_object/mac_application.rb
 - lib/jss/api_object/matchable.rb
-- lib/jss/api_object/mdm.rb
 - lib/jss/api_object/mobile_device.rb
 - lib/jss/api_object/mobile_device_application.rb
 - lib/jss/api_object/mobile_device_configuration_profile.rb
@@ -148,8 +147,6 @@ files:
 - lib/jss/api_object/network_segment.rb
 - lib/jss/api_object/osx_configuration_profile.rb
 - lib/jss/api_object/package.rb
-- lib/jss/api_object/patch.rb
-- lib/jss/api_object/patch_policy.rb
 - lib/jss/api_object/peripheral.rb
 - lib/jss/api_object/peripheral_type.rb
 - lib/jss/api_object/policy.rb
@@ -161,7 +158,6 @@ files:
 - lib/jss/api_object/script.rb
 - lib/jss/api_object/self_servable.rb
 - lib/jss/api_object/self_servable/icon.rb
-- lib/jss/api_object/sitable.rb
 - lib/jss/api_object/site.rb
 - lib/jss/api_object/software_update_server.rb
 - lib/jss/api_object/updatable.rb
@@ -209,9 +205,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8