depot3 3.0.15 → 3.0.20

data/lib/d3/admin/add.rb

@@ -24,6 +24,7 @@
 
 ###
 module D3
+
   module Admin
 
     ### The Admin::Add modile contains constants and methods related to
@@ -34,35 +35,35 @@ module D3
 
       ### These are the symbols representing all the possible commandline options
       ### used for defining new packages.
-      NEW_PKG_OPTIONS = %w{
-          version
-          revision
-          package_name
-          description
-          filename
-          category
-          oses
-          cpu_type
-          reboot
-          removable
-          remove_first
-          prohibiting_processes
-          auto_groups
-          excluded_groups
-          pre_install
-          post_install
-          pre_remove
-          post_remove
-          expiration
-          expiration_paths
-          source_path
-        }.map{|i| i.to_sym}
+      NEW_PKG_OPTIONS = %i(
+        version
+        revision
+        package_name
+        description
+        filename
+        category
+        oses
+        cpu_type
+        reboot
+        removable
+        remove_first
+        prohibiting_processes
+        auto_groups
+        excluded_groups
+        pre_install
+        post_install
+        pre_remove
+        post_remove
+        expiration
+        expiration_paths
+        source_path
+      ).freeze
 
       ### If we need to build the pkg, these options are needed
-      BUILD_OPTIONS = [:workspace, :package_build_type]
+      BUILD_OPTIONS = [:workspace, :package_build_type].freeze
 
       ### If we are building a .pkg these options are needed
-      PKG_OPTIONS = [:pkg_identifier, :pkg_preserve_owners]
+      PKG_OPTIONS = [:pkg_identifier, :pkg_preserve_owners, :signing_identity, :signing_options].freeze
 
       ### Continuously loop through displaying the add-package menu, and getting
       ### new values, until the user types 'x'.
@@ -71,39 +72,36 @@ module D3
       ###
       ### @return [OpenStruct] the new_package_options with validated data
       ###
-      def loop_thru_add_walkthru (options)
-
-        inherited_line = options.inherited_from ? "with values inherited from '#{options.inherited_from}'" : "with global default values"
-
-
+      def loop_thru_add_walkthru(options)
+        inherited_line = options.inherited_from ? "with values inherited from '#{options.inherited_from}'" : 'with global default values'
 
         choice = nil
 
         # loop until the user types an x
-        while choice != "x"
+        while choice != 'x'
           walkthru_menu_header = <<-END_HEADER
 ------------------------------------
-Adding pilot d3 package '#{options.edition or options.basename}'
+Adding pilot d3 package '#{options.edition || options.basename}'
 #{inherited_line}
 ------------------------------------
 END_HEADER
           menu_options = NEW_PKG_OPTIONS
-          if options.source_path and get_package_type_from_source(options.source_path) == :root_folder
+          if options.source_path && get_package_type_from_source(options.source_path) == :root_folder
             menu_options += BUILD_OPTIONS
             menu_options += PKG_OPTIONS if options.package_build_type == :pkg
           end
 
-          choice = D3::Admin::Interactive.get_menu_choice( walkthru_menu_header, walkthru_menu_lines(menu_options, options) )
+          choice = D3::Admin::Interactive.get_menu_choice(walkthru_menu_header, walkthru_menu_lines(menu_options, options))
 
           if choice == 'x'
             (options, errors) = validate_all_new_package_options options
             if errors.empty?
               break # while
             else
-              puts "***** ERRORS *****"
+              puts '***** ERRORS *****'
               puts errors.join "\n"
-              puts "*****"
-              puts "Type return to continue, ^c to exit"
+              puts '*****'
+              puts 'Type return to continue, ^c to exit'
               gets
               choice = 'not x'
             end # if errors empty
@@ -115,10 +113,9 @@ END_HEADER
             # Here the value we're actually editing
             current_opt_value = options[chosen_opt]
 
-
             # if we're editing version or revision, and the current pkg or filenames are
             # based on them then make a note to update the names  when we get the new values
-            if chosen_opt == :basename or chosen_opt == :version or chosen_opt == :revision
+            if chosen_opt == :basename || chosen_opt == :version || chosen_opt == :revision
               update_edition = true
               update_pkg_name = options.package_name.start_with? options.edition
               update_filename = options.filename.start_with? options.edition
@@ -130,7 +127,7 @@ END_HEADER
 
             # if editing the source or the buildtype, we might have to update the
             # names as well
-            if chosen_opt == :source_path or chosen_opt == :package_build_type
+            if chosen_opt == :source_path || chosen_opt == :package_build_type
               update_pkg_name = options.package_name =~ /\.(m?pkg|dmg)$/
               update_filename = true
             end
@@ -139,7 +136,7 @@ END_HEADER
             options[chosen_opt] = D3::Admin::Interactive.get_value(chosen_opt, current_opt_value, nil)
 
             # if we changed the version, reset the revision to 1 and update values as needed
-            if chosen_opt == :version and options[chosen_opt] != current_opt_value
+            if chosen_opt == :version && options[chosen_opt] != current_opt_value
               options[:revision] = 1
               update_edition = true
               update_pkg_name = options.package_name.start_with? options.edition
@@ -152,10 +149,10 @@ END_HEADER
             options.filename = "#{options.edition}.#{options.package_build_type}" if update_filename
 
             # if we edited the source path, we might need to update the names and the pkg build type
-            if chosen_opt == :source_path and options.source_path.extname =~  /\.(m?pkg|dmg)$/
+            if chosen_opt == :source_path && options.source_path.extname =~ /\.(m?pkg|dmg)$/
               options.package_name.sub(/\.(m?pkg|dmg)$/, options.source_path.extname)
               options.filename.sub(/\.(m?pkg|dmg)$/, options.source_path.extname)
-              options.package_build_type = options.source_path.extname == ".dmg" ? :dmg : :pkg
+              options.package_build_type = options.source_path.extname == '.dmg' ? :dmg : :pkg
             end
 
             # ditto if we edited the package_build_type
@@ -164,12 +161,11 @@ END_HEADER
               options.filename.sub(/\.(m?pkg|dmg)$/, options.package_build_type.to_s)
             end
 
-          end #if choice == x
+          end # if choice == x
         end # while choice not x
 
         # return the options
         options
-
       end # loop_thru_add_walkthru
 
       ### Regenerate the walkthru menu lines
@@ -181,12 +177,12 @@ END_HEADER
       ###
       ### @return [Array<String>] the lines of the walkthru menu
       ###
