fig 0.1.67 → 0.1.69

data/Changes

@@ -1,3 +1,65 @@
+v0.1.69
+
+  Backwards incompatibilities:
+
+  - While publishing, you cannot simultaneously have a package definition file
+    (e.g. "package.fig") and use environment variable options (--set/--append).
+    Previous to now, any package definition file would simply be ignored and
+    the publish would happen based upon the environment variable options.
+
+    - Easier to understand, yet unlikely to already exist case:
+
+        fig package/1.2.3 --publish --set VARIABLE=VALUE --file non-default.fig
+
+      Is this supposed to mean publish based upon the --set option or the
+      --file option?  Again, it was the former, but that was non-obvious.
+
+    - More likely existing case:
+
+        fig package/1.2.3 --publish --set VARIABLE=VALUE
+
+      while there is a "package.fig" file in the current directory.
+      Workaround: use the "--no-file" option:
+
+        fig package/1.2.3 --publish --set VARIABLE=VALUE --no-file
+
+    Just to be clear, it's perfectly fine (and useful) to have combined a
+    package definition file and environment variable options when not
+    publishing.
+
+  New feature (and backwards incompatibility):
+
+  - Locks FIG_HOME when updating.  (Or attempts to.  If FIG_HOME is on NFS, all
+    bets are off.)  By default, if Fig is updating and notices another instance
+    updating, it will fail.  You can override this behavior via
+    --update-lock-response.  Specify "wait" to get Fig to wait for lock release
+    or "ignore" for it to skip lock checking.
+
+    The default behavior of failing was chosen to prevent surprises in the
+    scenario of starting multiple servers out of the same directory:
+
+        for exchange in cme ice liffe cboe
+        do
+            fig --update -- run-server $exchange &
+        done
+
+    If Fig defaulted to waiting, the above scenario would silently cause three
+    out of the four servers to block until the other one's updates were
+    finished.
+
+  Bug fixes:
+
+  - Specifying --update with FIG_REMOTE_URL using FTP should be fast as it used
+    to be.
+
+  - Skips retrieving directories and files to themselves.  (Tragic accident of
+    retrieving "." onto itself resulted in a corrupted git repo.)
+
+v0.1.68.beta.2
+v0.1.68.beta.1
+
+  - Test releases
+
 v0.1.67
 
   Backwards incompatibilities:
@@ -462,7 +524,7 @@ v0.1.42
 
   - Fig::Package refactoring.
 
-  - "file:" protocol works for FIG_REMOTE_HOME.
+  - "file:" protocol works for FIG_REMOTE_URL.
 
   - Testing no longer requires ssh.
 

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '0.1.67'
+  VERSION = '0.1.69'
 end

data/lib/fig/command.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'fileutils'
 require 'net/ftp'
 require 'set'
 
@@ -16,6 +16,7 @@ require 'fig/repository'
 require 'fig/repository_error'
 require 'fig/runtime_environment'
 require 'fig/statement/configuration'
+require 'fig/update_lock'
 require 'fig/user_input_error'
 require 'fig/working_directory_maintainer'
 
@@ -23,9 +24,10 @@ module Fig; end
 
 # Main program
 class Fig::Command
-  def run_fig(argv)
+  def run_fig(argv, options = nil)
     begin
-      @options = Fig::Command::Options.new(argv)
+      @options = options || Fig::Command::Options.new()
+      @options.process_command_line(argv)
     rescue Fig::UserInputError => error
       $stderr.puts error.to_s # Logging isn't set up yet.
       return Fig::Command::Action::EXIT_FAILURE
@@ -67,7 +69,8 @@ class Fig::Command
       base_config(),
       @environment,
       @repository,
-      @operating_system
+      @operating_system,
+      @package_source_description
     )
 
     actions.each do
@@ -84,25 +87,40 @@ class Fig::Command
     return Fig::Command::Action::EXIT_SUCCESS
   end
 
-  def run_with_exception_handling(argv)
+  def run_with_exception_handling(argv, options = nil)
     begin
