fig 0.1.62 → 0.1.64

data/lib/fig/environmentvariables/casesensitive.rb

@@ -4,7 +4,7 @@ module Fig; end;
 module EnvironmentVariables; end
 
 # Manager of a set of environment variables where the variable names are
-# case-insensitive, e.g. on *nix.
+# case-sensitive, e.g. on *nix.
 class Fig::EnvironmentVariables::CaseSensitive
   include Fig::EnvironmentVariables
 

data/lib/fig/figrc.rb

@@ -5,105 +5,105 @@ require 'fig/configfileerror'
 require 'fig/operatingsystem'
 require 'fig/repository'
 
-module Fig
-  # Parse multiple figrc files and assemble them into a single
-  # ApplicationConfiguration object.
-  class FigRC
-    REPOSITORY_CONFIGURATION =
-        "#{Repository::METADATA_SUBDIRECTORY}/figrc"
-
-    def self.find(
-      override_path, repository_url, login, fig_home, disable_figrc = false
+module Fig; end
+
+# Parse multiple figrc files and assemble them into a single
+# ApplicationConfiguration object.
+class Fig::FigRC
+  REPOSITORY_CONFIGURATION =
+      "#{Fig::Repository::METADATA_SUBDIRECTORY}/figrc"
+
+  def self.find(
+    override_path, repository_url, login, fig_home, disable_figrc = false
+  )
+    configuration = Fig::ApplicationConfiguration.new(repository_url)
+
+    handle_override_configuration(configuration, override_path)
+    handle_figrc(configuration) if not disable_figrc
+    handle_repository_configuration(
+      configuration, repository_url, login, fig_home
     )
-      configuration = ApplicationConfiguration.new(repository_url)
 
-      handle_override_configuration(configuration, override_path)
-      handle_figrc(configuration) if not disable_figrc
-      handle_repository_configuration(
-        configuration, repository_url, login, fig_home
-      )
+    return configuration
+  end
 
-      return configuration
-    end
+  private
 
-    private
-
-    def self.handle_override_configuration(configuration, override_path)
-      begin
-        if not override_path.nil?
-          configuration.push_dataset(
-            JSON.parse(File::open(override_path).read)
-          )
-        end
-      rescue JSON::ParserError => exception
-        translate_parse_error(exception, override_path)
+  def self.handle_override_configuration(configuration, override_path)
+    begin
+      if not override_path.nil?
+        configuration.push_dataset(
+          JSON.parse(File::open(override_path).read)
+        )
       end
-
-      return
+    rescue JSON::ParserError => exception
+      translate_parse_error(exception, override_path)
     end
 
-    def self.handle_figrc(configuration)
-      user_figrc_path = File.expand_path('~/.figrc')
-      return if not File.exists? user_figrc_path
+    return
+  end
 
-      begin
-        configuration.push_dataset(
-          JSON.parse(File::open(user_figrc_path).read)
-        )
-      rescue JSON::ParserError => exception
-        translate_parse_error(exception, user_figrc_path)
-      end
+  def self.handle_figrc(configuration)
+    user_figrc_path = File.expand_path('~/.figrc')
+    return if not File.exists? user_figrc_path
 
-      return
+    begin
+      configuration.push_dataset(
+        JSON.parse(File::open(user_figrc_path).read)
+      )
+    rescue JSON::ParserError => exception
+      translate_parse_error(exception, user_figrc_path)
     end
 
-    def self.handle_repository_configuration(
-      configuration, repository_url, login, fig_home
-    )
-      return if repository_url.nil?
+    return
+  end
 
-      figrc_url = "#{repository_url}/#{REPOSITORY_CONFIGURATION}"
-      repo_figrc_path =
-        File.expand_path(File.join(fig_home, REPOSITORY_CONFIGURATION))
+  def self.handle_repository_configuration(
+    configuration, repository_url, login, fig_home
+  )
+    return if repository_url.nil?
 
-      os = OperatingSystem.new(login)
+    figrc_url = "#{repository_url}/#{REPOSITORY_CONFIGURATION}"
+    repo_figrc_path =
+      File.expand_path(File.join(fig_home, REPOSITORY_CONFIGURATION))
 
-      repo_config_exists = nil
-      begin
-        os.download( figrc_url, repo_figrc_path )
-        repo_config_exists = true
-      rescue NotFoundError => e
-        repo_config_exists = false
-      end
+    os = Fig::OperatingSystem.new(login)
 
-      return configuration if not repo_config_exists
+    repo_config_exists = nil
+    begin
+      os.download( figrc_url, repo_figrc_path )
+      repo_config_exists = true
+    rescue Fig::NotFoundError => e
+      repo_config_exists = false
+    end
 
-      begin
-        configuration.push_dataset(
-          JSON.parse(File.open(repo_figrc_path).read)
-        )
-      rescue JSON::ParserError => exception
-        translate_parse_error(exception, figrc_url)
-      end
+    return configuration if not repo_config_exists
 
-      return
+    begin
+      configuration.push_dataset(
+        JSON.parse(File.open(repo_figrc_path).read)
+      )
+    rescue JSON::ParserError => exception
+      translate_parse_error(exception, figrc_url)
     end
 
-    def self.translate_parse_error(json_parse_error, config_file_path)
-      message = json_parse_error.message
-      message.chomp!
+    return
+  end
 
-      # JSON::ParserError tends to include final newline inside of single
-      # quotes, which makes error messages ugly.
-      message.sub!(/ \n+ ' \z /xm, %q<'>)
+  def self.translate_parse_error(json_parse_error, config_file_path)
+    message = json_parse_error.message
+    message.chomp!
 
-      # Also, there's a useless source code line number in the message.
-      message.sub!(/ \A \d+ : \s+ /xm, %q<>)
+    # JSON::ParserError tends to include final newline inside of single
+    # quotes, which makes error messages ugly.
+    message.sub!(/ \n+ ' \z /xm, %q<'>)
 
-      raise ConfigFileError.new(
-        "Parse issue with #{config_file_path}: #{message}",
-        config_file_path
-      )
-    end
+    # Also, there's a useless source code line number in the message.
+    message.sub!(/ \A \d+ : \s+ /xm, %q<>)
+
+    raise Fig::ConfigFileError.new(
+      "Parse issue with #{config_file_path}: #{message}",
+      config_file_path
+    )
   end
 end

data/lib/fig/grammar.treetop

@@ -1,3 +1,5 @@
+# Treetop (http://treetop.rubyforge.org/) grammar for package definitions.
+
 require 'fig/package'
 require 'fig/packagedescriptor'
 require 'fig/parser'
@@ -7,231 +9,214 @@ require 'fig/statement/configuration'
 require 'fig/statement/include'
 require 'fig/statement/override'
 require 'fig/statement/path'
-require 'fig/statement/publish'
 require 'fig/statement/resource'
 require 'fig/statement/retrieve'
 require 'fig/statement/set'
 
 module Fig
-
-grammar Fig
-  rule package
-    optional_ws statements:(package_statement*) optional_ws {
-      def to_package(descriptor, directory)
-        Package.new(
-          descriptor.name,
-          descriptor.version,
-          directory,
-          statements.elements.map do
-            |statement|
-            statement.to_package_statement(descriptor)
-          end
-        )
-      end
-    }
-  end
-
-  rule package_statement
-    archive / resource / retrieve / config
-  end
-
-  rule archive
-    statement_start:"archive" ws resource_url {
-      def to_package_statement(descriptor)
-        Statement::Archive.new(
-          Parser.node_location(statement_start), resource_url.value.text_value
-        )
-      end
-    }
-  end
-
-  rule resource
-    statement_start:"resource" ws resource_url {
-      def to_package_statement(descriptor)
-        Statement::Resource.new(
-          Parser.node_location(statement_start), resource_url.value.text_value
-        )
-      end
-    }
-  end
-
-  rule retrieve
-    statement_start:"retrieve" ws var:retrieve_variable_name "->" path:retrieve_path ws {
-      def to_package_statement(descriptor)
-        Statement::Retrieve.new(
-          Parser.node_location(statement_start),
-          var.text_value,
-          path.text_value
-        )
-      end
-    }
-  end
-
-  rule retrieve_variable_name
-    [@a-zA-Z0-9/._]+
-  end
-
-  rule retrieve_path
-    [a-zA-Z0-9_/.\[\]-]+
-  end
-
-  rule config
-    statement_start:"config" ws config_name ws statements:config_statement* "end" ws {
-      def to_package_statement(descriptor)
-        Statement::Configuration.new(
-          Parser.node_location(statement_start),
-          config_name.text_value,
-          statements.elements.map do
-            |statement|
-            statement.to_config_statement(descriptor)
-          end
-        )
-      end
-    }
-  end
-
-  rule config_statement
-    include / command / path / set
-  end
-
-  rule include
-    statement_start:"include" ws descriptor overrides:(override*) {
-      def to_config_statement(containing_package_descriptor)
-        Statement::Include.new(
-          Parser.node_location(statement_start),
-          PackageDescriptor.parse(descriptor.text_value.strip),
-          overrides.elements.map{ |e| e.to_override },
-          containing_package_descriptor
-        )
-      end
-    }
-  end
-
-  rule override
-    statement_start:"override" ws package_name "/" version_name ws {
-      def to_override
-        return Statement::Override.new(
-          Parser.node_location(statement_start),
-          package_name.text_value,
-          version_name.text_value
-        )
-      end
-    }
-  end
-
-  rule path
-    statement_start:("append" / "path" / "add") ws name:environment_variable_name "=" value:path_value ws {
-      def to_config_statement(descriptor)
-        Statement::Path.new(
-          Parser.node_location(statement_start),
-          name.text_value,
-          value.text_value
-        )
-      end
-    }
-  end
-
-  rule environment_variable_name
-    [a-zA-Z0-9_]+
-  end
-
-  rule path_value
-    # Characters blocked in the value:
-    #    ;:     - Windows/*nix path separators
-    #    "<>|   - Characters not allowed in filenames on Windows
-    #    \s     - Necessary for the "ws" token to work
-    [^;:"<>|\s]+
-  end
-
-  rule set
-    statement_start:"set" ws name:environment_variable_name "=" value:set_value ws {
-      def to_config_statement(descriptor)
-        Statement::Set.new(
-          Parser.node_location(statement_start),
-          name.text_value,
-          value.text_value
-        )
-      end
-    }
-  end
-
-  rule set_value
-    [\S]*
-  end
-
-  rule command
-    statement_start:"command" ws string {
-      def to_config_statement(descriptor)
-        Statement::Command.new(
-          Parser.node_location(statement_start), string.value.text_value
-        )
-      end
-    }
-  end
-
-  rule string
-    '"' value:(!'"' . )* '"' ws
-  end
-
-  rule descriptor
-    ((package:package_name ("/" version:version_name)? (":" config:config_name)? ws) /
-    (":" config:config_name ws)) {
-      def get_version
-        elements.each do |element|
-          if element.respond_to?(:version)
-            return element.version.text_value
-          end
+  grammar Fig
+    rule package
+      optional_ws statements:(package_statement*) optional_ws {
+        def to_package(directory, build_state)
+          Package.new(
+            build_state.descriptor.name,
+            build_state.descriptor.version,
+            directory,
+            statements.elements.map do
+              |statement|
+              statement.to_package_statement(build_state)
+            end
+          )
         end
-        nil
-      end
-      def get_config
-        return self.config.text_value if self.respond_to?(:config)
-        elements.each do |element|
-          if element.respond_to?(:config)
-            return element.config.text_value
-          end
+      }
+    end
+
+    rule package_statement
+      archive / resource / retrieve / config
+    end
+
+    rule archive
+      statement_start:"archive" ws resource_url {
+        def to_package_statement(build_state)
+          Statement::Archive.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            resource_url.value.text_value
+          )
         end
-        nil
-      end
-    }
-  end
-
-  rule package_name
-    [a-zA-Z0-9_.-]+
-  end
-
-  rule version_name
-    [a-zA-Z0-9_.-]+
-  end
-
-  rule config_name
-    [a-zA-Z0-9_.-]+
-  end
-
-  rule resource_url
-    # Unquoted allows globbing for files, quoted does not.
-    #
-    # Unquoted, anything but:
-    #    @      - To allow for package substitution
-    #    "<>|   - Characters not allowed in filenames on Windows
-    #    \s     - Necessary for the "ws" token to work
-    (value:[^@"<>|\s]+ ws)
-
-    # Unquoted, anything but:
-    #    @        - To allow for package substitution
-    #    "<>|     - Characters not allowed in filenames on Windows
-    #    *?\[\]{} - Characters significant to Dir.glob()
-    #    \s       - We just don't want these. :]  (May need to allow space.)
-    / ('"' value:[^@"<>|*?\[\]{}\s]+ '"' ws)
-  end
-
-  rule ws
-    [ \n\r\t]+
-  end
-
-  rule optional_ws
-    [ \n\r\t]*
+      }
+    end
+
+    rule resource
+      statement_start:"resource" ws resource_url {
+        def to_package_statement(build_state)
+          Statement::Resource.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            resource_url.value.text_value
+          )
+        end
+      }
+    end
+
+    rule retrieve
+      statement_start:"retrieve" ws var:environment_variable_name "->" path:retrieve_path ws {
+        def to_package_statement(build_state)
+          Statement::Retrieve.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            var.text_value,
+            path.text_value
+          )
+        end
+      }
+    end
+
+    rule retrieve_path
+      [a-zA-Z0-9_/.\[\]-]+
+    end
+
+    rule config
+      statement_start:"config" ws config_name ws statements:config_statement* "end" ws {
+        def to_package_statement(build_state)
+          Statement::Configuration.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            config_name.text_value,
+            statements.elements.map do
+              |statement|
+              statement.to_config_statement(build_state)
+            end
+          )
+        end
+      }
+    end
+
+    rule config_name
+      [a-zA-Z0-9_.-]+
+    end
+
+    rule config_statement
+      override / include / command / path / set
+    end
+
+    rule include
+      statement_start:"include" ws descriptor_string ws {
+        def to_config_statement(build_state)
+          include_descriptor =
+            Statement::Include.parse_descriptor(
+              descriptor_string.text_value.strip,
+              :source_description =>
+                build_state.node_location_description(descriptor_string),
+              :validation_context => ' for an include statement'
+            )
+
+          Statement::Include.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            include_descriptor,
+            build_state.descriptor
+          )
+        end
+      }
+    end
+
+    rule override
+      statement_start:"override" ws descriptor_string ws {
+        def to_config_statement(build_state)
+          descriptor =
+            Statement::Override.parse_descriptor(
+              descriptor_string.text_value.strip,
+              :source_description =>
+                build_state.node_location_description(descriptor_string),
+              :validation_context => ' for an override statement'
+            )
+
+          return Statement::Override.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            descriptor.name,
+            descriptor.version
+          )
+        end
+      }
+    end
+
+    rule path
+      statement_start:("add" / "append" / "path") ws name_value:[\S]+ ws {
+        def to_config_statement(build_state)
+          return build_state.new_environment_variable_statement(
+            Statement::Path, statement_start, name_value
+          )
+        end
+      }
+    end
+
+    rule environment_variable_name
+      [a-zA-Z0-9_]+
+    end
+
+    rule set
+      statement_start:"set" ws name_value:[\S]+ ws {
+        def to_config_statement(build_state)
+          return build_state.new_environment_variable_statement(
+            Statement::Set, statement_start, name_value
+          )
+        end
+      }
+    end
+
+    rule command
+      statement_start:"command" ws string {
+        def to_config_statement(build_state)
+          Statement::Command.new(
+            build_state.node_location(statement_start),
+            build_state.source_description,
+            string.value.text_value
+          )
+        end
+      }
+    end
+
+    rule string
+      '"' value:(!'"' . )* '"' ws
+    end
+
+    rule descriptor_string
+      [\S]+
+    end
+
+    rule package_name
+      [a-zA-Z0-9_.-]+
+    end
+
+    rule version_name
+      [a-zA-Z0-9_.-]+
+    end
+
+    rule resource_url
+      # Unquoted allows globbing for files, quoted does not.
+      #
+      # Unquoted, anything but:
+      #    @      - To allow for package substitution
+      #    "<>|   - Characters not allowed in filenames on Windows
+      #    \s     - Necessary for the "ws" token to work
+      (value:[^@"<>|\s]+ ws)
+
+      # Quoted, anything but:
+      #    @        - To allow for package substitution
+      #    "<>|     - Characters not allowed in filenames on Windows
+      #    *?\[\]{} - Characters significant to Dir.glob()
+      #    \s       - We just don't want these. :]  (May need to allow space.)
+      / ('"' value:[^@"<>|*?\[\]{}\s]+ '"' ws)
+    end
+
+    rule ws
+      [ \n\r\t]+
+    end
+
+    rule optional_ws
+      [ \n\r\t]*
+    end
   end
 end
-
-end