-      def walkthru_menu_lines (menu_options, current_options)
+      def walkthru_menu_lines(menu_options, current_options)
         display_lines = []
 
         menu_options.each_index do |i|
           # the option symbol, like :reboot
-          #opt = NEW_PKG_OPTIONS[i]
+          # opt = NEW_PKG_OPTIONS[i]
           opt = menu_options[i]
           opt_def = D3::Admin::OPTIONS[opt]
           label = opt_def[:label]
@@ -195,7 +191,7 @@ END_HEADER
           value_display = converter ? converter.call(value) : value
           display_lines[i] = "#{label}: #{value_display}"
         end
-        return display_lines
+        display_lines
       end # def walkthru_menu_lines
 
       ### Validate commandline options when adding a package without walkthru
@@ -210,17 +206,17 @@ END_HEADER
       ###
       ### @return [OpenStruct] the new_package_options with validated data
       ###
-      def add_pilot_cli (cli_options)
-        (new_package_options, errors) = validate_all_new_package_options (cli_options)
+      def add_pilot_cli(cli_options)
+        (new_package_options, errors) = validate_all_new_package_options(cli_options)
         if errors.empty?
           return new_package_options
         else
-          puts "***** ERRORS *****"
+          puts '***** ERRORS *****'
           puts errors.join "\n"
-          puts "*****"
-          raise ArgumentError, "Errors in commandline options, see above."
+          puts '*****'
+          raise ArgumentError, 'Errors in commandline options, see above.'
         end # if errors empty
-      end #validate_cli_add_pilot
+      end # validate_cli_add_pilot
 
       ### Validate all possible options for making a new pkg.
       ###
@@ -235,11 +231,10 @@ END_HEADER
       ### @return [Array<OpenStruct, Array>] An array with two items: the possibly-validated options
       ###   and an array of error messages, which should be empty if all options are valid.
       ###
-      def validate_all_new_package_options (options_from_user)
-
+      def validate_all_new_package_options(options_from_user)
         # what do we need to check
         opts_to_check = NEW_PKG_OPTIONS
-        if options_from_user.source_path and get_package_type_from_source(options_from_user.source_path) == :root_folder
+        if options_from_user.source_path && get_package_type_from_source(options_from_user.source_path) == :root_folder
           opts_to_check += BUILD_OPTIONS
           opts_to_check += PKG_OPTIONS if options_from_user.package_build_type == :pkg
         end
@@ -273,16 +268,16 @@ END_HEADER
 
         # group overlaps
         begin
-           D3::Package::Validate.validate_non_overlapping_groups options_from_user[:auto_groups], options_from_user[:excluded_groups]
+          D3::Package::Validate.validate_non_overlapping_groups options_from_user[:auto_groups], options_from_user[:excluded_groups]
         rescue JSS::InvalidDataError
-           errors << "Auto and Excluded group-lists can't contain groups in common."
+          errors << "Auto and Excluded group-lists can't contain groups in common."
         end
 
         # expiration path if expiration
         if options_from_user[:expiration] > 0
-            errors << "expiration path cannot be empty if expiration is > 0 ." unless options_from_user[:expiration_paths]
+          errors << 'expiration path cannot be empty if expiration is > 0 .' unless options_from_user[:expiration_paths]
         end
-        return [options_from_user, errors]
+        [options_from_user, errors]
       end # validate_all_new_package_options
 
       ### Figure out the default values for all options for creating a new package
@@ -296,7 +291,7 @@ END_HEADER
         dft_opts = OpenStruct.new
 
         # first populate the opts from the defined defaults for anything that's still nil
-        D3::Admin::OPTIONS.each {|opt, settings| dft_opts[opt] = settings[:default]}
+        D3::Admin::OPTIONS.each { |opt, settings| dft_opts[opt] = settings[:default] }
 
         dft_opts.basename = basename
 
@@ -313,7 +308,7 @@ END_HEADER
         end #  if basename
 
         # edition if available
-        if dft_opts.version and dft_opts.revision
+        if dft_opts.version && dft_opts.revision
           dft_opts.edition = "#{dft_opts.basename}-#{dft_opts.version}-#{dft_opts.revision}"
         else
           dft_opts.edition = nil
@@ -330,15 +325,16 @@ END_HEADER
         dft_opts.workspace = D3::Admin::Prefs.prefs[:workspace]
         dft_opts.workspace ||= D3::Admin::DFT_WORKSPACE
 
-
         # use the pkg_identifier_prefix from the prefs
         pfx = D3::Admin::Prefs.prefs[:apple_pkg_id_prefix]
         pfx ||= D3::Admin::DFT_PKG_ID_PREFIX
         dft_opts.pkg_identifier ||= "#{pfx}.#{basename}".gsub(/\.+/, '.')
 
         # We now have our defaults for a new pkg
-        return dft_opts
+        dft_opts.signing_identity = D3::Admin::Prefs.prefs[:signing_identity] || ''
+        dft_opts.signing_options = D3::Admin::Prefs.prefs[:signing_options] || ''
 
+        dft_opts
       end # populate_default_options
 
       ### Get default values from an existing d3 package, and use them to
@@ -352,7 +348,6 @@ END_HEADER
       ### @return  [OpenStruct] an ostruct with the default values
       ###
       def default_options_from_package(pkg, dft_opts = OpenStruct.new)
-
         # populate the opts from the pkg, if the pkg has a value
         D3::Admin::OPTIONS.keys.each do |opt|
           next unless pkg.respond_to?(opt)
@@ -370,7 +365,7 @@ END_HEADER
 
         # grab the first pkg-id if it exists
         # we might use it to if making a new pkg
-        if pkg.apple_receipt_data and pkg.apple_receipt_data[0] and pkg.apple_receipt_data[0][:apple_pkg_id]
+        if pkg.apple_receipt_data && pkg.apple_receipt_data[0] && pkg.apple_receipt_data[0][:apple_pkg_id]
           dft_opts.pkg_identifier = pkg.apple_receipt_data[0][:apple_pkg_id]
         end
 
@@ -386,13 +381,13 @@ END_HEADER
       ### @return [Symbol] :dmg, :pkg, or :root_folder
       ###
       def get_package_type_from_source (source_path)
-        if source_path.to_s.end_with? ".dmg"
-          return :dmg
+        if source_path.to_s.end_with? '.dmg'
+          :dmg
         elsif source_path.to_s =~ /\.m?pkg$/
-          return :pkg
+          :pkg
         else