-      return_code = run_fig(argv)
-      return return_code
+      return run_fig(argv, options)
     rescue Fig::URLAccessError => error
       urls = error.urls.join(', ')
-      $stderr.puts "Access to #{urls} in #{error.package}/#{error.version} not allowed."
-      return Fig::Command::Action::EXIT_FAILURE
+      $stderr.puts \
+        "Access to #{urls} in #{error.package}/#{error.version} not allowed."
     rescue Fig::UserInputError => error
       log_error_message(error)
-      return Fig::Command::Action::EXIT_FAILURE
     end
+
+    return Fig::Command::Action::EXIT_FAILURE
+  end
+
+  def add_publish_listener(listener)
+    @publish_listeners << listener
+
+    return
+  end
+
+  def initialize()
+    @publish_listeners = []
   end
 
   private
 
   ExecutionContext =
     Struct.new(
-      :base_package, :base_config, :environment, :repository, :operating_system
+      :base_package,
+      :base_config,
+      :environment,
+      :repository,
+      :operating_system,
+      :package_source_description
     )
 
   def derive_remote_url()
@@ -119,17 +137,18 @@ class Fig::Command
   def check_include_statements_versions?()
     return false if @options.suppress_warning_include_statement_missing_version?
 
-    suppressed_warnings = @configuration['suppress warnings']
+    suppressed_warnings = @application_configuration['suppress warnings']
     return true if not suppressed_warnings
 
     return ! suppressed_warnings.include?('include statement missing version')
   end
 
   def configure()
+    set_up_update_lock()
     set_up_application_configuration()
 
     Fig::Logging.initialize_post_configuration(
-      @options.log_config() || @configuration['log configuration'],
+      @options.log_config() || @application_configuration['log configuration'],
       @options.log_level()
     )
 
@@ -139,8 +158,23 @@ class Fig::Command
     prepare_environment()
   end
 
+  def set_up_update_lock()
+    return if not @options.update_packages
+
+    update_lock_response = @options.update_lock_response
+    return if update_lock_response == :ignore
+
+    @update_lock = Fig::UpdateLock.new(@options.home, update_lock_response)
+
+    # *sigh* Ruby 1.8 doesn't support close_on_exec(), so we've got to ensure
+    # this stuff on our own.
+    Fig::AtExit.add { @update_lock.close }
+
+    return
+  end
+
   def set_up_application_configuration()
