fig 1.27.10 → 2.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca3d4107601b758e49ddca59e90bb1c0ed2847c91f6c5897e6186dd690ae6c3
-  data.tar.gz: 5905c7f1aab9c1097f706f5323ec614b2b1d3f7c5924fd53151a4faba715678d
+  metadata.gz: 8016bb7d559da6494a599f732340222272f56f001fcae4186f6f43377d57823f
+  data.tar.gz: 8fe1d2462572ba968651d6c66e41e4f0a657a2dbcf17408592b03e00055694ea
 SHA512:
-  metadata.gz: 50c02a6d449dfc241963b678b2a26137249a7859e5b968d1ac9c553aa3678dba7399d1ce14971591d316cc0f1c568e065240bd702324c8f28660cbf5af27d67c
-  data.tar.gz: 0d682e893bd59286c798b0ffb0fa56d285a6dd2f4af3c4345f5d25867a9a645945f95a65eaa8ebd7e50508e4052caf31bf9a6a3c0416e62b66a38021d1b54117
+  metadata.gz: dc59c14253bd39d46a5a44cbdce3efb103e41ed089eba614f27bc246fb41333ab23cd439d8d6bcd1d0eaed88c720f07e48655e261e5f1ec27fd10bc8c9069cc1
+  data.tar.gz: dceb0d12693a8df6229b04e52b1fc9cf8a4e74ad007b0897fe08564d5455b69acca53e16090bff08354c52dcc216bfce29da8e0aa7f1c31e0055d06f0ad4ccc2

data/Changes

