fig 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8016bb7d559da6494a599f732340222272f56f001fcae4186f6f43377d57823f
-  data.tar.gz: 8fe1d2462572ba968651d6c66e41e4f0a657a2dbcf17408592b03e00055694ea
+  metadata.gz: e7b0a1e7e7c54f5641e35e7ae6cb79f68d99ecbf29fcea10db478169599ae532
+  data.tar.gz: d13a64acc3c9f804a96454039a54005098b3869f83af7e1f037fa61e445e6dab
 SHA512:
-  metadata.gz: dc59c14253bd39d46a5a44cbdce3efb103e41ed089eba614f27bc246fb41333ab23cd439d8d6bcd1d0eaed88c720f07e48655e261e5f1ec27fd10bc8c9069cc1
-  data.tar.gz: dceb0d12693a8df6229b04e52b1fc9cf8a4e74ad007b0897fe08564d5455b69acca53e16090bff08354c52dcc216bfce29da8e0aa7f1c31e0055d06f0ad4ccc2
+  metadata.gz: e62dcf96e9bb214fb48a4d88428006ef893b7c7d0e93c4fc63752e3931261f5eaf1549eade14ac836d5f022bbcddc5f165f1315d773fb5748f275ca799cf963b
+  data.tar.gz: de2f11e4a62585e3c23d1ca6193d8564be023bb3765b9e9c2e1baec8e2e05952a6b9c2d3ad5c719a5c40368450c786c71b019dd6cfab6a4eb50105b72b9e6ffa

data/lib/fig/application_configuration.rb

@@ -5,7 +5,8 @@ module Fig; end
 # Configuration for the Fig program, as opposed to a config in a package.
 class Fig::ApplicationConfiguration
   attr_accessor :base_whitelisted_url
-  attr_accessor :remote_repository_url
+  attr_accessor :remote_download_url
+  attr_accessor :remote_upload_url
 
   def initialize()
     @data = []

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

@@ -115,8 +115,10 @@ required or allowed is dependent upon what your are doing.
 
 Environment variables:
 
-  FIG_REMOTE_URL     location of remote repository, required for remote
-                     operations
+  FIG_DOWNLOAD_URL   location of remote repository for download, required for remote
+                     download operations
+  FIG_UPLOAD_URL     location of remote repository for upload, required for remote
+                     publish/upload operations
   FIG_HOME           path to local repository, defaults to $HOME/.fighome
   FIG_SVN_EXECUTABLE path to svn executable, set to empty string to suppress
                      use of Subversion

data/lib/fig/command/options.rb

@@ -712,7 +712,7 @@ Running commands:
     end
 
     @parser.on('--no-figrc', 'ignore ~/.figrc') { @no_figrc = true }
-    @parser.on('--no-remote-figrc', 'ignore $FIG_REMOTE_URL/_meta/figrc') {
+    @parser.on('--no-remote-figrc', 'ignore $FIG_DOWNLOAD_URL/_meta/figrc') {
       @no_remote_figrc = true
     }
 

data/lib/fig/command.rb

@@ -236,20 +236,28 @@ class Fig::Command
   def set_up_application_configuration()
     @application_configuration = Fig::FigRC.find(
       @options.figrc,
-      ENV['FIG_REMOTE_URL'],
+      ENV['FIG_DOWNLOAD_URL'],
+      ENV['FIG_UPLOAD_URL'],
       @operating_system,
       @options.home,
       @options.no_figrc?,
       @options.no_remote_figrc?
     )
 
-    if \
-          remote_operation_necessary? \
-      &&  @application_configuration.remote_repository_url.nil?
+    if remote_operation_necessary?
+      # Check if any action is a publishing operation. Note that "publish" doesn't
+      # necessarily mean "upload" b/c it could be publishing to a local repo.
+      publishing_operation = @options.actions.any? {|action| action.publish?}
 
-      raise Fig::UserInputError.new(
-        'Please define the FIG_REMOTE_URL environment variable.'
-      )
+      if publishing_operation && @application_configuration.remote_upload_url.nil?
+        raise Fig::UserInputError.new(
+          'Must set FIG_UPLOAD_URL for publish/upload operations.'
+        )
+      elsif !publishing_operation && @application_configuration.remote_download_url.nil?
+        raise Fig::UserInputError.new(
+          'Must set FIG_DOWNLOAD_URL for download repository operations.'
+        )
+      end
     end
 
     return
@@ -261,7 +269,8 @@ class Fig::Command
       @options,
       @operating_system,
       @options.home(),
-      @application_configuration.remote_repository_url,
+      @application_configuration.remote_download_url,
+      @application_configuration.remote_upload_url,
       @parser,
       @publish_listeners,
     )

data/lib/fig/figrc.rb