-    @configuration = Fig::FigRC.find(
+    @application_configuration = Fig::FigRC.find(
       @options.figrc(),
       derive_remote_url(),
       @options.login?,
@@ -155,8 +189,8 @@ class Fig::Command
     @repository = Fig::Repository.new(
       @operating_system,
       @options.home(),
-      @configuration,
-      nil, # remote_user
+      @application_configuration,
+      @publish_listeners,
       check_include_statements_versions?
     )
 
@@ -209,8 +243,9 @@ class Fig::Command
     else
       @base_package = package_loader.load_package_object_from_file()
     end
+    @package_source_description = package_loader.package_source_description()
 
-    applier = new_package_applier(package_loader.package_source_description())
+    applier = new_package_applier()
 
     if retrieves_should_happen
       applier.activate_retrieves()
@@ -233,7 +268,7 @@ class Fig::Command
 
   def new_package_loader()
     return Fig::Command::PackageLoader.new(
-      @configuration,
+      @application_configuration,
       @descriptor,
       @options.package_definition_file,
       base_config(),
@@ -241,20 +276,20 @@ class Fig::Command
     )
   end
 
-  def new_package_applier(package_source_description)
+  def new_package_applier()
     return Fig::Command::PackageApplier.new(
       @base_package,
       @environment,
       @options,
       @descriptor,
       base_config(),
-      package_source_description
+      @package_source_description
     )
   end
 
-  # If the user has specified a descriptor, than any package.fig or --file
-  # option is ignored.  Thus, in order to avoid confusing the user, we make
-  # specifying both an error.
+  # If the user has specified a descriptor and we are not publishing, than any
+  # package.fig or --file option is ignored.  Thus, in order to avoid confusing
+  # the user, we make specifying both an error.
   def ensure_descriptor_and_file_were_not_both_specified()
     file = @options.package_definition_file()
 
@@ -263,7 +298,7 @@ class Fig::Command
     # processed.
     file_specified = ! file.nil? && file != :none
 
-    if @descriptor and file_specified
+    if @descriptor && file_specified
       raise Fig::UserInputError.new(
         %Q<Cannot specify both a package descriptor (#{@descriptor.original_string}) and the --file option (#{file}).>
       )

data/lib/fig/command/action.rb

@@ -1,6 +1,13 @@
 module Fig; end
 class Fig::Command; end
 
+# One of the main activities Fig should do as part of the current run.
+#
+# This exists because the code used to have complicated logic about whether a
+# package.fig should be read, whether the Package object should be loaded,
+# should a config be applied, when should some activity happen, etc.  Now, we
+# let the Action object say what it wants in terms of setup and then tell it to
+# do whatever it needs to.
 module Fig::Command::Action
   EXIT_SUCCESS = 0
   EXIT_FAILURE = 1

data/lib/fig/command/action/publish.rb

@@ -34,7 +34,7 @@ class Fig::Command::Action::Publish
       Fig::Logging.info "#{@descriptor.to_string()} has already been published."
 
       if not @force
-        raise UserInputError.new(
+        raise Fig::UserInputError.new(
           'Use the --force option if you really want to overwrite.'
         )
       else
@@ -44,7 +44,11 @@ class Fig::Command::Action::Publish
 
     Fig::Logging.info "Publishing #{@descriptor.to_string()}."
     @execution_context.repository.publish_package(
-      @publish_statements, @descriptor, false
+      @publish_statements,
+      @descriptor,
+      false,
+      @execution_context.base_package,
+      @force
     )
 
     return EXIT_SUCCESS

data/lib/fig/command/action/publish_local.rb

@@ -21,7 +21,11 @@ class Fig::Command::Action::PublishLocal
 
     Fig::Logging.info "Publishing #{@descriptor.to_string()}."
     @execution_context.repository.publish_package(
-      @publish_statements, @descriptor, :publish_local
+      @publish_statements,
+      @descriptor,
+      :publish_local,
+      @execution_context.base_package,
+      false
     )
 
     return EXIT_SUCCESS

data/lib/fig/command/action/role/publish.rb

@@ -1,3 +1,4 @@
+require 'fig/command/package_loader'
 require 'fig/package'
 require 'fig/statement/configuration'
 require 'fig/user_input_error'
@@ -59,20 +60,8 @@ module Fig::Command::Action::Role::Publish
       )
     end
 
-    # TODO: fail on environment statements && --file because the --file will
-    # get ignored as far as statements are concerned.
-    publish_statements = nil
     if not @environment_statements.empty?
-      @publish_statements =
-        @package_contents_statements +
-        [
-          Fig::Statement::Configuration.new(
-            nil,
-            nil,
-            Fig::Package::DEFAULT_CONFIG,
-            @environment_statements
-          )
-        ]
+      derive_publish_statements_from_environment_statements
     elsif not @package_contents_statements.empty?
       raise Fig::UserInputError.new(
         '--resource/--archive options were specified, but no --set/--append option was given. Will not publish.'
@@ -87,4 +76,36 @@ module Fig::Command::Action::Role::Publish
 
     return
   end
+
+  def derive_publish_statements_from_environment_statements
+    if @execution_context.package_source_description
+      message = 'Cannot publish based upon both a package definition file ('
+      message << @execution_context.package_source_description
+      message << ') and --set/--append options.'
+
+      if @execution_context.package_source_description ==
+        Fig::Command::PackageLoader::DEFAULT_FIG_FILE
+
+        message << "\n\n"
+        message << 'You can avoid loading '
+        message << Fig::Command::PackageLoader::DEFAULT_FIG_FILE
+        message << ' by using the --no-file option.'
+      end
+
+      raise Fig::UserInputError.new(message)
+    end
+
+    @publish_statements =
+      @package_contents_statements +
+      [
+        Fig::Statement::Configuration.new(
+          nil,
+          nil,
+          Fig::Package::DEFAULT_CONFIG,
+          @environment_statements
+        )
+      ]
+
+    return
+  end
 end

data/lib/fig/command/action/version.rb

@@ -19,8 +19,12 @@ class Fig::Command::Action::Version
     return true
   end
 
+  def configure(options)
+    @version_message = options.version_message
+  end
+
   def execute()
-    puts File.basename($0) + ' v' + Fig::VERSION
+    puts @version_message || File.basename($0) + ' v' + Fig::VERSION
 
     return EXIT_SUCCESS
   end

data/lib/fig/command/options.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 require 'fig/command/action/clean'
 require 'fig/command/action/get'
 require 'fig/command/action/help'
@@ -24,7 +22,7 @@ require 'fig/command/action/update'
 require 'fig/command/action/update_if_missing'
 require 'fig/command/action/version'
 require 'fig/command/option_error'
-require 'fig/package'
+require 'fig/command/options/parser'
 require 'fig/package_descriptor'
 require 'fig/statement/archive'
 require 'fig/statement/include'
@@ -37,55 +35,6 @@ class Fig::Command; end
 
 # Command-line processing.
 class Fig::Command::Options
-  USAGE = <<-EOF
-Usage:
-
-  fig [...] [DESCRIPTOR] [--update | --update-if-missing] [-- COMMAND]
-  fig [...] [DESCRIPTOR] [--update | --update-if-missing] [--command-extra-args VALUES]
-
-  fig {--publish | --publish-local} DESCRIPTOR
-      [--resource PATH]
-      [--archive  PATH]
-      [--include  DESCRIPTOR]
-      [--override DESCRIPTOR]
-      [--force]
-      [...]
-
-  fig --clean DESCRIPTOR [...]
-
-  fig --get VARIABLE                                         [DESCRIPTOR] [...]
-  fig --list-configs                                         [DESCRIPTOR] [...]
-  fig --list-dependencies [--list-tree] [--list-all-configs] [DESCRIPTOR] [...]
-  fig --list-variables [--list-tree] [--list-all-configs]    [DESCRIPTOR] [...]
-  fig {--list-local | --list-remote}                                      [...]
-
-  fig {--version | --help}
-
-
-A DESCRIPTOR looks like <package name>[/<version>][:<config>] e.g. "foo",
-"foo/1.2.3", and "foo/1.2.3:default". Whether ":<config>" and "/<version>" are
-required or allowed is dependent upon what your are doing.
-
-Standard options (represented as "[...]" above):
-
-      [--set    VARIABLE=VALUE]
-      [--append VARIABLE=VALUE]
-      [--file PATH] [--no-file]
-      [--config CONFIG]
-      [--login]
-      [--log-level LEVEL] [--log-config PATH]
-      [--figrc PATH] [--no-figrc]
-      [--suppress-warning-include-statement-missing-version]
-
-Environment variables:
-
-  FIG_REMOTE_URL (required),
-  FIG_HOME (path to local repository cache, defaults to $HOME/.fighome).
-  EOF
-
-  LOG_LEVELS = %w[ off fatal error warn info debug all ]
-  LOG_ALIASES = { 'warning' => 'warn' }
-
   # Public version of #strip_shell_command() here so that it can be kept in
   # sync.
   def self.strip_shell_command(argv)
@@ -107,14 +56,57 @@ Environment variables:
     return argv
   end
 
-  attr_reader :shell_command
-  attr_reader :command_extra_argv
-  attr_reader :descriptor
-  attr_reader :exit_code
-  attr_reader :update_packages
+  attr_reader   :command_extra_argv
+  attr_reader   :config
+  attr_reader   :descriptor
+  attr_reader   :environment_statements
+  attr_reader   :exit_code
+  attr_reader   :figrc
+  attr_reader   :home
+  attr_reader   :log_config
+  attr_reader   :log_level
+  attr_reader   :package_contents_statements
+  attr_reader   :package_definition_file
+  attr_reader   :parser
+  attr_reader   :shell_command
+  attr_reader   :update_lock_response
+  attr_reader   :update_packages
+  attr_reader   :variable_to_get
+  attr_accessor :version_message
+
+  def initialize()
+    @home   = ENV['FIG_HOME'] || File.expand_path('~/.fighome')
+    @parser = Fig::Command::Options::Parser.new()
+  end
+
+  def process_command_line(argv)
+    argv = argv.clone
+    strip_shell_command(argv)
+
+    set_up_parser()
+    @help_message = @parser.help
+
+    @parser.parse!(argv)
+
+    if not exit_code.nil?
+      return
+    end
+
+    if argv.size > 1
+      $stderr.puts %q<Extra arguments. Should only have a package/version after all other options. Had "> + argv.join(%q<", ">) + %q<" left over.>
+      @exit_code = 1
+      return
+    end
+
+    derive_primary_descriptor(argv.first)
+    if not @base_action and @descriptor
+      set_base_action(Fig::Command::Action::RunCommandStatement)
+    end
+    set_up_sub_actions()
 
-  def initialize(argv)
-    process_command_line(argv)
+    actions().each {|action| action.configure(self)}
+
+    return
   end
 
   def actions()
@@ -132,65 +124,29 @@ Environment variables:
     return actions
   end
 
-  def config()
-    return @options[:config]
-  end
-
-  def figrc()
-    return @options[:figrc]
-  end
-
   def force?()
-    return @options[:force]
+    return @force
   end
 
-  def variable_to_get()
-    return @options[:variable_to_get]
-  end
-
-  def home()
-    return @options[:home]
-  end
+  def help_message()
+    return @help_message + <<-'END_MESSAGE'
+        --                           end of Fig options; anything after this is used as a command to run
+        --command-extra-args         end of Fig options; anything after this is appended to the end of a
+                                     "command" statement in a "config" block.
 
-  def log_config()
-    return @options[:log_config]
+    END_MESSAGE
   end
 
   def login?()
-    return @options[:login]
-  end
-
-  def log_level()
-    return @options[:log_level]
+    return @login
   end
 
   def no_figrc?()
-    return @options[:no_figrc]
-  end
-
-  def environment_statements()
-    return @options[:environment_statements]
-  end
-
-  def package_definition_file()
-    return @options[:package_definition_file]
-  end
-
-  def package_contents_statements()
-    return @options[:package_contents_statements]
+    return @no_figrc
   end
 
   def suppress_warning_include_statement_missing_version?()
-    return @options[:suppress_warning_include_statement_missing_version]
-  end
-
-  def help_message()
-    return @help_message + <<-'END_MESSAGE'
-        --                           end of Fig options; anything after this is used as a command to run
-        --command-extra-args         end of Fig options; anything after this is appended to the end of a
-                                     "command" statement in a "config" block.
-
-    END_MESSAGE
+    return @suppress_warning_include_statement_missing_version
   end
 
   private
@@ -200,64 +156,12 @@ Environment variables:
   # regex with "\A" and "\z".
   STARTS_WITH_NON_HYPHEN = %r< \A [^-] .* >x
 
-  ARGUMENT_DESCRIPTION = {
-    '--set'    => Fig::Statement::Set::ARGUMENT_DESCRIPTION,
-    '--append' => Fig::Statement::Path::ARGUMENT_DESCRIPTION
-  }
-
-  def list_tree?()
-    return @options[:list_tree]
-  end
-
   def list_all_configs?()
-    return @options[:list_all_configs]
+    return @list_all_configs
   end
 
-  def process_command_line(argv)
-    argv = argv.clone
-    strip_shell_command(argv)
-
-    @switches = []
-    @options = {}
-
-    @options[:home] = ENV['FIG_HOME'] || File.expand_path('~/.fighome')
-
-    parser = new_parser()
-    @help_message = parser.help
-
-    begin
-      parser.parse!(argv)
-    rescue OptionParser::InvalidArgument => error
-      raise_invalid_argument(error.args[0], error.args[1])
-    rescue OptionParser::MissingArgument => error
-      raise_missing_argument(error.args[0])
-    rescue OptionParser::InvalidOption => error
-      raise Fig::Command::OptionError.new(
-        "Unknown option #{error.args[0]}.\n\n#{USAGE}"
-      )
-    rescue OptionParser::ParseError => error
-      raise Fig::Command::OptionError.new(error.to_s)
-    end
-
-    if not exit_code.nil?
-      return
-    end
-
-    if argv.size > 1
-      $stderr.puts %q<Extra arguments. Should only have a package/version after all other options. Had "> + argv.join(%q<", ">) + %q<" left over.>
-      @exit_code = 1
-      return
-    end
-
-    derive_primary_descriptor(argv.first)
-    if not @base_action and @descriptor
-      set_base_action(Fig::Command::Action::RunCommandStatement)
-    end
-    set_up_sub_actions()
-
-    actions().each {|action| action.configure(self)}
-
-    return
+  def list_tree?()
+    return @list_tree
   end
 
   def strip_shell_command(argv)
@@ -282,78 +186,45 @@ Environment variables:
     return
   end
 
-  def raise_missing_argument(option)
-    raise Fig::Command::OptionError.new(
-      "Please provide a value for #{option}."
-    )
-  end
+  def set_up_parser
+    set_up_queries()
+    set_up_commands()
+    set_up_package_configuration_source()
+    set_up_environment_statements()
+    set_up_package_contents_statements()
+    set_up_remote_repository_access()
+    set_up_program_configuration()
 
-  def raise_invalid_argument(option, value)
-    # *sigh* OptionParser does not raise MissingArgument for the case of an
-    # option with a required value being followed by another option.  It
-    # assigns the next option as the value instead.  E.g. for
-    #
-    #    fig --set --get FOO
-    #
-    # it assigns "--get" as the value of the "--set" option.
-    switch_strings =
-      (@switches.collect {|switch| [switch.short, switch.long]}).flatten
-    if switch_strings.any? {|string| string == value}
-      raise_missing_argument(option)
-    end
-
-    description = ARGUMENT_DESCRIPTION[option]
-    if description.nil?
-      description = ''
-    else
-      description = ' ' + description
-    end
-
-    raise Fig::Command::OptionError.new(
-      %Q<Invalid value for #{option}: "#{value}".#{description}>
-    )
-  end
-
-  def new_parser
-    return OptionParser.new do |parser|
-      set_up_queries(parser)
-      set_up_commands(parser)
-      set_up_package_configuration_source(parser)
-      set_up_environment_statements(parser)
-      set_up_package_contents_statements(parser)
-      set_up_remote_repository_access(parser)
-      set_up_program_configuration(parser)
-    end
+    return
   end
 
-  def set_up_queries(parser)
-    parser.banner = "#{USAGE}\n"
-    @switches << parser.define_tail(
+  def set_up_queries()
+    @parser.on_tail(
       '-?', '-h','--help','display this help text'
     ) do
       set_base_action(Fig::Command::Action::Help)
     end
 
-    @switches << parser.define_tail('-v', '--version', 'print Fig version') do
+    @parser.on_tail('-v', '--version', 'print Fig version') do
       set_base_action(Fig::Command::Action::Version)
     end
 
-    @switches << parser.define(
+    @parser.on(
       '-g',
       '--get VARIABLE',
       STARTS_WITH_NON_HYPHEN,
       'print value of environment variable VARIABLE'
     ) do |variable_to_get|
       set_base_action(Fig::Command::Action::Get)
-      @options[:variable_to_get] = variable_to_get
+      @variable_to_get = variable_to_get
     end
 
-    set_up_listings(parser)
+    set_up_listings()
 
     return
   end
 
-  def set_up_listings(parser)
+  def set_up_listings()
     option_mapping = {
       :local_packages => [
         ['--list-local', '--list', 'list packages in $FIG_HOME'],
@@ -388,39 +259,39 @@ Environment variables:
       | type, specification_action_class |
 
       specification, action_class = *specification_action_class
-      @switches << parser.define(*specification) do
+      @parser.on(*specification) do
         set_base_action(action_class)
       end
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--list-tree', 'for listings, output a tree instead of a list'
     ) do
-      @options[:list_tree] = true
+      @list_tree = true
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--list-all-configs',
       'for listings, follow all configurations of the base package'
     ) do
-      @options[:list_all_configs] = true
+      @list_all_configs = true
     end
 
     return
   end
 
-  def set_up_commands(parser)
-    @switches << parser.define('--clean', 'remove package from $FIG_HOME') do
+  def set_up_commands()
+    @parser.on('--clean', 'remove package from $FIG_HOME') do
       set_base_action(Fig::Command::Action::Clean)
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--publish', 'install package in $FIG_HOME and in remote repo'
     ) do |publish|
       set_base_action(Fig::Command::Action::Publish)
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--publish-local', 'install package only in $FIG_HOME'
     ) do |publish_local|
       set_base_action(Fig::Command::Action::PublishLocal)
@@ -439,57 +310,63 @@ Environment variables:
       \z
     >x
 
-  def set_up_package_configuration_source(parser)
-    @switches << parser.define(
+  def set_up_package_configuration_source()
+    @parser.on(
       '-c',
       '--config CONFIG',
       STARTS_WITH_NON_HYPHEN,
       %q<apply configuration CONFIG, default is "default">
     ) do |config|
-      @options[:config] = config
+      @config = config
     end
 
-    @options[:package_definition_file] = nil
-    @switches << parser.define(
+    @package_definition_file = nil
+    @parser.on(
       '--file FILE',
       FILE_OPTION_VALUE_PATTERN,
       %q<read Fig file FILE. Use '-' for stdin. See also --no-file>
     ) do |path|
-      @options[:package_definition_file] = path
+      @package_definition_file = path
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--no-file', 'ignore package.fig file in current directory'
     ) do |path|
-      @options[:package_definition_file] = :none
+      @package_definition_file = :none
     end
 
     return
   end
 
-  def set_up_environment_statements(parser)
-    @options[:environment_statements] = []
-    @switches << parser.define(
+  def set_up_environment_statements()
+    @environment_statements = []
+    @parser.on(
       '-p',
       '--append VARIABLE=VALUE',
       STARTS_WITH_NON_HYPHEN,
       'append (actually, prepend) VALUE to PATH-like environment variable VARIABLE'
     ) do |name_value|
-      @options[:environment_statements] <<
+      @environment_statements <<
         new_variable_statement('--append', name_value, Fig::Statement::Path)
     end
+    @parser.add_argument_description(
+      %w<-p --append>, Fig::Statement::Path::ARGUMENT_DESCRIPTION
+    )
 
-    @switches << parser.define(
+    @parser.on(
       '-s',
       '--set VARIABLE=VALUE',
       STARTS_WITH_NON_HYPHEN,
       'set environment variable VARIABLE to VALUE'
     ) do |name_value|
-      @options[:environment_statements] <<
+      @environment_statements <<
         new_variable_statement('--set', name_value, Fig::Statement::Set)
     end
+    @parser.add_argument_description(
+      %w<-s --set>, Fig::Statement::Set::ARGUMENT_DESCRIPTION
+    )
 
-    @switches << parser.define(
+    @parser.on(
       '-i',
       '--include DESCRIPTOR',
       STARTS_WITH_NON_HYPHEN,
@@ -509,10 +386,10 @@ Environment variables:
       # We've never allowed versionless includes from the command-line. Hooray!
       statement.complain_if_version_missing()
 
-      @options[:environment_statements] << statement
+      @environment_statements << statement
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--override DESCRIPTOR',
       STARTS_WITH_NON_HYPHEN,
       'dictate version of package as specified in DESCRIPTOR'
@@ -527,37 +404,37 @@ Environment variables:
           nil, '--override option', descriptor.name, descriptor.version
         )
 
-      @options[:environment_statements] << statement
+      @environment_statements << statement
     end
 
     return
   end
 
-  def set_up_package_contents_statements(parser)
-    @options[:package_contents_statements] = []
-    @switches << parser.define(
+  def set_up_package_contents_statements()
+    @package_contents_statements = []
+    @parser.on(
       '--archive PATH',
       STARTS_WITH_NON_HYPHEN,
       'include PATH archive in package (when using --publish)'
     ) do |path|
-      @options[:package_contents_statements] <<
+      @package_contents_statements <<
         Fig::Statement::Archive.new(nil, '--archive option', path)
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--resource PATH',
       STARTS_WITH_NON_HYPHEN,
       'include PATH resource in package (when using --publish)'
     ) do |path|
-      @options[:package_contents_statements] <<
+      @package_contents_statements <<
         Fig::Statement::Resource.new(nil, '--resource option', path)
     end
 
     return
   end
 
-  def set_up_remote_repository_access(parser)
-    @switches << parser.define(
+  def set_up_remote_repository_access()
+    @parser.on(
       '-u',
       '--update',
       'check remote repo for updates and download to $FIG_HOME as necessary'
@@ -565,7 +442,7 @@ Environment variables:
       set_update_action(Fig::Command::Action::Update, :unconditionally)
     end
 
-    @switches << parser.define(
+    @parser.on(
       '-m',
       '--update-if-missing',
       'check remote repo for updates only if package missing from $FIG_HOME'
@@ -573,58 +450,73 @@ Environment variables:
       set_update_action(Fig::Command::Action::UpdateIfMissing, :if_missing)
     end
 
-    @switches << parser.define(
+    @parser.on(
       '-l', '--login', 'login to remote repo as a non-anonymous user'
     ) do
-      @options[:login] = true
+      @login = true
     end
 
-    @options[:force] = nil
-    @switches << parser.define(
+    @force = nil
+    @parser.on(
       '--force',
       'force-overwrite existing version of a package to the remote repo'
     ) do |force|
-      @options[:force] = force
+      @force = force
     end
 
     return
   end
 
-  def set_up_program_configuration(parser)
-    @switches << parser.define(
+  LOG_LEVELS = %w< off fatal error warn info debug all >
+  LOG_ALIASES = { 'warning' => 'warn' }
+
+  def set_up_program_configuration()
+    @parser.on(
       '--figrc PATH',
       STARTS_WITH_NON_HYPHEN,
       'add PATH to configuration used for Fig'
     ) do |path|
-      @options[:figrc] = path
+      @figrc = path
     end
 
-    @switches << parser.define('--no-figrc', 'ignore ~/.figrc') { @options[:no_figrc] = true }
+    @parser.on('--no-figrc', 'ignore ~/.figrc') { @no_figrc = true }
 
-    @switches << parser.define(
+    @parser.on(
       '--log-config PATH',
       STARTS_WITH_NON_HYPHEN,
       'use PATH file as configuration for Log4r'
     ) do |path|
-      @options[:log_config] = path
+      @log_config = path
     end
 
     level_list = LOG_LEVELS.join(', ')
-    @switches << parser.define(
+    @parser.on(
       '--log-level LEVEL',
       LOG_LEVELS,
       LOG_ALIASES,
       'set logging level to LEVEL',
       "  (#{level_list})"
     ) do |log_level|
-      @options[:log_level] = log_level
+      @log_level = log_level
+    end
+
+    @update_lock_response = :fail
+    update_lock_responses = [:fail, :wait, :ignore]
+    response_list = update_lock_responses.join(', ')
+    @parser.on(
+      '--update-lock-response TYPE',
+      update_lock_responses,
+      'what to do when update lock already exists',
+      "  (#{response_list}, default is fail)"
+    ) do |response|
+      @update_lock_response = response
     end
 
-    @switches << parser.define(
+    @parser.on(
       '--suppress-warning-include-statement-missing-version',
       %q<don't complain about "include package" without a version>
     ) do
-      @options[:suppress_warning_include_statement_missing_version] = true
+      @suppress_warning_include_statement_missing_version = true
     end
 
     return
@@ -665,7 +557,7 @@ Environment variables:
 
   def new_variable_statement(option, name_value, statement_class)
     variable, value = statement_class.parse_name_value(name_value) {
-      raise_invalid_argument(option, name_value)
+      @parser.raise_invalid_argument(option, name_value)
     }
 
     return statement_class.new(nil, "#{option} option", variable, value)