fig 0.1.41 → 0.1.42

data/Changes

@@ -1,9 +1,19 @@
+v0.1.xx
+
+  - "file:" protocol works for FIG_REMOTE_HOME.
+
+  - Testing no longer requires ssh.
+
+
 v0.1.41
 
   - Release cleanup
 
+
 v0.1.40
 
+  - Works on Mac (in conjunction with libarchive-static 1.0.1).
+
   - Supports configuration via rc files in JSON format.  These can be (in
     ascending order of priority of values):
       - in the repository under "_meta/figrc"

data/VERSION

@@ -1 +1 @@
-0.1.41
+0.1.42

data/lib/fig.rb

@@ -7,6 +7,9 @@ require 'fig/figrc'
 require 'fig/logging'
 require 'fig/options'
 require 'fig/os'
+require 'fig/package'
+require 'fig/package/configuration'
+require 'fig/package/publish'
 require 'fig/parser'
 require 'fig/repository'
 require 'fig/retriever'
@@ -18,9 +21,9 @@ module Fig
 
   def parse_descriptor(descriptor)
     # todo should use treetop for these:
-    package_name = descriptor =~ /^([^:\/]+)/ ? $1 : nil
-    config_name = descriptor =~ /:([^:\/]+)/ ? $1 : nil
-    version_name = descriptor =~ /\/([^:\/]+)/ ? $1 : nil
+    package_name = descriptor =~ %r< ^ ( [^:/]+ ) >x ? $1 : nil
+    config_name  = descriptor =~ %r< : ( [^:/]+ ) >x ? $1 : nil
+    version_name = descriptor =~ %r< / ( [^:/]+ ) >x ? $1 : nil
     return package_name, config_name, version_name
   end
 
@@ -129,7 +132,7 @@ module Fig
     end
 
     if input
-      package = Parser.new.parse_package(nil, nil, '.', input)
+      package = Parser.new(configuration).parse_package(nil, nil, '.', input)
       direct_retrieves=[]
       if options[:retrieve]
         package.retrieves.each do |var, path|
@@ -162,8 +165,8 @@ module Fig
         return 10
       end
       if not options[:modifiers].empty?
-        publish_statements = options[:resources] + options[:archives] + [Configuration.new('default', options[:modifiers])]
-        publish_statements << Publish.new('default','default')
+        publish_statements = options[:resources] + options[:archives] + [Package::Configuration.new('default', options[:modifiers])]
+        publish_statements << Package::Publish.new('default','default')
       elsif not package.statements.empty?
         publish_statements = package.statements
       else
@@ -208,7 +211,8 @@ module Fig
       return_code = run_fig(argv)
       return return_code
     rescue URLAccessError => exception
-      $stderr.puts "Access to #{exception.url} not allowed."
+      urls = exception.urls.join(', ')
+      $stderr.puts "Access to #{urls} in #{exception.package}/#{exception.version} not allowed."
       return 1
     rescue UserInputError => exception
       # If there's no message, we assume that the cause has already been logged.
@@ -216,6 +220,10 @@ module Fig
         $stderr.puts exception.to_s
       end
 
+      return 1
+    rescue OptionParser::InvalidOption => exception
+      $stderr.puts exception.to_s
+      $stderr.puts USAGE
       return 1
     end
   end

data/lib/fig/environment.rb

@@ -2,6 +2,10 @@ 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/repositoryerror'
 
 module Fig
@@ -72,13 +76,13 @@ module Fig
 
     def apply_config_statement(base_package, statement, backtrace)
       case statement
-      when Path
+      when Package::Path
         append_variable(base_package, statement.name, statement.value)
-      when Set
+      when Package::Set
         set_variable(base_package, statement.name, statement.value)
-      when Include
+      when Package::Include
         include_config(base_package, statement.package_name, statement.config_name, statement.version_name, statement.overrides, backtrace)
-      when Command
+      when Package::Command
         # ignore
       else
         fail "Unexpected statement: #{statement}"

data/lib/fig/grammar.treetop

@@ -1,4 +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'
 
 module Fig
 