-          return :root_folder
-        end # if .source_path.to_s.end_with? ".dmg"
+          :root_folder
+        end # if .source_path.to_s.end_with? '.dmg'
       end
 
       ### Add the new pkg to d3
@@ -401,16 +396,17 @@ END_HEADER
       ###
       ### @return [Integer] the JSS id of the new package
       ###
-      def add_new_package (new_package_options)
-
+      def add_new_package(new_package_options)
         # new_package_options should now have all the validated data we need to make a new pkg
-        new_pilot = D3::Package.new(:id => :new,
-          :basename => new_package_options.basename,
-          :name => new_package_options.package_name,
-          :version => new_package_options.version,
-          :revision => new_package_options.revision,
-          :filename => new_package_options.filename,
-          :admin => ENV["USER"])
+        new_pilot = D3::Package.new(
+          id: :new,
+          basename: new_package_options.basename,
+          name: new_package_options.package_name,
+          version: new_package_options.version,
+          revision: new_package_options.revision,
+          filename: new_package_options.filename,
+          admin: ENV['USER']
+        )
 
         D3::Admin::Add::NEW_PKG_OPTIONS.each do |opt|
           setter = "#{opt}=".to_sym
@@ -420,21 +416,28 @@ END_HEADER
         # do we need to build the pkg?
         unless new_package_options.source_path.extname =~ /\.(m?pkg|dmg)$/
           if new_package_options.package_build_type == :pkg
-            puts "Building .pkg..."
-            new_pkg_path = JSS::Composer.mk_pkg(new_package_options.package_name,
+            puts 'Building .pkg...'
+
+            new_pkg_path = JSS::Composer.mk_pkg(
+              new_package_options.package_name,
               new_package_options.version,
               new_package_options.source_path,
-              :pkg_id => new_package_options.pkg_identifier,
-              :out_dir => new_package_options.workspace,
-              :preserve_ownership => new_package_options.pkg_preserve_owners )
+              pkg_id: new_package_options.pkg_identifier,
+              out_dir: new_package_options.workspace,
+              preserve_ownership: new_package_options.pkg_preserve_owners,
+              signing_identity: new_package_options.signing_identity,
+              signing_options: new_package_options.signing_options
+            )
 
             new_package_options.source_path = new_pkg_path
 
           elsif new_package_options.package_build_type == :dmg
-            puts "Building .dmg..."
-            new_pkg_path = JSS::Composer.mk_dmg(new_package_options.package_name,
+            puts 'Building .dmg...'
+            new_pkg_path = JSS::Composer.mk_dmg(
+              new_package_options.package_name,
               new_package_options.source_path,
-              new_package_options.workspace)
+              new_package_options.workspace
+            )
 
             new_package_options.source_path = new_pkg_path
           end # if new_package_options.package_build_type
@@ -445,19 +448,20 @@ END_HEADER
 
         new_pkg_id = new_pilot.save
 
-        puts "Indexing..."
+        puts 'Indexing...'
         # make the index - all d3 pkgs are indexed in the JSS
-        new_pilot.mk_index :local_filepath => new_package_options.source_path
+        new_pilot.mk_index local_filepath: new_package_options.source_path
 
         # upload to dist point
         # if its a .pkg, the apple rcpt data is updated during the upload
-        puts "Uploading to the Master Distribution Point..."
+        puts 'Uploading to the Master Distribution Point...'
         new_pilot.upload_master_file new_package_options.source_path, D3::Admin::Auth.rw_credentials(:dist)[:password]
 
-        return new_pkg_id
-
+        new_pkg_id
       end # add_new_package
 
     end # module Add
+
   end # module Admin
+
 end # module D3

data/lib/d3/admin/interactive.rb

@@ -22,9 +22,9 @@
 ###
 ###
 
-
 ###
 module D3
+
   module Admin
 
     ### This module contains methods for interacting with the user in the terminal
@@ -33,24 +33,24 @@ module D3
     ### These methods all return a string of user input, possibly an empty string.
     ###
     module Interactive
+
       require 'readline'
       extend self
 
       # Set up readline
       # no spaces at the end of readline completion
-      Readline.completion_append_character = ""
+      Readline.completion_append_character = ''
       #  names may contain spaces
-      Readline.basic_word_break_characters = ""
+      Readline.basic_word_break_characters = ''
       # this appends a / to directories as we auto-complete paths.
-      Readline.completion_proc = Proc.new do |str|
-        files = Dir.glob(str + "*")
-        files.map {|f|  File.directory?(f) ? "#{f}/" : f }
+      Readline.completion_proc = proc do |str|
+        files = Dir.glob(str + '*')
+        files.map { |f| File.directory?(f) ? "#{f}/" : f }
       end
 
+      UNSET = 'n'.freeze
 
-      UNSET = "n"
-
-      DFT_EDITOR = "/usr/bin/nano -L"
+      DFT_EDITOR = '/usr/bin/nano -L'.freeze
 
       ### Display a menu of numbered choices, and return the user's choice,
       ### or 'x' if the user is done choosing.
@@ -61,41 +61,40 @@ module D3
       ###
       ### @return [Integer, String] The index of the chosen  chosen, or 'x'
       ###
-      def get_menu_choice (header, items)
-
+      def get_menu_choice(header, items)
         # add a 1-based number and ) to the start of each line, like 1),  and 2)...
-        items.each_index{|i| items[i]  = "#{i +1}) #{items[i]}"}
+        items.each_index { |i| items[i] = "#{i + 1}) #{items[i]}" }
         menu_count = items.count
         menu_count_display = "(1-#{menu_count}, x=done, ^c=cancel)"
 
         menu = "#{header}\n#{items.join("\n")}"
 
         # clear the screen between displays of the menu, so its always at the top.
-        system "clear" or system "cls"
+        system 'clear' or system 'cls'
         puts menu
-        choice = ""
-        while choice == ""
+        choice = ''
+        while choice == ''
           choice = Readline.readline("Which to change? #{menu_count_display}: ", false)
           break if choice == 'x'
 
           # they chose a number..
           if choice =~ /^\d+$/
             # map it to one of the editing options
-            choice = (choice.to_i) - 1
+            choice = choice.to_i - 1
             # but they might have chosen a higher number than allowws
-            choice = "" unless (0..(menu_count - 1)).include? choice
+            choice = '' unless (0..(menu_count - 1)).cover? choice
           else
-            choice = ""
+            choice = ''
           end
 
           # tell them they made a bad choice
-          if choice == ""
+          if choice == ''
             puts "\n******* Sorry, invalid choice.\n"
             next
           end
         end # while choice == ""
 
