fig 0.1.51 → 0.1.52

data/lib/fig/environment.rb

@@ -2,11 +2,12 @@ require 'stringio'
 
 require 'fig/backtrace'
 require 'fig/logging'
-require 'fig/package/command'
-require 'fig/package/include'
-require 'fig/package/path'
-require 'fig/package/set'
+require 'fig/package'
 require 'fig/repositoryerror'
+require 'fig/statement/command'
+require 'fig/statement/include'
+require 'fig/statement/path'
+require 'fig/statement/set'
 require 'fig/userinputerror'
 
 module Fig
@@ -16,56 +17,73 @@ module Fig
   class Environment
     DEFAULT_VERSION_NAME = 'current'
 
-    def initialize(os, repository, variables_override, retriever)
-      @os = os
+    def initialize(repository, variables_override, retriever)
       @repository = repository
       @variables = variables_override || get_environment_variables
       @retrieve_vars = {}
       @packages = {}
-      @applied_configs = {}
       @retriever = retriever
     end
 
     def get_environment_variables
       vars = {}
       ENV.each { |key,value| vars[key]=value }
+
       return vars
     end
 
     # Returns the value of an envirionment variable
     def [](name)
-      @variables[name]
+      return @variables[name]
     end
 
     # Indicates that the values from a particular envrionment variable path
     def add_retrieve(name, path)
       @retrieve_vars[name] = path
+
+      return
     end
 
     def register_package(package)
       name = package.package_name
-      if @packages[name]
+
+      if get_package(name)
         Logging.fatal %Q<There is already a package with the name "#{name}".>
         raise RepositoryError.new
       end
+
       @packages[name] = package
+
+      return
+    end
+
+    def get_package(package_name)
+      return @packages[package_name]
+    end
+
+    def packages
+      return @packages.values
     end
 
     def apply_config(package, config_name, backtrace)
-      if (@applied_configs[package.package_name] ||= []).member?(config_name)
+      if package.applied_config_names.member?(config_name)
         return
       end
       new_backtrace = backtrace
 
       config = package[config_name]
       config.statements.each { |stmt| apply_config_statement(package, stmt, new_backtrace) }
-      @applied_configs[package.package_name] << config_name
+      package.add_applied_config_name(config_name)
+
+      return
     end
 
     def execute_shell(command)
       with_environment do
         yield command.map{|arg| expand_command_line_argument(arg)}
       end
+
+      return
     end
 
     def execute_command(command, args, package)
@@ -77,10 +95,17 @@ module Fig
 
         yield expand_path(argument, package).split(' ')
       end
+
+      return
     end
 
     def find_config_name_in_package(package_name)
-      return @applied_configs.key?(package_name) ? @applied_configs[package_name].first : 'default'
+      package = get_package(package_name)
+      if not package
+        return Package::DEFAULT_CONFIG
+      end
+
+      return package.primary_config_name || Package::DEFAULT_CONFIG
     end
 
     def execute_config(base_package, package_name, config_name, version_name, args, &block)
@@ -97,21 +122,25 @@ module Fig
       else
         raise UserInputError.new(%Q<The "#{package.to_s}" package with the "#{config_name}" configuration does not contain a command.>)
       end
+
+      return
     end
 
     def apply_config_statement(base_package, statement, backtrace)
       case statement
-      when Package::Path
+      when Statement::Path
         append_variable(base_package, statement.name, statement.value)
-      when Package::Set
+      when Statement::Set
         set_variable(base_package, statement.name, statement.value)
-      when Package::Include
+      when Statement::Include
         include_config(base_package, statement.package_name, statement.config_name, statement.version_name, statement.overrides, backtrace)
-      when Package::Command
+      when Statement::Command
         # ignore
       else
         fail "Unexpected statement: #{statement}"
       end
+
+      return
     end
 
     def include_config(base_package, package_name, config_name, version_name, overrides, backtrace)
@@ -126,14 +155,22 @@ module Fig
       overrides.each do |override|
         new_backtrace.add_override(override.package_name, override.version_name)
       end
-      package = lookup_package(package_name || base_package.package_name, version_name, new_backtrace)
-      apply_config(package, config_name || 'default', new_backtrace)
+      package = lookup_package(
+        package_name || base_package.package_name, version_name, new_backtrace
+      )
+      apply_config(
+        package, config_name || Package::DEFAULT_CONFIG, new_backtrace
+      )
+
+      return
     end
 
     private
 
     def set_variable(base_package, name, value)
       @variables[name] = expand_and_retrieve_variable_value(base_package, name, value)
