fig 1.24.1.beta.2 → 1.24.1.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1e5215c6b2a2e43e74fc04c1d3edbdf085db2c0
-  data.tar.gz: 40ae3c1877969e31dea223d4594fec1fa0b88cf2
+  metadata.gz: b8cdbd459dfb515f0701d28fe062527a0d3ed627
+  data.tar.gz: 724829b9273df955565b304b37c4f333f5f8c27e
 SHA512:
-  metadata.gz: 88d441ff92224c341e3e79346eb4952b50b00841205fe17c2f7c2179ba2cc67ccc06c4ccdfc6a8c116f220656c5266d875e83813773cc7623bdd7c5486629f37
-  data.tar.gz: 6e30cb231f647fc7b50b09c7570c1ce7bf9415eda4df9e5a70db3ac543f3cd302d44ec48213749e31571d0979af72d375e4098536c4a866e429606c115938505
+  metadata.gz: 4a7d05fa8c86fd0b7098b8dad60ee1d8a4aa5f55f6f5a909aa44f6c56d085cb98dd7083fffe67d408d0daeca92b591605c868b3ce306fdaf127652d154dd07bb
+  data.tar.gz: 690e99f51ed7ef89758c4650e762e6321fa2217ed6771400ae8c0b68e192a77c59948c761c0b3d2a9592fd57577044f659bcfa4ff9552d1ffdd9048933c747d5

data/Changes

@@ -1,3 +1,21 @@
+v1.24.1.beta.3 - 2015/04/27
+
+  Bug fixes:
+
+  - Fixed potential package version data collapsing in --yaml and --json
+    output.
+
+  - The --list-dependencies and --list-variables options now work with packages
+    brought in via an include-file statement.
+
+  Miscellaneous:
+
+  - Fig now refuses to use the --list-all-configs option with --graphviz,
+    --yaml, and --json options.  The results were non-sensical in the face of
+    overrides and other conflicts between peer base configs.
+
+  - Display file names instead of "<unpublished>" for unnamed packages.
+
 v1.24.1.beta.2 - 2015/04/24
 
   Bug fix:

data/lib/fig.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Fig
-  VERSION = '1.24.1.beta.2'
+  VERSION = '1.24.1.beta.3'
 end

data/lib/fig/command.rb

@@ -11,6 +11,7 @@ require 'fig/command/package_applier'
 require 'fig/command/package_loader'
 require 'fig/figrc'
 require 'fig/logging'
+require 'fig/non_repository_packages'
 require 'fig/operating_system'
 require 'fig/package'
 require 'fig/parser'
@@ -76,10 +77,11 @@ class Fig::Command
       base_config(),
       @environment,
       @repository,
+      @non_repository_packages,
       @working_directory_maintainer,
       @operating_system,
       @package_source_description,
-      @package_loaded_from_path
+      @package_load_path_description
     )
 
     actions.each do
@@ -139,10 +141,11 @@ class Fig::Command
       :base_config,
       :environment,
       :repository,
+      :non_repository_packages,
       :working_directory_maintainer,
       :operating_system,
       :package_source_description,
-      :package_loaded_from_path
+      :package_load_path_description
     )
 
   def handle_nothing_to_do()
@@ -202,6 +205,9 @@ class Fig::Command
     )
 
     prepare_repository()
+
+    @non_repository_packages = Fig::NonRepositoryPackages.new @parser
+
     prepare_runtime_environment()
   end
 