-        return choice
+        choice
       end # get_menu_choice
 
       ### Call one of the get_ methods and do the matching validity check,
@@ -114,10 +113,8 @@ module D3
       ### @return [Object] the validated data from the user
       ###
       def get_value(option_or_get_method, default = nil, validate_method = nil)
-
         # if the option_or_get_method is one of the keys in OPTIONS, then use OPTIONS[get_method][:get] if it exists
         if D3::Admin::OPTIONS.keys.include?(option_or_get_method)
-          option_to_get = option_or_get_method
           get_method = D3::Admin::OPTIONS[option_or_get_method][:get]
           # if we weren't giving a validate method, get it from the OPTIONS
           validate_method ||= D3::Admin::OPTIONS[option_or_get_method][:validate]
@@ -127,7 +124,7 @@ module D3
 
         valid = :start
         validated = nil
-        until valid === true
+        until valid === true # Keep the ===, trust me. Don't listen to rubocop.
           puts "\nSorry: #{validated}, Try again.\n" unless valid === :start
 
           value_input = self.send get_method, default
@@ -137,8 +134,8 @@ module D3
 
           (valid, validated) = D3::Admin::Validate.validate(value_input, validate_method)
 
-        end #until valid === true
-        return validated
+        end # until valid === true
+        validated
       end # get value
 
       ### Prompt for user input for an option and return the response.
@@ -179,8 +176,7 @@ module D3
       ###
       ### @return [String] The data entered by the user, possibly an empty string
       ###
-      def prompt_for_data (desc: nil, prompt: nil, opt: nil, default: :no_default, required: true )
-
+      def prompt_for_data(desc: nil, prompt: nil, opt: nil, default: :no_default, required: true)
         unset_line = nil
         default_display = default
 
@@ -197,26 +193,26 @@ module D3
 
         # some values are special for displaying
         default_display = case default_display
-          when :no_default then  ''
-          when D3::Admin::DFT_REQUIRED then '' # the '---Required---' should only be visible in the menu, not the prompt
-          when D3::Admin::DFT_NONE then UNSET
-          else default_display.to_s
-        end
+                          when :no_default then ''
+                          when D3::Admin::DFT_REQUIRED then '' # the '---Required---' should only be visible in the menu, not the prompt
+                          when D3::Admin::DFT_NONE then UNSET
+                          else default_display.to_s
+                          end
 
         data_entered = ''
         puts "\n#{desc}" if desc
-        prompt ||= "Please enter a value"
-        hit_return = default_display.empty? ? "" : " (Hit return for '#{default_display}' )"
+        prompt ||= 'Please enter a value'
+        hit_return = default_display.empty? ? '' : " (Hit return for '#{default_display}' )"
         prompt_line = "#{prompt}#{hit_return}: "
 
         while true do
           data_entered = Readline.readline(prompt_line, false)
           data_entered = default_display if data_entered == ''
-          break unless required and data_entered.empty?
+          break unless required && data_entered.empty?
         end
         # if 'n' was typed for an unsettable option, return nil
-        return nil if opt_def and opt_def[:unsetable] and data_entered == UNSET
-        return data_entered.strip
+        return nil if opt_def && opt_def[:unsetable] && data_entered == UNSET
+        data_entered.strip
       end # prompt_for_data
 
       ### Ask the user for an edition or basename
@@ -235,12 +231,12 @@ Enter:
    - 'v' to view a list of all packages with the basenames and editions in d3.
         END_DESC
 
-        input = "v"
-        while input == "v" do
-          input = prompt_for_data(desc: desc, prompt: "Edition or Basename", default: default, required: true)
-          D3::Admin::Report.show_all_basenames_and_editions if input == "v"
+        input = 'v'
+        while input == 'v'
+          input = prompt_for_data(desc: desc, prompt: 'Edition or Basename', default: default, required: true)
+          D3::Admin::Report.show_all_basenames_and_editions if input == 'v'
         end
-        return input
+        input
       end # get existing pkg
 
       ### Ask the user for an id or name
@@ -248,7 +244,7 @@ Enter:
       ###
       ### @return [String] the name or id entered, or nil
       ###
-      def get_jss_package_for_import (default = nil)
+      def get_jss_package_for_import(default = nil)
         desc = <<-END_DESC
 IMPORT JSS PACKAGE
 Enter a package id or display-name for
@@ -257,16 +253,16 @@ Enter:
    - 'v' to view a list of all JSS package names not in d3.
         END_DESC
 
-        input = "v"
-        while input == "v" do
-          input = prompt_for_data(desc: desc, prompt: "JSS id or display name", default: default, required: true)
-          D3::Admin::Report.show_pkgs_available_for_import if input == "v"
+        input = 'v'
+        while input == 'v'
+          input = prompt_for_data(desc: desc, prompt: 'JSS id or display name', default: default, required: true)
+          D3::Admin::Report.show_pkgs_available_for_import if input == 'v'
         end
-        return input
+        input
       end # get existing pkg
 
       ### get a basename from the user
-      def get_basename (default = nil)
+      def get_basename(default = nil)
         desc = <<-END_DESC
 BASENAME
 Enter a basename.
@@ -274,31 +270,31 @@ Enter 'v' to view a list of all basenames in d3 and
 the newest edition for each.
         END_DESC
 
-        input = "v"
-        while input == "v" do
-          input = prompt_for_data(desc: desc, prompt: "Basename", required: true)
-          D3::Admin::Report.show_all_basenames_and_editions if input == "v"
+        input = 'v'
+        while input == 'v'
+          input = prompt_for_data(desc: desc, prompt: 'Basename', required: true)
+          D3::Admin::Report.show_all_basenames_and_editions if input == 'v'
         end
-        return input
+        input
       end # get basename
 
       ### get a package name from user
-      def get_package_name (default = nil)
+      def get_package_name(default = nil)
         desc = <<-END_DESC
 JSS PACKAGE NAME
 Enter a unique name for this package in d3 and Casper.
 Enter 'v' to view a list of package names currently in d3.
         END_DESC
-        input = "v"
-        while input == "v" do
+        input = 'v'
+        while input == 'v'
           input = prompt_for_data(opt: :package_name, desc: desc, default: default, required: true)
-          D3::Admin::Report.show_existing_package_ids if input == "v"
+          D3::Admin::Report.show_existing_package_ids if input == 'v'
         end
-        return input
+        input
       end # get pkg name
 