@@ -1,3 +1,188 @@
+v2.0.0.beta.1 - 2025/2/3
+
+  Announcement:
+
+  - Fig now requires miminum of ruby 3.1.2.
+  - Switch libarchive backend from libarchive-static to ffi-libarchive-binary
+  - Use stdlib for typical package tarball creation.
+
+  Bug Fixes:
+
+  - Abandon use of deprecated APIs.
+
+  Miscellaneous:
+
+  - Add github CI support.
+  - Add build matrix for windows, mac, and linux.
+
+v1.27.29 - 2023/2/7
+
+  Bug fix:
+
+  - Updated libarchive-static gem to pick up newer libarchive and zlib.
+  - Updated rdoc for security fixes.
+
+v1.27.28 - 2023/1/24
+
+  Bug fix:
+
+  - Updated gems for Ruby 3 (specifically libarchive-static and net-ftp).
+
+v1.27.27 - 2022/6/15
+
+  Bug fix:
+
+  - Fixed HTTP download success detection.
+
+v1.27.26 - 2022/5/26
+
+  Bug fix:
+
+  - Fixed up-to-dateness checking for unauthenticated protocols.
+
+v1.27.25 - 2021/8/12
+
+  Miscellaneous:
+
+  - Now looks for environment variables that start with "FIG_EXPORT_VARIABLE_"
+    and exports those without the prefix to all running commands and options
+    such as "--get".  So, assuming no packages manipulate variable FOO, running
+
+      > FOO=direct FIG_EXPORT_VARIABLE_FOO=overridden fig --get FOO
+
+    will emit "overridden".  This is useful for writing wrappers for Fig that
+    save the values of environment variables that affect the Ruby runtime used
+    by Fig itself, e.g.
+
+      for variable in GEM_HOME GEM_PATH GEM_SKIP LD_LIBRARY_PATH RUBYLIB RUBYLIB_PREFIX RUBYOPT RUBYPATH RUBYSHELL
+      do
+        eval variable_value="\"\$$variable\""
+
+        if [[ -n $variable_value ]]
+        then
+          eval export "FIG_EXPORT_VARIABLE_$variable=\"$variable_value\""
+          unset $variable
+        fi
+      done
+
+v1.27.24.beta.2 - 2021/8/12
+
+  - Test release.
+
+v1.27.24.beta.1 - 2021/8/12
+
+  - Test release.
+
+v1.27.23 - 2021/8/3
+
+  Bug fix:
+
+  - Fix for traversing include-file dependencies with non-default config names.
+    Thanks for to Gabriel Burca for the bug report.
+
+v1.27.22 - 2021/4/28
+
+  Miscellaneous:
+
+  - Update net-ssh and add dependencies on non-Windows platforms to be
+    compatible with ED25519 SSH keys.
+
+v1.27.21.beta.1 - 2021/4/26
+
+  - Test release.
+
+v1.27.20 - 2021/3/17
+
+  Miscellaneous:
+
+  - Add --suppress-includes-beyond-package-depth command-line option to allow
+    looking at dependencies to a limited level.  Most likely, you want to
+    specify a value of 2 to get at your direct dependencies, but not your
+    indirect ones.  This is because there is a virtual package for the
+    command-line, your base package, whether from a file or a descriptor, and
+    then the dependency.
+  - Better debugging output when dealing with file-based package.
+
+  Bug fixes:
+
+  - Fixed comparison of synthetic packages and comparison of file-based
+    packages.
+
+v1.27.19.beta.1 - 2021/3/15
+
+  - Test release.
+
+v1.27.18 - 2020/10/21
+
+  Miscellaneous:
+
+  - Bump Bundler version in Gemfile.lock in order to facilitate use of MRI/YARV
+    v2.7.x.
+
+v1.27.17 - 2019/7/19
+
+  Miscellaneous:
+
+  - Add --microsecond-only-file-modification-time-comparisons command-line
+    option to deal with unnamed environments (ok, VirtualBox) truncating file
+    mtime values.  There is no need to use this option on macOS because it is
+    forced on on that platform (see v1.27.12 below).
+  - Add app configuration option equivalent to that command-line option: "only
+    compare file modification times to the microsecond".
+
+v1.27.16.beta.2 - 2019/7/19
+
+  - Test release.
+
+v1.27.16.beta.1 - 2019/7/18
+
+  - Test release.
+
+v1.27.15 - 2019/5/3
+
+  Bug fixes:
+
+  - Recursive resource globbing (i.e. use of double asterisks) could result in
+    files being stored multiple times in an a package.  Thanks to bug report
+    and code digging from Matt Hellige.
+
+v1.27.14.beta.1 - 2019/4/26
+
+  - Test release.
+
+v1.27.13 - 2019/4/9
+
+  Miscellaneous:
+
+  - Declare the v2 grammar no longer experimental.  It's been six years.
+
+v1.27.12 - 2018/9/4
+
+  Miscellaneous:
+
+  - In deciding whether a retrieved file has changed, in addition to checking
+    file modification times, we check file sizes.
+
+  Bug fixes:
+
+  - On macOS, only compare file modification times to the microsecond.  This
+    works around a problem with APFS where copied timestamps have the
+    nanoseconds truncated.  Bug reported by Jay Fields.
+  - Fixed a bug in warning when one retrieve statement overrides another.  Bug
+    reported by Tom Anderson.
+
+v1.27.11.beta.3 - 2018/8/31
+
+  - Test release.
+
+v1.27.11.beta.2 - 2018/8/31
+
+  - Test release.
+
+v1.27.11.beta.1 - 2018/8/30
+
+  - Test release.
+
 v1.27.10 - 2018/8/1
 
   Miscellaneous:
@@ -9,7 +194,7 @@ v1.27.10 - 2018/8/1
 
 v1.27.9.beta.1 - 2018/8/1
 
- - Test release.
+  - Test release.
 
 v1.27.8 - 2018/6/18
 

data/README.md

@@ -43,4 +43,4 @@ there's a Vim plugin in `support/vim`.
 
 # Copyright
 
-Copyright ©2009-2018 Matthew Foemmel. See LICENSE for details.
+Copyright ©2009-2019 Matthew Foemmel. See LICENSE for details.

data/bin/fig

@@ -1,82 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
 