+
+      return
     end
 
     def append_variable(base_package, name, value)
@@ -153,6 +190,8 @@ module Fig
       else
         @variables[name] = value
       end
+
+      return
     end
 
     def with_environment
@@ -163,12 +202,19 @@ module Fig
       ensure
         old_env.each { |key,value| ENV[key] = value }
       end
+
+      return
     end
 
     def lookup_package(package_name, version_name, backtrace)
-      package = @packages[package_name]
+      package = get_package(package_name)
       if package.nil?
-        package = @repository.load_package(package_name, version_name || DEFAULT_VERSION_NAME)
+        if not version_name
+          Logging.fatal "No version specified for #{package_name}."
+          raise RepositoryError.new
+        end
+
+        package = @repository.get_package(package_name, version_name)
         package.backtrace = backtrace
         @packages[package_name] = package
       elsif version_name && version_name != package.version_name
@@ -181,7 +227,8 @@ module Fig
           + ( stacktrace.empty? ? '' : "\n#{stacktrace}" )
         raise RepositoryError.new
       end
-      package
+
+      return package
     end
 
     # Replace @ symbol with the package's directory, "[package]" with the
@@ -215,12 +262,14 @@ module Fig
         end
         file = target
       end
+
       return file
     end
 
     def expand_path(path, base_package)
       expanded_path = expand_at_sign_package_references(path, base_package)
       check_for_bad_escape(expanded_path, path)
+
       return expanded_path.gsub(%r< \\ ([\\@]) >x, '\1')
     end
 
@@ -235,6 +284,8 @@ module Fig
         backslashes = $1 || ''
         backslashes + base_package.directory
       end
+
+      return
     end
 
     def expand_command_line_argument(arg)
@@ -254,9 +305,9 @@ module Fig
         >x
       ) do |match|
         backslashes = $1 || ''
-        package = @packages[$2]
+        package = get_package($2)
         if package.nil?
-          raise RepositoryError.new "Package not found: #{$1}"
+          raise RepositoryError.new("Package not found: #{$1}")
         end
         backslashes + package.directory
       end
@@ -274,6 +325,8 @@ module Fig
           %Q<Unknown escape "#{$1}" in "#{original}">
         )
       end
+
+      return
     end
 
     def translate_retrieve_variables(base_package, name)

data/lib/fig/figrc.rb

@@ -2,7 +2,7 @@ require 'json'
 
 require 'fig/applicationconfiguration'
 require 'fig/configfileerror'
-require 'fig/os'
+require 'fig/operatingsystem'
 
 REPOSITORY_CONFIGURATION = '_meta/figrc'
 
@@ -64,7 +64,7 @@ module Fig
       repo_figrc_path =
         File.expand_path(File.join(fig_home, REPOSITORY_CONFIGURATION))
 
-      os = OS.new(login)
+      os = OperatingSystem.new(login)
 
       repo_config_exists = nil
       begin

data/lib/fig/grammar.treetop

@@ -1,15 +1,15 @@
 require 'fig/package'
-require 'fig/package/archive'
-require 'fig/package/command'
-require 'fig/package/configuration'
-require 'fig/package/include'
-require 'fig/package/install'
-require 'fig/package/override'
-require 'fig/package/path'
-require 'fig/package/publish'
-require 'fig/package/resource'
-require 'fig/package/retrieve'
-require 'fig/package/set'
+require 'fig/packagedescriptor'
+require 'fig/statement/archive'
+require 'fig/statement/command'
+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
 
@@ -34,7 +34,7 @@ grammar Fig
   rule archive
     "archive" ws url {
       def to_package_statement
-        Package::Archive.new(url.value.text_value)
+        Statement::Archive.new(url.value.text_value)
       end
     }
   end
@@ -42,7 +42,7 @@ grammar Fig
   rule resource
     "resource" ws url {
       def to_package_statement
-        Package::Resource.new(url.value.text_value)
+        Statement::Resource.new(url.value.text_value)
       end
     }
   end
@@ -50,7 +50,7 @@ grammar Fig
   rule retrieve
     "retrieve" ws var:retrieve_variable "->" path:retrieve_path ws {
       def to_package_statement
-        Package::Retrieve.new(var.text_value, path.text_value)
+        Statement::Retrieve.new(var.text_value, path.text_value)
       end
     }
   end
@@ -63,18 +63,10 @@ grammar Fig
     [a-zA-Z0-9_/.\[\]-]+
   end
 
