fig 0.1.71 → 0.1.73

data/Changes

@@ -1,3 +1,23 @@
+v0.1.73
+
+  Backwards incompatibilities:
+
+  - --update-lock-response is, for the time being, no longer supported on
+    Windows.  Dealing with file locking on Windows is hard and we don't have
+    the time to figure it right now.
+
+  Bug fixes:
+
+  - FIG_HOME locking didn't cover all the situations that it should have, e.g.
+    the --clean option.
+
+  - Crash when --command-extra-args was specified without a package descriptor.
+
+v0.1.72.beta.2
+v0.1.72.beta.1
+
+  - Test releases
+
 v0.1.71
 
   Backwards incompatibilities:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '0.1.71'
+  VERSION = '0.1.73'
 end

data/lib/fig/command.rb

@@ -158,11 +158,19 @@ class Fig::Command
   end
 
   def set_up_update_lock()
-    return if not @options.update_packages
+    return if @options.actions.none? {|action| action.modifies_repository?}
 
     update_lock_response = @options.update_lock_response
     return if update_lock_response == :ignore
 
+    if Fig::OperatingSystem.windows?
+      if ! update_lock_response.nil?
+        Fig::Logging.warn('At present, locking is not supported on Windows.')
+      end
+
+      return
+    end
+
     @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
@@ -202,12 +210,7 @@ class Fig::Command
       check_include_statements_versions?
     )
 
-    case @options.update_packages
-    when :unconditionally
-      @repository.update_unconditionally
-    when :if_missing
-      @repository.update_if_missing
-    end
+    @options.actions.each {|action| action.prepare_repository(@repository)}
 
     return
   end

data/lib/fig/command/action.rb

@@ -37,10 +37,20 @@ module Fig::Command::Action
     return false
   end
 
+  # Does the action care about command-line options that affect package
+  # contents, i.e. --resource/--archive?
   def cares_about_package_content_options?()
     return false
   end
 
+  def modifies_repository?()
+    return NotImplementedError
+  end
+
+  def prepare_repository(repository)
+    return # Nothing by default.
+  end
+
   def load_base_package?()
     raise NotImplementedError
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::Clean
     return :required
   end
 
+  def modifies_repository?()
+    return true
+  end
+
   def load_base_package?()
     return false
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::DumpPackageDefinitionParsed
     return nil
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::DumpPackageDefinitionText
     return nil
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::Get
     return nil
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::ListConfigs
     return nil
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::ListLocal
     return :warn
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return nil # Don't care.
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::ListRemote
     return :warn
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return nil # Don't care.
   end

data/lib/fig/command/action/list_variables/default.rb

@@ -16,6 +16,10 @@ class Fig::Command::Action::ListVariables::Default
     return nil
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -21,6 +21,11 @@ module Fig::Command::Action::Role::HasSubAction
     return sub_action.descriptor_requirement()
   end
 
+  def modifies_repository?()
+    check_sub_action_presence()
+    return sub_action.modifies_repository?
+  end
+
   def load_base_package?()
     check_sub_action_presence()
     return sub_action.load_base_package?

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

@@ -9,6 +9,10 @@ module  Fig::Command::Action; end
 module  Fig::Command::Action::Role; end
 
 module Fig::Command::Action::Role::ListWalkingDependencyTree
+  def modifies_repository?()
+    return false
+  end
+
   def walk_dependency_tree(base_package, config_names, backtrace, depth, &block)
     config_names.each do
       |config_name|

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

@@ -23,6 +23,10 @@ module Fig::Command::Action::Role::Publish
     return true
   end
 
+  def modifies_repository?()
+    return true
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -15,6 +15,10 @@ module Fig::Command::Action::Role::Update
     return true
   end
 
+  def modifies_repository?()
+    return true
+  end
+
   def load_base_package?()
     return true
   end

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

@@ -17,6 +17,10 @@ class Fig::Command::Action::RunCommandLine
     return nil
   end
 
+  def modifies_repository?()
+    return false
+  end
+
   def load_base_package?()
     return true
   end
