xolo-admin 1.0.1 → 2.0.2

data/lib/xolo/admin/credentials.rb

@@ -39,7 +39,13 @@ module Xolo
       XOLO_CREDS_SVC = 'com.pixar.xolo.password'
 
       # the Label for the generic 'Xolo::Admin::Credentials' keychain entry
-      XOLO_CREDS_LBL = '"Xolo Admin Password"'
+      XOLO_CREDS_LBL = 'Xolo Admin Password'
+
+      # Pre v2.0.0, the label was different. We need to check for the old one when fetching the password
+      # and if it's there, update it to the new one.
+      # TODO: Remove this in 2.1.0 or other appropriate future version,
+      # once we can be sure most users have updated to 2.0.0 or later.
+      XOLO_CREDS_LBL_OLD = '"Xolo Admin Password"'
 
       # Module methods
       ##############################
@@ -70,10 +76,16 @@ module Xolo
         cmd << '-w'
         run_security(cmd.map { |i| security_escape i }.join(' '))
 
+      # TEMPORARY - check for the old label if we didn't find the password with the new label, and if we find it with the old label, update it to the new label
+      # TODO: Remove this in 2.1.0 or other appropriate future version,
+      # once we can be sure most users have updated to 2.0.0 or later.
+      rescue Xolo::NoSuchItemError
+        fetch_and_update_pw_if_necessary
+
       # If we can't access the keychain, prompt for the password. This is usually
       # when we're running in a non-GUI session, e.g. via ssh.
       rescue Xolo::KeychainError
-        raise unless @security_exit_status.exitstatus == SEC_STATUS_NO_GUI_ERROR
+        raise unless @security_exit_status.exitstatus == Xolo::Core::SecurityCmd::SEC_STATUS_NO_GUI_ERROR
         raise unless STDOUT.isatty
 
         question = "Keychain not accessible.\nPlease enter the xolo admin password for #{config.admin}: "
@@ -82,6 +94,38 @@ module Xolo
         end
       end
 
+      # TEMPORARY - update the label of the existing keychain item if it has the old label but not the new one,
+      # to avoid prompting users to re-enter their password when we change the label in 2.0.0
+      # TODO: Remove this in 2.1.0 or other appropriate future version,
+      # once we can be sure most users have updated to 2.0.0 or later.
+      #####################
+      def fetch_and_update_pw_if_necessary
+        cmd = ['find-generic-password']
+        cmd << '-s'
+        cmd << XOLO_CREDS_SVC
+        cmd << '-l'
+        cmd << XOLO_CREDS_LBL_OLD
+        cmd << '-w'
+        pw = run_security(cmd.map { |i| security_escape i }.join(' '))
+
+        if @security_exit_status.exitstatus == Xolo::Core::SecurityCmd::SEC_STATUS_NOT_FOUND_ERROR
+          raise Xolo::NoSuchItemError, "No xolo admin password. Please run 'xadm config'"
+        end
+
+        # then delete the old item with the old label
+        cmd = ['delete-generic-password']
+        cmd << '-s'
+        cmd << XOLO_CREDS_SVC
+        cmd << '-l'
+        cmd << XOLO_CREDS_LBL_OLD
+        run_security(cmd.map { |i| security_escape i }.join(' '))
+
+        # if we found the password with the old label, update it to the new label
+        store_pw(ENV['USER'], pw)
+
+        pw
+      end
+
       # Store an item in the default keychain
       #
       # @param acct [String] The username for the password.
@@ -141,50 +185,50 @@ module Xolo
       # @return [String] the stdout of the 'security' command.
       #
       ######