-       ### get a package name from user
-      def get_filename (default = nil)
+      ### get a package name from user
+      def get_filename(default = nil)
         desc = <<-END_DESC
 INSTALLER FILENAME
 Enter a unique name for this package's installer file
@@ -306,12 +302,12 @@ on the master distribution point. The file will be
 renamed to this name on the distribution point.
 Enter 'v' to see a list of existing pkg filenames in the JSS
         END_DESC
-        input = "v"
-        while input == "v" do
+        input = 'v'
+        while input == 'v'
           input = prompt_for_data(opt: :filename, desc: desc, default: default, required: true)
-          D3::Admin::Report.show_existing_package_ids if input == "v"
+          D3::Admin::Report.show_existing_package_ids if input == 'v'
         end
-        return input
+        input
       end # get pkg name
 
       ### Get a version from the user
@@ -319,7 +315,7 @@ Enter 'v' to see a list of existing pkg filenames in the JSS
       ### @param default[String] the value to use when the user types a return.
       ###
       ### @return [String] the value to use as the version
-      def get_version (default = nil)
+      def get_version(default = nil)
         desc = <<-END_DESC
 VERSION
 Enter a version for this package.
@@ -335,7 +331,7 @@ All spaces will be converted to underscores.
       ###
       ### @return [String] the value to use as the rev
       ###
-      def get_revision (default = nil)
+      def get_revision(default = nil)
         desc = <<-END_DESC
 REVISION
 Enter a Package revision for this package.
@@ -353,16 +349,15 @@ an existing version of a given basename.
       ###
       ### @return [String] the desired description
       ###
-      def get_description(current_desc = "")
-
+      def get_description(current_desc = '')
         # do we have a current desc to display and possibly keep?
-        current_desc_review = ""
+        current_desc_review = ''
         unless current_desc.to_s.empty?
           current_desc_review = "\n----- Current Description -----\n#{current_desc}\n-------------------------------\n\n"
         end
 
         if prefd_editor = D3::Admin::Prefs.prefs[:editor]
-          prefd_editor_choice =  "\n   - 'e' to edit using '#{prefd_editor}' "
+          prefd_editor_choice = "\n   - 'e' to edit using '#{prefd_editor}' "
         else
           prefd_editor_choice = ''
         end
@@ -387,26 +382,26 @@ or '#{DFT_EDITOR}' if none is set.
 
         # show it, get response
         puts input_desc
-        choice = Readline.readline("Your choice (hit return to keep current desc.): ", false)
+        choice = Readline.readline('Your choice (hit return to keep current desc.): ', false)
 
         # keep or empty?
         return current_desc if choice.empty?
 
-        return "" if choice.casecmp('b') == 0
+        return '' if choice.casecmp('b').zero?
 
         # make a tem file, save current into it
-        desc_tmp_file = Pathname.new Tempfile.new("d3_description_")
+        desc_tmp_file = Pathname.new Tempfile.new('d3_description_')
         desc_tmp_file.jss_save current_desc
 
         # which editor?
-        if choice.casecmp('e') == 0
+        if choice.casecmp('e').zero?
           cmd = prefd_editor
-        elsif choice.casecmp('v') == 0
-          cmd = "/usr/bin/vim"
-        elsif choice.casecmp('m') == 0
-          cmd = "/usr/bin/emacs"
-        elsif choice.casecmp('n') == 0
-          cmd = "/usr/bin/nano -L"
+        elsif choice.casecmp('v').zero?
+          cmd = '/usr/bin/vim'
+        elsif choice.casecmp('m').zero?
+          cmd = '/usr/bin/emacs'
+        elsif choice.casecmp('n').zero?
+          cmd = '/usr/bin/nano -L'
         else
           cmd = ENV['EDITOR']
         end
@@ -416,7 +411,7 @@ or '#{DFT_EDITOR}' if none is set.
 
         result = desc_tmp_file.read.chomp
         desc_tmp_file.delete
-        return result.chomp
+        result.chomp
       end # get_description
 
       ### Get the local path to the package being added to d3
@@ -424,7 +419,7 @@ or '#{DFT_EDITOR}' if none is set.
       ### if the source is a root-folder rather than a .pkg or .dmg
       ###
       ### @return [Pathname] the local path to the pkg source
-      def get_source_path (default = false)
+      def get_source_path(default = false)
         desc = <<-END_DESC
 SOURCE
 Enter the path to a .pkg or .dmg installer
@@ -433,7 +428,7 @@ END_DESC
 
         # 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.
-        prompt_for_data(opt: :source_path, desc: desc, default: default, required: true).strip.gsub(/\\ /," ")
+        prompt_for_data(opt: :source_path, desc: desc, default: default, required: true).strip.gsub(/\\ /, ' ')
       end
 
       ### If we're builting a pkg, should we build a .pkg, or a .dmg?
@@ -455,8 +450,8 @@ Should we build a .pkg or .dmg?  ( p = pkg, d = dmg )
       ###
       ### @return [String] the prefix to use
       ###
-      def get_pkg_identifier (default = nil)
-              desc = <<-END_DESC
+      def get_pkg_identifier(default = nil)
+        desc = <<-END_DESC
 PKG IDENTIFIER
 Enter the Apple .pkg indentifier for building a .pkg.
 E.g. com.mycompany.myapp
@@ -477,8 +472,8 @@ E.g. com.mycompany.myapp
       ###
       ### @return [String] the prefix to use
       ###
-      def get_pkg_identifier_prefix (default = D3::Admin::DFT_PKG_ID_PREFIX)
-              desc = <<-END_DESC
+      def get_pkg_identifier_prefix(default = D3::Admin::DFT_PKG_ID_PREFIX)
+        desc = <<-END_DESC
 PKG IDENTIFIER PREFIX
 Enter the prefix to prepend to a basename to create an Apple .pkg indentifier.
 E.g. If you enter 'com.mycompany', then when you build a .pkg with basename 'foo'
@@ -487,6 +482,46 @@ the default .pkg identifier  will be 'com.mycompany.foo'
         prompt_for_data(opt: :pkg_identifier_prefix, desc: desc, default: default, required: true)
       end
 