@@ -35,11 +39,15 @@ class Fig::Command::Action::RunCommandLine
 
   def configure(options)
     @command_line = options.shell_command
+
+    return
   end
 
   def execute()
     @execution_context.environment.execute_shell(@command_line) do
       |command| @execution_context.operating_system.shell_exec command
     end
+
+    return EXIT_SUCCESS
   end
 end

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

@@ -14,7 +14,11 @@ class Fig::Command::Action::RunCommandStatement
   end
 
   def descriptor_requirement()
-    return nil
+    return :required
+  end
+
+  def modifies_repository?()
+    return false
   end
 
   def load_base_package?()
@@ -36,17 +40,18 @@ class Fig::Command::Action::RunCommandStatement
   def configure(options)
     @extra_argv = options.command_extra_argv
     @descriptor = options.descriptor
+
+    return
   end
 
   def execute()
     environment   = @execution_context.environment
     base_package  = @execution_context.base_package
 
-    # TODO: Elliot's current theory is that this is pointless as long as
-    # we've applied the config.
-    environment.include_config(base_package, @descriptor, nil)
     environment.execute_config(
       base_package, @descriptor, @extra_argv || []
     ) { |command| @execution_context.operating_system.shell_exec command }
+
+    return EXIT_SUCCESS
   end
 end

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

@@ -14,4 +14,10 @@ class Fig::Command::Action::Update
   def options()
     return %w<--update>
   end
+
+  def prepare_repository(repository)
+    repository.update_unconditionally
+
+    return
+  end
 end

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

@@ -14,4 +14,10 @@ class Fig::Command::Action::UpdateIfMissing
   def options()
     return %w<--update-if-missing>
   end
+
+  def prepare_repository(repository)
+    repository.update_if_missing
+
+    return
+  end
 end

data/lib/fig/command/options.rb

@@ -53,7 +53,6 @@ class Fig::Command::Options
   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
 
@@ -462,7 +461,7 @@ class Fig::Command::Options
       '--update',
       'check remote repo for updates and download to $FIG_HOME as necessary'
     ) do
-      set_update_action(Fig::Command::Action::Update, :unconditionally)
+      set_update_action(Fig::Command::Action::Update)
     end
 
     @parser.on(
@@ -470,7 +469,7 @@ class Fig::Command::Options
       '--update-if-missing',
       'check remote repo for updates only if package missing from $FIG_HOME'
     ) do
