xolo-admin 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68e91c47fc2a8727a01783c335fc24826b93221151a2a020e34b2cc94b9558b3
-  data.tar.gz: 79a97ef6351fcdef02429d1617d332335890b8ec19352f1d3dfba3b7031408bf
+  metadata.gz: c2b0f21f5f3a7a55117054a2fe5cd35e7e702debd3909669f969e009b603cbbe
+  data.tar.gz: 27f012b50a0986d7a06854f5cef89af6b549efe7a22b30faf3601418be3dc56d
 SHA512:
-  metadata.gz: 29ff161a1fcd6368eba29865bb670c6e26b24c30ad48a9100d1c2449e4f9a6e321f850e127e3802b2fcf68f457160b41dec086650b4eddd6f15e93ee011b7e57
-  data.tar.gz: faf10455d2f7ed6cba2de80a08b667911547faf1059ba1e1bc109656b4f4e7dbe3c59f73d6ceefb3f348370babfd69d881980e2acae7b71c4d7cbe9c45b4cbc5
+  metadata.gz: 854b8cf91c614184a51b2753931135dbb91d697965b5531859d886d96e554fcfb33c60abc141c47bb0748a4150cec8fa0d357a4cbfb4dbf44625b439229adf9a
+  data.tar.gz: bbcbf4275c621a79829d365b0a4d0bd4ac09775516efb924fbb4bd8f1f9039c17e0b1d8c2ce22293793ffbb83696e86b385cdd57fa2c41c6f706080c69bd1b2e

data/lib/xolo/admin/configuration.rb

@@ -17,7 +17,7 @@ module Xolo
 
       include Singleton
 
-      # Save to yaml file in ~/Library/Preferences/com.pixar.xolo.admin.prefs.yaml
+      # Save to yaml file in ~/Library/Preferences/com.pixar.xolo.admin.config.yaml
       #
       # - hostname of xolo server
       #   - always port 443, for now

data/lib/xolo/admin/options.rb

@@ -263,7 +263,30 @@ module Xolo
           desc: <<~ENDDESC
             Show only titles that are available for updates via Self Service. To see those with initial installation via Self Service, use --self-service.
           ENDDESC
+        },
+
+        released_to_all: {
+          label: 'Released to All',
+          cli: :A,
+          type: :boolean,
+          validate: :validate_boolean,
+          default: false,
+          desc: <<~ENDDESC
+            Show only titles that have --release-groups set to 'all'.
+          ENDDESC
+        },
+
+        version_scripts: {
+          label: 'Using Version Scripts',
+          cli: :v,
+          type: :boolean,
+          validate: :validate_boolean,
+          default: false,
+          desc: <<~ENDDESC
+            Show only titles that use a version script.
+          ENDDESC
         }