+      ### Get the optional Apple Developer signing ID
+      ### .pkgs can be codesigned with a certificate from Apple
+      ### The Developer ID Installer certificate must be
+      ### in the login.keychain of the user operating d3admin unless
+      ### otherwise specified in signing_options
+      ###
+      ### This value is saved in the admin prefs for future use.
+      ###
+      ### @param default[String] the default value when hitting return
+      ###
+      ### @return [String] The Apple Developer signing ID to use
+      ###
+      def get_signing_identity(default = D3::Admin::Prefs.prefs[:signing_identity])
+        desc = <<-END_DESC
+SIGNING IDENTITY
+Enter the common name of your Apple Developer signing ID to create signed Apple .pkgs.
+E.g. If you enter 'Developer ID Installer: My Company (A12BC34DE56)', then that string will be passed
+as the option for pkgbuild --sign. D3 will not attempt to sign unless this option is set.'
+        END_DESC
+        prompt_for_data(opt: :signing_identity, desc: desc, default: default, required: false)
+      end
+
+      ### Get any arguments and options to pass to pkgbuild
+      ### A signing identity must be defined for these options to be used.
+      ###
+      ### This value is saved in the admin prefs for future use.
+      ###
+      ### @param default[String] the default value when hitting return
+      ###
+      ### @return [String] The string of arguments and options to pass to pkgbuild
+      ###
+      def get_signing_options(default = D3::Admin::Prefs.prefs[:signing_options])
+        desc = <<-END_DESC
+SIGNING OPTIONS
+Enter optional arguments and options to pass to pkgbuild. These options are ignored unless a signing identity is defined.
+E.g. --keychain '/Users/d3/Library/Keychain' --cert 'My Awesome Authority' --timestamp
+        END_DESC
+        prompt_for_data(opt: :signing_options, desc: desc, default: default, required: false)
+      end
+
       ### Get the desired local workspace for building pkgs
       ### Defaults to ENV['HOME']
       ###
@@ -494,7 +529,7 @@ the default .pkg identifier  will be 'com.mycompany.foo'
       ###
       ### @return [Pathname] the path to the workspace
       ###
-      def get_workspace (default = ENV['HOME'])
+      def get_workspace(default = ENV['HOME'])
         desc = <<-END_DESC
 PACKAGE BUILD WORKSPACE
 Enter the path to a folder where we can build packages.
@@ -510,7 +545,7 @@ This will be stored between uses of d3admin.
       ###
       ### @return [String] the users response
       ###
-      def get_pkg_preserve_owners (default = 'n')
+      def get_pkg_preserve_owners(default = 'n')
         desc = <<-END_DESC
 PRESERVE SOURCE OWNERSHIP
 When building a .pkg, the OS generally sets the ownership and permissions
@@ -524,7 +559,7 @@ Should we override the OS and preserve the ownership on
 the source folder when the item is installed on the client?
 Enter 'y' or 'n'
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Preserve ownership (y/n)", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Preserve ownership (y/n)', default: default, required: true)
       end
 
       ### Get a pre-install script, either local file, JSS id, or JSS name
@@ -534,8 +569,8 @@ Enter 'y' or 'n'
       ### @return [Pathname, Integer, nil] The local script file, or the JSS id of the
       ###   chosen script
       ###
-      def get_pre_install_script (default = nil)
-        get_script "PRE-INSTALL SCRIPT", :pre_install , default
+      def get_pre_install_script(default = nil)
+        get_script 'PRE-INSTALL SCRIPT', :pre_install, default
       end
 
       ### Get a post-install script, either local file, JSS id, or JSS name
@@ -545,8 +580,8 @@ Enter 'y' or 'n'
       ### @return [Pathname, Integer, nil] The local script file, or the JSS id of the
       ###   chosen script
       ###
-      def get_post_install_script (default = nil)
-        get_script "POST-INSTALL SCRIPT", :post_install , default
+      def get_post_install_script(default = nil)
+        get_script 'POST-INSTALL SCRIPT', :post_install, default
       end
 
       ### Get a pre-remove script, either local file, JSS id, or JSS name
@@ -556,8 +591,8 @@ Enter 'y' or 'n'
       ### @return [Pathname, Integer, nil] The local script file, or the JSS id of the
       ###   chosen script
       ###
-      def get_pre_remove_script (default = nil)
-         get_script "PRE-REMOVE SCRIPT", :pre_remove , default
+      def get_pre_remove_script(default = nil)
+        get_script 'PRE-REMOVE SCRIPT', :pre_remove, default
       end
 
       ### Get a post-remove script, either local file, JSS id, or JSS name
@@ -567,8 +602,8 @@ Enter 'y' or 'n'
       ### @return [Pathname, Integer, nil] The local script file, or the JSS id of the
       ###   chosen script
       ###
-      def get_post_remove_script (default = nil)
-        get_script "POST-REMOVE SCRIPT", :post_remove , default
+      def get_post_remove_script(default = nil)
+        get_script 'POST-REMOVE SCRIPT', :post_remove, default
       end
 
       ### Get a script, either local file, JSS id, or JSS name
@@ -578,7 +613,7 @@ Enter 'y' or 'n'
       ### @return [Pathname, Integer, nil] The local script file, or the JSS id of the
       ###   chosen script
       ###
-      def get_script (heading, opt , default = nil)
+      def get_script(heading, opt, default = nil)
         desc = <<-END_DESC
 #{heading}
 Enter a path to a local file containing the script
@@ -586,12 +621,12 @@ or the name or id of an existing script in the JSS.
 Enter 'v' to view a list of scripts in the JSS.
         END_DESC
 
-        result = "v"
-        while result == "v" do
+        result = 'v'
+        while result == 'v'
           result = prompt_for_data(opt: opt, desc: desc, default: default, required: true)
-          D3.less_text JSS::Script.all_names.sort_by{|s| s.downcase}.join("\n") if result == "v"
+          D3.less_text JSS::Script.all_names.sort_by(&:downcase).join("\n") if result == 'v'
         end
-        return result
+        result
       end
 
       ### Prompt the admin for one or more auto-groups for this installer
@@ -599,7 +634,7 @@ Enter 'v' to view a list of scripts in the JSS.
       ### @param default[nil,String,Array<String>] The groups to use
       ###
       ### @return [String]
-      def get_auto_groups (default = nil)
+      def get_auto_groups(default = nil)
         desc = <<-END_DESC
 AUTO-INSTALL GROUPS
 Enter a comma-separated list of JSS Computer Group names whose members should
@@ -613,8 +648,7 @@ Enter '#{D3::STANDARD_AUTO_GROUP}' to install on all machines.
       ### Prompt the admin for one or more auto-groups for this installer
       ###
       ### @param default[nil,String,Array<String>] The groups to
-      def get_excluded_groups (default = nil)
-
+      def get_excluded_groups(default = nil)
         desc = <<-END_PROMPT
 EXCLUDED GROUPS
 Enter a comma-separated list of JSS Computer Group names