-  rule install
-    "install" ws statements:config_statement* "end" ws {
-      def to_package_statement
-        Package::Install.new(statements.elements.map { |statement| statement.to_config_statement })
-      end
-    }
-  end
-
   rule config
     "config" ws config_name ws statements:config_statement* "end" ws {
       def to_package_statement
-        Package::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
+        Statement::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
       end
     }
   end
@@ -86,10 +78,10 @@ grammar Fig
   rule include
     "include" ws descriptor overrides:(override*) {
       def to_config_statement
-        package = descriptor.respond_to?(:package) ? descriptor.package.text_value : nil
-        config = descriptor.get_config
-        version = descriptor.get_version
-        Package::Include.new(package, config, version, overrides.elements.map{ |e| e.to_override })
+        Statement::Include.new(
+          PackageDescriptor.parse(descriptor.text_value.strip),
+          overrides.elements.map{ |e| e.to_override }
+        )
       end
     }
   end
@@ -97,7 +89,7 @@ grammar Fig
   rule override
     "override" ws package_name "/" version_name ws {
       def to_override
-        return Package::Override.new(package_name.text_value, version_name.text_value)
+        return Statement::Override.new(package_name.text_value, version_name.text_value)
       end
     }
   end
@@ -105,7 +97,7 @@ grammar Fig
   rule path
     ("append" / "path" / "add") ws name:path_name "=" value:path_value ws {
       def to_config_statement
-        Package::Path.new(name.text_value, value.text_value)
+        Statement::Path.new(name.text_value, value.text_value)
       end
     }
   end
@@ -121,7 +113,7 @@ grammar Fig
   rule set
     "set" ws name:set_name "=" value:set_value ws {
       def to_config_statement
-        Package::Set.new(name.text_value, value.text_value)
+        Statement::Set.new(name.text_value, value.text_value)
       end
     }
   end
@@ -137,7 +129,7 @@ grammar Fig
   rule command
     "command" ws string {
       def to_config_statement
-        Package::Command.new(string.value.text_value)
+        Statement::Command.new(string.value.text_value)
       end
     }
   end

data/lib/fig/{os.rb → operatingsystem.rb}

@@ -1,13 +1,15 @@
 require 'fileutils'
 # Must specify absolute path of ::Archive when using
-# this module to avoid conflicts with Fig::Package::Archive
+# this module to avoid conflicts with Fig::Statement::Archive
 require 'libarchive_ruby' unless RUBY_PLATFORM == 'java'
-require 'uri'
 require 'net/http'
 require 'net/ssh'
 require 'net/sftp'
 require 'net/netrc'
+require 'rbconfig'
 require 'tempfile'
+require 'uri'
+
 require 'highline/import'
 
 require 'fig/logging'
@@ -17,7 +19,7 @@ require 'fig/notfounderror'
 module Fig
   # Does things requiring real O/S interaction, primarilly taking care of file
   # transfers and running external commands.
-  class OS
+  class OperatingSystem
     def initialize(login)
       @login = login
       @username = ENV['FIG_USERNAME']
@@ -77,7 +79,7 @@ module Fig
         uri = URI.parse(url)
       rescue
         Logging.fatal %Q<Unable to parse url: "#{url}">
-        raise NetworkError.new(%Q<Unable to parse url: "#{url}">)
+        raise NetworkError.new
       end
       case uri.scheme
       when 'ftp'
@@ -184,7 +186,7 @@ module Fig
         begin
           FileUtils.cp(uri.path, path)
           return true
-        rescue Errno::ENOENT => e
+        rescue Errno::ENOENT
           raise NotFoundError.new
         end
       else
@@ -292,7 +294,7 @@ module Fig
 
     # Expects files_to_archive as an Array of filenames.
     def create_archive(archive_name, files_to_archive)
-      if OS.java?
+      if OperatingSystem.java?
         `tar czvf #{archive_name} #{files_to_archive.join(' ')}`
       else
         # TODO: Need to verify files_to_archive exists.
@@ -318,7 +320,7 @@ module Fig
     # .zip
     def unpack_archive(dir, file)
       Dir.chdir(dir) do
-        if OS.java?
+        if OperatingSystem.java?
           `tar xzvf #{file}`
         else
           ::Archive.read_open_filename(file) do |ar|
@@ -331,7 +333,7 @@ module Fig
     end
 
     def self.windows?
-      Config::CONFIG['host_os'] =~ /mswin|mingw/
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
     def self.java?
@@ -343,7 +345,7 @@ module Fig
     end
 
     def shell_exec(cmd)
-      if OS.windows?
+      if OperatingSystem.windows?
         Windows.shell_exec_windows(cmd)
       else
         shell_exec_unix(cmd)