fig 1.27.10 → 2.0.0.pre.alpha.2

data/lib/fig/grammar/v1.rb

@@ -157,11 +157,13 @@ module Fig
         r0
       end
 
-    end
 
-    class V1Parser < Treetop::Runtime::CompiledParser
-      include V1
+      class Parser < Treetop::Runtime::CompiledParser
+        include V1
+      end
     end
 
+    V1Parser = V1::Parser
+
   end
 end

data/lib/fig/grammar/v1_base.rb

@@ -166,7 +166,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
@@ -240,7 +240,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
@@ -318,7 +318,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
@@ -347,7 +347,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
@@ -411,7 +411,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
@@ -469,7 +469,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
@@ -585,7 +585,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
@@ -659,7 +659,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
@@ -733,7 +733,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
@@ -808,7 +808,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
@@ -819,7 +819,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
@@ -830,7 +830,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
@@ -930,7 +930,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
@@ -976,7 +976,7 @@ module Fig
                   r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure('end')
+                  terminal_parse_failure('\'end\'')
                   r7 = nil
                 end
                 s0 << r7
@@ -1029,9 +1029,15 @@ module Fig
         if r1
           i2 = index
           r3 = lambda { |sequence| sequence[-1].text_value == 'end' }.call(s0)
+          if !r3
+            terminal_parse_failure("<semantic predicate>")
+          end
           if r3
+            @index = i2
             r2 = nil
+            terminal_parse_failure("<semantic predicate>", true)
           else
+            @terminal_failures.pop
             @index = i2
             r2 = instantiate_node(SyntaxNode,input, index...index)
           end
@@ -1062,9 +1068,15 @@ module Fig
                 if r8
                   i9 = index
                   r10 = lambda { |sequence| sequence[-1].text_value == 'end' }.call(s5)
+                  if !r10
+                    terminal_parse_failure("<semantic predicate>")
+                  end
                   if r10
+                    @index = i9
                     r9 = nil
+                    terminal_parse_failure("<semantic predicate>", true)
                   else
+                    @terminal_failures.pop
                     @index = i9
                     r9 = instantiate_node(SyntaxNode,input, index...index)
                   end
@@ -1236,7 +1248,7 @@ module Fig
             r4 = true
             @index += match_len
           else
-            terminal_parse_failure('"')
+            terminal_parse_failure('\'"\'')
             r4 = nil
           end
           s1 << r4
@@ -1260,7 +1272,7 @@ module Fig
                   r9 = true
                   @index += match_len
                 else
-                  terminal_parse_failure('\\')
+                  terminal_parse_failure('\'\\\\\'')
                   r9 = nil
                 end
                 s8 << r9
@@ -1302,7 +1314,7 @@ module Fig
                 r11 = true
                 @index += match_len
               else
-                terminal_parse_failure('"')
+                terminal_parse_failure('\'"\'')
                 r11 = nil
               end
               s1 << r11
@@ -1344,7 +1356,7 @@ module Fig
               r15 = true
               @index += match_len
             else
-              terminal_parse_failure("'")
+              terminal_parse_failure('"\'"')
               r15 = nil
             end
             s12 << r15
@@ -1368,7 +1380,7 @@ module Fig
                     r20 = true
                     @index += match_len
                   else
-                    terminal_parse_failure('\\')
+                    terminal_parse_failure('\'\\\\\'')
                     r20 = nil
                   end
                   s19 << r20
@@ -1410,7 +1422,7 @@ module Fig
                   r22 = true
                   @index += match_len
                 else
-                  terminal_parse_failure("'")
+                  terminal_parse_failure('"\'"')
                   r22 = nil
                 end
                 s12 << r22
@@ -1450,6 +1462,7 @@ module Fig
             else
               r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
               r23.extend(QuotedOrBareString6)
+              r23.extend(QuotedOrBareString6)
             end
             if r23
               r23 = SyntaxNode.new(input, (index-1)...index) if r23 == true
@@ -1551,7 +1564,7 @@ module Fig
             r4 = true
             @index += match_len
           else
-            terminal_parse_failure('"')
+            terminal_parse_failure('\'"\'')
             r4 = nil
           end
           s1 << r4
@@ -1575,7 +1588,7 @@ module Fig
                   r9 = true
                   @index += match_len
                 else
-                  terminal_parse_failure('\\')
+                  terminal_parse_failure('\'\\\\\'')
                   r9 = nil
                 end
                 s8 << r9