-function emit-stack-trace {
-    local -i x
-    local -i stack_frames="${#FUNCNAME[@]}"
-
-    {
-        echo "ERROR in ${FUNCNAME[1]}() at ${BASH_SOURCE[1]}:${BASH_LINENO[0]}"
-
-        for (( x=2; x < stack_frames; x++ ))
-        do
-            echo "called by ${FUNCNAME[x]}() at ${BASH_SOURCE[x]}:${BASH_LINENO[x - 1]}"
-        done
-    } >&2
-} # end emit-stack-trace()
-
-function strict-errors {
-    set -o errexit
-    set -o errtrace
-
-    trap emit-stack-trace ERR
-} # end strict-errors()
-
-function loose-errors {
-    set +o errexit
-    set +o errtrace
-
-    trap - ERR
-} # end loose-errors()
-
-
-strict-errors
-
-
-# "dirname $0" does not work if we were invoked via a symlink, so we've got to
-# go through this fun.  See http://mywiki.wooledge.org/BashFAQ/028
-if readlink -e /dev/null &>/dev/null
-then
-    # GNU readlink(1)
-    self="$(readlink -e "${BASH_SOURCE[0]}")"
-else
-    # BSD readlink(1)
-    loose-errors
-    self="${BASH_SOURCE[0]}"
-    if [[ ! $self =~ ^/ ]]
-    then
-        if [[ $self =~ / ]]
-        then
-            self="$PWD/$self"
-        else
-            echo 'Could not determine base directory for Fig.' >&2
-            exit 1
-        fi
-    fi
-
-    self_link="$(! readlink -n "$self")"
-    while [[ -n $self_link ]]
-    do
-        if [[ ! $self_link =~ ^/ ]]
-        then
-            self_link="$(dirname "$self")/$self_link"
-        fi
-
-        self="$self_link"
-        self_link="$(! readlink -n "$self")"
-    done
-    strict-errors
-fi
-
-fig_dir=$(dirname "$self")
-
-
-# No longer strict on errors; let Ruby code determine how this script exits.
-loose-errors
-
-
-exec ruby                                                               \
-    --external-encoding UTF-8                                           \
-    --internal-encoding UTF-8                                           \
-    -r "$fig_dir/../lib/fig/command/initialization.rb"                  \
-    -e 'exit Fig::Command.new.run_fig_with_exception_handling ARGV'     \
-    -- "$@"
+require 'bundler/setup'
+require 'fig'

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

@@ -12,7 +12,7 @@ class Fig::Command::Action::SourcePackage
   include Fig::Command::Action::Role::HasNoSubAction
 
   def options()
-    return %w<--get>
+    return %w<-source-package>
   end
 
   def descriptor_requirement()

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'fig'
+require 'fig/version'
 require 'fig/command'
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'fig'
+require 'fig/version'
 require 'fig/command'
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'

data/lib/fig/command/initialization.rb

@@ -3,6 +3,7 @@
 # This is not a normal module/class.  It contains code to be run by bin/fig and
 # bin/fig-debug just after process startup.
 
+# FIXME remove this check and rely on gem/bundler enforcement
 ( [2, 0, 0] <=> ( RUBY_VERSION.split(".").collect {|x| x.to_i} ) ) <= 0 or
   abort "Ruby v2.0.0 is required; this is v#{RUBY_VERSION}."
 

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

@@ -87,6 +87,7 @@ Standard options (represented as "[...]" above):
 
       [-R | --suppress-retrieves] [--suppress-cleanup-of-retrieves]
       [--suppress-all-includes] [--suppress-cross-package-includes]
+      [--suppress-includes-beyond-package-depth COUNT]
 
       [--file PATH] [--no-file]
       [{-c | --config} CONFIG]

data/lib/fig/command/options.rb

@@ -165,6 +165,10 @@ class Fig::Command::Options
     return @no_remote_figrc
   end
 
+  def usec_mtime_comparisons?
+    return @usec_mtime_comparisons
+  end
+
   def suppress_warning_include_statement_missing_version?()
     return @suppress_warning_include_statement_missing_version
   end
@@ -298,6 +302,20 @@ Running commands:
       set_suppress_includes(:cross_package)
     end
 