@@ -6,7 +17,12 @@ grammar Fig
   rule package
     ws statements:(package_statement*) {
       def to_package(package_name, version_name, directory)
-        Package.new(package_name, version_name, directory, statements.elements.map { |statement| statement.to_package_statement })
+        Package.new(
+          package_name,
+          version_name,
+          directory,
+          statements.elements.map { |statement| statement.to_package_statement }
+        )
       end
     }
   end
@@ -18,7 +34,7 @@ grammar Fig
   rule archive
     "archive" ws url {
       def to_package_statement
-        Archive.new(url.value.text_value)
+        Package::Archive.new(url.value.text_value)
       end
     }
   end
@@ -26,23 +42,31 @@ grammar Fig
   rule resource
     "resource" ws url {
       def to_package_statement
-        Resource.new(url.value.text_value)
+        Package::Resource.new(url.value.text_value)
       end
     }
   end
 
   rule retrieve
-    "retrieve" ws var:[@a-zA-Z0-9/\._]+ "->" path:[a-zA-Z0-9_/\.\-\[\]]+ ws {
+    "retrieve" ws var:retrieve_variable "->" path:retrieve_path ws {
       def to_package_statement
-        Retrieve.new(var.text_value, path.text_value)
+        Package::Retrieve.new(var.text_value, path.text_value)
       end
     }
   end
 
+  rule retrieve_variable
+    [@a-zA-Z0-9/._]+
+  end
+
+  rule retrieve_path
+    [a-zA-Z0-9_/.\[\]-]+
+  end
+
   rule install
     "install" ws statements:config_statement* "end" ws {
       def to_package_statement
-        Install.new(statements.elements.map { |statement| statement.to_config_statement })
+        Package::Install.new(statements.elements.map { |statement| statement.to_config_statement })
       end
     }
   end
@@ -50,7 +74,7 @@ grammar Fig
   rule config
     "config" ws config_name ws statements:config_statement* "end" ws {
       def to_package_statement
-        Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
+        Package::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
       end
     }
   end
@@ -65,7 +89,7 @@ grammar Fig
         package = descriptor.respond_to?(:package) ? descriptor.package.text_value : nil
         config = descriptor.get_config
         version = descriptor.get_version
-        Include.new(package, config, version, overrides.elements.map{ |e| e.to_override })
+        Package::Include.new(package, config, version, overrides.elements.map{ |e| e.to_override })
       end
     }
   end
@@ -73,31 +97,47 @@ grammar Fig
   rule override
     "override" ws package_name "/" version_name ws {
       def to_override
-        return Override.new(package_name.text_value, version_name.text_value)
+        return Package::Override.new(package_name.text_value, version_name.text_value)
       end
     }
   end
 
   rule path
-    ("append" / "path" / "add") ws name:[a-zA-Z0-9_]+ "=" value:[@a-zA-Z0-9/\-\\._]+ ws {
+    ("append" / "path" / "add") ws name:path_name "=" value:path_value ws {
       def to_config_statement
-        Path.new(name.text_value, value.text_value)
+        Package::Path.new(name.text_value, value.text_value)
       end
     }
   end
 
+  rule path_name
+    [a-zA-Z0-9_]+
+  end
+
+  rule path_value
+    [@a-zA-Z0-9/\\._-]+
+  end
+
   rule set
-    "set" ws name:[a-zA-Z0-9_]+ "=" value:[@a-zA-Z0-9/\-\\._]+ ws {
+    "set" ws name:set_name "=" value:set_value ws {
       def to_config_statement
-        Set.new(name.text_value, value.text_value)
+        Package::Set.new(name.text_value, value.text_value)
       end
     }
   end
 
+  rule set_name
+    [a-zA-Z0-9_]+
+  end
+
+  rule set_value
+    [@a-zA-Z0-9/\\._-]+
+  end
+
   rule command
     "command" ws string {
       def to_config_statement
-        Command.new(string.value.text_value)
+        Package::Command.new(string.value.text_value)
       end
     }
   end
@@ -134,11 +174,11 @@ grammar Fig
   end
 
   rule version_name
-    [a-zA-Z0-9_\-.]+
+    [a-zA-Z0-9_.-]+
   end
 
   rule config_name
-    [a-zA-Z0-9_\-.]+
+    [a-zA-Z0-9_.-]+
   end
 
   rule name
@@ -146,7 +186,7 @@ grammar Fig
   end
 
   rule url
-    (value:[a-zA-Z0-9:/\-\\._\*]+ ws) / ('"' value:[a-zA-Z0-9:/\-\\._]+ '"' ws)
+    (value:[a-zA-Z0-9:/\\._*-]+ ws) / ('"' value:[a-zA-Z0-9:/\\._-]+ '"' ws)
   end
 
   rule ws

data/lib/fig/options.rb

@@ -1,5 +1,10 @@
 require 'optparse'
 require 'fig/package'
+require 'fig/package/archive'
+require 'fig/package/include'
+require 'fig/package/path'
+require 'fig/package/resource'
+require 'fig/package/set'
 
 module Fig
   def parse_descriptor(descriptor)
@@ -66,7 +71,7 @@ EOF
         'append (actually, prepend) VAL to environment var VAR, delimited by separator'
       ) do |var_val|
         var, val = var_val.split('=')
-        options[:modifiers] << Path.new(var, val)
+        options[:modifiers] << Package::Path.new(var, val)
       end
 
       options[:archives] = []
@@ -74,7 +79,7 @@ EOF
         '--archive FULLPATH',
         'include FULLPATH archive in package (when using --publish)'
       ) do |path|