@@ -1617,7 +1630,7 @@ module Fig
                 r11 = true
                 @index += match_len
               else
-                terminal_parse_failure('"')
+                terminal_parse_failure('\'"\'')
                 r11 = nil
               end
               s1 << r11
@@ -1658,7 +1671,7 @@ module Fig
               r15 = true
               @index += match_len
             else
-              terminal_parse_failure("'")
+              terminal_parse_failure('"\'"')
               r15 = nil
             end
             s12 << r15
@@ -1682,7 +1695,7 @@ module Fig
                     r20 = true
                     @index += match_len
                   else
-                    terminal_parse_failure('\\')
+                    terminal_parse_failure('\'\\\\\'')
                     r20 = nil
                   end
                   s19 << r20
@@ -1724,7 +1737,7 @@ module Fig
                   r22 = true
                   @index += match_len
                 else
-                  terminal_parse_failure("'")
+                  terminal_parse_failure('"\'"')
                   r22 = nil
                 end
                 s12 << r22
@@ -1778,11 +1791,13 @@ module Fig
         r0
       end
 
-    end
 
-    class V1BaseParser < Treetop::Runtime::CompiledParser
-      include V1Base
+      class Parser < Treetop::Runtime::CompiledParser
+        include V1Base
+      end
     end
 
+    V1BaseParser = V1Base::Parser
+
   end
 end

data/lib/fig/grammar/v2.rb

@@ -212,7 +212,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('include-file')
+          terminal_parse_failure('\'include-file\'')
           r1 = nil
         end
         s0 << r1
@@ -242,7 +242,7 @@ module Fig
                 r7 = true
                 @index += match_len
               else
-                terminal_parse_failure(':')
+                terminal_parse_failure('\':\'')
                 r7 = nil
               end
               s6 << r7
@@ -309,7 +309,7 @@ module Fig
           r2 = true
           @index += match_len
         else
-          terminal_parse_failure('"')
+          terminal_parse_failure('\'"\'')
           r2 = nil
         end
         s1 << r2
@@ -333,7 +333,7 @@ module Fig
                 r7 = true
                 @index += match_len
               else
-                terminal_parse_failure('\\')
+                terminal_parse_failure('\'\\\\\'')
                 r7 = nil
               end
               s6 << r7
@@ -375,7 +375,7 @@ module Fig
               r9 = true
               @index += match_len
             else
-              terminal_parse_failure('"')
+              terminal_parse_failure('\'"\'')
               r9 = nil
             end
             s1 << r9
@@ -397,7 +397,7 @@ module Fig
             r11 = true
             @index += match_len
           else
-            terminal_parse_failure("'")
+            terminal_parse_failure('"\'"')
             r11 = nil
           end
           s10 << r11
@@ -421,7 +421,7 @@ module Fig
                   r16 = true
                   @index += match_len
                 else
-                  terminal_parse_failure('\\')
+                  terminal_parse_failure('\'\\\\\'')
                   r16 = nil
                 end
                 s15 << r16
@@ -463,7 +463,7 @@ module Fig
                 r18 = true
                 @index += match_len
               else
-                terminal_parse_failure("'")
+                terminal_parse_failure('"\'"')
                 r18 = nil
               end
               s10 << r18
@@ -516,11 +516,13 @@ module Fig
         r0
       end
 
-    end
 
-    class V2Parser < Treetop::Runtime::CompiledParser
-      include V2
+      class Parser < Treetop::Runtime::CompiledParser
+        include V2
+      end
     end
 
+    V2Parser = V2::Parser
+
   end
 end

data/lib/fig/grammar/version.rb

@@ -54,7 +54,7 @@ module Fig
           r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('grammar')
+          terminal_parse_failure('\'grammar\'')
           r1 = nil
         end
         s0 << r1
@@ -80,7 +80,7 @@ module Fig
               r4 = true
               @index += match_len
             else
-              terminal_parse_failure('v')
+              terminal_parse_failure('\'v\'')
               r4 = nil
             end
             s0 << r4
@@ -137,11 +137,13 @@ module Fig
         r0
       end
 
-    end
 
-    class VersionParser < Treetop::Runtime::CompiledParser
-      include Version
+      class Parser < Treetop::Runtime::CompiledParser
+        include Version
+      end
     end
 
+    VersionParser = Version::Parser
+
   end
 end

data/lib/fig/grammar/version_identification.rb

@@ -105,11 +105,13 @@ module Fig
         r0
       end
 
-    end
 
-    class VersionIdentificationParser < Treetop::Runtime::CompiledParser
-      include VersionIdentification
+      class Parser < Treetop::Runtime::CompiledParser
+        include VersionIdentification
+      end
     end
 
+    VersionIdentificationParser = VersionIdentification::Parser
+
   end
 end

data/lib/fig/operating_system.rb

@@ -4,8 +4,11 @@ require 'cgi'
 require 'fileutils'
 # Must specify absolute path of ::Archive when using
 # this module to avoid conflicts with Fig::Statement::Archive
-require 'libarchive_ruby'
+require 'ffi-libarchive-binary'
 require 'rbconfig'
+require 'set'
+require 'zlib'
+require 'rubygems/package'
 
 require 'fig/at_exit'
 require 'fig/environment_variables/case_insensitive'
@@ -29,36 +32,50 @@ class Fig::OperatingSystem
   WINDOWS_FILE_NAME_ILLEGAL_CHARACTERS = %w[ \\ / : * ? " < > | ]
   UNIX_FILE_NAME_ILLEGAL_CHARACTERS    = %w[ / ]
 
-  def self.windows?
-    return !! (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/)
-  end
+  class << self
+    def windows?
+      return @is_windows if not @is_windows.nil?
 
-  def self.unix?
-    ! Fig::OperatingSystem.windows?
-  end
+      @is_windows = !! (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/)
 
-  def self.file_name_illegal_characters()
-    if Fig::OperatingSystem.windows?
-      return WINDOWS_FILE_NAME_ILLEGAL_CHARACTERS
+      return @is_windows
     end
 
-    return UNIX_FILE_NAME_ILLEGAL_CHARACTERS
-  end
+    def macos?
+      return @is_macos if not @is_macos.nil?
 
-  def self.wrap_variable_name_with_shell_expansion(variable_name)
-    if Fig::OperatingSystem.windows?
-      return "%#{variable_name}%"
-    else
-      return "$#{variable_name}"
+      @is_macos = !! (RbConfig::CONFIG['host_os'] =~ /^darwin/)
+
+      return @is_macos
     end
-  end
 
-  def self.get_environment_variables(initial_values = nil)
-    if Fig::OperatingSystem.windows?
-      return Fig::EnvironmentVariables::CaseInsensitive.new(initial_values)
+    def unix?
+      ! Fig::OperatingSystem.windows?
     end
 
-    return Fig::EnvironmentVariables::CaseSensitive.new(initial_values)
+    def file_name_illegal_characters()
+      if windows?
+        return WINDOWS_FILE_NAME_ILLEGAL_CHARACTERS
+      end
+
+      return UNIX_FILE_NAME_ILLEGAL_CHARACTERS
+    end
+
+    def wrap_variable_name_with_shell_expansion(variable_name)
+      if Fig::OperatingSystem.windows?
+        return "%#{variable_name}%"
+      else
+        return "$#{variable_name}"
+      end
+    end
+
+    def get_environment_variables(initial_values = nil)
+      if windows?
+        return Fig::EnvironmentVariables::CaseInsensitive.new(initial_values)
+      end
+
+      return Fig::EnvironmentVariables::CaseSensitive.new(initial_values)
+    end
   end
 
   def initialize(login)
@@ -186,12 +203,14 @@ class Fig::OperatingSystem
 
   # Expects paths_to_archive as an Array of paths.
   def create_archive(archive_name, paths_to_archive)
+    existing_files = Set.new
+
     # TODO: Need to verify files_to_archive exists.
-    ::Archive.write_open_filename(
-      archive_name, ::Archive::COMPRESSION_GZIP, ::Archive::FORMAT_TAR
-    ) do |writer|
-      paths_to_archive.each do |path|
-        add_path_to_archive(path, writer)
+    Zlib::GzipWriter.open(archive_name) do |gz|
+      Gem::Package::TarWriter.new(gz) do |writer|
+        paths_to_archive.each do |path|
+          add_path_to_archive(path, existing_files, writer)
+        end
       end
     end
   end
@@ -204,7 +223,7 @@ class Fig::OperatingSystem
   def unpack_archive(directory, archive_path)
     FileUtils.mkdir_p directory
     Dir.chdir(directory) do
-      if ! File.exists? archive_path
+      if ! File.exist? archive_path
         raise Fig::RepositoryError.new "#{archive_path} does not exist."
       end
 
@@ -276,27 +295,35 @@ class Fig::OperatingSystem
     return protocol, uri
   end
 
-  def add_path_to_archive(path, archive_writer)
+  def add_path_to_archive(path, existing_files, archive_writer)
+    # #chomp() required on Windows for #copy_lstat(), but also useful for
+    # de-duping directories specified both with and without trailing slash.
+    cleaned_path = path.chomp '/'
+
+    return if existing_files.include? cleaned_path
+
     children = []
-    archive_writer.new_entry do |entry|
-      entry.copy_lstat(path.chomp '/') # chomp required on Windows
-      entry.pathname = path
-      if entry.symbolic_link?
-        linked = File.readlink(path)
-        entry.symlink = linked
-      end
-      archive_writer.write_header(entry)
 
-      if entry.regular?
-        archive_writer.write_data(open(path) {|f| f.binmode; f.read })
-      elsif entry.directory?
-        children = Dir.entries(path) - ['.', '..']
+    stat = File.lstat(path)
+    if stat.symlink?
+      archive_writer.add_symlink(path, File.readlink(path), stat.mode)
+    elsif stat.file?
+      archive_writer.add_file_simple(path, stat.mode, stat.size) do |dst_io|
+        File.open path, "rb" do |src_io|
+          IO.copy_stream(src_io, dst_io)
+        end
       end
+    elsif stat.directory?
+      children = Dir.entries(path) - ['.', '..']
     end
 
+    existing_files << cleaned_path
+
     children.each do
       |child|
-      add_path_to_archive(File.join(path, child), archive_writer)
+      add_path_to_archive(
+        File.join(path, child), existing_files, archive_writer,
+      )
     end
 
     return

data/lib/fig/package.rb

@@ -102,8 +102,19 @@ class Fig::Package
 
   def <=>(other)
     return if not other
-
-    compared = compare_components(name, other.name)
+    return if synthetic?
+    return if other.synthetic?
+
+    if (
+          not name              \
+      and not other.name        \
+      and not description       \
+      and not other.description
+    )
+      compared = compare_components(file_path, other.file_path)
+    else
+      compared = compare_components(name, other.name)
+    end
     return compared if compared != 0
 
     return compare_components(version, other.version)
@@ -158,7 +169,7 @@ class Fig::Package
         full_path = statement.full_path_relative_to self
 
         descriptors << Fig::PackageDescriptor.new(
-          nil, nil, nil, :file_path => full_path
+          nil, nil, statement.config_name, :file_path => full_path
         )
       elsif statement.is_a?(Fig::Statement::Override)
         backtrace.add_override(statement)
@@ -185,7 +196,7 @@ class Fig::Package
       return "[#{@file_path}]"
     end
 
-    return @description
+    return "<#{@description}>"
   end
 
   def to_s
@@ -204,7 +215,7 @@ class Fig::Package
   # Useful for debugging; should not be used for regular output.
   def to_descriptive_string_with_config(config_name)
     return Fig::PackageDescriptor.format(
-      name, version, config_name, :use_default_config, description
+      name_or_file_or_description, version, config_name, :use_default_config, description
     )
   end
 

data/lib/fig/package_descriptor.rb

@@ -101,7 +101,9 @@ class Fig::PackageDescriptor
   end
 
   def <=>(other)
-    return to_string() <=> other.to_string()
+    self_string  = to_string(:use_default_config, :use_file_or_description)
+    other_string = other.to_string(:use_default_config, :use_file_or_description)
+    return self_string <=> other_string
   end
 
 

data/lib/fig/parser.rb

@@ -42,9 +42,6 @@ class Fig::Parser
     2 => Fig::Grammar::V2Parser,
   }
 
-  # TODO: Remove this once stablized.
-  @@seen_v2 = false
-
   def get_grammar_version(unparsed_package)
     version_parser = Fig::Grammar::VersionIdentificationParser.new()
 
@@ -72,12 +69,6 @@ class Fig::Parser
         %Q<Don't know how to parse grammar version #{version}#{statement.position_string()}.>
       )
     end
-    if version == 2 && ! @@seen_v2
-      @@seen_v2 = true
-      Fig::Logging.info(
-        'Encountered v2 grammar.  This is experimental and subject to change without notice.'
-      )
-    end
 
     return version
   end