xolo-admin 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8637742b96fa6e20b3d2d781f6c3e6d7c19cf0fbaa9bd4d39625cf9738f06845
-  data.tar.gz: af15092c906bd833441229bccc8d2944b99dbc035fc29a6ddcb3985979ab4f77
+  metadata.gz: ace6e6d8f0ac4d0ed085f2037803869d1b35ea3ff4efb53b3651dc3faafa5c25
+  data.tar.gz: 39cae6de70ea1a0e90c9a12e2e80b4502b27715bfcedbbf991b1239eec69bb1c
 SHA512:
-  metadata.gz: d73169bf141bf0d98d2b05c586673e073d2d43785418bbfe57c34a4876637f1e6fca2e5b91f3739ec35d563bc4d254e57f58d6e61d629814ed5f47bfe750e2d9
-  data.tar.gz: a7edfa0ddc811772c3dc12c3621bdf200b01630f4c0605190ee8c07e4abbb7065bda17be11cf0dd3857dfb5b302a60641225a4cbd2397a5fbae0de1758f9dba4
+  metadata.gz: '059aa31ea917298e5aef01c64625b9fa8b1b539c181217ec7dffbfcc51e334c4d0e2ee43dff2e9d4908ddd9867a0b8c1c683685c9039300283f9d99c37b7d159'
+  data.tar.gz: 5dbc53d110470af587c234efebd060baf590872f17613ef5c3dc688a3bde85a94e544e6824ec92cc428b5352d2c4b93a6483bc27fa3e5c6c24579cdb48ff4c65

data/data/client/xolo

@@ -162,6 +162,8 @@ Commands:
   install, i <title>[=<version>] [<title2>[=<version2>] ...]
     Install a title, or specific version thereof (e.g. a version currently in pilot)
     If no version is specified, the currently released version will be installed.
+    If you are only installing only one specific version of one title, you can
+    omit the =, e.g. install <title> <version>.
 
   uninstall, u <title> [<title2> ...]
     Uninstall a title, if possible. Not all titles are uninstallable via xolo.
