xolo-server 1.0.0 → 1.0.1

data/lib/xolo/server/mixins/version_jamf_access.rb

@@ -489,14 +489,18 @@ module Xolo
         # @return [Jamf::Policy] The auto-install-policy for this version, if it exists
         ##########################
         def jamf_auto_install_policy
-          @jamf_auto_install_policy ||=
-            if jamf_auto_install_policy_exist?
-              Jamf::Policy.fetch(name: jamf_auto_install_policy_name, cnx: jamf_cnx)
-            else
-              return if deleting?
+          # This is imporant to avoid infinite recursion
+          return @jamf_auto_install_policy if @jamf_auto_install_policy
 
-              create_jamf_auto_install_policy
-            end
+          if jamf_auto_install_policy_exist?
+            @jamf_auto_install_policy = Jamf::Policy.fetch(name: jamf_auto_install_policy_name, cnx: jamf_cnx)
+          else
+            return if deleting?
+
+            # this sets @jamf_auto_install_policy
+            create_jamf_auto_install_policy
+          end
+          @jamf_auto_install_policy
         end
 
         # The auto install policy is triggered by checkin
@@ -505,32 +509,34 @@ module Xolo
         # Before release, the targets are those defined in #pilot_groups_to_use
         #
         # After release, the targets are changed to those
-        # in title_object#target_group
+        # in title_object#release_groups
         #
         # This policy is never in self service
         # @return [Jamf::Policy] the auto install policy for this version
         #########################
         def create_jamf_auto_install_policy
           progress "Jamf: Creating Auto Install Policy: #{jamf_auto_install_policy_name}", log: :debug
-          pol = Jamf::Policy.create name: jamf_auto_install_policy_name, cnx: jamf_cnx
-          configure_jamf_auto_install_policy(pol)
-          pol.save
-          pol
+
+          @jamf_auto_install_policy = Jamf::Policy.create name: jamf_auto_install_policy_name, cnx: jamf_cnx
+
+          configure_jamf_auto_install_policy
+          @jamf_auto_install_policy.save
         end
 
         # repair the auto-install policy only
         #############################
         def repair_jamf_auto_install_policy
           progress "Jamf: Repairing Auto Install Policy '#{jamf_auto_install_policy_name}'", log: :info
-          pol = jamf_auto_install_policy
-          configure_jamf_auto_install_policy(pol)
-          pol.save
+          configure_jamf_auto_install_policy
+          jamf_auto_install_policy.save
         end
 
         # Configure the given policy as the auto-install policy for this version
         # @param pol [Jamf::Policy] the policy to configure
         ################################
-        def configure_jamf_auto_install_policy(pol)
+        def configure_jamf_auto_install_policy(pol = nil)
+          pol ||= jamf_auto_install_policy
+
           pol.category = Xolo::Server::JAMF_XOLO_CATEGORY
           pol.set_trigger_event :checkin, true
           pol.set_trigger_event :custom, Xolo::BLANK
@@ -553,7 +559,7 @@ module Xolo
           end
 
           # enable or disable based on status
-          if pilot? || released?
+          if pilot? || released? || releasing?
             pol.enable
           else
             pol.disable

data/lib/xolo/server/mixins/version_ted_access.rb

@@ -62,6 +62,9 @@ module Xolo
           set_patch_capabilites
           set_ted_patch_component_criteria ttl_obj: title_object
 
+          enable_ted_patch
+          title_object.enable_ted_title
+
           self.ted_id_number = new_patch.patchId
         end
 
@@ -94,6 +97,9 @@ module Xolo
           # those are handled by the title object calling the same method
           #
           # set_ted_patch_component_criteria ttl_obj: title_object
+
+          enable_ted_patch
+          title_object.enable_ted_title
         end
 
         # Set any killapps for this version in the title editor.
@@ -235,9 +241,6 @@ module Xolo
           comp = ted_patch.component
 
           ea_name ? set_ea_component(comp, ea_name) : set_app_component(comp, app_name, app_bundle_id)
-
-          # SHouldn't be needed here, is called in both create and update
-          # enable_ted_patch
         end
 
         # get the param values for patch component criteria from the title object,
@@ -361,7 +364,9 @@ module Xolo
           set_patch_killapps
           set_patch_capabilites
           set_ted_patch_component_criteria ttl_obj: title_object
-          enable_ted_patch unless ted_patch(refresh: true).enabled?
+          enable_ted_patch
+
+          title_object.enable_ted_title
         end
 
       end # VersionTedAccess

data/lib/xolo/server/routes.rb

@@ -71,15 +71,12 @@ module Xolo
       ##############
       after do
         # log a stack trace if the response status is 4xx or 5xx, or if there's a sinatra.error
