fig 0.1.73 → 0.1.75

data/lib/fig/parser_package_build_state.rb

@@ -4,6 +4,7 @@ require 'fig/statement'
 require 'fig/statement/archive'
 require 'fig/statement/command'
 require 'fig/statement/configuration'
+require 'fig/statement/grammar_version'
 require 'fig/statement/include'
 require 'fig/statement/override'
 require 'fig/statement/path'
@@ -43,22 +44,45 @@ class Fig::ParserPackageBuildState
     )
   end
 
-  def new_package_statement(directory, statements)
+  def new_package_statement(directory, grammar_node, statement_nodes)
+    grammar_statement = nil
+    if grammar_node && ! grammar_node.empty?
+      grammar_statement = grammar_node.to_package_statement(self)
+    else
+      grammar_statement = Fig::Statement::GrammarVersion.new(
+        nil,
+        %Q<[synthetic statement created in #{__FILE__} line #{__LINE__}]>,
+        0 # Grammar version
+      )
+    end
+    statement_objects = [grammar_statement]
+
+    statement_nodes.elements.each do
+      |node|
+
+      statement_objects << node.to_package_statement(self)
+    end
+
     return Fig::Package.new(
       descriptor.name,
       descriptor.version,
       directory,
-      statements.elements.map do
-        |statement|
-        statement.to_package_statement(self)
-      end
+      statement_objects
+    )
+  end
+
+  def new_grammar_version_statement(keyword_node, version_node)
+    return Fig::Statement::GrammarVersion.new(
+      node_location(keyword_node),
+      source_description,
+      version_node.text_value.to_i
     )
   end
 
   def new_asset_statement(statement_class, keyword_node, url_node)
     url = url_node.text_value
 
-    statement_class.validate_url(url) {
+    need_to_glob = statement_class.validate_and_process_escapes_in_url!(url) {
       |error_description|
 
       raise_invalid_value_parse_error(
@@ -67,7 +91,7 @@ class Fig::ParserPackageBuildState
     }
 
     return statement_class.new(
-      node_location(keyword_node), source_description, url
+      node_location(keyword_node), source_description, url, need_to_glob
     )
   end
 
@@ -87,14 +111,17 @@ class Fig::ParserPackageBuildState
       )
     end
 
+    statement_objects = statements.elements.map do
+      |statement|
+
+      statement.to_config_statement(self)
+    end
+
     return Fig::Statement::Configuration.new(
       node_location(keyword_node),
       source_description,
       name_node.text_value,
-      statements.elements.map do
-        |statement|
-        statement.to_config_statement(self)
-      end
+      statement_objects
     )
   end
 

data/lib/fig/repository.rb

@@ -13,6 +13,7 @@ require 'fig/package_descriptor'
 require 'fig/parser'
 require 'fig/repository_error'
 require 'fig/repository_package_publisher'
+require 'fig/url'
 
 module Fig; end
 
@@ -25,10 +26,6 @@ class Fig::Repository
   VERSION_FILE_NAME     = 'repository-format-version'
   VERSION_SUPPORTED     = 1
 
-  def self.is_url?(url)
-    not (/ftp:\/\/|https?:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
-  end
-
   def initialize(
     os,
     local_repository_directory,
@@ -268,9 +265,9 @@ class Fig::Repository
     temp_dir = package_download_temp_dir(descriptor)
     begin
       install_package(descriptor, temp_dir)
-    rescue Fig::NotFoundError
+    rescue Fig::NotFoundError => error
       Fig::Logging.fatal \
-        "Package not found in remote repository: #{descriptor.to_string()}"
+        "Package #{descriptor.to_string()} not found in remote repository. (Was looking for #{error.path}.)"
 
       delete_local_package(descriptor)
 
@@ -303,13 +300,13 @@ class Fig::Repository
     package = read_package_from_directory(temp_dir, descriptor)
 
     package.archive_urls.each do |archive_url|
-      if not Fig::Repository.is_url?(archive_url)
+      if not Fig::URL.is_url?(archive_url)
         archive_url = remote_dir_for_package(descriptor) + '/' + archive_url
       end
       @operating_system.download_and_unpack_archive(archive_url, temp_dir)
     end
     package.resource_urls.each do |resource_url|
-      if not Fig::Repository.is_url?(resource_url)
+      if not Fig::URL.is_url?(resource_url)
         resource_url =
           remote_dir_for_package(descriptor) + '/' + resource_url
       end

data/lib/fig/repository_package_publisher.rb

@@ -9,29 +9,42 @@ require 'fig/at_exit'
 require 'fig/logging'
 require 'fig/not_found_error'
 require 'fig/package_cache'
+require 'fig/package_definition_text_assembler'
 require 'fig/package_descriptor'
 require 'fig/package_parse_error'
 require 'fig/parser'
 require 'fig/repository'
 require 'fig/repository_error'
 require 'fig/statement/archive'
+require 'fig/statement/grammar_version'
 require 'fig/statement/resource'
+require 'fig/url'
 
 module Fig; end
 
+# Handles package publishing for the Repository.
 class Fig::RepositoryPackagePublisher
-  attr_accessor :operating_system
-  attr_accessor :publish_listeners
-  attr_accessor :package_statements
-  attr_accessor :descriptor
-  attr_accessor :source_package
-  attr_accessor :was_forced
-  attr_accessor :base_temp_dir
-  attr_accessor :local_dir_for_package
-  attr_accessor :remote_dir_for_package
-  attr_accessor :local_fig_file_for_package
-  attr_accessor :remote_fig_file_for_package
-  attr_accessor :local_only
+  attr_writer :operating_system
+  attr_writer :publish_listeners
+  attr_writer :descriptor
+  attr_writer :source_package
+  attr_writer :was_forced
+  attr_writer :base_temp_dir
+  attr_writer :local_dir_for_package
+  attr_writer :remote_dir_for_package
+  attr_writer :local_fig_file_for_package
+  attr_writer :remote_fig_file_for_package
+  attr_writer :local_only
+
+  def initialize()
+    @text_assembler = Fig::PackageDefinitionTextAssembler.new
+
+    return
+  end
+
+  def package_statements=(statements)
+    @text_assembler.add_input(statements)
+  end
 
   def publish_package()
     derive_publish_metadata()
@@ -47,9 +60,9 @@ class Fig::RepositoryPackagePublisher
 
     publish_package_contents
     if not @local_only
-      @operating_system.upload(fig_file, remote_fig_file_for_package())
+      @operating_system.upload(fig_file, @remote_fig_file_for_package)
     end
-    @operating_system.copy(fig_file, local_fig_file_for_package())
+    @operating_system.copy(fig_file, @local_fig_file_for_package)
 
     notify_listeners
 
@@ -60,8 +73,16 @@ class Fig::RepositoryPackagePublisher
 
   private
 
+  def derive_publish_metadata()
+    @publish_time  = Time.now()
+    @publish_login = Sys::Admin.get_login()
+    @publish_host  = Socket.gethostname()
+
+    return
+  end
+
   def validate_asset_names()
-    asset_statements = @package_statements.select { |s| s.is_asset? }
+    asset_statements = @text_assembler.asset_input_statements
 
     asset_names = Set.new()
     asset_statements.each do
@@ -85,27 +106,12 @@ class Fig::RepositoryPackagePublisher
     end
   end
 
-  def derive_publish_metadata()
-    @publish_time  = Time.now()
-    @publish_login = Sys::Admin.get_login()
-    @publish_host  = Socket.gethostname()
-
-    return
-  end
-
   def derive_definition_file()
-    @definition_file_lines = []
-
     add_package_metadata_comments()
-    add_statements_to_publish_and_create_resource_archive()
+    add_output_statements_and_create_resource_archive()
     add_unparsed_text()
 
-    @definition_file_lines.flatten!
-    file_content = @definition_file_lines.join("\n")
-    file_content.gsub!(/\n{3,}/, "\n\n")
-    file_content.strip!
-    file_content << "\n"
-
+    file_content = @text_assembler.assemble_package_definition()
     begin
       Fig::Parser.new(nil, false).parse_package(
         @descriptor,
@@ -123,34 +129,20 @@ class Fig::RepositoryPackagePublisher
   end
 
   def add_package_metadata_comments()
-    @definition_file_lines <<
+    @text_assembler.add_header(
       %Q<# Publishing information for #{@descriptor.to_string()}:>
-    @definition_file_lines << %q<#>
+    )
+    @text_assembler.add_header %q<#>
 
-    @definition_file_lines <<
+    @text_assembler.add_header(
       %Q<#     Time: #{@publish_time} (epoch: #{@publish_time.to_i()})>
+    )
 
-    @definition_file_lines << %Q<#     User: #{@publish_login}>
-    @definition_file_lines << %Q<#     Host: #{@publish_host}>
-    @definition_file_lines << %Q<#     Args: "#{ARGV.join %q[", "]}">
-    @definition_file_lines << %Q<#     Fig:  v#{Fig::VERSION}>
-    @definition_file_lines << %q<#>
-
-    asset_statements =
-      @package_statements.select { |statement| statement.is_asset? }
-    asset_strings =
-      asset_statements.collect { |statement| statement.unparse('#    ') }
-
-    if asset_strings.empty?
-      @definition_file_lines <<
-        %q<# There were no asset statements in the unpublished package definition.>
-    else
-      @definition_file_lines << %q<# Original asset statements: >
-      @definition_file_lines << %q<#>
-      @definition_file_lines << asset_strings
-    end
-
-    @definition_file_lines << %Q<\n>
+    @text_assembler.add_header %Q<#     User: #{@publish_login}>
+    @text_assembler.add_header %Q<#     Host: #{@publish_host}>
+    @text_assembler.add_header %Q<#     Args: "#{ARGV.join %q[", "]}">
+    @text_assembler.add_header %Q<#     Fig:  v#{Fig::VERSION}>
+    @text_assembler.add_header %Q<\n>
 
     return
   end
@@ -159,37 +151,64 @@ class Fig::RepositoryPackagePublisher
   # files (those where the statement references a URL as opposed to a local
   # file) and then copies all files into the local repository and the remote
   # repository (if not a local-only publish).
-  def add_statements_to_publish_and_create_resource_archive()
-    initialize_statements_to_publish()
+  def add_output_statements_and_create_resource_archive()
+    assemble_output_statements()
     create_resource_archive()
 
-    @statements_to_publish.each do
+    return
+  end
+
+  def assemble_output_statements()
+    @resource_paths = []
+
+    if (
+          @text_assembler.input_statements.empty? \
+      ||  ! @text_assembler.input_statements[0].is_a?(Fig::Statement::GrammarVersion)
+    )
+      @text_assembler.add_output Fig::Statement::GrammarVersion.new(
+        nil,
+        %Q<[synthetic statement created in #{__FILE__} line #{__LINE__}]>,
+        0 # Grammar version
+      )
+    end
+
+    @text_assembler.input_statements.each do
       |statement|
 
       if statement.is_asset?
-        @definition_file_lines <<
-          statement.class.new(nil, nil, statement.asset_name).unparse('')
+        add_asset_to_output_statements(statement)
       else
-        @definition_file_lines << statement.unparse('')
+        @text_assembler.add_output statement
       end
     end
 
     return
   end
 
-  def initialize_statements_to_publish()
-    @resource_paths = []
-
-    @statements_to_publish = @package_statements.reject do |statement|
-      if (
-        statement.is_a?(Fig::Statement::Resource) &&
-        ! Fig::Repository.is_url?(statement.url)
-      )
-        @resource_paths << statement.url
-        true
+  def add_asset_to_output_statements(asset_statement)
+    if Fig::URL.is_url? asset_statement.url
+      @text_assembler.add_output asset_statement
+    elsif asset_statement.is_a? Fig::Statement::Archive
+      if asset_statement.requires_globbing?
+        expand_globs_from( [asset_statement.url] ).each do
+          |file|
+
+          @text_assembler.add_output(
+            Fig::Statement::Archive.new(
+              nil,
+              %Q<[synthetic statement created in #{__FILE__} line #{__LINE__}]>,
+              file,
+              false # No globbing
+            )
+          )
+        end
       else
-        false
+        @text_assembler.add_output asset_statement
       end
+    elsif asset_statement.requires_globbing?
+      @resource_paths.concat expand_globs_from( [asset_statement.url] )
+    else
+      @resource_paths << asset_statement.url
     end
 
     return
@@ -197,15 +216,19 @@ class Fig::RepositoryPackagePublisher
 
   def create_resource_archive()
     if @resource_paths.size > 0
-      asset_paths = expand_globs_from(@resource_paths)
-      check_asset_paths(asset_paths)
+      check_asset_paths(@resource_paths)
 
       file = Fig::Repository::RESOURCES_FILE
-      @operating_system.create_archive(file, asset_paths)
+      @operating_system.create_archive(file, @resource_paths)
       Fig::AtExit.add { File.delete(file) }
 
-      @statements_to_publish.unshift(
-        Fig::Statement::Archive.new(nil, nil, file)
+      @text_assembler.add_output(
+        Fig::Statement::Archive.new(
+          nil,
+          %Q<[synthetic statement created in #{__FILE__} line #{__LINE__}]>,
+          file,
+          false # No globbing
+        )
       )
     end
 
@@ -213,7 +236,7 @@ class Fig::RepositoryPackagePublisher
   end
 
   def publish_package_contents()
-    @statements_to_publish.each do
+    @text_assembler.output_statements.each do
       |statement|
 
       if statement.is_asset?
@@ -226,9 +249,9 @@ class Fig::RepositoryPackagePublisher
 
   def publish_asset(asset_statement)
     asset_name = asset_statement.asset_name()
-    asset_remote = "#{remote_dir_for_package()}/#{asset_name}"
+    asset_remote = "#{@remote_dir_for_package}/#{asset_name}"
 
-    if Fig::Repository.is_url?(asset_statement.url)
+    if Fig::URL.is_url? asset_statement.url
       asset_local = File.join(publish_temp_dir(), asset_name)
 
       begin
@@ -243,9 +266,7 @@ class Fig::RepositoryPackagePublisher
     end
 
     if not @local_only
-      @operating_system.upload(
-        asset_local, asset_remote
-      )
+      @operating_system.upload(asset_local, asset_remote)
     end
 
     @operating_system.copy(
@@ -255,20 +276,17 @@ class Fig::RepositoryPackagePublisher
       @operating_system.unpack_archive(@local_dir_for_package, asset_name)
     end
 
-    @definition_file_lines <<
-      asset_statement.class.new(nil, nil, asset_name).unparse('')
-
     return
   end
 
   def add_unparsed_text()
     if @source_package && @source_package.unparsed_text
-
-      @definition_file_lines << ''
-      @definition_file_lines << '# Original, unparsed package text:'
-      @definition_file_lines << '#'
-      @definition_file_lines <<
+      @text_assembler.add_footer ''
+      @text_assembler.add_footer '# Original, unparsed package text:'
+      @text_assembler.add_footer '#'
+      @text_assembler.add_footer(
         @source_package.unparsed_text.gsub(/^(?=[^\n]+$)/, '# ').gsub(/^$/, '#')
+      )
     end
 
     return
@@ -299,7 +317,7 @@ class Fig::RepositoryPackagePublisher
   end
 
   def publish_temp_dir()
-    File.join(base_temp_dir(), 'publish')
+    File.join(@base_temp_dir, 'publish')
   end
 
   def check_asset_path(asset_path)
@@ -328,12 +346,12 @@ class Fig::RepositoryPackagePublisher
     return
   end
 
-  # 'resources' is an Array of fileglob patterns: ['tmp/foo/file1',
+  # 'paths' is an Array of fileglob patterns: ['tmp/foo/file1',
   # 'tmp/foo/*.jar']
-  def expand_globs_from(resources)
+  def expand_globs_from(paths)
     expanded_files = []
 
-    resources.each do
+    paths.each do
       |path|
 
       globbed_files = Dir.glob(path)