@@ -255,8 +257,24 @@ function parse_cli() {
   command=$1
   [[ ${#@} -gt 0 ]] && shift
 
+  # the remaining positional parameters as an array called targets
+  # It'll either be exactly 1 item: title
+  # or exactly 2 items containing no '=' : title, version
+  # or exactly 2 items containing no '=' : title, title
+  # or any number if items in the form: title[=version]  where the =version is optional.
   targets=("${(@)@}")
 
+  # if targets has exactly 2 items, and neither of them contains
+  # '=' and the second one isn't an existing title then treat
+  # them as the title and a version and reset 'targets' to be 'title=version'
+  if [[ "$#targets" == 2  ]] \
+    && [[ "$targets[1]" != *"$TITLE_VERSION_SEPARATOR"* ]] \
+    && [[ "$targets[2]" != *"$TITLE_VERSION_SEPARATOR"* ]] \
+    && ! echo "$(all_xolo_titles)" | grep -qE "^${targets[2]}$"  ; then
+
+    targets=("$targets[1]=$targets[2]")
+  fi
+
   debug "Parsed command line:"
   debug "..show_help is: $show_help"
   debug "..be_verbose is: $be_verbose"
@@ -275,6 +293,9 @@ function parse_cli() {
 #################################
 function parse_title_and_version() {
   local arg=$1
+  unset title_is_valid
+  unset version_is_valid
+
   debug "Parsing title and version from arg: '$arg'"
 
   if [[ "$arg" == *"$TITLE_VERSION_SEPARATOR"* ]] ; then
@@ -786,9 +807,13 @@ function refresh_client_data() {
 # validate that the title exists
 ###############################
 function validate_title() {
+
   # if we've already validated the title, we're done
   [[ -n "$title_is_valid" ]] && return
 
+  # use passed arg if needed
+  [[ -z "$title" ]] && title=$1
+
   debug "Validating title: $title"
 
   # die if no title given
@@ -823,7 +848,7 @@ function validate_version() {
   all_versions=$(versions_for_title $title)
   debug "All versions for title $title:\n$all_versions"
   # [[ $all_versions =~ (^|\n)$version($|\n) ]] || die "No such version: $version"
-  echo "$all_versions" | grep -q "^$version$" || die "No such version: $version"
+  echo "$all_versions" | grep -q "^$version$" || die "No such version '$version' for title '$title'"
   version_is_valid=1
 }
 

data/lib/xolo/admin/command_line.rb

@@ -398,6 +398,7 @@ module Xolo
               opt opt_key, desc, short: deets[:cli], type: type, required: required, multi: deets[:multi]
             end # opts_to_use.each
           end # if cmd_opts
+          conflicts :subscribed, :managed if cmd == Xolo::Admin::Options::LIST_TITLES_CMD
         end # Optimist.options
       end
 

data/lib/xolo/admin/options.rb

@@ -198,6 +198,52 @@ module Xolo
       TARGET_TITLE_PLACEHOLDER = Xolo::Admin::Title::TARGET_TITLE_PLACEHOLDER
       TARGET_VERSION_PLACEHOLDER = 'TARGET_VERSION_PH'
 
+      LIST_TITLES_OPTIONS = {
+        subscribed: {
+          label: 'Subscribed Only',
+          cli: :s,
+          type: :boolean,
+          validate: :validate_boolean,
+          default: false,
+          desc: <<~ENDDESC
+            Show only 'subscribed' titles. Can be combined with --autopkg.
+          ENDDESC
+        },
+
+        managed: {
+          label: 'Managed Only',
+          cli: :m,
+          type: :boolean,
+          validate: :validate_boolean,
+          default: false,
+          desc: <<~ENDDESC
+            Show only 'managed' titles. Can be combined with --autopkg.
+          ENDDESC
+        },
+
+        autopkg: {
+          label: 'AutoPkg Only',
+          cli: :a,
+          type: :boolean,
+          validate: :validate_boolean,
+          default: false,
+          desc: <<~ENDDESC
+            Show only titles configured for AutoPkg. Can be combined with --subscribed or --managed.
+          ENDDESC
+        },
+
+        pilots: {
+          label: 'Pilots Only',
+          cli: :p,
+          type: :boolean,
+          validate: :validate_boolean,
+          default: false,
+          desc: <<~ENDDESC
+            Show only titles with pending pilot (un-released) versions. Use 'list-versions' to see details for a title. Can be combined with --subscribed or --managed.
+          ENDDESC
+        }
+      }.freeze
+
       PATCH_REPORT_OPTIONS = {
         summary: {
           label: 'Summary Only',
@@ -410,7 +456,7 @@ module Xolo
         LIST_TITLES_CMD => {
           desc: 'List all software titles.',
           display: LIST_TITLES_CMD,
-          opts: {},
+          opts: LIST_TITLES_OPTIONS,
           arg_banner: :none,
           process_method: :list_titles,
           target: :none

data/lib/xolo/admin/processing.rb

@@ -211,16 +211,27 @@ module Xolo
           return
         end
 
-        report_title = 'All titles in Xolo'
-        header = %w[Title Created By SSvc? Released Latest]
+        type = opts_to_process.subscribed ? ' subscribed' : nil
+        type ||= opts_to_process.managed ? ' managed' : nil
+        autopkg = opts_to_process.autopkg ? ' autopkg' : nil
+        pilots = opts_to_process.pilots ? ' with unreleased pilots' : nil
+
+        report_title = "All#{type}#{autopkg} titles in Xolo#{pilots}"
+
+        titles.select! { |t| t.subscribed? } if opts_to_process.subscribed
+        titles.reject! { |t| t.subscribed? } if opts_to_process.managed
+        titles.select! { |t| t.autopkg_recipe } if opts_to_process.autopkg
+        titles.select! { |t| pending_pilots? t } if opts_to_process.pilots
+
+        header = %w[Title Created By SSvc? Latest Released]
         data = titles.map do |t|
           [
             t.title,
             t.creation_date.to_date,
             t.created_by,
             t.self_service || false,
-            t.released_version,
-            t.latest_version
+            t.latest_version,
+            t.released_version
           ]
         end
         data.sort_by! { |d| d[0].downcase } # sort by title
@@ -230,6 +241,16 @@ module Xolo
         handle_processing_error e
       end
 
+      # @param title [Xolo::Admin::Title] The title in question
+      # @return [Boolean] Does a given Title object have pilots?
+      ###########################
+      def pending_pilots?(title)
+        return false if title.version_order.pix_empty?
+        return false if title.released_version == title.version_order.first
+
+        true
+      end
+
       # Add a title to Xolo
       #
       # @return [void]
@@ -487,16 +508,19 @@ module Xolo
           return
         end
 
-        report_title = "All versions of '#{cli_cmd.title}' in Xolo"
+        report_title = "All versions of '#{cli_cmd.title}' in Xolo.  ** = No .pkg uploaded"
         header = %w[Vers Created By Released By Status]
         data = versions.sort_by(&:creation_date).map do |v|
+          no_pkg = v.pkg_to_upload.pix_empty? && v.jamf_pkg_file.pix_empty?
+          status = no_pkg ? "#{v.status} **" : v.status
+
           [
             v.version,
             v.creation_date.to_date,
             v.created_by,
             v.release_date&.to_date,
             v.released_by,
-            v.status
+            status
           ]
         end
         show_text generate_report(data, header_row: header, title: report_title)

data/lib/xolo/core/version.rb

@@ -12,7 +12,7 @@ module Xolo
 
     module Version
 
-      VERSION = '2.0.3'.freeze
+      VERSION = '2.1.0'.freeze
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xolo-admin
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-25 00:00:00.000000000 Z
+date: 2026-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday