xolo-admin 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93b88b4836493ad597c2417b6c83f5ed5526a71e1b434ef391ccfe3cc46bfbd6
-  data.tar.gz: b6647511a33dfcdf8812be9dc615c7134df5b8ce989b766c6fd6f33886b188d3
+  metadata.gz: 9c667de0cc034e593ed21097a61d356497d18be62c6efa84d681459138457e5c
+  data.tar.gz: 28c33bd6e5eeb50864a7faca5342381a7929354c7eb052d62e6efa377c14ef08
 SHA512:
-  metadata.gz: 7e797fdfa95678ab2f6811f44f860a0b5018c72fce7654bb11260d35b176dd19ef84c7d1c250f414dd26d643f21596624cf97cff498fd2c27f005845b5dec330
-  data.tar.gz: de7997dd22b4c59149e1d8b9c565628e959b0636130699997dbb3e339a7debdadc12ac6f5d592eeb188e493b8a7b10d178f7118c6dc798fd839c742a8919b5b8
+  metadata.gz: 1af30205a20f66da58d657c716a2de2d6fe7da54f3745add8b68df80929ab2e6aa8dd72a68e1e2d72a009e03c6c48c276f1bd9fbaa3d6b18ba92fe5d7c21dbbc
+  data.tar.gz: 1ac20c8dee5bc4aedab29c39aa405788edf80f43cf1de8843e960220cf4024436ca2ed2f26e9b41e8a76203f5a76de2cdf5b9dedb8234ce1cc7c9b3510d7a069

data/data/client/xolo

@@ -97,6 +97,7 @@ be_verbose=
 debugging_on=
 no_versions=
 show_xolo_version=
+do_recon=
 
 # arguments
 command=
@@ -155,7 +156,9 @@ Options:
                      policies, etc, from test xolo server, not the production server.
                      Setting the XOLO_TEST_MODE env. variable does the same thing.
   -r, --recon:       With 'install' or 'uninstall' run a 'jamf recon' after the
-                     operation completes successfully.
+                     operation completes successfully. With 'update', run a 'jamf recon'
+                     before the checkin. NOTE: With update, the whole process may take
+                     many minutes.
   -n, --no-versions: With the 'list-titles' and 'list-installed' commands,
                      do not show the versions available, or the version
                      installed, respectively.
@@ -190,6 +193,9 @@ Commands:
     every time this computer checks in with Jamf Pro.
     Note: this just runs the 'jamf policy' command, which will execute any pending
     Jamf policies triggered by "recurring check-in".
+    If --recon is given, a Jamf recon will run first, followed by a 1 minute pause
+    for Jamf to process the data before doing the check-in. This helps the Mac to see
+    very recently-released versions as patch updates.
 
   refresh, r
     Update xolo's information about current titles and versions.
@@ -1035,6 +1041,12 @@ function run_recon() {
 function update() {
   say "Updating installed titles, or installing newly scoped ones..."
 
+  if [[ -n "$do_recon" ]]  ; then
+    run_recon
+    say "Pausing to let Jamf Pro process recon data..."
+    sleep 60
+  fi
+
   debug "Running jamf policy..."
     if be_verbose ; then
     $JAMF policy -verbose

data/lib/xolo/admin/options.rb

@@ -158,6 +158,7 @@ module Xolo
       FREEZE_TITLE_CMD = 'freeze'
       THAW_TITLE_CMD = 'thaw'
       LIST_FROZEN_CMD = 'list-frozen'
+      RERUN_AUTOPKG_RECIPE_CMD = 'rerun-autopkg-recipe'
 
       LIST_VERSIONS_CMD = 'list-versions'
       ADD_VERSION_CMD = 'add-version'
@@ -382,6 +383,10 @@ module Xolo
         }
       }.freeze
 