@@ -628,7 +662,7 @@ Enter 'v' to view list of computer groups.
       ###
       ### @return [String] whatever the admin typed
       ###
-      def get_search_target (default = false)
+      def get_search_target(default = false)
         desc = <<-END_PROMPT
 SEARCH TEXT
 Enter text to use in matching basenames or computer group names.
@@ -637,26 +671,25 @@ Matching a group name will list all packages auto-installed or
 excluded for the group. (RegExp's OK)
 Enter 'all' to list all packages in d3.
         END_PROMPT
-        prompt_for_data( desc: desc, prompt: "Text to match or 'all'").chomp
+        prompt_for_data(desc: desc, prompt: "Text to match or 'all'").chomp
       end # get auto
 
-
-      def get_status_for_filter (with_frozen = false)
+      def get_status_for_filter(with_frozen = false)
         if with_frozen
           frozen_line = "\nUse 'frozen' to limit to frozen receipts"
-          frozen_title = " OR FROZEN"
+          frozen_title = 'OR FROZEN'
         else
-          frozen_line = ""
-          frozen_title = ""
+          frozen_line = ''
+          frozen_title = ''
         end
 
         desc = <<-END_PROMPT
 LIMIT TO STATUS#{frozen_title}
 Enter a comma-separate list of statuses for limiting the list.
-Valid Statuses are: #{D3::Basename::STATUSES_FOR_FILTERS.join(", ")}#{frozen_line}
+Valid Statuses are: #{D3::Basename::STATUSES_FOR_FILTERS.join(', ')}#{frozen_line}
 Enter 'all' to show all statuses
         END_PROMPT
-        prompt_for_data( desc: desc, prompt: "Statuses", default: 'all').chomp
+        prompt_for_data(desc: desc, prompt: 'Statuses', default: 'all').chomp
       end
 
       ### Prompt the admin for one or more groups
@@ -665,15 +698,13 @@ Enter 'all' to show all statuses
       ###
       ### @return [String,nil]
       ###
-      def get_groups (desc, opt, default = nil)
-
-        result = "v"
-        while result == "v" do
-          result = prompt_for_data(opt: opt, desc: desc,  default: default, required: true)
-          D3.less_text JSS::ComputerGroup.all_names.sort_by{|s| s.downcase}.join("\n") if result == "v"
+      def get_groups(desc, opt, default = nil)
+        result = 'v'
+        while result == 'v'
+          result = prompt_for_data(opt: opt, desc: desc, default: default, required: true)
+          D3.less_text JSS::ComputerGroup.all_names.sort_by(&:downcase).join("\n") if result == 'v'
         end
-
-        return result
+        result
       end # get auto
 
       ### Get a list of allowed OSes for this pkg
@@ -683,7 +714,7 @@ Enter 'all' to show all statuses
       ###
       ### @return [String,nil] A comma-separated list of allowed OSes
       ###
-      def get_oses (default = [])
+      def get_oses(default = [])
         desc = <<-END_DESC
 LIMIT TO OS's
 Enter a comma-separated list of OS's allowed to
@@ -699,7 +730,7 @@ Use '>=' to set a minimum OS, e.g. '>=10.8.5'
       ###
       ### @return [Symbol,nil] :ppc, :intel, or nil
       ###
-      def get_cpu_type (default = 'x86')
+      def get_cpu_type(default = 'x86')
         desc = <<-END_DESC
 LIMIT TO CPU TYPE
 Should this packge be limited to certain CPU types?
@@ -714,7 +745,7 @@ Enter 'ppc' or 'x86'  or 'none' for neither.
       ###
       ### @return [String] the category entered by the user
       ###
-      def get_category (default = "n")
+      def get_category(default = 'n')
         desc = <<-END_DESC
 CATEGORY
 Enter the JSS category name for this package.
@@ -723,10 +754,10 @@ Enter:
    - 'n' for no category
         END_DESC
 
-        result = "v"
-        while result == "v" do
-          result = prompt_for_data(desc: desc, prompt: "Category", default: default, required: true)
-          D3.less_text JSS::Category.all_names.sort_by{|c| c.downcase}.join("\n") if result == "v"
+        result = 'v'
+        while result == 'v'
+          result = prompt_for_data(desc: desc, prompt: 'Category', default: default, required: true)
+          D3.less_text JSS::Category.all_names.sort_by(&:downcase).join("\n") if result == 'v'
         end
         return nil if result == 'n'
         result
@@ -742,7 +773,7 @@ Enter:
       ###
       ### @return [Regexp,nil] the pattern to match
       ###
-      def get_prohibiting_processes (default = 'n')
+      def get_prohibiting_processes(default = 'n')
         desc = <<-END_DESC
 PROHIBITING PROCESSES
 Enter a comma separated string of process name(s) as they appear in the
@@ -757,7 +788,7 @@ to quit GUI applications gracefully. Matching is case sensitive.
 Enter 'n' for none.
         END_DESC
 
-        result = prompt_for_data(desc: desc, prompt: "Prohibiting Processes", opt: :prohibiting_processes, default: default, required: true)
+        result = prompt_for_data(desc: desc, prompt: 'Prohibiting Processes', opt: :prohibiting_processes, default: default, required: true)
         return nil if result == 'n'
         result
       end
@@ -768,13 +799,13 @@ Enter 'n' for none.
       ###
       ### @return [String] the users response
       ###
-      def get_removable (default = 'y')
+      def get_removable(default = 'y')
         desc = <<-END_DESC
 REMOVABLE
 Can this package be uninstalled?
 Enter 'y' or 'n'
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Removable? (y/n)", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Removable? (y/n)', default: default, required: true)
       end
 
       ### Ask if we should ininstall older versions of this basename
@@ -784,14 +815,14 @@ Enter 'y' or 'n'
       ###
       ### @return [String] the users response
       ###
-      def get_remove_first (default = 'y')
+      def get_remove_first(default = 'y')
         desc = <<-END_DESC
 UNINSTALL OLDER VERSIONS
 Should older versions of this basename be uninstalled
 (if they are removable) before attempting to install this package?
 Enter 'y' or 'n'
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Remove older installs first? (y/n)", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Remove older installs first? (y/n)', default: default, required: true)
       end
 
       ### Ask if this package needs a reboot
@@ -800,7 +831,7 @@ Enter 'y' or 'n'
       ###
       ### @return [String] the users response
       ###
-      def get_reboot (default = 'n')
+      def get_reboot(default = 'n')
         desc = <<-END_DESC
 REBOOT REQUIRED (PUPPIES!)
 Does this package require a reboot after installation?
@@ -809,8 +840,7 @@ with 'd3 install', and the user will be notified to log
 out as soon as possible.
 Enter 'y' or 'n'
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Requires reboot? (y/n)", default: default, required: true)
-
+        prompt_for_data(desc: desc, prompt: 'Requires reboot? (y/n)', default: default, required: true)
       end
 
       ### Get an expiration period (# of days) from the user
@@ -819,7 +849,7 @@ Enter 'y' or 'n'
       ###
       ### @return [Integer] the value to use as the expiration
       ###
-      def get_expiration (default = 0)
+      def get_expiration(default = 0)
         desc = <<-END_DESC
 EXPIRATION
 On machines that allow package expiration,
@@ -828,7 +858,7 @@ number of days without being used?
 Enter the number of days, or 0 for no expiration.
         END_DESC
 
-        prompt_for_data(desc: desc, prompt: "Expiration days", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Expiration days', default: default, required: true)
       end
 
       ### Get the path to the executable(s) to monitor for expiration
@@ -837,7 +867,7 @@ Enter the number of days, or 0 for no expiration.
       ###
       ### @return [Array<Pathname>] the path(s) to the executable
       ###
-      def get_expiration_paths (default = 'n')
+      def get_expiration_paths(default = 'n')
         desc = <<-END_DESC
 EXPIRATION PATH(S)
 Enter the path(s) to the executable(s) that must be used
@@ -846,7 +876,7 @@ should not be escaped. E.g.
 /Applications/Google Chrome.app/Contents/MacOS/Google Chrome, /Applications/Firefox.app/Contents/MacOS/firefox
 Enter 'n' for none
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Expiration Path(s)", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Expiration Path(s)', default: default, required: true)
       end
 
       ### when deleting a pkg, should its pre- and post- scripts be kept?
@@ -855,7 +885,7 @@ Enter 'n' for none
       ###
       ### @return [String] the users response
       ###
-      def get_keep_scripts (default = 'n')
+      def get_keep_scripts(default = 'n')
         desc = <<-END_DESC
 KEEP ASSOCIATED SCRIPTS IN CASPER?
 When deleting a package, should any associated scripts
@@ -865,7 +895,7 @@ NOTE: If any other d3 packages or policies are using the scripts
 they won't be deleted. The other users of the scripts will be reported.
 Enter 'y' or 'n'
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Delete Scripts? (y/n)", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Delete Scripts? (y/n)', default: default, required: true)
       end
 
       ### when deleting a pkg, should it be kept in the JSS?
@@ -874,14 +904,14 @@ Enter 'y' or 'n'
       ###
       ### @return [String] the users response
       ###
-      def get_keep_in_jss (default = 'n')
+      def get_keep_in_jss(default = 'n')
         desc = <<-END_DESC
 KEEP THE PACKAGE IN CASPER?
 When deleting a package, should it be kept as a Casper package
 and only deleted from d3?
 Enter 'y' or 'n'
         END_DESC
-        prompt_for_data(desc: desc, prompt: "Keep in JSS? (y/n)", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Keep in JSS? (y/n)', default: default, required: true)
       end
 
       ### what kind of package list are we showing?
@@ -890,7 +920,7 @@ Enter 'y' or 'n'
       ###
       ### @return [String] the chosen report type
       ###
-      def get_show_type (default = D3::Admin::Report::DFT_SHOW_TYPE)
+      def get_show_type(default = D3::Admin::Report::DFT_SHOW_TYPE)
         desc = <<-END_DESC
 SERVER PACKAGE LIST
 Enter the type of list you'd like to generate about packages in d3.
@@ -905,25 +935,25 @@ One of:
   auto       - packages auto-installed for a given computer group
   excluded   - packages not available to a given computer group
 END_DESC
-        prompt_for_data(desc: desc, prompt: "Show packages", default: default, required: true)
+        prompt_for_data(desc: desc, prompt: 'Show packages', default: default, required: true)
       end
 
       ### What computer are we generating a receipt report for?
       ###
       ### @return [String] A computer name in the JSS
       ###
-      def get_computer (default = nil)
-          desc = <<-END_DESC
+      def get_computer(default = nil)
+        desc = <<-END_DESC
 COMPUTER NAME
 Enter the name of a computer Casper.
 Enter 'v' to view a list available computer names.
 END_DESC
-        input = "v"
-        while input == "v" do
-          input = prompt_for_data(desc: desc, prompt: "Computer name", default: nil, required: true)
-          D3::Admin::Report.show_available_computers_for_reports if input == "v"
+        input = 'v'
+        while input == 'v'
+          input = prompt_for_data(desc: desc, prompt: 'Computer name', default: nil, required: true)
+          D3::Admin::Report.show_available_computers_for_reports if input == 'v'
         end
-        return input
+        input
       end # get computer
 
       ### Get the config target
@@ -932,8 +962,8 @@ END_DESC
       ###
       ### @return [String] the prefix to use
       ###
-      def get_config_target (default = "all")
-              desc = <<-END_DESC
+      def get_config_target(default = 'all')
+        desc = <<-END_DESC
 CONFIGURATION
 Which setting would you like to configure?
   jss - the JSS and credentials (stored in your keychain)
@@ -942,6 +972,8 @@ Which setting would you like to configure?
   workspace - the folder in which to build .pkgs and .dmgs
   editor - the shell command for editing package descriptions
   pkg-id-prefix - the prefix for the .pkg identifier when building .pkgs
+  signing-identity - optional Developer ID Installer certificate issued by Apple
+  signing-options - optional string of signing options to pass to pkgbuild.
   all - all of the above
   display - show current configuration
 
@@ -955,7 +987,7 @@ Which setting would you like to configure?
       ###
       ### @return [String] the command to use
       ###
-      def get_editor (default = "/usr/bin/nano")
+      def get_editor(default = '/usr/bin/nano')
         desc = <<-END_DESC
 EDITOR
 Enter the shell command to use during --walkthru
@@ -966,9 +998,11 @@ Note: if the command launches a GUI editor, make sure the
 shell command stays running until the document is closed.
 Most such editors have an option for that.
 END_DESC
-        prompt_for_data( desc: desc, default: default,prompt: "Command", required: true)
+        prompt_for_data(desc: desc, default: default, prompt: 'Command', required: true)
       end
 
     end # module
+
   end # module Admin
+
 end # module D3