@@ -282,7 +288,7 @@ class Fig::Command
 
     @environment = Fig::RuntimeEnvironment.new(
       @repository,
-      @parser,
+      @non_repository_packages,
       @options.suppress_includes,
       environment_variables,
       @working_directory_maintainer,
@@ -337,7 +343,8 @@ class Fig::Command
       @base_package = package_loader.load_package_object_from_file()
     end
     @package_source_description = package_loader.package_source_description()
-    @package_loaded_from_path = package_loader.package_loaded_from_path()
+    @package_load_path_description =
+      package_loader.package_load_path_description()
 
     return
   end

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

@@ -84,6 +84,9 @@ module Fig::Command::Action::Role::ListFromDataStructure
     if package.version
       hash['version'] = package.version
     end
+    if package.file_path
+      hash['file'] = package.file_path
+    end
     if package.description
       hash['description'] = package.description
     end
@@ -93,6 +96,14 @@ module Fig::Command::Action::Role::ListFromDataStructure
   end
 
   def package_id(package)
-    return package.name || "description: #{package.description}"
+    if package.name
+      return package.to_s
+    end
+
+    if file = package.file_path
+      return "file: #{file}"
+    end
+
+    return "description: #{package.description}"
   end
 end

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

@@ -73,6 +73,7 @@ module Fig::Command::Action::Role::ListWalkingDependencyTree
 
       if depth < 1
         @execution_context.repository.reset_cached_data
+        @execution_context.non_repository_packages.reset_cached_data
       end
 
       package_block.call base_package, config_name, depth
@@ -86,7 +87,7 @@ module Fig::Command::Action::Role::ListWalkingDependencyTree
 
         do_walk_dependency_tree(
           package,
-          [descriptor.config],
+          [descriptor.config || Fig::Package::DEFAULT_CONFIG],
           new_backtrace,
           depth + 1,
           include_block,
@@ -121,6 +122,8 @@ module Fig::Command::Action::Role::ListWalkingDependencyTree
       return @execution_context.repository.get_package(
         descriptor, :allow_any_version
       )
+    elsif descriptor.file_path
+      return @execution_context.non_repository_packages[descriptor.file_path]
     end
 
     return base_package

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

@@ -93,9 +93,9 @@ module Fig::Command::Action::Role::Publish
   end
 
   def derive_publish_statements_from_environment_statements
-    if @execution_context.package_loaded_from_path
+    if @execution_context.package_load_path_description
       message = 'Cannot publish based upon both a package definition file ('
-      message << @execution_context.package_loaded_from_path
+      message << @execution_context.package_load_path_description
       message << ') and --set/--append options.'
 
       if @execution_context.package_source_description ==

data/lib/fig/command/options.rb

@@ -916,19 +916,10 @@ Running commands:
     end
 
     if list_tree?
-      if graphviz?
-        raise Fig::Command::OptionError.new(
-          'Cannot use --list-tree and --graphviz at the same time.'
-        )
-      elsif json?
-        raise Fig::Command::OptionError.new(
-          'Cannot use --list-tree and --json at the same time.'
-        )
-      elsif yaml?
-        raise Fig::Command::OptionError.new(
-          'Cannot use --list-tree and --json at the same time.'
-        )
-      end
+      validate_list_options_with_nodes('--list-tree')
+    end
+    if list_all_configs?
+      validate_list_options_with_nodes('--list-all-configs')
     end
     if graphviz?
       if json?
@@ -981,6 +972,24 @@ Running commands:
     return
   end
 
+  def validate_list_options_with_nodes(conflicting_option)
+    if graphviz?
+      raise Fig::Command::OptionError.new(
+        "Cannot use #{conflicting_option} and --graphviz at the same time."
+      )
+    elsif json?
+      raise Fig::Command::OptionError.new(
+        "Cannot use #{conflicting_option} and --json at the same time."
+      )
+    elsif yaml?
+      raise Fig::Command::OptionError.new(
+        "Cannot use #{conflicting_option} and --json at the same time."
+      )
+    end
+
+    return
+  end
+
   def set_up_sub_actions()
     if @base_action and @base_action.sub_action?
       # This is a cheat because the only things with sub-actions at present are

data/lib/fig/command/package_applier.rb

@@ -71,6 +71,7 @@ class Fig::Command::PackageApplier
           @base_package.name(),
           @base_package.version(),
           @base_config,
+          :file_path => @base_package.file_path,
           :description => @base_package.description
         ),
         @base_package,
@@ -91,6 +92,7 @@ class Fig::Command::PackageApplier
     return Fig::Package.new(
       nil,  # Name
       nil,  # Version
+      nil,  # File path
       'command-line',
       '.',  # Working
       '.',  # Base

data/lib/fig/command/package_loader.rb

@@ -9,7 +9,7 @@ class Fig::Command; end
 
 # Loads the base package.
 class Fig::Command::PackageLoader
-  attr_reader :package_loaded_from_path
+  attr_reader :package_load_path_description
 
   DEFAULT_PACKAGE_FILE = 'package.fig'
   DEFAULT_APPLICATION_FILE = 'application.fig'
@@ -47,8 +47,8 @@ class Fig::Command::PackageLoader
   end
 
   def package_source_description()
-    if @package_loaded_from_path
-      return @package_loaded_from_path
+    if @package_load_path_description
+      return @package_load_path_description
     elsif @descriptor
       return Fig::PackageDescriptor.format(
         @descriptor.name, @descriptor.version, nil
@@ -64,18 +64,20 @@ class Fig::Command::PackageLoader
     if @package_definition_file == :none
       return nil
     elsif @package_definition_file == '-'
-      @package_loaded_from_path = '<standard input>'
+      @package_load_path_description = '<standard input>'
 
       return $stdin.read
     elsif @package_definition_file.nil?
       if File.exist?(DEFAULT_PACKAGE_FILE)
-        @package_loaded_from_path = DEFAULT_PACKAGE_FILE
+        @package_load_path_description = DEFAULT_PACKAGE_FILE
+        @package_load_path             = DEFAULT_PACKAGE_FILE
       elsif File.exist?(DEFAULT_APPLICATION_FILE)
-        @package_loaded_from_path = DEFAULT_APPLICATION_FILE
+        @package_load_path_description = DEFAULT_APPLICATION_FILE
+        @package_load_path             = DEFAULT_APPLICATION_FILE
       end
 
-      if @package_loaded_from_path
-        return File.read(@package_loaded_from_path)
+      if @package_load_path
+        return File.read(@package_load_path)
       end
     else
       return read_in_package_definition_file(@package_definition_file)
@@ -86,7 +88,8 @@ class Fig::Command::PackageLoader
 
   def read_in_package_definition_file(config_file)
     if File.exist?(config_file)
-      @package_loaded_from_path = config_file
+      @package_load_path_description       = config_file
+      @package_load_path                   = config_file
       @package_include_file_base_directory = File.dirname config_file
 
       return File.read(config_file)
@@ -109,7 +112,8 @@ class Fig::Command::PackageLoader
       nil,
       nil,
       nil,
-      :description => source_description,
+      :file_path          => @package_load_path,
+      :description        => @package_load_path ? nil : source_description,
       :source_description => source_description
     )
 
@@ -135,6 +139,7 @@ class Fig::Command::PackageLoader
       Fig::Package.new(
         nil,  # Name
         nil,  # Version
+        nil,  # File path
         'synthetic',
         '.',  # Working
         '.',  # Base

data/lib/fig/non_repository_packages.rb

@@ -0,0 +1,63 @@
+# coding: utf-8
+
+require 'fig/not_yet_parsed_package'
+require 'fig/package_descriptor'
+
+
+module Fig; end
+
+
+class Fig::NonRepositoryPackages
+  def initialize(parser)
+    @parser           = parser
+
+    reset_cached_data
+
+    return
+  end
+
+  def reset_cached_data
+    @packages_by_path = {}
+
+    return
+  end
+
+  def [](file_path)
+    file_path = File.expand_path file_path
+    if package = @packages_by_path[file_path]
+      return package
+    end
+
+    if ! File.exist? file_path
+      return
+    end
+
+    load_package file_path
+
+    return @packages_by_path[file_path]
+  end
+
+
+  private
+
+  def load_package(file_path)
+    content = File.read file_path
+
+    descriptor =
+      Fig::PackageDescriptor.new(nil, nil, nil, :file_path => file_path)
+
+    unparsed_package                    = Fig::NotYetParsedPackage.new
+    unparsed_package.descriptor         = descriptor
+    unparsed_package.working_directory  =
+      unparsed_package.include_file_base_directory =
+      File.dirname(file_path)
+    unparsed_package.source_description = file_path
+    unparsed_package.unparsed_text      = content
+
+    package = @parser.parse_package unparsed_package
+
+    @packages_by_path[file_path] = package
+
+    return
+  end
+end

data/lib/fig/package.rb

@@ -5,6 +5,8 @@ require 'fig/no_such_package_config_error'
 require 'fig/package_descriptor'
 require 'fig/statement/archive'
 require 'fig/statement/configuration'
+require 'fig/statement/include'
+require 'fig/statement/include_file'
 require 'fig/statement/resource'
 require 'fig/statement/retrieve'
 
@@ -22,6 +24,7 @@ class Fig::Package
 
   attr_reader   :name
   attr_reader   :version
+  attr_reader   :file_path
   attr_reader   :description
   attr_reader   :runtime_directory
   attr_reader   :include_file_base_directory
@@ -32,6 +35,7 @@ class Fig::Package
   def initialize(
     name,
     version,
+    file_path,
     description,
     runtime_directory,
     include_file_base_directory,
@@ -40,6 +44,7 @@ class Fig::Package
   )
     @name                         = name
     @version                      = version
+    @file_path                    = file_path
     @description                  = description
     @runtime_directory            = runtime_directory
     @include_file_base_directory  = include_file_base_directory
@@ -68,12 +73,20 @@ class Fig::Package
   end
 
   def [](config_name)
-    @statements.each do |stmt|
-      return stmt if stmt.is_a?(Fig::Statement::Configuration) && stmt.name == config_name
+    @statements.each do
+      |statement|
+
+      return statement if
+            statement.is_a?(Fig::Statement::Configuration) \
+        &&  statement.name == config_name
     end
 
     descriptor = Fig::PackageDescriptor.new(
-      @name, @version, config_name, :description => @description
+      @name,
+      @version,
+      config_name,
+      :file_path   => @file_path,
+      :description => @description
     )
     config_description = nil
     if @name.nil? and @version.nil?
@@ -139,6 +152,12 @@ class Fig::Package
 
       if statement.is_a?(Fig::Statement::Include)
         descriptors << statement.resolved_dependency_descriptor(self, backtrace)
+      elsif statement.is_a?(Fig::Statement::IncludeFile)
+        full_path = statement.full_path_relative_to self
+
+        descriptors << Fig::PackageDescriptor.new(
+          nil, nil, nil, :file_path => full_path
+        )
       elsif statement.is_a?(Fig::Statement::Override)
         backtrace.add_override(statement)
       end
@@ -157,8 +176,18 @@ class Fig::Package
     return
   end
 
+  def name_or_file_or_description
+    return @name if @name
+
+    if @file_path
+      return "[#{@file_path}]"
+    end
+
+    return @description
+  end
+
   def to_s
-    name    = @name || UNPUBLISHED
+    name    = name_or_file_or_description
     version = @version || '<empty>'
     return Fig::PackageDescriptor.format(name, version, nil)
   end
@@ -166,7 +195,7 @@ class Fig::Package
   def to_s_with_config(config_name)
     displayed_config = config_name == DEFAULT_CONFIG ? nil : config_name
     return Fig::PackageDescriptor.format(
-      name || UNPUBLISHED, version, displayed_config
+      name_or_file_or_description, version, displayed_config
     )
   end
 
@@ -177,9 +206,8 @@ class Fig::Package
     )
   end
 
-  private
 
-  UNPUBLISHED     = '<unpublished>'
+  private
 
   def compare_components(mine, others)
     if mine.nil?

data/lib/fig/package_descriptor.rb

@@ -11,7 +11,12 @@ class Fig::PackageDescriptor
   UNBRACKETED_COMPONENT_PATTERN = / (?! [.]{1,2} $) [a-zA-Z0-9_.-]+ /x
   COMPONENT_PATTERN = / \A #{UNBRACKETED_COMPONENT_PATTERN} \z /x
 
-  attr_reader :name, :version, :config, :original_string, :description
+  attr_reader :name
+  attr_reader :version
+  attr_reader :config
+  attr_reader :original_string
+  attr_reader :file_path
+  attr_reader :description
 
   def self.format(
     name, version, config, use_default_config = false, description = nil
@@ -59,6 +64,9 @@ class Fig::PackageDescriptor
   #   :version                        => { :required | :forbidden }
   #   :config                         => { :required | :forbidden }
   #   :original_string                => the unparsed form
+  #   :file_path                      => if this is for a file outside of the
+  #                                      repository and not synthetic, the
+  #                                      source of the package
   #   :description                    => meta-information, if this is for a
   #                                      synthetic package
   #   :require_at_least_one_component => should we have at least one of
@@ -72,6 +80,7 @@ class Fig::PackageDescriptor
     @version         = translate_component(version)
     @config          = translate_component(config)
     @original_string = options[:original_string]
+    @file_path       = options[:file_path]
     @description     = options[:description]
 
     validate_component name,    'name',    :name,    options
@@ -81,13 +90,13 @@ class Fig::PackageDescriptor
   end
 
   # Specifically not named :to_s because it doesn't act like that should.
-  def to_string(use_default_config = false, use_description = false)
+  def to_string(use_default_config = false, use_file_or_description = false)
     return Fig::PackageDescriptor.format(
       @name,
       @version,
       @config,
       use_default_config,
-      use_description ? @description : nil
+      use_file_or_description ? @file_path ? @file_path : @description : nil
     )
   end
 
@@ -95,6 +104,7 @@ class Fig::PackageDescriptor
     return to_string() <=> other.to_string()
   end
 
+
   private
 
   def translate_component(value)
@@ -159,6 +169,21 @@ class Fig::PackageDescriptor
       )
     end
 
+    name_alternate_count = 0
+    if @name
+      name_alternate_count += 1
+    end
+    if @file_path
+      name_alternate_count += 1
+    end
+    if @description
+      name_alternate_count += 1
+    end
+
+    if name_alternate_count > 1
+      raise "Bug! More than one of name, file, and description provided! Name: #{@name}, File: #{@file}, Description: #{@description}"
+    end
+
     return
   end
 

data/lib/fig/parser_package_build_state.rb

@@ -68,6 +68,7 @@ class Fig::ParserPackageBuildState
     package = Fig::Package.new(
       @descriptor.name,
       @descriptor.version,
+      @descriptor.file_path,
       @descriptor.description,
       unparsed_package.working_directory,
       unparsed_package.include_file_base_directory,

data/lib/fig/runtime_environment.rb

@@ -28,19 +28,18 @@ class Fig::RuntimeEnvironment
 
   def initialize(
     repository,
-    parser,
+    non_repository_packages,
     suppress_includes,
     variables_override,
     working_directory_maintainer
   )
     @repository                   = repository
-    @parser                       = parser
+    @non_repository_packages      = non_repository_packages
     @suppress_includes            = suppress_includes
     @variables                    =
       variables_override || Fig::OperatingSystem.get_environment_variables()
     @retrieves                    = {}
     @named_packages               = {}
-    @packages_from_files          = {}
     @working_directory_maintainer = working_directory_maintainer
   end
 
@@ -106,6 +105,7 @@ class Fig::RuntimeEnvironment
           package.name,
           package.version,
           config_name,
+          :file_path   => package.file_path,
           :description => package.description
         )
       )
@@ -170,9 +170,7 @@ class Fig::RuntimeEnvironment
     when Fig::Statement::Include
       include_config(package, statement, backtrace)
     when Fig::Statement::IncludeFile
-      include_file_config(
-        package, statement.path, statement.config_name, backtrace
-      )
+      include_file_config(package, statement, backtrace)
     when Fig::Statement::Override
       backtrace.add_override(statement)
     end
@@ -263,18 +261,17 @@ class Fig::RuntimeEnvironment
     return package, resolved_descriptor, new_backtrace
   end
 
-  def include_file_config(including_package, path, config_name, backtrace)
+  def include_file_config(including_package, include_file_statement, backtrace)
     return if @suppress_includes
 
-    full_path =
-      File.absolute_path(path, including_package.include_file_base_directory)
+    full_path = include_file_statement.full_path_relative_to including_package
 
     descriptor =
-      Fig::PackageDescriptor.new(nil, nil, nil, :description => full_path)
+      Fig::PackageDescriptor.new(nil, nil, nil, :file_path => full_path)
 
     new_backtrace = Fig::IncludeBacktrace.new(backtrace, descriptor)
-    package =
-      package_for_file(including_package, full_path, descriptor, backtrace)
+    package       = package_for_file(including_package, full_path, backtrace)
+    config_name   = include_file_statement.config_name
 
     apply_config(
       package, config_name || Fig::Package::DEFAULT_CONFIG, new_backtrace
@@ -354,31 +351,16 @@ class Fig::RuntimeEnvironment
     return package
   end
 
-  def package_for_file(including_package, full_path, descriptor, backtrace)
-    package = @packages_from_files[full_path]
-    return package if package
+  def package_for_file(including_package, full_path, backtrace)
+    if package = @non_repository_packages[full_path]
+      package.backtrace = backtrace
 
-    if ! File.exist? full_path
-      raise_repository_error(
-        %Q<"#{full_path}" does not exist.>, backtrace, including_package
-      )
+      return package
     end
 
-    content = File.read full_path
-
-    unparsed_package = Fig::NotYetParsedPackage.new
-    unparsed_package.descriptor         = descriptor
-    unparsed_package.working_directory  =
-      unparsed_package.include_file_base_directory =
-      File.dirname(full_path)
-    unparsed_package.source_description = full_path
-    unparsed_package.unparsed_text      = content
-
-    package = @parser.parse_package unparsed_package
-
-    @packages_from_files[full_path] = package
-
-    return package
+    raise_repository_error(
+      %Q<"#{full_path}" does not exist.>, backtrace, including_package
+    )
   end
 
   def determine_package_for_execution(base_package, base_config, descriptor)
@@ -395,7 +377,11 @@ class Fig::RuntimeEnvironment
         Fig::IncludeBacktrace.new(
           nil,
           Fig::PackageDescriptor.new(
-            package_name, descriptor.version, config_name
+            package_name,
+            descriptor.version,
+            config_name,
+            :file_path   => descriptor.file_path,
+            :description => descriptor.description
           )
         )
       )

data/lib/fig/statement/include_file.rb

@@ -70,6 +70,10 @@ class Fig::Statement::IncludeFile < Fig::Statement
     return 'include-file'
   end
 
+  def full_path_relative_to(including_package)
+    return File.expand_path(path, including_package.include_file_base_directory)
+  end
+
   def deparse_as_version(deparser)
     return deparser.include_file(self)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.24.1.beta.2
+  version: 1.24.1.beta.3
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -343,6 +343,7 @@ files:
 - lib/fig/logging/colorizable.rb
 - lib/fig/network_error.rb
 - lib/fig/no_such_package_config_error.rb
+- lib/fig/non_repository_packages.rb
 - lib/fig/not_yet_parsed_package.rb
 - lib/fig/operating_system.rb
 - lib/fig/package.rb