+    @parser.on(
+      '--suppress-includes-beyond-package-depth DEPTH',
+      STARTS_WITH_NON_HYPHEN,
+      %q<only process includes to the package depth specified (you want 2 or greater)>,
+    ) do |depth|
+      if depth !~ /\A\d+\z/
+        raise Fig::Command::OptionError.new(
+          'Value of --suppress-includes-beyond-package-depth must be an integer.'
+        )
+      end
+
+      set_suppress_includes(depth.to_i)
+    end
+
     return
   end
 
@@ -735,6 +753,13 @@ Running commands:
       @update_lock_response = response
     end
 
+    @parser.on(
+      '--microsecond-only-file-modification-time-comparisons',
+      %q<to deal with situations with truncated times; always on on macOS>
+    ) do
+      @usec_mtime_comparisons = true
+    end
+
     @parser.on(
       '--suppress-warning-include-statement-missing-version',
       %q<don't complain about an include statement without a version>
@@ -821,7 +846,7 @@ Running commands:
   def set_suppress_includes(value)
     if @suppress_includes
       raise Fig::Command::OptionError.new(
-        'Can only specify one --suppress-all-includes/--suppress-cross-package-includes option.'
+        'Can only specify one --suppress-all-includes/--suppress-cross-package-includes/--suppress-includes-beyond-package-depth option.'
       )
     end
 

data/lib/fig/command/package_applier.rb

@@ -44,7 +44,7 @@ class Fig::Command::PackageApplier
       @synthetic_package_for_command_line =
         synthesize_package_for_command_line_options(ignore_base_config)
       @environment.apply_config(
-        @synthetic_package_for_command_line, Fig::Package::DEFAULT_CONFIG, nil
+        @synthetic_package_for_command_line, Fig::Package::DEFAULT_CONFIG, nil,
       )
     rescue Fig::NoSuchPackageConfigError => exception
       make_no_such_package_exception_descriptive(exception)

data/lib/fig/command.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'bundler/setup'
 require 'fileutils'
 require 'net/ftp'
 require 'set'
@@ -272,7 +273,17 @@ class Fig::Command
 
   def prepare_runtime_environment()
     if retrieves_should_happen?
-      @working_directory_maintainer = Fig::WorkingDirectoryMaintainer.new('.')
+      # With APFS, at least on High Sierra, even «/bin/cp -p» does not preserve
+      # timestamps properly.  The timestamps get truncated to microseconds.
+      usec_mtime_comparisons =
+            Fig::OperatingSystem.macos?           \
+        ||  @options.usec_mtime_comparisons?      \
+        ||  @application_configuration[
+              'only compare file modification times to the microsecond'
+            ]
+
+      @working_directory_maintainer =
+        Fig::WorkingDirectoryMaintainer.new('.', usec_mtime_comparisons)
 
       Fig::AtExit.add do
         @working_directory_maintainer.prepare_for_shutdown(
@@ -281,9 +292,31 @@ class Fig::Command
       end
     end
 
+    initial_environment_variables = nil
+    ENV.keys.each do
+      |variable_name|
+
+      if variable_name.start_with? 'FIG_EXPORT_VARIABLE_'
+        initial_environment_variables ||= {}
+
+        initial_environment_variables[ variable_name[20..-1] ] =
+          ENV.delete(variable_name)
+      end
+    end
+
     environment_variables = nil
     if reset_environment?
-      environment_variables = Fig::OperatingSystem.get_environment_variables({})
+      environment_variables = Fig::OperatingSystem.get_environment_variables(
+        initial_environment_variables || {},
+      )
+    elsif initial_environment_variables
+      environment_variables = Fig::OperatingSystem.get_environment_variables
+
+      initial_environment_variables.each_pair do
+        |key, value|
+
+        environment_variables[key] = value
+      end
     end
 
     @environment = Fig::RuntimeEnvironment.new(

data/lib/fig/figrc.rb

@@ -61,7 +61,7 @@ class Fig::FigRC
 
   def self.handle_figrc(configuration)
     user_figrc_path = File.expand_path('~/.figrc')
-    return if not File.exists? user_figrc_path
+    return if not File.exist? user_figrc_path
 
     begin
       configuration_text = File::open(user_figrc_path).read

data/lib/fig/grammar/base.rb

@@ -106,7 +106,7 @@ module Fig
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('#')
+          terminal_parse_failure('\'#\'')
           r1 = nil
         end
         s0 << r1
@@ -133,7 +133,7 @@ module Fig
               r4 = true
               @index += match_len
             else
-              terminal_parse_failure("\n")
+              terminal_parse_failure('"\\n"')
               r4 = nil
             end
             s0 << r4
@@ -211,11 +211,13 @@ module Fig
         r0
       end
 
-    end
 
-    class BaseParser < Treetop::Runtime::CompiledParser
-      include Base
+      class Parser < Treetop::Runtime::CompiledParser
+        include Base
+      end
     end
 
+    BaseParser = Base::Parser
+
   end
 end

data/lib/fig/grammar/v0.rb

@@ -205,7 +205,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('archive')
+          terminal_parse_failure('\'archive\'')
           r1 = nil
         end
         s0 << r1
@@ -279,7 +279,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('resource')
+          terminal_parse_failure('\'resource\'')
           r1 = nil
         end
         s0 << r1
@@ -358,7 +358,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('retrieve')
+          terminal_parse_failure('\'retrieve\'')
           r1 = nil
         end
         s0 << r1
@@ -387,7 +387,7 @@ module Fig
                 r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure('->')
+                terminal_parse_failure('\'->\'')
                 r5 = nil
               end
               s0 << r5
@@ -469,7 +469,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('config')
+          terminal_parse_failure('\'config\'')
           r1 = nil
         end
         s0 << r1
@@ -527,7 +527,7 @@ module Fig
                     r9 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('end')
+                    terminal_parse_failure('\'end\'')
                     r9 = nil
                   end
                   s0 << r9
@@ -653,7 +653,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('include')
+          terminal_parse_failure('\'include\'')
           r1 = nil
         end
         s0 << r1
@@ -746,7 +746,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('override')
+          terminal_parse_failure('\'override\'')
           r1 = nil
         end
         s0 << r1
@@ -839,7 +839,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('set')
+          terminal_parse_failure('\'set\'')
           r1 = nil
         end
         s0 << r1
@@ -933,7 +933,7 @@ module Fig
           r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('add')
+          terminal_parse_failure('\'add\'')
           r2 = nil
         end
         if r2
@@ -944,7 +944,7 @@ module Fig
             r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('append')
+            terminal_parse_failure('\'append\'')
             r3 = nil
           end
           if r3
@@ -955,7 +955,7 @@ module Fig
               r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('path')
+              terminal_parse_failure('\'path\'')
               r4 = nil
             end
             if r4
@@ -1057,7 +1057,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('command')
+          terminal_parse_failure('\'command\'')
           r1 = nil
         end
         s0 << r1
@@ -1134,7 +1134,7 @@ module Fig
           r1 = true
           @index += match_len
         else
-          terminal_parse_failure('"')
+          terminal_parse_failure('\'"\'')
           r1 = nil
         end
         s0 << r1
@@ -1161,7 +1161,7 @@ module Fig
               r4 = true
               @index += match_len
             else
-              terminal_parse_failure('"')
+              terminal_parse_failure('\'"\'')
               r4 = nil
             end
             s0 << r4
@@ -1407,7 +1407,7 @@ module Fig
             r6 = true
             @index += match_len
           else
-            terminal_parse_failure('"')
+            terminal_parse_failure('\'"\'')
             r6 = nil
           end
           s5 << r6
@@ -1439,7 +1439,7 @@ module Fig
                 r9 = true
                 @index += match_len
               else
-                terminal_parse_failure('"')
+                terminal_parse_failure('\'"\'')
                 r9 = nil
               end
               s5 << r9
@@ -1508,11 +1508,13 @@ module Fig
         r0
       end
 
-    end
 
-    class V0Parser < Treetop::Runtime::CompiledParser
-      include V0
+      class Parser < Treetop::Runtime::CompiledParser
+        include V0
+      end
     end
 
+    V0Parser = V0::Parser
+
   end
 end