-      set_update_action(Fig::Command::Action::UpdateIfMissing, :if_missing)
+      set_update_action(Fig::Command::Action::UpdateIfMissing)
     end
 
     @parser.on(
@@ -558,7 +557,7 @@ class Fig::Command::Options
     return
   end
 
-  def set_update_action(update_action_class, update_packages)
+  def set_update_action(update_action_class)
     update_action = update_action_class.new
     if @update_action
       raise Fig::Command::OptionError.new(
@@ -567,7 +566,6 @@ class Fig::Command::Options
     end
 
     @update_action = update_action
-    @update_packages = update_packages
   end
 
   def new_variable_statement(option, name_value, statement_class)

data/lib/fig/command/options/parser.rb

@@ -70,7 +70,7 @@ Local repository maintenance:
 Standard options (represented as "[...]" above):
 
       [-u | --update | -m | --update-if-missing]
-      --update-lock-response TYPE
+      --update-lock-response {wait | fail | ignore}
 
       [{-s | --set}    VARIABLE=VALUE]
       [{-p | --append} VARIABLE=VALUE]

data/lib/fig/grammar.treetop

@@ -1,5 +1,13 @@
 # Treetop (http://treetop.rubyforge.org/) grammar for package definitions.
 
+# Some aspects of this grammar are significantly dumber than they could be
+# because:
+#
+#   * We want to treat statements as identically as possible to their
+#     command-line equivalents.
+#   * Treetop parse errors are pretty inscrutable at times and we can make
+#     error messages clearer by validating a lot of the terminals ourselves.
+
 module Fig
   grammar Fig
     rule package
@@ -14,28 +22,30 @@ module Fig
       archive / resource / retrieve / config
     end
 
-    # Note that these are being parsed like they allow globbing despite
-    # globbing not being performed.
     rule archive
-      statement_start:"archive" ws resource_url {
+      statement_start:"archive" ws url:asset_url ws {
         def to_package_statement(build_state)
           return build_state.new_asset_statement(
-            Statement::Archive, statement_start, resource_url
+            Statement::Archive, statement_start, url
           )
         end
       }
     end
 
     rule resource
-      statement_start:"resource" ws resource_url {
+      statement_start:"resource" ws url:asset_url ws {
         def to_package_statement(build_state)
           return build_state.new_asset_statement(
-            Statement::Resource, statement_start, resource_url
+            Statement::Resource, statement_start, url
           )
         end
       }
     end
 
+    rule asset_url
+      [\S]+
+    end
+
     rule retrieve
       statement_start:"retrieve" ws var:environment_variable_name "->" path:retrieve_path ws {
         def to_package_statement(build_state)
@@ -126,23 +136,6 @@ module Fig
       [\S]+
     end
 
-    rule resource_url
-      # Unquoted allows globbing for files, quoted does not.
-      #
-      # Unquoted, anything but:
-      #    @      - To allow for package substitution
-      #    "<>|   - Characters not allowed in filenames on Windows
-      #    \s     - Necessary for the "ws" token to work
-      (url:[^@"<>|\s]+ ws)
-
-      # Quoted, anything but:
-      #    @        - To allow for package substitution
-      #    "<>|     - Characters not allowed in filenames on Windows
-      #    *?\[\]{} - Characters significant to Dir.glob()
-      #    \s       - We just don't want these. :]  (May need to allow space.)
-      / ('"' url:[^@"<>|*?\[\]{}\s]+ '"' ws)
-    end
-
     rule ws
       [ \n\r\t]+
     end

data/lib/fig/parser.rb

@@ -101,6 +101,8 @@ class Fig::Parser
   end
 
   def check_for_bad_urls(package, descriptor)
+    return if not @application_config
+
     bad_urls = []
     package.walk_statements do |statement|
       statement.urls.each do |url|

data/lib/fig/parser_package_build_state.rb

@@ -56,13 +56,13 @@ class Fig::ParserPackageBuildState
   end
 
   def new_asset_statement(statement_class, keyword_node, url_node)
-    url = url_node.url.text_value
+    url = url_node.text_value
 
     statement_class.validate_url(url) {
       |error_description|
 
       raise_invalid_value_parse_error(
-        keyword_node, url_node.url, 'URL/path', error_description
+        keyword_node, url_node, 'URL/path', error_description
       )
     }
 

data/lib/fig/repository.rb

@@ -26,7 +26,7 @@ class Fig::Repository
   VERSION_SUPPORTED     = 1
 
   def self.is_url?(url)
-    not (/ftp:\/\/|http:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
+    not (/ftp:\/\/|https?:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
   end
 
   def initialize(

data/lib/fig/repository_package_publisher.rb

@@ -10,6 +10,7 @@ require 'fig/logging'
 require 'fig/not_found_error'
 require 'fig/package_cache'
 require 'fig/package_descriptor'
+require 'fig/package_parse_error'
 require 'fig/parser'
 require 'fig/repository'
 require 'fig/repository_error'
@@ -41,9 +42,10 @@ class Fig::RepositoryPackagePublisher
     @operating_system.delete_and_recreate_directory(@local_dir_for_package)
 
     fig_file = File.join(temp_dir, Fig::Repository::PACKAGE_FILE_IN_REPO)
-    content = publish_package_content_and_derive_definition_file()
+    content = derive_definition_file
     @operating_system.write(fig_file, content)
 
+    publish_package_contents
     if not @local_only
       @operating_system.upload(fig_file, remote_fig_file_for_package())
     end
@@ -91,18 +93,33 @@ class Fig::RepositoryPackagePublisher
     return
   end
 
-  def publish_package_content_and_derive_definition_file()
+  def derive_definition_file()
     @definition_file_lines = []
 
     add_package_metadata_comments()
-    publish_package_content()
+    add_statements_to_publish_and_create_resource_archive()
     add_unparsed_text()
 
     @definition_file_lines.flatten!
     file_content = @definition_file_lines.join("\n")
     file_content.gsub!(/\n{3,}/, "\n\n")
+    file_content.strip!
+    file_content << "\n"
+
+    begin
+      Fig::Parser.new(nil, false).parse_package(
+        @descriptor,
+        'the directory should not matter for a consistency check',
+        '<package to be published>',
+        file_content
+      )
+    rescue Fig::PackageParseError => error
+      raise \
+        "Bug in code! Could not parse package definition to be published.\n" +
+        "#{error}\n\nGenerated contents:\n#{file_content}"
+    end
 
-    return file_content.strip() + "\n"
+    return file_content
   end
 
   def add_package_metadata_comments()
@@ -142,7 +159,7 @@ class Fig::RepositoryPackagePublisher
   # files (those where the statement references a URL as opposed to a local
   # file) and then copies all files into the local repository and the remote
   # repository (if not a local-only publish).
-  def publish_package_content()
+  def add_statements_to_publish_and_create_resource_archive()
     initialize_statements_to_publish()
     create_resource_archive()
 
@@ -150,7 +167,8 @@ class Fig::RepositoryPackagePublisher
       |statement|
 
       if statement.is_asset?
-        publish_asset(statement)
+        @definition_file_lines <<
+          statement.class.new(nil, nil, statement.asset_name).unparse('')
       else
         @definition_file_lines << statement.unparse('')
       end
@@ -194,6 +212,18 @@ class Fig::RepositoryPackagePublisher
     return
   end
 
+  def publish_package_contents()
+    @statements_to_publish.each do
+      |statement|
+
+      if statement.is_asset?
+        publish_asset(statement)
+      end
+    end
+
+    return
+  end
+
   def publish_asset(asset_statement)
     asset_name = asset_statement.asset_name()
     asset_remote = "#{remote_dir_for_package()}/#{asset_name}"
@@ -236,8 +266,9 @@ class Fig::RepositoryPackagePublisher
 
       @definition_file_lines << ''
       @definition_file_lines << '# Original, unparsed package text:'
-      @definition_file_lines << '# '
-      @definition_file_lines << @source_package.unparsed_text.gsub(/^/, '# ')
+      @definition_file_lines << '#'
+      @definition_file_lines <<
+        @source_package.unparsed_text.gsub(/^(?=[^\n]+$)/, '# ').gsub(/^$/, '#')
     end
 
     return

data/lib/fig/statement/archive.rb

@@ -14,7 +14,7 @@ class Fig::Statement::Archive < Fig::Statement
   def initialize(line_column, source_description, url)
     super(line_column, source_description)
 
-    @url = url
+    set_up_url(url)
   end
 
   def asset_name()

data/lib/fig/statement/asset.rb

@@ -11,6 +11,10 @@ module Fig::Statement::Asset
     return
   end
 
+  def glob?()
+    return @glob
+  end
+
   def urls()
     return [ url() ]
   end
@@ -25,8 +29,56 @@ module Fig::Statement::Asset
     return url().split('/').last()
   end
 
+  private
+
+  def set_up_url(url)
+    # Damn you Ruby 1.8!!!!
+    if url[0..0] == '"'
+      @url = url[1..-2]
+      @glob = true
+    else
+      @url = url
+      @glob = false
+    end
+
+    return
+  end
+
   module ClassMethods
     def validate_url(url)
+      # Damn you Ruby 1.8!!!!
+      if  url[0..0] == '"' && url[-1..-1] != '"' ||
+          url[0..0] != '"' && url[-1..-1] == '"'
+        yield 'has unbalanced quotes.'
+        return
+      end
+
+      if url[0..0] == '"'
+        if url.length < 3
+          yield 'is empty'
+          return
+        end
+
+        url = url[1..-2]
+      end
+
+      if url.include? '@'
+        yield %q<contains an "@", which isn't permitted in order to allow for package substitution.>
+        return
+      end
+
+      if url =~ / ( ["<>|] ) /x
+        yield %Q<contains a "#{$1}", which isn't permitted because Windows doesn't allow it in file names.>
+        return
+      end
+
+      if url =~ / \s /x
+        # We may need to allow a space character in the future, but this will
+        # require a change to the grammar.
+        yield %q<contains whitespace.>
+        return
+      end
+
       # "config" is a reasonable asset name, so we let that pass.
       if Fig::Parser.strict_keyword?(url)
         yield 'is a keyword.'

data/lib/fig/statement/path.rb

@@ -5,7 +5,9 @@ module Fig; end
 # A statement that specifies or modifies a path environment variable, e.g.
 # "append", "path", "add" (though those are all synonyms).
 class Fig::Statement::Path < Fig::Statement
-  VALUE_REGEX          = %r< \A [^;:"<>|\s]+ \z >x
+  # We block single-quotes right now in order to allow for using them for
+  # quoting later.
+  VALUE_REGEX          = %r< \A [^;:'"<>|\s]+ \z >x
   ARGUMENT_DESCRIPTION =
     %q[The value must look like "NAME=VALUE". VALUE cannot contain any of ";:<>|", double quotes, or whitespace.]
 

data/lib/fig/statement/resource.rb

@@ -15,7 +15,7 @@ class Fig::Statement::Resource < Fig::Statement
   def initialize(line_column, source_description, url)
     super(line_column, source_description)
 
-    @url = url
+    set_up_url(url)
   end
 
   def asset_name()

data/lib/fig/statement/set.rb

@@ -4,7 +4,9 @@ module Fig; end
 
 # A statement that sets the value of an environment variable.
 class Fig::Statement::Set < Fig::Statement
-  VALUE_REGEX          = %r< \A \S* \z >x
+  # We block quotes right now in order to allow for using them for
+  # quoting later.
+  VALUE_REGEX          = %r< \A [^\s\\'"]* \z >x
   ARGUMENT_DESCRIPTION =
     %q<The value must look like "NAME=VALUE"; VALUE cannot contain whitespace though it can be empty.>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.71
+  version: 0.1.73
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &17242720 !ruby/object:Gem::Requirement
+  requirement: &11075420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *17242720
+  version_requirements: *11075420
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &17263920 !ruby/object:Gem::Requirement
+  requirement: &11074940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *17263920
+  version_requirements: *11074940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17263440 !ruby/object:Gem::Requirement
+  requirement: &11074460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *17263440
+  version_requirements: *11074460
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &17262880 !ruby/object:Gem::Requirement
+  requirement: &11074000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17262880
+  version_requirements: *11074000
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &17262360 !ruby/object:Gem::Requirement
+  requirement: &11089880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *17262360
+  version_requirements: *11089880
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &17261880 !ruby/object:Gem::Requirement
+  requirement: &11089400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *17261880
+  version_requirements: *11089400
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &17261400 !ruby/object:Gem::Requirement
+  requirement: &11088900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *17261400
+  version_requirements: *11088900
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &17260900 !ruby/object:Gem::Requirement
+  requirement: &11088420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *17260900
-- !ruby/object:Gem::Dependency
-  name: polyglot
-  requirement: &17260380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-  type: :runtime
-  prerelease: false
-  version_requirements: *17260380
+  version_requirements: *11088420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17259920 !ruby/object:Gem::Requirement
+  requirement: &11087940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *17259920
+  version_requirements: *11087940
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &17259420 !ruby/object:Gem::Requirement
+  requirement: &11087460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *17259420
+  version_requirements: *11087460
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &17258960 !ruby/object:Gem::Requirement
+  requirement: &11086980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +131,7 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *17258960
+  version_requirements: *11086980
 description: Fig is a utility for configuring environments and managing dependencies
   across a team of developers. Given a list of packages and a command to run, Fig
   builds environment variables named in those packages (e.g., CLASSPATH), then executes