-        if response.status >= 400
-          log_error "Response status #{response.status} for #{request.request_method} #{request.path}"
-          if env['sinatra.error']
-            log_error "Sinatra Error message: #{env['sinatra.error'].message}"
-            env['sinatra.error'].backtrace.each { |line| log_error "..#{line}" }
-          else
-            log_error 'Xolo Stack trace:'
-            caller.each { |line| log_error "..#{line}" }
-          end
+        log_debug "Response status #{response.status} for #{request.request_method} #{request.path}" if response.status >= 400
+
+        sinatra_error = env['sinatra.error']
+        if sinatra_error
+          log_error "Sinatra Error message: #{sinatra_error.message}"
+          sinatra_error.backtrace.each { |line| log_error "..#{line}" }
         end
 
         if @no_json
@@ -99,7 +96,6 @@ module Xolo
         # from ruby-jss and windoo api connections?
         # perhaps a callback to when a Sinatra server instance
         # 'finishes'?
-        # can't
       end
 
       # Ping
@@ -135,19 +131,6 @@ module Xolo
       # test
       ##########
       get '/test' do
-        # Xolo::Server::Helpers::Maintenance.post_to_start_cleanup force: true
-        # result = { result: 'posted to start cleanup' }
-
-        # send_email(
-        #   to: 'xolo@pixar.com',
-        #   subject: 'Test Email from Xolo Server',
-        #   msg: 'This is a test email from the Xolo Server'
-        # )
-        # result = { result: 'message sent' }
-
-        # client_data_testing
-        # update_client_data
-
         result = { result: 'test' }
 
         body result

data/lib/xolo/server/version.rb

@@ -560,8 +560,6 @@ module Xolo
         save_local_data
 
         create_patch_in_ted
-        enable_ted_patch
-        title_object.enable_ted_title
 
         create_in_jamf
 
@@ -608,7 +606,6 @@ module Xolo
 
         # update ted before jamf
         update_patch_in_ted
-        enable_ted_patch
         update_version_in_jamf
         update_local_instance_values
         save_local_data
@@ -689,6 +686,7 @@ module Xolo
         progress msg, log: :info
         pol = jamf_auto_install_policy
         set_policy_release_groups pol
+        pol.enable
         pol.save
 
         # set scope targets of patch policy to all (in patch pols, 'all' means 'all eligible')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xolo-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-28 00:00:00.000000000 Z
+date: 2025-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -154,14 +154,12 @@ description: |
   == Xolo
   Xolo (sorta pronounced 'show-low') is an HTTPS server and set of command-line tools for macOS that provide automatable access to the software deployment and patch management aspects of {Jamf Pro}[https://www.jamf.com/products/jamf-pro/] and the {Jamf Title Editor}[https://learn.jamf.com/en-US/bundle/title-editor/page/About_Title_Editor.html]. It enhances Jamf Pro's abilities in many ways:
 
-    - Management of titles and versions/patches is scriptable and automatable, allowing developers and admins to integrate with CI/CD workflows.
-    - Simplifies and standardizes the complex, multistep manual process of managing titles and patches using the Title Editor and Patch Management web interfaces.
-    - Client installs can be performed by remotely via ssh and/or MDM
-    - Automated pre-release piloting of new versions/patches
-    - Titles can be expired (auto-uninstalled) after a period of disuse, reclaiming unused licenses.
-    - And more!
-
-  "Xolo" is the short name for the Mexican hairless dog breed {'xoloitzcuintle'}[https://en.wikipedia.org/wiki/Xoloitzcuintle] (show-low-itz-kwint-leh), as personified by Dante in the 2017 Pixar film _Coco_.
+  * Management of titles and versions/patches is scriptable and automatable, allowing developers and admins to integrate with CI/CD workflows.
+  * Simplifies and standardizes the complex, multistep manual process of managing titles and patches using the Title Editor and Patch Management web interfaces.
+  * Client installs can be performed by remotely via ssh and/or MDM
+  * Automated pre-release piloting of new versions/patches
+  * Titles can be expired (auto-uninstalled) after a period of disuse, reclaiming unused licenses.
+  * And more!
 
   The xolo-server gem packages the code needed to run `xoloserver`, the sinatra-based HTTPS server at the heart of Xolo.
 email: xolo@pixar.com
@@ -175,9 +173,22 @@ files:
 - LICENSE.txt
 - README.md
 - bin/xoloserver
+- data/client/xolo
 - data/com.pixar.xoloserver.plist
 - data/uninstall-pkgs-by-id.zsh
+- lib/optimist_with_insert_blanks.rb
 - lib/xolo-server.rb
+- lib/xolo/core.rb
+- lib/xolo/core/base_classes/configuration.rb
+- lib/xolo/core/base_classes/server_object.rb
+- lib/xolo/core/base_classes/title.rb
+- lib/xolo/core/base_classes/version.rb
+- lib/xolo/core/constants.rb
+- lib/xolo/core/exceptions.rb
+- lib/xolo/core/json_wrappers.rb
+- lib/xolo/core/loading.rb
+- lib/xolo/core/output.rb
+- lib/xolo/core/version.rb
 - lib/xolo/server.rb
 - lib/xolo/server/app.rb
 - lib/xolo/server/command_line.rb