@@ -15,10 +15,10 @@ module Fig; end
 class Fig::FigRC
   REPOSITORY_CONFIGURATION =
       "#{Fig::Repository::METADATA_SUBDIRECTORY}/figrc"
-
   def self.find(
     override_path,
-    specified_repository_url,
+    download_repository_url,
+    upload_repository_url,
     operating_system,
     fig_home,
     disable_figrc = false,
@@ -28,17 +28,44 @@ class Fig::FigRC
 
     handle_override_configuration(configuration, override_path)
     handle_figrc(configuration) if not disable_figrc
+    
+    # Check for legacy environment variable usage
+    download_url = derive_repository_url(download_repository_url, 'DOWNLOAD', configuration)
+    upload_url = derive_repository_url(upload_repository_url, 'UPLOAD', configuration)
+    remote_url = ENV['FIG_REMOTE_URL']
+    
+    has_download = !download_url.nil? && !download_url.strip.empty?
+    has_upload = !upload_url.nil? && !upload_url.strip.empty?
+    has_remote = !remote_url.nil? && !remote_url.strip.empty?
+    
+    # Error case: FIG_REMOTE_URL exists but one or both new URLs missing
+    if has_remote && (!has_download || !has_upload)
+      raise Fig::UserInputError.new(
+        'FIG_REMOTE_URL is set but FIG_DOWNLOAD_URL and/or FIG_UPLOAD_URL are missing. ' +
+        'Please set both FIG_DOWNLOAD_URL and FIG_UPLOAD_URL instead of FIG_REMOTE_URL.'
+      )
+    end
 
-    repository_url =
-      derive_repository_url(specified_repository_url, configuration)
-
-    configuration.base_whitelisted_url = repository_url
-    configuration.remote_repository_url = repository_url
-
-    handle_repository_configuration(
-      configuration, repository_url, operating_system, fig_home
-    ) if not disable_remote_figrc
-
+    # Warning case: All three variables exist
+    if has_remote && has_download && has_upload
+      $stderr.puts "WARNING: FIG_REMOTE_URL is set but will be ignored. Using FIG_DOWNLOAD_URL and FIG_UPLOAD_URL instead."
+    end
+    
+    # Set the new URL attributes
+    configuration.remote_download_url = download_url
+    configuration.remote_upload_url = upload_url
+    
+    # For backward compatibility with code expecting whitelisted URLs
+    url_for_whitelist = has_download ? download_url : nil
+    configuration.base_whitelisted_url = url_for_whitelist
+    
+    # Handle repository configuration if enabled
+    if !disable_remote_figrc && has_download
+      handle_repository_configuration(
+        configuration, download_url, operating_system, fig_home
+      )
+    end
+    
     return configuration
   end
 
@@ -73,9 +100,9 @@ class Fig::FigRC
     return
   end
 
-  def self.derive_repository_url(specified_repository_url, configuration)
+  def self.derive_repository_url(specified_repository_url, which, configuration)
     if specified_repository_url.nil?
-      return configuration['default FIG_REMOTE_URL']
+      return configuration["default FIG_#{which}_URL"]
     end
 
     if specified_repository_url.empty? || specified_repository_url =~ /\A\s*\z/

data/lib/fig/protocol/file.rb

@@ -21,10 +21,12 @@ class Fig::Protocol::File
     return packages if ! ::File.exist?(unescaped_path)
 
     ls = ''
+
+    unescaped_path = FileTest.symlink?(unescaped_path) ? ::File.realpath(unescaped_path) : unescaped_path
     Find.find(unescaped_path) {
       |file|
 
-      if FileTest.directory? file
+      if FileTest.directory?(file)
         ls << file.to_s
         ls << "\n"
       end

data/lib/fig/protocol/ftp.rb

@@ -90,17 +90,17 @@ class Fig::Protocol::FTP
   end
 
   def upload(local_file, uri)
-    ftp_uri = Fig::URL.parse(ENV['FIG_REMOTE_URL'])
+    ftp_uri = Fig::URL.parse(ENV['FIG_UPLOAD_URL'])
     ftp_root_path = ftp_uri.path
     ftp_root_dirs = ftp_uri.path.split('/')
-    remote_publish_path = uri.path[0, uri.path.rindex('/')]
-    remote_publish_dirs = remote_publish_path.split('/')
+    remote_upload_path = uri.path[0, uri.path.rindex('/')]
+    remote_upload_dirs = remote_upload_path.split('/')
     # Use array subtraction to deduce which project/version folder to upload
     # to, i.e. [1,2,3] - [2,3,4] = [1]
-    remote_project_dirs = remote_publish_dirs - ftp_root_dirs
+    remote_project_dirs = remote_upload_dirs - ftp_root_dirs
     Net::FTP.open(uri.host) do |ftp|
       ftp_login(ftp, uri.host, :prompt_for_login)
-      # Assume that the FIG_REMOTE_URL path exists.
+      # Assume that the FIG_UPLOAD_URL path exists.
       ftp.chdir(ftp_root_path)
       remote_project_dirs.each do |dir|
         # Can't automatically create parent directories, so do it manually.

data/lib/fig/repository.rb

@@ -33,7 +33,8 @@ class Fig::Repository
     options,
     operating_system,
     local_repository_directory,
-    remote_repository_url,
+    remote_download_url,
+    remote_upload_url,
     parser,
     publish_listeners
   )
@@ -41,7 +42,8 @@ class Fig::Repository
     @options                      = options
     @operating_system             = operating_system
     @local_repository_directory   = local_repository_directory
-    @remote_repository_url        = remote_repository_url
+    @remote_download_url          = remote_download_url
+    @remote_upload_url            = remote_upload_url
     @parser                       = parser
     @publish_listeners            = publish_listeners
 
@@ -77,7 +79,7 @@ class Fig::Repository
   def list_remote_packages
     check_remote_repository_format()
 
-    paths = @operating_system.download_list(remote_repository_url())
+    paths = @operating_system.download_list(remote_download_url())
 
     return paths.reject { |path| path =~ %r< ^ #{METADATA_SUBDIRECTORY} / >xs }
   end
@@ -156,9 +158,9 @@ class Fig::Repository
 
     if not local_only
       publisher.remote_directory_for_package =
-        remote_directory_for_package(descriptor)
+        remote_directory_for_package(descriptor, for_publishing: true)
       publisher.remote_fig_file_for_package =
-        remote_fig_file_for_package(descriptor)
+        remote_fig_file_for_package(descriptor, for_publishing: true)
     end
 
     return publisher.publish_package()
@@ -174,7 +176,8 @@ class Fig::Repository
 
   private
 
-  attr_reader :remote_repository_url
+  attr_reader :remote_download_url
+  attr_reader :remote_upload_url
 
   def initialize_local_repository()
     FileUtils.mkdir_p(@local_repository_directory)
@@ -244,7 +247,7 @@ class Fig::Repository
       temp_dir = base_temp_dir()
       @operating_system.delete_and_recreate_directory(temp_dir)
       remote_version_file = Fig::URL.append_path_components(
-        remote_repository_url(), [VERSION_FILE_NAME]
+        remote_download_url(), [VERSION_FILE_NAME]
       )
       local_version_file = File.join(temp_dir, "remote-#{VERSION_FILE_NAME}")
       begin
@@ -452,9 +455,9 @@ class Fig::Repository
     return
   end
 
-  def remote_fig_file_for_package(descriptor)
+  def remote_fig_file_for_package(descriptor, for_publishing: false)
     return Fig::URL.append_path_components(
-      remote_directory_for_package(descriptor), [PACKAGE_FILE_IN_REPO]
+      remote_directory_for_package(descriptor, for_publishing: for_publishing), [PACKAGE_FILE_IN_REPO]
     )
   end
 
@@ -466,9 +469,10 @@ class Fig::Repository
     File.join(package_download_dir, PACKAGE_FILE_IN_REPO)
   end
 
-  def remote_directory_for_package(descriptor)
+  def remote_directory_for_package(descriptor, for_publishing: false)
+    url = for_publishing ? remote_upload_url() : remote_download_url()
     return Fig::URL.append_path_components(
-      remote_repository_url(), [descriptor.name, descriptor.version]
+      url, [descriptor.name, descriptor.version]
     )
   end
 

data/lib/fig/url_access_disallowed_error.rb

@@ -11,5 +11,10 @@ module Fig
       @urls       = urls
       @descriptor = descriptor
     end
+
+    def message
+      "URLAccessDisallowedError:\n  descriptor = #{descriptor.inspect}\n  urls = " +
+        @urls.map { |k,v| " - #{k}: #{v.inspect}" }.join("\n    ")
+    end
   end
 end

data/lib/fig/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Fig
-  VERSION = '2.0.0-alpha.2'.freeze
+  VERSION = '2.0.0-alpha.4'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Fig Folks
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.3.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +306,7 @@ dependencies:
 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 the command in that environment. The caller's environment is not affected.
 
-  Built from git SHA1: b5a5d92
+  Built from git SHA1: c0b5d8c
 email: maintainer@figpackagemanager.org
 executables:
 - fig
@@ -464,7 +478,7 @@ files:
 licenses:
 - BSD-3-Clause
 metadata:
-  git_sha: b5a5d92
+  git_sha: c0b5d8c
 rdoc_options: []
 require_paths:
 - lib
@@ -482,5 +496,5 @@ requirements: []
 rubygems_version: 3.6.1
 specification_version: 4
 summary: 'Utility for configuring environments and managing dependencies across a
-  team of developers. Built from git SHA1: b5a5d92'
+  team of developers. Built from git SHA1: c0b5d8c'
 test_files: []