-      def run_security(cmd)
-        output = Xolo::BLANK
-        errs = Xolo::BLANK
-
-        Open3.popen3("#{SEC_COMMAND} -i") do |stdin, stdout, stderr, wait_thr|
-          # pid = wait_thr.pid # pid of the started process.
-          stdin.puts cmd
-          stdin.close
-
-          output = stdout.read
-          errs = stderr.read
-
-          @security_exit_status = wait_thr.value # Process::Status object returned.
-        end
-        # exit 44 is 'The specified item could not be found in the keychain'
-        return output.chomp if @security_exit_status.success?
-
-        case @security_exit_status.exitstatus
-        when SEC_STATUS_AUTH_ERROR
-          raise Xolo::KeychainError, 'Problem accessing login keychain. Is it locked?'
-
-        when SEC_STATUS_NOT_FOUND_ERROR
-          raise Xolo::NoSuchItemError, "No xolo admin password. Please run 'xadm config'"
-
-        else
-          errs.chomp!
-          errs =~ /: returned\s+(-?\d+)$/
-          errnum = Regexp.last_match(1)
-          desc = errnum ? security_error_desc(errnum) : errs
-          desc ||= errs
-          raise Xolo::KeychainError, "#{desc.gsub("\n", '; ')}; exit status #{@security_exit_status.exitstatus}"
-        end # case
-      end # run_security
+      # def run_security(cmd)
+      #   output = Xolo::BLANK
+      #   errs = Xolo::BLANK
+
+      #   Open3.popen3("#{Xolo::Core::SecurityCmd::SEC_COMMAND} -i") do |stdin, stdout, stderr, wait_thr|
+      #     # pid = wait_thr.pid # pid of the started process.
+      #     stdin.puts cmd
+      #     stdin.close
+
+      #     output = stdout.read
+      #     errs = stderr.read
+
+      #     @security_exit_status = wait_thr.value # Process::Status object returned.
+      #   end
+      #   # exit 44 is 'The specified item could not be found in the keychain'
+      #   return output.chomp if @security_exit_status.success?
+
+      #   case @security_exit_status.exitstatus
+      #   when Xolo::Core::SecurityCmd::SEC_STATUS_AUTH_ERROR
+      #     raise Xolo::KeychainError, 'Problem accessing login keychain. Is it locked?'
+
+      #   when Xolo::Core::SecurityCmd::SEC_STATUS_NOT_FOUND_ERROR
+      #     raise Xolo::NoSuchItemError, "No xolo admin password. Please run 'xadm config'"
+
+      #   else
+      #     errs.chomp!
+      #     errs =~ /: returned\s+(-?\d+)$/
+      #     errnum = Regexp.last_match(1)
+      #     desc = errnum ? security_error_desc(errnum) : errs
+      #     desc ||= errs
+      #     raise Xolo::KeychainError, "#{desc.gsub("\n", '; ')}; exit status #{@security_exit_status.exitstatus}"
+      #   end # case
+      # end # run_security
 
       # use `security error` to get a description of an error number
       ##############
-      def security_error_desc(num)
-        desc = `#{SEC_COMMAND} error #{num}`
-        return if desc.include?('unknown error')
+      # def security_error_desc(num)
+      #   desc = `#{Xolo::Core::SecurityCmd::SEC_COMMAND} error #{num}`
+      #   return if desc.include?('unknown error')
 
-        desc.chomp.split(num).last
-      rescue StandardError
-        nil
-      end
+      #   desc.chomp.split(num).last
+      # rescue StandardError
+      #   nil
+      # end
 
       # given a string, wrap it in single quotes and escape internal single quotes
       # and backslashes so it can be used in the interactive 'security' command
@@ -193,17 +237,17 @@ module Xolo
       #
       # @return [String] the escaped string
       ###################
-      def security_escape(str)
-        # first escape backslashes
-        str = str.to_s.gsub '\\', '\\\\\\'
+      # def security_escape(str)
+      #   # first escape backslashes
+      #   str = str.to_s.gsub '\\', '\\\\\\'
 
-        # then single quotes
-        str.gsub! "'", "\\\\'"
+      #   # then single quotes
+      #   str.gsub! "'", "\\\\'"
 
-        # if other things need escaping, add them here
+      #   # if other things need escaping, add them here
 
-        "'#{str}'"
-      end # security_escape
+      #   "'#{str}'"
+      # end # security_escape
 
     end # module Prefs
 

data/lib/xolo/admin/highline_terminal.rb

@@ -1,30 +1,22 @@
-# Copyright 2025 Pixar
-#
-#    Licensed under the terms set forth in the LICENSE.txt file available at
-#    at the root of this project.
-#
-#
-
 # frozen_string_literal: true
 
-# MonkeyPatch HighLine::Terminal#readline_read so that Readline
-# lines can be case-insensitive, and have a prompt.
-#
-# To use a prompt, put it in the environtment variable 'XADM_HIGHLINE_READLINE_PROMPT'
-#
-# To make the readline completion case-insensitive, set the environment
-# variable XADM_HIGHLINE_READLINE_CASE_INSENSITIVE to anything.
-#
-# This really only modifies the Regexp used for the completion_proc to make it
-# case insensitive if desired (adding an 'i' to the end)
-# and sets the prompt when calling Readline.readline
-#
-# TODO: Do this 'smartly' as with the monkeypatches in pixar-ruby-extensions
-#
 class HighLine
 
   class Terminal
 
+    # MonkeyPatch HighLine::Terminal#readline_read so that Readline
+    # lines can be case-insensitive, and have a prompt.
+    #
+    # To use a prompt, put it in the environtment variable 'XADM_HIGHLINE_READLINE_PROMPT'
+    #
+    # To make the readline completion case-insensitive, set the environment
+    # variable XADM_HIGHLINE_READLINE_CASE_INSENSITIVE to anything.
+    #
+    # This really only modifies the Regexp used for the completion_proc to make it
+    # case insensitive if desired (adding an 'i' to the end)
+    # and sets the prompt when calling Readline.readline
+    #################################
+    #
     # Use readline to read one line
     # @param question [HighLine::Question] question from where to get
     #   autocomplete candidate strings
@@ -51,31 +43,6 @@ class HighLine
       raw_answer
     end
 
-    # Get one line from terminal using default #gets method.
-    ##############################
-    # def get_line_default(highline)
-    #   raise EOFError, 'The input stream is exhausted.' if highline.track_eof? && highline.input.eof?
-
-    #   highline.output.print "#{ENV['XADM_HIGHLINE_LINE_PROMPT']}" if ENV['XADM_HIGHLINE_LINE_PROMPT']
-
-    #   highline.input.gets
-    # end
-
-  end # terminal
-
-  # # Deals with the task of "asking" a question
-  # class QuestionAsker
-
-  #   alias ask_once_real ask_once
-
-  #   # Gets just one answer, as opposed to #gather_answers
-  #   #
-  #   # @return [String] answer
-  #   def ask_once
-  #     @highline.output.print "#{ENV['XADM_HIGHLINE_LINE_PROMPT']}" if ENV['XADM_HIGHLINE_LINE_PROMPT']
-  #     ask_once_real
-  #   end
-
-  # end # question asker
+  end # class Terminal
 
 end

data/lib/xolo/admin/interactive.rb

@@ -98,17 +98,34 @@ module Xolo
 
             # The menu items for setting values
             cmd_details(cmd)[:opts].each do |key, deets|
+              # dont displau items for the other kind of action
+              next if deets[:add_only] && edit_command?
+              next if deets[:edit_only] && add_command?
+
+              # only show items for the current title type, if applicable
+              if deets[:title_type]
+                if walkthru_cmd_opts[:subscribed]
+                  next if deets[:title_type] == Xolo::MANAGED
+                elsif deets[:title_type] == Xolo::SUBSCRIBED
+                  next
+                end
+              end
+
               curr_val = current_opt_values[key]
-              new_val = walkthru_cmd_opts[key]
+
               not_avail = send(deets[:walkthru_na]) if deets[:walkthru_na]
+
+              # if a value is not available, remove any previously set value
+              walkthru_cmd_opts.delete_field(key) if not_avail && walkthru_cmd_opts.to_h.key?(key)
+
+              new_val = walkthru_cmd_opts[key]
+
               menu_item = menu_item_text(deets[:label], oldval: curr_val, newval: new_val, not_avail: not_avail)
 
               # no processing if item not available
               if not_avail
-                # menu.choice(nil, nil, menu_item) {}
                 menu.choice(menu_item) {}
               else
-                # menu.choice(nil, nil, menu_item) { prompt_for_walkthru_value key, deets, curr_val }
                 menu.choice(menu_item) { prompt_for_walkthru_value key, deets, curr_val }
               end
             end
@@ -139,22 +156,63 @@ module Xolo
         end # until done with menu
       end # def self.display_title_menu(_title)
 
+      # @return [String, nil] If a string, a reason why the given menu item is not available now.
+      #   If nil, the menu item is displayed normally.
+      ##############################
+      def display_name_na
+        return unless walkthru_cmd_opts[:subscribed]
+
+        'N/A when subcribing via a Patch Source'
+      end
+
+      # @return [String, nil] If a string, a reason why the given menu item is not available now.
+      #   If nil, the menu item is displayed normally.
+      ##############################
+      def publisher_na
+        return unless walkthru_cmd_opts[:subscribed]
+
+        'N/A when subcribing via a Patch Source'
+      end
+
       # @return [String, nil] If a string, a reason why the given menu item is not available now.
       #   If nil, the menu item is displayed normally.
       ##############################
       def version_script_na
-        return unless walkthru_cmd_opts[:app_name] || walkthru_cmd_opts[:app_bundle_id]
+        unless walkthru_cmd_opts[:app_name] || walkthru_cmd_opts[:app_bundle_id] || walkthru_cmd_opts[:subscribed]
+          return
+        end
 
-        'N/A when using App Name/BundleID'
+        'N/A when using App Name/BundleID, or subcribing via a Patch Source'
       end
 
       # @return [String, nil] If a string, a reason why the given menu item is not available now.
       #   If nil, the menu item is displayed normally.
       ##############################
       def app_name_bundleid_na
-        return unless walkthru_cmd_opts[:version_script]
+        return unless walkthru_cmd_opts[:version_script] || walkthru_cmd_opts[:subscribed]
+
+        'N/A when using Version Script, or subcribing via a Patch Source'
+      end
+
+      # @return [String, nil] If a string, a reason why the given menu item is not available now.
+      #   If nil, the menu item is displayed normally.
+      ##############################
+      def patch_source_na
+        # if walkthru_cmd_opts[:version_script] || walkthru_cmd_opts[:app_name] || walkthru_cmd_opts[:app_bundle_id]
+        #   'N/A when using Version Script or App Name/BundleID'
+        # elsif walkthru_cmd_opts[:publisher] || walkthru_cmd_opts[:display_name]
+        #   'N/A when using Display Name or Publisher'
+        # end
+        nil unless walkthru_cmd_opts[:subscribed]
+      end
+
+      # @return [String, nil] If a string, a reason why the given menu item is not available now.
+      #   If nil, the menu item is displayed normally.
+      ##############################
+      def title_id_na
+        return if walkthru_cmd_opts[:patch_source]
 
-        'N/A when using Version Script'
+        'N/A until Patch Source is set'
       end
 
       # @return [String, nil] If a string, a reason why the given menu item is not available now.
@@ -223,7 +281,14 @@ module Xolo
 
         header_text.sub! Xolo::Admin::Options::TARGET_TITLE_PLACEHOLDER, cli_cmd.title if cli_cmd.title
         header_text.sub! Xolo::Admin::Options::TARGET_VERSION_PLACEHOLDER, cli_cmd.version if cli_cmd.version
-
+        if edit_command?
+          header_text <<
+            if current_opt_values[:subscribed]
+              " (subscribed as '#{current_opt_values[:display_name]}')"
+            else
+              ' (managed)'
+            end
+        end
         header_sep_line = Xolo::DASH * header_text.length
 
         system 'clear'
@@ -231,7 +296,7 @@ module Xolo
           #{header_sep_line}
           #{header_text}
           #{header_sep_line}
-          Current Settings => New Settings
+          Current Settings -> New Settings
 
         ENDPUTS
       end
@@ -455,7 +520,11 @@ module Xolo
         validated_new_val = deets[:multi] ? [] : nil
         all_done = false
         until all_done
-          latest_input = Readline.readline(prompt, true)
+          latest_input = Readline.readline(prompt, true).strip
+          # dragging in items from the finder will esacpe spaces in the path with \'s
+          # in the shell this is good, but ruby is interpreting the \'s, so lets remove them.
+          latest_input.gsub!(/\\ /, ' ')
+
           break if latest_input == Xolo::X
           return Xolo::NONE if !deets[:required] && (latest_input == Xolo::NONE)
 
@@ -503,8 +572,8 @@ module Xolo
         # if deets[:readline] is a symbol, its an xadm method that returns an array
         # of the possible values for readline completion and validation;
         # only things in the array are allowed, so no need for other validation or conversion
-        # We add 'x' and 'none' to the list so they will be accepted for exiting and
-        # clearing.
+        # We add 'x' and 'none' to the list for clearing it, and if a multi-value we add 'x'
+        # for exiting out of the prompt
         #
         # if its just truthy then we use readline without a pre-set list of values
         # (e.g. paths, which might not exist locally) and may have a separate validate
@@ -513,10 +582,12 @@ module Xolo
           if deets[:readline]
             if deets[:readline].is_a? Symbol
               convert = send deets[:readline]
-              convert << Xolo::NONE unless deets[:required]
-              convert << Xolo::X
+              convert << Xolo::NONE unless convert.include?(Xolo::NONE) || deets[:required]
+              convert << Xolo::X if deets[:multi] && !convert.include?(Xolo::X)
               # if we're doing release groups, make sure the list includes 'all',
-              convert << Xolo::TARGET_ALL if deets[:label] == Xolo::Admin::Title::ATTRIBUTES[:release_groups][:label]
+              if !convert.include?(Xolo::TARGET_ALL) && deets[:label] == Xolo::Admin::Title::ATTRIBUTES[:release_groups][:label]
+                convert << Xolo::TARGET_ALL
+              end
               validate = nil
             end
             true
@@ -722,9 +793,67 @@ module Xolo
 
           missing_values << deets[:label]
         end
+
+        missing_values += title_missing_values if title_command?
+
         missing_values
       end
 
+      # Process missing valus for titles
+      # @return [Array<String>] The  title-specific missing values
+      ##################################
+      def title_missing_values
+        title_missing_values = []
+
+        # if subscribing, need patch source and title id
+        # if walkthru_cmd_opts[:type] == Xolo::SUBSCRIBED
+        if walkthru_cmd_opts[:subscribed]
+          unless walkthru_cmd_opts[:patch_source]
+            title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:patch_source][:label]
+          end
+          title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:title_id][:label] unless walkthru_cmd_opts[:title_id]
+
+        # if managed, need display name, publisher and version script or app name/bundle id,
+        else
+          unless walkthru_cmd_opts[:publisher]
+            title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:publisher][:label]
+          end
+          unless walkthru_cmd_opts[:display_name]
+            title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:display_name][:label]
+          end
+
+          # version script or app name/bundle id
+          if walkthru_cmd_opts[:version_script] || walkthru_cmd_opts[:app_name] || walkthru_cmd_opts[:app_bundle_id]
+            # need both app name and bundle id if using either
+            if walkthru_cmd_opts[:app_name] && !walkthru_cmd_opts[:app_bundle_id]
+              title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:app_bundle_id][:label]
+            elsif walkthru_cmd_opts[:app_bundle_id] && !walkthru_cmd_opts[:app_name]
+              title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:app_name][:label]
+            end
+          else
+            title_missing_values << "#{Xolo::Admin::Title::ATTRIBUTES[:version_script][:label]} OR #{Xolo::Admin::Title::ATTRIBUTES[:app_name][:label]} & #{Xolo::Admin::Title::ATTRIBUTES[:app_bundle_id][:label]}"
+          end
+
+        end
+
+        # if expiring, need expire path
+        if walkthru_cmd_opts[:expiration].to_i.positive? && !walkthru_cmd_opts[:expiration_paths].pix_empty?
+          title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:expiration_paths][:label]
+        end
+
+        # if in ssvc, need category and icon
+        return title_missing_values unless walkthru_cmd_opts[:self_service]
+
+        unless walkthru_cmd_opts[:self_service_category]
+          title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:self_service_category][:label]
+        end
+        return title_missing_values if walkthru_cmd_opts[:self_service_icon]
+
+        title_missing_values << Xolo::Admin::Title::ATTRIBUTES[:self_service_icon][:label]
+
+        title_missing_values
+      end # def title_missing_values
+
       # Prompt for an editor to use from those in MULTILINE_EDITORS
       # @return [String] the path to an editor to use for multiline values.
       ##################

data/lib/xolo/admin/jamf_pro.rb

@@ -32,6 +32,9 @@ module Xolo
       # Xolo server route to the list available categories
       CATEGORY_NAME_ROUTE = "#{JAMF_ROUTE_BASE}/category-names"
 
+      # Xolo server route to the list of available titles for subscription
+      AVAILABLE_TITLES_ROUTE = "#{JAMF_ROUTE_BASE}/available-titles-for-subscription"
+
       # Module Methods
       ##########################
       ##########################
@@ -68,6 +71,17 @@ module Xolo
         @jamf_category_names ||= server_cnx.get(CATEGORY_NAME_ROUTE).body
       end
 
+      # @return [Array<String>] data about all titles available for subscription in Jamf Pro.
+      #######################
+      def jamf_available_titles
+        @jamf_available_titles ||= server_cnx.get(AVAILABLE_TITLES_ROUTE).body
+      end
+
+      # @return [Array<String>] All Patch Sources with any available titles in Jamf Pro
+      def jamf_patch_sources_with_available_titles
+        @jamf_patch_sources_with_available_titles ||= jamf_available_titles.map { |t| t[:source_name] }.sort.uniq
+      end
+
     end # module
 
   end # module Admin

data/lib/xolo/admin/options.rb

@@ -152,6 +152,7 @@ module Xolo
 
       LIST_TITLES_CMD = 'list-titles'
       ADD_TITLE_CMD = 'add-title'
+      SUBSCRIBE_CMD = 'subscribe'
       EDIT_TITLE_CMD = 'edit-title'
       DELETE_TITLE_CMD = 'delete-title'
       FREEZE_TITLE_CMD = 'freeze'
@@ -174,6 +175,7 @@ module Xolo
 
       LIST_GROUPS_CMD = 'list-groups'
       LIST_CATEGORIES_CMD = 'list-categories'
+      LIST_AVAILABLE_CMD = 'list-available'
       SAVE_CLIENT_CODE_CMD = 'save-client'
 
       SERVER_STATUS_CMD = 'server-status'
@@ -190,7 +192,7 @@ module Xolo
 
       HELP_OPT = '--help'
 
-      DFT_CMD_TITLE_ARG_BANNER = "  title:     The unique name of a title in Xolo, e.g. 'google-chrome'"
+      DFT_CMD_TITLE_ARG_BANNER = "  title:     The unique name of a title in Xolo, e.g. 'google-chrome'\n             Must be lowercase alphanumeric and dashes only."
       DFT_CMD_VERSION_ARG_BANNER = "  version:   The version of the title you are working with. e.g. '12.34.5'"
 
       TARGET_TITLE_PLACEHOLDER = Xolo::Admin::Title::TARGET_TITLE_PLACEHOLDER
@@ -299,7 +301,7 @@ module Xolo
           readline_prompt: 'Group Name',
           readline: :jamf_computer_group_names,
           desc: <<~ENDDESC
-            One or more Jamf Computer Group names or ids whose members will receive the MDM deployment.
+            One or more Jamf Computer Group names whose members will receive the MDM deployment.
 
             When using the --groups CLI option, you can specify more than one group by using the option more than once, or by providing a single option value with the groups separated by commas.
           ENDDESC
@@ -425,6 +427,17 @@ 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",
@@ -554,7 +567,7 @@ module Xolo
             before the MDM command is sent.
 
             Computers can be specified by name, serial number, or Jamf ID. Groups can be specified by
-            name or ID.
+            name.
 
             NOTE: Any automated installs (via Pilot or Release groups) will happen eventually anyway.
             All Macs with the title already installed will also get new versions automatically.
@@ -688,6 +701,21 @@ module Xolo
           process_method: :list_categories
         },
 
+        LIST_AVAILABLE_CMD => {
+          desc: 'List all titles available for subscription, and their Patch Sources and Title IDs.',
+          long_desc: <<~ENDLONG,
+            When adding a subscribed title to Xolo, you need to know the Patch Source and Title ID.
+            This command lists all available titles from all defined Patch Sources on the Jamf Pro server,
+            and the unique identifiers for each. You can use those values with the --patch-source and --title-id
+            options of the 'xadm add-title' command.
+          ENDLONG
+          display: LIST_AVAILABLE_CMD,
+          usage: "#{Xolo::Admin::EXECUTABLE_FILENAME} [global-options] #{LIST_AVAILABLE_CMD}",
+          opts: {},
+          arg_banner: :none,
+          process_method: :list_available_titles
+        },
+
         SAVE_CLIENT_CODE_CMD => {
           desc: 'Save the xolo client tool to a directory for packaging and deployment.',
           long_desc: <<~ENDLONG,
@@ -1090,6 +1118,12 @@ module Xolo
         # versions
         elsif version_command?
 
+          # make note of the title being subscribed or managed
+          title_obj = Xolo::Admin::Title.fetch(cli_cmd.title, server_cnx)
+
+          @current_opt_values[:subscribed] = title_obj.subscribed?
+          @current_opt_values[:display_name] = title_obj.display_name
+
           # adding a new one?
           if add_command?
             prev_version = Xolo::Admin::Title.latest_version cli_cmd.title, server_cnx