-        options[:archives] << Archive.new(path)
+        options[:archives] << Package::Archive.new(path)
       end
 
       options[:cleans] = []
@@ -127,7 +132,7 @@ EOF
         'include PKG (with any variable prepends) in environment'
       ) do |descriptor|
         package_name, config_name, version_name = parse_descriptor(descriptor)
-        options[:modifiers] << Include.new(package_name, config_name, version_name, {})
+        options[:modifiers] << Package::Include.new(package_name, config_name, version_name, {})
       end
 
       options[:list] = false
@@ -179,14 +184,14 @@ EOF
         '--resource FULLPATH',
         'include FULLPATH resource in package (when using --publish)'
       ) do |path|
-        options[:resources] << Resource.new(path)
+        options[:resources] << Package::Resource.new(path)
       end
 
       opts.on(
         '-s', '--set VAR=VAL', 'set environment variable VAR to VAL'
       ) do |var_val|
         var, val = var_val.split('=')
-        options[:modifiers] << Set.new(var, val)
+        options[:modifiers] << Package::Set.new(var, val)
       end
 
       options[:update] = false

data/lib/fig/os.rb

@@ -68,12 +68,22 @@ module Fig
     NOT_MODIFIED = 3
     NOT_FOUND = 4
 
+    def strip_paths_for_list(ls_output, packages, path)
+      if not ls_output.nil?
+        ls_output = ls_output.gsub(path + '/', '').gsub(path, '').split("\n")
+        ls_output.each do |line|
+          parts = line.gsub(/\\/, '/').sub(/^\.\//, '').sub(/:$/, '').chomp().split('/')
+          packages << parts.join('/') if parts.size == 2
+        end
+      end
+    end
+
     def download_list(url)
       begin
         uri = URI.parse(url)
       rescue
         Logging.fatal %Q<Unable to parse url: "#{url}">
-        raise NetworkError.new
+        raise NetworkError.new(%Q<Unable to parse url: "#{url}">)
       end
       case uri.scheme
       when 'ftp'
@@ -88,18 +98,17 @@ module Fig
         packages = []
         Net::SSH.start(uri.host, uri.user) do |ssh|
           ls = ssh.exec!("[ -d #{uri.path} ] && find #{uri.path}")
-          if not ls.nil?
-            ls = ls.gsub(uri.path + '/', '').gsub(uri.path, '').split("\n")
-            ls.each do |line|
-              parts = line.gsub(/\\/, '/').sub(/^\.\//, '').sub(/:$/, '').chomp().split('/')
-              packages << parts.join('/') if parts.size == 2
-            end
-          end
+          strip_paths_for_list(ls, packages, uri.path)
         end
         packages
+      when 'file'
+        packages = []
+        ls = %x<[ -d #{uri.path} ] && find #{uri.path}>
+        strip_paths_for_list(ls, packages, uri.path)
+        return packages
       else
         Logging.fatal "Protocol not supported: #{url}"
-        raise NetworkError.new
+        raise NetworkError.new("Protocol not supported: #{url}")
       end
     end
 
@@ -170,9 +179,15 @@ module Fig
         cmd = `which fig-download`.strip + " #{timestamp} #{uri.path}"
         log_download(url, path)
         ssh_download(uri.user, uri.host, path, cmd)
+      when 'file'
+        begin
+          FileUtils.cp(uri.path, path)
+        rescue Errno::ENOENT => e
+          raise NotFoundError.new
+        end
       else
         Logging.fatal "Unknown protocol: #{url}"
-        raise NetworkError.new
+        raise NetworkError.new("Unknown protocol: #{url}")
       end
     end
 
@@ -197,7 +212,7 @@ module Fig
         unpack_archive(dir, path)
       else
         Logging.fatal "Unknown archive type: #{basename}"
-        raise NetworkError.new
+        raise NetworkError.new("Unknown archive type: #{basename}")
       end
     end
 
@@ -233,6 +248,12 @@ module Fig
           end
           ftp.putbinaryfile(local_file)
         end
+      when 'file'
+        FileUtils.mkdir_p(File.dirname(uri.path))
+        FileUtils.cp(local_file, uri.path)
+      else
+        Logging.fatal "Unknown protocol: #{uri}"
+        raise NetworkError.new("Unknown protocol: #{uri}")
       end
     end
 
@@ -371,7 +392,7 @@ module Fig
       else
         tempfile.delete
         Logging.fatal "Unable to download file #{path}: #{return_code}"
-        raise NetworkError.new
+        raise NetworkError.new("Unable to download file #{path}: #{return_code}")
       end
     end
 

data/lib/fig/package.rb

@@ -1,216 +1,69 @@
 require 'fig/logging'
 require 'fig/packageerror'
-
-module Fig
-  class Package
-    attr_reader :package_name, :version_name, :directory, :statements
-    attr_accessor :backtrace
-
-    def initialize(package_name, version_name, directory, statements)
-      @package_name = package_name
-      @version_name = version_name
-      @directory = directory
-      @statements = statements
-      @backtrace = nil
-    end
-
-    def [](config_name)
-      @statements.each do |stmt|
-        return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
-      end
-      Fig::Logging.fatal "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
-      raise PackageError.new
-    end
-
-    def configs
-      @statements.select { |statement| statement.is_a?(Configuration) }
-    end
-
-    def retrieves
-      retrieves = {}
-      statements.each { |statement| retrieves[statement.var] = statement.path if statement.is_a?(Retrieve) }
-      retrieves
-    end
-
-    def archive_urls
-      @statements.select{|s| s.is_a?(Archive)}.map{|s|s.url}
-    end
-
-    def resource_urls
-      @statements.select{|s| s.is_a?(Resource)}.map{|s|s.url}
-    end
-
-    def unparse
-      @statements.map { |statement| statement.unparse('') }.join("\n")
-    end
-
-    def ==(other)
-      @package_name == other.package_name && @version_name == other.version_name && @statements.to_yaml == other.statements.to_yaml
-    end
-
-    def to_s
-      @package_name + '/' + @version_name
-    end
+require 'fig/package/archive'
+require 'fig/package/configuration'
+require 'fig/package/resource'
+require 'fig/package/retrieve'
+
+module Fig; end
+
+class Fig::Package
+  attr_reader :package_name, :version_name, :directory, :statements
+  attr_accessor :backtrace
+
+  def initialize(package_name, version_name, directory, statements)
+    @package_name = package_name
+    @version_name = version_name
+    @directory = directory
+    @statements = statements
+    @backtrace = nil
   end
 
-  class Archive
-    attr_reader :url
-
-    def initialize(url)
-      @url = url
-    end
-
-    def unparse(indent)
-      %Q<#{indent}archive "#{url}">
+  def [](config_name)
+    @statements.each do |stmt|
+      return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
     end
+    Fig::Logging.fatal "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
+    raise PackageError.new
   end
 
-  class Resource
-    attr_reader :url
-
-    def initialize(url)
-      @url = url
-    end
-
-    def unparse(indent)
-      "#{indent}resource #{url}"
-    end
+  def configs
+    @statements.select { |statement| statement.is_a?(Configuration) }
   end
 
-  class Retrieve
-    attr_reader :var, :path
-
-    def initialize(var, path)
-      @var = var
-      @path = path
-    end
-
-    def unparse(indent)
-      "#{indent}retrieve #{var}->#{path}"
-    end
+  def retrieves
+    retrieves = {}
+    statements.each { |statement| retrieves[statement.var] = statement.path if statement.is_a?(Retrieve) }
+    retrieves
   end
 
-  class Publish
-    attr_reader :local_name, :remote_name
-
-    def initialize(local_name, remote_name)
-      @local_name = local_name
-      @remote_name = remote_name
-    end
-
-    def unparse(indent)
-      "#{indent}publish #{@local_name}->#{@remote_name}"
-    end
+  def archive_urls
+    @statements.select{|s| s.is_a?(Archive)}.map{|s|s.url}
   end
 
-  class Install
-    def initialize(statements)
-      @statements = statements
-    end
-
-    def unparse(indent)
-      prefix = "\n#{indent}install"
-      body = @statements.map { |statement| statement.unparse(indent+'  ') }.join("\n")
-      suffix = "#{indent}end"
-      return [prefix, body, suffix].join("\n")
-    end
-  end
-
-  class Configuration
-    attr_reader :name, :statements
-
-    def initialize(name, statements)
-      @name = name
-      @statements = statements
-    end
-
-    def with_name(name)
-      Configuration.new(name, statements)
-    end
-
-    def commands
-      result = statements.select { |statement| statement.is_a?(Command) }
-      result
-    end
-
-    def unparse(indent)
-      unparse_statements(indent, "config #{@name}", @statements, 'end')
-    end
-  end
-
-  class Path
-    attr_reader :name, :value
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-    end
-
-    def unparse(indent)
-      "#{indent}append #{name}=#{value}"
-    end
+  def resource_urls
+    @statements.select{|s| s.is_a?(Resource)}.map{|s|s.url}
   end
 
-  class Set
-    attr_reader :name, :value
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-    end
-
-    def unparse(indent)
-      "#{indent}set #{name}=#{value}"
+  def walk_statements(&block)
+    @statements.each do |statement|
+      yield statement
+      statement.walk_statements &block
     end
   end
 
-  class Include
-    attr_reader :package_name, :config_name, :version_name, :overrides
-
-    def initialize(package_name, config_name, version_name, overrides)
-      @package_name = package_name
-      @config_name = config_name
-      @version_name = version_name
-      @overrides = overrides
-    end
-
-    def unparse(indent)
-      descriptor = ''
-      descriptor += @package_name if @package_name
-      descriptor += "/#{@version_name}" if @version_name
-      descriptor += ":#{@config_name}" if @config_name
-      @overrides.each do |override|
-        descriptor += override.unparse
-      end
-      return "#{indent}include #{descriptor}"
-    end
+  def unparse
+    @statements.map { |statement| statement.unparse('') }.join("\n")
   end
 
-  class Override
-    attr_reader :package_name, :version_name
-
-    def initialize(package_name, version_name)
-      @package_name = package_name
-      @version_name = version_name
-    end
-
-    def unparse()
-      return ' override ' + @package_name + '/' + @version_name
-    end
+  def ==(other)
+    return false if other.nil?
+    @package_name == other.package_name && @version_name == other.version_name && @statements.to_yaml == other.statements.to_yaml
   end
 
-  class Command
-    attr_reader :command
-
-    def initialize(command)
-      @command = command
-    end
-
-    def unparse(indent)
-      %Q<#{indent}command "#{@command}">
-    end
+  def to_s
+    @package_name + '/' + @version_name
   end
-
 end
 
 def unparse_statements(indent, prefix, statements, suffix)