+
       }.freeze
 
       PATCH_REPORT_OPTIONS = {

data/lib/xolo/admin/processing.rb

@@ -37,6 +37,10 @@ module Xolo
       # the lack of sinatra and such.
       LOG_LEVELS = %w[debug info warn error fatal].freeze
 
+      INSTALL = 'Install'
+      UPDATE = 'Update'
+      INS_UPD = 'Ins & Upd'
+
       # Module Methods
       ##########################
       ##########################
@@ -191,8 +195,7 @@ module Xolo
       # @return [void]
       ###############################
       def update_config
-        debug? && puts("DEBUG: opts_to_process: #{opts_to_process}")
-
+        show_debug "DEBUG: opts_to_process: #{opts_to_process}"
         # Xolo::Admin::Configuration::KEYS.each_key do |key|
         #   config.send "#{key}=", opts_to_process[key]
         # end
@@ -221,6 +224,8 @@ module Xolo
         type ||= opts_to_process.managed ? ' managed' : nil
         autopkg = opts_to_process.autopkg ? ' autopkg' : nil
         pilots = opts_to_process.pilots ? ' with unreleased pilots' : nil
+        vscripts = opts_to_process.version_scripts ? ' with version scripts' : nil
+        to_all = opts_to_process.released_to_all ? ",\n# released to all non-excluded computers." : nil
 
         ssvc =
           if opts_to_process.self_service && opts_to_process.self_service_updates
@@ -231,26 +236,43 @@ module Xolo
             ' updated via Self Service'
           end
 
-        report_title = "All#{type}#{autopkg} titles in Xolo#{pilots}#{ssvc}"
+        report_title = "All#{type}#{autopkg} titles in Xolo#{pilots}#{ssvc}#{vscripts}#{to_all}"
 
         titles.select!(&:subscribed?) if opts_to_process.subscribed
         titles.reject!(&:subscribed?) if opts_to_process.managed
         titles.select!(&:autopkg_recipe) if opts_to_process.autopkg
-        titles.select! { |t| pending_pilots? t } if opts_to_process.pilots
         titles.select!(&:self_service?) if opts_to_process.self_service
         titles.select!(&:self_service_updates?) if opts_to_process.self_service_updates
 
-        header = %w[Title Created By SSvc? Latest Released]
+        # pending_pilots is a local method, not a title attribute!
+        titles.select! { |t| pending_pilots? t } if opts_to_process.pilots
+        titles.select! { |t| t.release_groups.include? Xolo::TARGET_ALL } if opts_to_process.released_to_all
+        titles.reject! { |t| t.version_script.pix_empty? } if opts_to_process.version_scripts
+
+        header = %w[Title Created By SSvc Latest Released]
+
         data = titles.map do |t|
+          ssvc_disp =
+            if t.self_service && t.self_service_updates
+              INS_UPD
+            elsif t.self_service
+              INSTALL
+            elsif t.self_service_updates
+              UPDATE
+            else
+              Xolo::DASH
+            end
+
           [
             t.title,
             t.creation_date.to_date,
             t.created_by,
-            t.self_service || false,
+            ssvc_disp,
             t.latest_version,
             t.released_version
           ]
         end
+
         data.sort_by! { |d| d[0].downcase } # sort by title
 
         show_text generate_report(data, header_row: header, title: report_title)
@@ -289,10 +311,8 @@ module Xolo
 
         response_data = new_title.add(server_cnx)
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
+
         if response_data[:progress_stream_url_path]
           display_progress response_data[:progress_stream_url_path]
         else
@@ -329,10 +349,7 @@ module Xolo
         title = Xolo::Admin::Title.new opts_to_process
         response_data = title.update server_cnx
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
 
@@ -399,10 +416,7 @@ module Xolo
 
         response_data = Xolo::Admin::Title.delete cli_cmd.title, server_cnx
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
 
@@ -427,10 +441,7 @@ module Xolo
         title = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
         response_data = title.freeze ARGV, cli_cmd_opts.users_given, server_cnx
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         if json?
           puts JSON.pretty_generate(response_data)
@@ -452,10 +463,7 @@ module Xolo
       def list_frozen
         title = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
         frozen_computers = title.frozen server_cnx
-        if debug?
-          puts "DEBUG: response_data: #{frozen_computers}"
-          puts
-        end
+        show_debug "response_data: #{frozen_computers}"
 
         if json?
           puts JSON.pretty_generate(frozen_computers)
@@ -490,10 +498,7 @@ module Xolo
         title = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
         response_data = title.thaw ARGV, cli_cmd_opts.users_given, server_cnx
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         if json?
           puts JSON.pretty_generate(response_data)
@@ -559,14 +564,13 @@ module Xolo
         new_vers = Xolo::Admin::Version.new opts_to_process
         response_data = new_vers.add(server_cnx)
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
 
         # Upload the pkg, if any?
+        # for pkg creation, no upload if autopkg.
+        # but yes for edits.
         upload_pkg(new_vers) unless title_obj.autopkg_enabled?
 
         speak 'It can take up to 15 minutes for the version to be available for use. Please do not release it before then'
@@ -587,11 +591,16 @@ module Xolo
       # @return [void]
       ################################
       def upload_pkg(version)
-        return unless version.pkg_to_upload.is_a? Pathname
+        unless version.pkg_to_upload.is_a? Pathname
+          show_debug "version.pkg_to_upload class: #{version.pkg_to_upload.class}"
+          return
+        end
 
-        # TODO: deal with autopkg pkgs, should we be able to do this?
+        # pause a moment for the previous stream to end.
+        sleep 5
 
         speak "Uploading #{version.pkg_to_upload.basename}, #{version.pkg_to_upload.pix_humanize_size} to Xolo"
+
         # start the upload in a thread
         upload_thr = Thread.new { version.upload_pkg(upload_cnx) }
 
@@ -621,14 +630,12 @@ module Xolo
 
         response_data = vers.update server_cnx
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
 
         # Upload the pkg, if any?
+        # speak 'Upload would happen here'
         upload_pkg(vers)
 
         speak "Version '#{cli_cmd.version}' of title '#{cli_cmd.title}' has been updated in Xolo."
@@ -691,10 +698,7 @@ module Xolo
 
         response_data = Xolo::Admin::Version.delete cli_cmd.title, cli_cmd.version, server_cnx
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
       rescue StandardError => e
@@ -713,10 +717,7 @@ module Xolo
         title = Xolo::Admin::Title.new opts_to_process
         response_data = title.release server_cnx, version: cli_cmd.version
 
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
         speak "Version '#{cli_cmd.version}' of Title '#{cli_cmd.title}' has been released."
@@ -865,10 +866,7 @@ module Xolo
           title = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
           response_data = title.repair server_cnx, versions: opts_to_process[:versions]
         end
-        if debug?
-          puts "DEBUG: response_data: #{response_data}"
-          puts
-        end
+        show_debug "response_data: #{response_data}"
 
         display_progress response_data[:progress_stream_url_path]
       rescue StandardError => e
@@ -1092,10 +1090,7 @@ module Xolo
         result = server_cnx.post(SERVER_SHUTDOWN_ROUTE, payload).body
         puts "result[:result] = #{result[:result]}"
 
-        if debug?
-          puts "DEBUG: response_data: #{result}"
-          puts
-        end
+        show_debug "response_data: #{result}"
 
         display_progress result[:progress_stream_url_path]
 

data/lib/xolo/core/base_classes/configuration.rb

@@ -33,7 +33,7 @@ module Xolo
       # Instance method #conf_file [Pathname]
       #  The full expanded absolute path to the config yaml file.
       #
-      # Constant KEYS [Hash{Symbol: Hash}]
+      # Constant KEYS [Hash {Symbol: Hash}]
       #   The keys of this Hash are the keys that may be found in the yaml file.
       #   The Hash values here define the value in the YAML file, with these keys:
       #

data/lib/xolo/core/base_classes/server_object.rb

@@ -14,12 +14,9 @@ module Xolo
 
     module BaseClasses
 
-      # The base class for dealing with Titles and Versions/Patches in the
-      # Xolo Server, Admin, and Client modules.
-      #
       # The base class for "xolo objects stored on the xolo server", i.e.
       # Titles and Versions/Patches - whether they are being used on the server,
-      # in xadm, or in the client.
+      # or in xadm.
       #
       # This class holds stuff common to all no matter where or how they are used.
       #

data/lib/xolo/core/base_classes/title.rb

@@ -15,12 +15,12 @@ module Xolo
     module BaseClasses
 
       # The base class for dealing with Titles in the
-      # Xolo Server, Admin, and Client modules.
+      # Xolo Server & Admin modules.
       #
       # This class holds the common aspects of Xolo Titles as used
-      # on the Xolo server, in the Xolo Admin CLI app 'xadm', and the
-      # client app 'xolo' - most importately it defines which data they
-      # exchange.
+      # on the Xolo server and in the Xolo Admin CLI app 'xadm'
+      # and the 'xolo' client app (as JSON data).
+      # - most importately it defines which data they exchange.
       #
       ############################
       class Title < Xolo::Core::BaseClasses::ServerObject
@@ -43,7 +43,7 @@ module Xolo
         #
         # This hash defines the common attributes of all Xolo titles - which should
         # be available in all subclasses, both on the server, in xadm, and via the
-        # client.
+        # client (as JSON data).
         #
         # Each of those subclasses might define (and store or calculate) other
         # attributes as needed.
@@ -759,7 +759,7 @@ module Xolo
 
               By default this is false, Patch Policies for versions will be set to 'Install Automatically'.
 
-              If set to true, Patch Policies for versions will be set to 'Make Available in Self Service' and the version will appear in the Updates section when available. The update won't happen until the user clicks a button, or the 7-day deadline passes. Notifications will be displayed daily.
+              If set to true, Patch Policies for versions will be set to 'Make Available in Self Service' and the version will appear in the Updates section when available. The update won't happen until the user clicks a button, or the 7-day deadline passes. Notifications will be displayed daily. For these titles, 'xolo update' will not apply the update, but 'xolo install <title>' will update/install the current release.
 
               When installing automatically, or the deadline passes, the update will happen at the checkin after the next recon. If the version has any KillApps, the user will be prompted to quit them, with a grace period of 15 minutes before the update starts.
 
@@ -966,6 +966,14 @@ module Xolo
           version_order&.first
         end
 
+        # Does a given version exist for this title?
+        # @param vers [String] the version in question
+        # @return [Boolean]
+        #######################
+        def version_exist?(vers)
+          version_order.include? vers
+        end
+
         # Is this a managed title?
         # @return [Boolean]
         #######################

data/lib/xolo/core/base_classes/version.rb

@@ -15,12 +15,12 @@ module Xolo
     module BaseClasses
 
       # The base class for dealing with Versions/Patches in the
-      # Xolo Server, Admin, and Client modules.
+      # Xolo Server & Admin modules.
       #
       # This class holds the common aspects of Xolo Versinos as used
-      # on the Xolo server, in the Xolo Admin CLI app 'xadm', and the
-      # client app 'xolo' - most importately it defines which data they
-      # exchange.
+      # on the Xolo server and in the Xolo Admin CLI app 'xadm'
+      # and the 'xolo' client app (as JSON data).
+      # - most importately it defines which data they exchange.
       #
       ############################
       class Version < Xolo::Core::BaseClasses::ServerObject

data/lib/xolo/core/version.rb

@@ -12,7 +12,7 @@ module Xolo
 
     module Version
 
-      VERSION = '2.2.2'.freeze
+      VERSION = '2.2.4'.freeze
 
     end
 

metadata

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