+      DEPLOY_RELEASED = 'released'
+      DEPLOY_LATEST = 'latest'
+      DEPLOY_SPECIAL_VERSIONS = [DEPLOY_RELEASED, DEPLOY_LATEST].freeze
+
       DEPLOY_VERSION_OPTIONS = {
         groups: {
           label: 'Computer group whose computers will be targeted',
@@ -518,17 +523,6 @@ module Xolo
           confirmation: true
         },
 
-        # SUBSCRIBE_CMD => {
-        #   desc: 'Subscribe to a software title from a Patch Source defined in Jamf Pro',
-        #   display: "#{SUBSCRIBE_CMD} title",
-        #   opts: Xolo::Admin::Title.subscribe_cli_opts,
-        #   walkthru_header: "Subscribing to Xolo Title '#{TARGET_TITLE_PLACEHOLDER}'",
-        #   target: :title,
-        #   process_method: :subscribe_title,
-        #   streamed_response: true,
-        #   confirmation: true
-        # },
-
         EDIT_TITLE_CMD => {
           desc: 'Edit an exising software title',
           display: "#{EDIT_TITLE_CMD} title",
@@ -605,6 +599,19 @@ module Xolo
           process_method: :list_versions
         },
 
+        RERUN_AUTOPKG_RECIPE_CMD => {
+          desc: 'Run the AutoPkg recipe for this title again, and re-upload the new pkg.',
+          display: "#{RERUN_AUTOPKG_RECIPE_CMD} title",
+          long_desc: <<~ENDLONG,
+            The recipe will be run immediately, and the resulting .pkg will be re-uploaded for the latest version of the title.
+          ENDLONG
+          opts: {},
+          target: :title,
+          process_method: :rerun_autopkg_recipe,
+          streamed_response: true,
+          confirmation: true
+        },
+
         ADD_VERSION_CMD => {
           desc: 'Add a new version to a title, making it available for piloting',
           display: "#{ADD_VERSION_CMD} title version",
@@ -667,6 +674,8 @@ module Xolo
             Computers in any excluded-groups for the target will be removed from the list of targets
             before the MDM command is sent.
 
+            You can use the words '#{DEPLOY_RELEASED}' or '#{DEPLOY_LATEST}' as the version, or a specific one.
+
             Computers can be specified by name, serial number, or Jamf ID. Groups can be specified by
             name.
 

data/lib/xolo/admin/processing.rb

@@ -513,6 +513,24 @@ module Xolo
         handle_processing_error e
       end
 
+      # Re run the autopkg recipe
+      ################################
+      def rerun_autopkg_recipe
+        return unless confirmed? "Re-run the AutoPkg recipe for '#{cli_cmd.title}' and re-upload the new pkg"
+
+        title = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
+
+        response_data = title.rerun_autopkg_recipe server_cnx
+
+        show_debug "response_data: #{response_data}"
+
+        display_progress response_data[:progress_stream_url_path]
+
+        speak "Recipe is running for '#{cli_cmd.title}'. Upload to distribution points will happen soon."
+      rescue StandardError => e
+        handle_processing_error e
+      end
+
       # List all versions of a title in Xolo
       #
       # @return [void]
@@ -648,7 +666,23 @@ module Xolo
       # @return [void]
       ###############################
       def deploy_version
-        return unless confirmed? "Deploy Version '#{cli_cmd.version}' of Title '#{cli_cmd.title}' via MDM?"
+        # If version is 'latest' or 'released', figure out the actual version to deploy
+        if Xolo::Admin::Options::DEPLOY_SPECIAL_VERSIONS.include? cli_cmd.version
+          title = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
+          vers_display =
+            case cli_cmd.version
+            when Xolo::Admin::Options::DEPLOY_RELEASED
+              cli_cmd.version = title.released_version
+              "#{cli_cmd.version} (#{Xolo::Admin::Options::DEPLOY_RELEASED})"
+            when Xolo::Admin::Options::DEPLOY_LATEST
+              cli_cmd.version = title.version_order.first
+              "#{cli_cmd.version} (#{Xolo::Admin::Options::DEPLOY_LATEST})"
+            else
+              cli_cmd.version
+            end
+        end
+
+        return unless confirmed? "Deploy Version '#{vers_display}' of Title '#{cli_cmd.title}' via MDM?"
 
         unless json? || quiet?
           puts "Deploying Version '#{cli_cmd.version}' of Title '#{cli_cmd.title}' to computers: #{ARGV.join(', ')}"

data/lib/xolo/admin/title.rb

@@ -216,6 +216,15 @@ module Xolo
         resp.body
       end
 
+      # Rerun the autopkg recipe for this title
+      # @param cnx [Faraday::Connection] The connection to use, must be logged in already
+      # @return [Hash] the response data
+      #########################
+      def rerun_autopkg_recipe(_nx = cnx)
+        resp = cnx.post "#{SERVER_ROUTE}/#{title}/rerun_autopkg_recipe", {}
+        resp.body
+      end
+
       # Fetch the frozen computers for this title
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash{String => String}] computer name => user name

data/lib/xolo/core/version.rb

@@ -12,7 +12,7 @@ module Xolo
 
     module Version
 
-      VERSION = '2.3.0'.freeze
+      VERSION = '2.4.0'.freeze
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xolo-admin
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-04 00:00:00.000000000 Z
+date: 2026-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday