fig 0.1.73 → 0.1.75

data/lib/fig/statement/include.rb

@@ -62,13 +62,12 @@ class Fig::Statement::Include < Fig::Statement
     )
   end
 
-  def unparse(indent)
-    text = ''
-    text += package_name() if package_name()
-    text += "/#{version()}" if version()
-    text += ":#{config_name()}" if config_name()
+  def unparse_as_version(unparser)
+    return unparser.include(self)
+  end
 
-    return "#{indent}include #{text}"
+  def minimum_grammar_version_required()
+    return 0
   end
 
   private

data/lib/fig/statement/override.rb

@@ -33,8 +33,11 @@ class Fig::Statement::Override < Fig::Statement
     @version = version
   end
 
-  def unparse(indent)
-    return "#{indent}override " +
-      Fig::PackageDescriptor.format(@package_name, @version, nil)
+  def unparse_as_version(unparser)
+    return unparser.override(self)
+  end
+
+  def minimum_grammar_version_required()
+    return 0
   end
 end

data/lib/fig/statement/path.rb

@@ -36,7 +36,17 @@ class Fig::Statement::Path < Fig::Statement
     @value = value
   end
 
-  def unparse(indent)
-    "#{indent}append #{name}=#{value}"
+  def is_environment_variable?()
+    return true
+  end
+
+  def unparse_as_version(unparser)
+    return unparser.path(self)
+  end
+
+  def minimum_grammar_version_required()
+    # TODO: fix this once going through
+    # Statement.strip_quotes_and_process_escapes()
+    return 0
   end
 end

data/lib/fig/statement/resource.rb

@@ -1,8 +1,9 @@
-require 'fig/repository'
 require 'fig/statement'
 require 'fig/statement/asset'
+require 'fig/url'
 
 module Fig; end
+class  Fig::Statement; end
 
 # Specifies a file (possibly via a URL) that is part of the current package.
 #
@@ -10,16 +11,15 @@ module Fig; end
 class Fig::Statement::Resource < Fig::Statement
   include Fig::Statement::Asset
 
-  attr_reader :url
-
-  def initialize(line_column, source_description, url)
+  def initialize(line_column, source_description, url, glob_if_not_url)
     super(line_column, source_description)
 
-    set_up_url(url)
+    @url             = url
+    @glob_if_not_url = glob_if_not_url
   end
 
   def asset_name()
-    if Fig::Repository.is_url?(url())
+    if Fig::URL.is_url?(url())
       return standard_asset_name()
     end
 
@@ -28,7 +28,7 @@ class Fig::Statement::Resource < Fig::Statement
     return nil
   end
 
-  def unparse(indent)
-    "#{indent}resource #{url}"
+  def unparse_as_version(unparser)
+    return unparser.resource(self)
   end
 end

data/lib/fig/statement/retrieve.rb

@@ -1,4 +1,5 @@
 require 'fig/logging'
+require 'fig/operating_system'
 require 'fig/statement'
 
 module Fig; end
@@ -16,7 +17,10 @@ class Fig::Statement::Retrieve < Fig::Statement
 
     # Yeah, it's not cross-platform, but File doesn't have an #absolute? method
     # and this is better than nothing.
-    if path =~ %r< ^ / >x
+    if (
+          path =~ %r< ^ [\\/] >x \
+      ||  Fig::OperatingSystem.windows? && path =~ %r< ^ [a-z] : >xi
+    )
       Fig::Logging.warn(
         %Q<The retrieve path "#{path}"#{position_string()} looks like it is intended to be absolute; retrieve paths are always treated as relative.>
       )
@@ -43,7 +47,11 @@ class Fig::Statement::Retrieve < Fig::Statement
     @referenced = yea_or_nay
   end
 
-  def unparse(indent)
-    "#{indent}retrieve #{var}->#{path}"
+  def unparse_as_version(unparser)
+    return unparser.retrieve(self)
+  end
+
+  def minimum_grammar_version_required()
+    return 0
   end
 end

data/lib/fig/statement/set.rb

@@ -35,7 +35,17 @@ class Fig::Statement::Set < Fig::Statement
     @value = value
   end
 
-  def unparse(indent)
-    "#{indent}set #{name}=#{value}"
+  def is_environment_variable?()
+    return true
+  end
+
+  def unparse_as_version(unparser)
+    return unparser.set(self)
+  end
+
+  def minimum_grammar_version_required()
+    # TODO: fix this once going through
+    # Statement.strip_quotes_and_process_escapes()
+    return 0
   end
 end

data/lib/fig/unparser.rb

@@ -0,0 +1,127 @@
+module Fig; end
+
+module Fig::Unparser
+  def unparse(statements)
+    @text         = ''
+    @indent_level = @initial_indent_level
+
+    statements.each { |statement| statement.unparse_as_version(self) }
+
+    text          = @text
+    @text         = nil
+    @indent_level = nil
+
+    return text
+  end
+
+  def archive(statement)
+    asset 'archive', statement
+
+    return
+  end
+
+  def command(statement)
+    raise NotImplementedError
+  end
+
+  def configuration(configuration_statement)
+    if ! @text.empty?
+      @text << "\n"
+    end
+
+    add_indent
+    @text << 'config '
+    @text << configuration_statement.name
+    @text << "\n"
+
+    @indent_level += 1
+    begin
+      configuration_statement.statements.each do
+        |statement|
+
+        statement.unparse_as_version(self)
+      end
+    ensure
+      @indent_level -= 1
+    end
+
+    add_indent
+    @text << "end\n"
+
+    return
+  end
+
+  def grammar_version(statement)
+    raise NotImplementedError
+  end
+
+  def include(statement)
+    add_indent
+
+    @text << 'include '
+    @text << Fig::PackageDescriptor.format(
+      statement.package_name, statement.version, statement.config_name
+    )
+    @text << "\n"
+
+    return
+  end
+
+  def override(statement)
+    add_indent
+
+    @text << 'override '
+    @text << Fig::PackageDescriptor.format(
+      statement.package_name, statement.version, nil
+    )
+    @text << "\n"
+
+    return
+  end
+
+  def path(statement)
+    environment_variable(statement, 'append')
+
+    return
+  end
+
+  def resource(statement)
+    asset 'resource', statement
+
+    return
+  end
+
+  def retrieve(statement)
+    raise NotImplementedError
+  end
+
+  def set(statement)
+    environment_variable(statement, 'set')
+
+    return
+  end
+
+  private
+
+  def asset(keyword, statement)
+    raise NotImplementedError
+  end
+
+  def asset_path(statement)
+    if @emit_as_input_or_to_be_published_values == :emit_as_input
+      return statement.url
+    end
+
+    return statement.asset_name
+  end
+
+  def environment_variable(statement, keyword)
+    raise NotImplementedError
+  end
+
+  def add_indent()
+    @text << @indent_string * @indent_level
+
+    return
+  end
+end

data/lib/fig/unparser/v0.rb

@@ -0,0 +1,84 @@
+require 'fig/package_descriptor'
+require 'fig/unparser'
+
+module Fig; end
+module Fig::Unparser; end
+
+# Handles serializing of statements in the v0 grammar.
+class Fig::Unparser::V0
+  include Fig::Unparser
+
+  def initialize(
+    emit_as_input_or_to_be_published_values,
+    indent_string = ' ' * 2,
+    initial_indent_level = 0
+  )
+    @emit_as_input_or_to_be_published_values =
+      emit_as_input_or_to_be_published_values
+    @indent_string        = indent_string
+    @initial_indent_level = initial_indent_level
+
+    return
+  end
+
+  def command(statement)
+    add_indent
+
+    @text << %q<command ">
+    @text << statement.command
+    @text << %Q<"\n>
+
+    return
+  end
+
+  def grammar_version(statement)
+    add_indent
+
+    # Comment out so that older clients don't have issues.
+    @text << "# grammar v0\n"
+
+    return
+  end
+
+  def retrieve(statement)
+    add_indent
+
+    @text << 'retrieve '
+    @text << statement.var
+    @text << '->'
+    @text << statement.path
+    @text << "\n"
+
+    return
+  end
+
+  private
+
+  def asset(keyword, statement)
+    path  = asset_path statement
+    quote = path =~ /[*?\[\]{}]/ ? '' : %q<">
+
+    add_indent
+    @text << keyword
+    @text << ' '
+    @text << quote
+    @text << path
+    @text << quote
+    @text << "\n"
+
+    return
+  end
+
+  def environment_variable(statement, keyword)
+    add_indent
+
+    @text << keyword
+    @text << ' '
+    @text << statement.name
+    @text << '='
+    @text << statement.value
+    @text << "\n"
+
+    return
+  end
+end

data/lib/fig/unparser/v1.rb

@@ -0,0 +1,77 @@
+require 'fig/unparser'
+
+module Fig; end
+module Fig::Unparser; end
+
+# Handles serializing of statements in the v1 grammar.
+class Fig::Unparser::V1
+  include Fig::Unparser
+
+  def initialize(
+    emit_as_input_or_to_be_published_values,
+    indent_string = ' ' * 2,
+    initial_indent_level = 0
+  )
+    @emit_as_input_or_to_be_published_values =
+      emit_as_input_or_to_be_published_values
+    @indent_string        = indent_string
+    @initial_indent_level = initial_indent_level
+
+    return
+  end
+
+  def command(statement)
+    add_indent
+
+    @text << %q<command ">
+    @text << statement.command
+    @text << %Q<"\n>
+
+    return
+  end
+
+  def grammar_version(statement)
+    add_indent
+
+    @text << "grammar v1\n"
+
+    return
+  end
+
+  private
+
+  def asset(keyword, statement)
+    quote = %q<'>
+    path  = asset_path statement
+
+    if statement.glob_if_not_url?
+      quote = %q<">
+      path = path.gsub(/\\/, ('\\' * 4))
+    end
+
+    add_indent
+    @text << keyword
+    @text << ' '
+    @text << quote
+    @text << path
+    @text << quote
+    @text << "\n"
+
+    return
+  end
+
+  def environment_variable(statement, keyword)
+    # TODO: temporarily hack v0 grammar in here so we can test asset
+    # statements; proper implementation once asset statements are done.
+    add_indent
+
+    @text << keyword
+    @text << ' '
+    @text << statement.name
+    @text << '='
+    @text << statement.value
+    @text << "\n"
+
+    return
+  end
+end

data/lib/fig/url.rb

@@ -0,0 +1,7 @@
+module Fig; end
+
+module Fig::URL
+  def self.is_url?(url)
+    not (/ftp:\/\/|https?:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
+  end
+end